Skip to content

Commit

Permalink
using > instead of » for a quote (#850)
Browse files Browse the repository at this point in the history
* using > instead of » for a quote

* Remove default global Ctrl+C "Open a chat to the selected contact" binding
  • Loading branch information
Jeka38 committed Jul 17, 2024
1 parent 449720c commit b98f393
Show file tree
Hide file tree
Showing 3 changed files with 3 additions and 3 deletions.
2 changes: 1 addition & 1 deletion options/default.xml
Original file line number Diff line number Diff line change
Expand Up @@ -644,7 +644,7 @@ QLineEdit#le_status_text {
<assign-custom-avatar type="QKeySequence" comment="Assign a custom avatar to the selected contact"/>
<clear-custom-avatar type="QKeySequence" comment="Remove custom avatar from the selected contact"/>
<delete type="QKeySequence" comment="Delete the selected contact">Shift+Del</delete>
<chat type="QKeySequence" comment="Open a chat to the selected contact">Ctrl+C</chat>
<chat type="QKeySequence" comment="Open a chat to the selected contact"></chat>
<message type="QKeySequence" comment="Send a message to the selected contact">Ctrl+M</message>
<event type="QKeySequence" comment="Receive incoming event">Ctrl+R</event>
<rename type="QKeySequence" comment="Rename the selected contact">F2</rename>
Expand Down
2 changes: 1 addition & 1 deletion qa/integration/psi-data/profiles/default/options.xml
Original file line number Diff line number Diff line change
Expand Up @@ -454,7 +454,7 @@
<clear-custom-avatar type="QKeySequence" comment="Remove custom avatar from the selected contact"></clear-custom-avatar>
<message type="QKeySequence" comment="Send a message to the selected contact">Ctrl+M</message>
<event type="QKeySequence" comment="Receive incoming event">Ctrl+R</event>
<chat type="QKeySequence" comment="Open a chat to the selected contact">Ctrl+C</chat>
<chat type="QKeySequence" comment="Open a chat to the selected contact"></chat>
<assign-custom-avatar type="QKeySequence" comment="Assign a custom avatar to the selected contact"></assign-custom-avatar>
<delete type="QKeySequence" comment="Delete the selected contact">Del</delete>
<login-transport type="QKeySequence" comment="Log on to the selected transport">Ctrl+L</login-transport>
Expand Down
2 changes: 1 addition & 1 deletion src/msgmle.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -633,7 +633,7 @@ void ChatEdit::insertAsQuote(const QString &text)
QString prevLine = toPlainText().left(pos - 1);
prevLine = prevLine.mid(prevLine.lastIndexOf("\n") + 1);

auto sym = QChar::fromLatin1(0xBB); // closing double quote
auto sym = QChar::fromLatin1(0x3E); // closing double quote
QString quote = sym + ' ' + text;
quote.replace("\n", QStringLiteral("\n%1 ").arg(sym));

Expand Down

1 comment on commit b98f393

@Neustradamus
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@Ri0n, @Vitozz, @Jeka38: I have always the problem with "»".

Can you solve the bug?

Example from 1:1:

<message from="user1@domain.tld/client" to="user2@domain.tld" id="XXXXXXXXXXXXXXXXXXXXXXX" xml:lang="en" type="chat">
<body>Main quote was
&gt; test</body>
<request xmlns="urn:xmpp:receipts"/>
<markable xmlns="urn:xmpp:chat-markers:0"/>
<origin-id xmlns="urn:xmpp:sid:0" id="XXXXXXXXXXXXXXXXXXXXXXX"/>
<html xmlns="http://jabber.org/protocol/xhtml-im">
<body xmlns="http://www.w3.org/1999/xhtml">Main quote was<br/>
<blockquote>test</blockquote>
</body>
</html>
</message>

Please sign in to comment.