Merge pull request #102 from mamarley/qcaqt5

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

diff --git a/src/uisupport/uistyle.cpp b/src/uisupport/uistyle.cpp
index 8228b8f..944b604 100644 (file)
--- a/src/uisupport/uistyle.cpp
+++ b/src/uisupport/uistyle.cpp
@@ -1,5 +1,5 @@
 /***************************************************************************
- *   Copyright (C) 2005-2014 by the Quassel Project                        *
+ *   Copyright (C) 2005-2015 by the Quassel Project                        *
  *   devel@quassel-irc.org                                                 *
  *                                                                         *
  *   This program is free software; you can redistribute it and/or modify  *
@@ -19,9 +19,9 @@
  ***************************************************************************/
 
 #include <QApplication>
+#include <QIcon>
 
 #include "buffersettings.h"
-#include "iconloader.h"
 #include "qssparser.h"
 #include "quassel.h"
 #include "uistyle.h"
@@ -33,13 +33,13 @@ QString UiStyle::_timestampFormatString;
 
 UiStyle::UiStyle(QObject *parent)
     : QObject(parent),
-    _channelJoinedIcon(SmallIcon("irc-channel-active")),
-    _channelPartedIcon(SmallIcon("irc-channel-inactive")),
-    _userOfflineIcon(SmallIcon("im-user-offline")),
-    _userOnlineIcon(SmallIcon("im-user")),
-    _userAwayIcon(SmallIcon("im-user-away")),
-    _categoryOpIcon(SmallIcon("irc-operator")),
-    _categoryVoiceIcon(SmallIcon("irc-voice")),
+    _channelJoinedIcon(QIcon::fromTheme("irc-channel-joined", QIcon(":/icons/irc-channel-joined.png"))),
+    _channelPartedIcon(QIcon::fromTheme("irc-channel-parted", QIcon(":/icons/irc-channel-parted.png"))),
+    _userOfflineIcon(QIcon::fromTheme("im-user-offline", QIcon::fromTheme("user-offline", QIcon(":/icons/im-user-offline.png")))),
+    _userOnlineIcon(QIcon::fromTheme("im-user", QIcon::fromTheme("user-available", QIcon(":/icons/im-user.png")))), // im-user-* are non-standard oxygen extensions
+    _userAwayIcon(QIcon::fromTheme("im-user-away", QIcon::fromTheme("user-away", QIcon(":/icons/im-user-away.png")))),
+    _categoryOpIcon(QIcon::fromTheme("irc-operator")),
+    _categoryVoiceIcon(QIcon::fromTheme("irc-voice")),
     _opIconLimit(UserCategoryItem::categoryFromModes("o")),
     _voiceIconLimit(UserCategoryItem::categoryFromModes("v"))
 {
@@ -665,14 +665,11 @@ void UiStyle::StyledMessage::style() const
     QString t;
     switch (type()) {
     case Message::Plain:
-        //: Plain Message
-        t = tr("%1").arg(txt); break;
+        t = QString("%1").arg(txt); break;
     case Message::Notice:
-        //: Notice Message
-        t = tr("%1").arg(txt); break;
+        t = QString("%1").arg(txt); break;
     case Message::Action:
-        //: Action Message
-        t = tr("%DN%1%DN %2").arg(nick).arg(txt);
+        t = QString("%DN%1%DN %2").arg(nick).arg(txt);
         break;
     case Message::Nick:
         //: Nick Message
@@ -709,14 +706,11 @@ void UiStyle::StyledMessage::style() const
     //case Message::Kill: FIXME
 
     case Message::Server:
-        //: Server Message
-        t = tr("%1").arg(txt); break;
+        t = QString("%1").arg(txt); break;
     case Message::Info:
-        //: Info Message
-        t = tr("%1").arg(txt); break;
+        t = QString("%1").arg(txt); break;
     case Message::Error:
-        //: Error Message
-        t = tr("%1").arg(txt); break;
+        t = QString("%1").arg(txt); break;
     case Message::DayChange:
     {
         //: Day Change Message
@@ -724,8 +718,7 @@ void UiStyle::StyledMessage::style() const
     }
         break;
     case Message::Topic:
-        //: Topic Message
-        t = tr("%1").arg(txt); break;
+        t = QString("%1").arg(txt); break;
     case Message::NetsplitJoin:
     {
         QStringList users = txt.split("#:#");
@@ -758,10 +751,9 @@ void UiStyle::StyledMessage::style() const
     }
     break;
     case Message::Invite:
-        //: Invite Message
-        t = tr("%1").arg(txt); break;
+        t = QString("%1").arg(txt); break;
     default:
-        t = tr("[%1]").arg(txt);
+        t = QString("[%1]").arg(txt);
     }
     _contents = UiStyle::styleString(t, UiStyle::formatType(type()));
 }
@@ -807,9 +799,9 @@ QString UiStyle::StyledMessage::decoratedSender() const
 {
     switch (type()) {
     case Message::Plain:
-        return tr("<%1>").arg(plainSender()); break;
+        return QString("<%1>").arg(plainSender()); break;
     case Message::Notice:
-        return tr("[%1]").arg(plainSender()); break;
+        return QString("[%1]").arg(plainSender()); break;
     case Message::Action:
         return "-*-"; break;
     case Message::Nick:
@@ -862,7 +854,7 @@ quint8 UiStyle::StyledMessage::senderHash() const
         if (chopCount < nick.size())
             nick.chop(chopCount);
     }
-    quint16 hash = qChecksum(nick.toAscii().data(), nick.toAscii().size());
+    quint16 hash = qChecksum(nick.toLatin1().data(), nick.toLatin1().size());
     return (_senderHash = (hash & 0xf) + 1);
 }