diff --git a/src/chatlog/chatmessage.cpp b/src/chatlog/chatmessage.cpp index 54f46562b..0f5ae94b5 100644 --- a/src/chatlog/chatmessage.cpp +++ b/src/chatlog/chatmessage.cpp @@ -187,7 +187,7 @@ QString ChatMessage::detectMarkdown(const QString &str) // Create regex for certain markdown syntax QRegExp exp("(\\*\\*)([^\\*\\*]{2,})(\\*\\*)" // Bold **text** - "|(\\*)([^\\*]{2,})(\\*)" // Italics *text* + "|(\\*)([^\\*]{2,})(\\*)" // Bold *text* "|(\\_)([^\\_]{2,})(\\_)" // Italics _text_ "|(\\_\\_)([^\\_\\_]{2,})(\\_\\_)" // Italics __text__ "|(\\-)([^\\-]{2,})(\\-)" // Underline -text- @@ -230,8 +230,8 @@ QString ChatMessage::detectMarkdown(const QString &str) // Match captured string to corresponding md format if (exp.cap(1) == "**") // Bold **text** htmledSnippet = QString(" %1 ").arg(snippet.mid(mul,snippet.length()-2*mul)); - else if (exp.cap(4) == "*" && snippet.length() > 2) // Italics *text* - htmledSnippet = QString(" %1 ").arg(snippet.mid(mul/2,snippet.length()-mul)); + else if (exp.cap(4) == "*" && snippet.length() > 2) // Bold *text* + htmledSnippet = QString(" %1 ").arg(snippet.mid(mul/2,snippet.length()-mul)); else if (exp.cap(7) == "_" && snippet.length() > 2) // Italics _text_ htmledSnippet = QString(" %1 ").arg(snippet.mid(mul/2,snippet.length()-mul)); else if (exp.cap(10) == "__"&& snippet.length() > 4) // Italics __text__ diff --git a/src/widget/form/settings/generalsettings.ui b/src/widget/form/settings/generalsettings.ui index 41e7418a5..c92316da3 100644 --- a/src/widget/form/settings/generalsettings.ui +++ b/src/widget/form/settings/generalsettings.ui @@ -39,8 +39,8 @@ 0 0 - 1280 - 2394 + 1277 + 1272 @@ -481,13 +481,6 @@ will be sent to them when they appear online to you. - - - - - - -