Fix built-in Oxygen support

[quassel.git] / src / uisupport / uistyle.cpp

diff --git a/src/uisupport/uistyle.cpp b/src/uisupport/uistyle.cpp
index cbd99c2..08190ed 100644 (file)
--- a/src/uisupport/uistyle.cpp
+++ b/src/uisupport/uistyle.cpp
@@ -19,13 +19,13 @@
  ***************************************************************************/
 #include <QApplication>
 
+#include "quassel.h"
 #include "uistyle.h"
 #include "uisettings.h"
 #include "util.h"
 
 // FIXME remove with migration code
 #include <QSettings>
-#include "global.h"
 
 UiStyle::UiStyle(const QString &settingsKey) : _settingsKey(settingsKey) {
   // register FormatList if that hasn't happened yet
@@ -39,9 +39,9 @@ UiStyle::UiStyle(const QString &settingsKey) : _settingsKey(settingsKey) {
   // FIXME remove migration at some point
   // We remove old settings if we find them, since they conflict
 #ifdef Q_WS_MAC
-  QSettings mys(QCoreApplication::organizationDomain(), Global::clientApplicationName);
+  QSettings mys(QCoreApplication::organizationDomain(), Quassel::buildInfo().clientApplicationName);
 #else
-  QSettings mys(QCoreApplication::organizationName(), Global::clientApplicationName);
+  QSettings mys(QCoreApplication::organizationName(), Quassel::buildInfo().clientApplicationName);
 #endif
   mys.beginGroup("QtUi");
   if(mys.childGroups().contains("Colors")) {
@@ -230,10 +230,13 @@ UiStyle::StyledString UiStyle::styleString(const QString &s_) {
         int color = 10 * s[pos+4].digitValue() + s[pos+5].digitValue();
         //TODO: use 99 as transparent color (re mirc color "standard")
         color &= 0x0f;
-        if(s[pos+3] == 'f')
+        if(s[pos+3] == 'f') {
+          curfmt &= 0xf0ffffff;
           curfmt |= (color << 24) | 0x00400000;
-        else
+        } else {
+          curfmt &= 0x0fffffff;
           curfmt |= (color << 28) | 0x00800000;
+        }
         length = 6;
       }
     } else if(s[pos+1] == 'O') { // reset formatting
@@ -314,6 +317,7 @@ UiStyle::StyledMessage UiStyle::styleMessage(const Message &msg) {
   QString nick = nickFromMask(msg.sender());
   QString txt = mircToInternal(msg.contents());
   QString bufferName = msg.bufferInfo().bufferName();
+  bufferName.replace('%', "%%"); // well, you _can_ have a % in a buffername apparently... -_-
 
   StyledMessage result;
 
@@ -336,7 +340,7 @@ UiStyle::StyledMessage UiStyle::styleMessage(const Message &msg) {
       if(!txt.isEmpty()) t = QString("%1 (%2)").arg(t).arg(txt);
       break;
     case Message::Quit:
-      s = tr("%Dq<--"); t = tr("%Dq%DN%DU%1%DU%DN %DH(%2@%3)%DH has quit").arg(nick, user, host);
+      s = tr("%Dq<--"); t = tr("%Dq%DN%1%DN %DH(%2@%3)%DH has quit").arg(nick, user, host);
       if(!txt.isEmpty()) t = QString("%1 (%2)").arg(t).arg(txt);
       break;
     case Message::Kick: