X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fuisupport%2Fuistyle.cpp;h=4e1bd775d992c480cca818a156d6c02590c8841d;hp=d97302a5e4d9cf513115fbc4f62de1e8a8a8a3ac;hb=661013d9d9588cd5383dbb0838dcfd35c95ba5ad;hpb=118c68a6cf5f098e68a6bed1df18dd6832ca4d10

diff --git a/src/uisupport/uistyle.cpp b/src/uisupport/uistyle.cpp
index d97302a5..4e1bd775 100644
--- a/src/uisupport/uistyle.cpp
+++ b/src/uisupport/uistyle.cpp
@@ -1,5 +1,5 @@
 /***************************************************************************
- *   Copyright (C) 2005-08 by the Quassel Project                          *
+ *   Copyright (C) 2005-09 by the Quassel Project                          *
  *   devel@quassel-irc.org                                                 *
  *                                                                         *
  *   This program is free software; you can redistribute it and/or modify  *
@@ -24,9 +24,6 @@
 #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?
@@ -36,24 +33,6 @@ UiStyle::UiStyle(const QString &settingsKey) : _settingsKey(settingsKey) {
     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
@@ -252,7 +231,7 @@ UiStyle::StyledString UiStyle::styleString(const QString &s_) {
       if(s[pos+1] == 'D') code += s[pos+2];
       FormatType ftype = formatType(code);
       if(ftype == Invalid) {
-        qWarning(qPrintable(QString("Invalid format code in string: %1").arg(s)));
+        qWarning() << (QString("Invalid format code in string: %1").arg(s));
         continue;
       }
       curfmt ^= ftype;
@@ -312,30 +291,25 @@ QString UiStyle::mircToInternal(const QString &mirc_) const {
   return mirc;
 }
 
-UiStyle::StyledMessage UiStyle::styleMessage(const Message &msg) {
-  return StyledMessage(msg, this);
-}
-
 /***********************************************************************************/
+UiStyle::StyledMessage::StyledMessage(const Message &msg)
+  : Message(msg)
+{
+}
 
-UiStyle::StyledMessage::StyledMessage(const Message &msg, UiStyle *style) {
-  QString user = userFromMask(msg.sender());
-  QString host = hostFromMask(msg.sender());
-  QString nick = nickFromMask(msg.sender());
-  QString txt = style->mircToInternal(msg.contents());
-  QString bufferName = msg.bufferInfo().bufferName();
+void UiStyle::StyledMessage::style(UiStyle *style) const {
+  QString user = userFromMask(sender());
+  QString host = hostFromMask(sender());
+  QString nick = nickFromMask(sender());
+  QString txt = style->mircToInternal(contents());
+  QString bufferName = bufferInfo().bufferName();
   bufferName.replace('%', "%%"); // well, you _can_ have a % in a buffername apparently... -_-
 
-  _msgType = msg.type();
-  _timestamp = msg.timestamp();
-
   QString t;
-  switch(msg.type()) {
+  switch(type()) {
     case Message::Plain:
-      _sender = nick;
       t = tr("%D0%1").arg(txt); break;
     case Message::Notice:
-      _sender = nick;
       t = tr("%Dn%1").arg(txt); break;
     case Message::Server:
       t = tr("%Ds%1").arg(txt); break;
@@ -353,14 +327,13 @@ UiStyle::StyledMessage::StyledMessage(const Message &msg, UiStyle *style) {
       break;
     case Message::Kick: {
         QString victim = txt.section(" ", 0, 0);
-        //if(victim == ui.ownNick->currentText()) victim = tr("you");
         QString kickmsg = txt.section(" ", 1);
         t = tr("%Dk%DN%1%DN has kicked %DN%2%DN from %DC%3%DC").arg(nick).arg(victim).arg(bufferName);
         if(!kickmsg.isEmpty()) t = QString("%1 (%2)").arg(t).arg(kickmsg);
       }
       break;
     case Message::Nick:
-      if(nick == msg.contents()) t = tr("%DrYou are now known as %DN%1%DN").arg(txt);
+      if(nick == contents()) t = tr("%DrYou are now known as %DN%1%DN").arg(txt);
       else t = tr("%Dr%DN%1%DN is now known as %DN%2%DN").arg(nick, txt);
       break;
     case Message::Mode:
@@ -371,25 +344,20 @@ UiStyle::StyledMessage::StyledMessage(const Message &msg, UiStyle *style) {
       t = tr("%Da%DN%1%DN %2").arg(nick).arg(txt);
       break;
     default:
-      _sender = msg.sender();
       t = tr("%De[%1]").arg(txt);
   }
   _contents = style->styleString(t);
 }
 
-QDateTime UiStyle::StyledMessage::timestamp() const {
-  return _timestamp;
-}
-
 QString UiStyle::StyledMessage::decoratedTimestamp() const {
-  return QString("[%1]").arg(_timestamp.toLocalTime().toString("hh:mm:ss"));
+  return QString("[%1]").arg(timestamp().toLocalTime().toString("hh:mm:ss"));
 }
 
-QString UiStyle::StyledMessage::sender() const {
+QString UiStyle::StyledMessage::plainSender() const {
   switch(type()) {
     case Message::Plain:
     case Message::Notice:
-      return _sender;
+      return nickFromMask(sender());
     default:
       return QString();
   }
@@ -398,9 +366,9 @@ QString UiStyle::StyledMessage::sender() const {
 QString UiStyle::StyledMessage::decoratedSender() const {
   switch(type()) {
     case Message::Plain:
-      return tr("<%1>").arg(_sender); break;
+      return tr("<%1>").arg(plainSender()); break;
     case Message::Notice:
-      return tr("[%1]").arg(_sender); break;
+      return tr("[%1]").arg(plainSender()); break;
     case Message::Server:
       return tr("*"); break;
     case Message::Error:
@@ -420,18 +388,10 @@ QString UiStyle::StyledMessage::decoratedSender() const {
     case Message::Action:
       return tr("-*-"); break;
     default:
-      return tr("%1").arg(_sender);
+      return tr("%1").arg(plainSender());
   }
 }
 
-QString UiStyle::StyledMessage::contents() const {
-  return _contents.plainText;
-}
-
-UiStyle::FormatType UiStyle::StyledMessage::timestampFormat() const {
-  return UiStyle::Timestamp;
-}
-
 UiStyle::FormatType UiStyle::StyledMessage::senderFormat() const {
   switch(type()) {
     case Message::Plain:
@@ -461,9 +421,6 @@ UiStyle::FormatType UiStyle::StyledMessage::senderFormat() const {
   }
 }
 
-UiStyle::FormatList UiStyle::StyledMessage::contentsFormatList() const {
-  return _contents.formatList;
-}
 
 /***********************************************************************************/