***************************************************************************/
#include <QApplication>
+#include "quassel.h"
#include "uistyle.h"
-#include "uistylesettings.h"
+#include "uisettings.h"
#include "util.h"
+// FIXME remove with migration code
+#include <QSettings>
+
UiStyle::UiStyle(const QString &settingsKey) : _settingsKey(settingsKey) {
// register FormatList if that hasn't happened yet
// FIXME I don't think this actually avoids double registration... then again... does it hurt?
Q_ASSERT(QVariant::nameToType("UiStyle::FormatList") != QVariant::Invalid);
}
+ // 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(), Quassel::buildInfo().clientApplicationName);
+#else
+ QSettings mys(QCoreApplication::organizationName(), Quassel::buildInfo().clientApplicationName);
+#endif
+ mys.beginGroup("QtUi");
+ if(mys.childGroups().contains("Colors")) {
+ qDebug() << "Removing obsolete UiStyle settings!";
+ mys.endGroup();
+ mys.remove("Ui");
+ mys.remove("QtUiStyle");
+ mys.remove("QtUiStyleNew");
+ mys.remove("QtUi/Colors");
+ mys.sync();
+ }
+
_defaultFont = QFont("Monospace", QApplication::font().pointSize());
// Default format
_customFormats[ftype] = fmt;
s.setCustomFormat(ftype, fmt);
} else {
- _customFormats[ftype] = QTextFormat().toCharFormat();
+ _customFormats.remove(ftype);
s.removeCustomFormat(ftype);
}
}
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
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;
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: