X-Git-Url: https://git.quassel-irc.org/?a=blobdiff_plain;f=src%2Fuisupport%2Fuistyle.cpp;h=f04dcf228a0c4db93ca663c50da02a22eae96817;hb=a4251618e99c35f727c526f8480055d5a9c5e41f;hp=f23ec19d03f700176edcaa116f28a56bcde93b6d;hpb=3bbdde4a0caba93ffd15981374be6a840183fc8f;p=quassel.git

diff --git a/src/uisupport/uistyle.cpp b/src/uisupport/uistyle.cpp
index f23ec19d..f04dcf22 100644
--- a/src/uisupport/uistyle.cpp
+++ b/src/uisupport/uistyle.cpp
@@ -292,11 +292,11 @@ QTextCharFormat UiStyle::cachedFormat(quint32 formatType, quint32 messageLabel)
   return _formatCache.value(formatType | ((quint64)messageLabel << 32), QTextCharFormat());
 }
 
-void UiStyle::setCachedFormat(const QTextCharFormat &format, quint32 formatType, quint32 messageLabel) {
+void UiStyle::setCachedFormat(const QTextCharFormat &format, quint32 formatType, quint32 messageLabel) const {
   _formatCache[formatType | ((quint64)messageLabel << 32)] = format;
 }
 
-QFontMetricsF *UiStyle::fontMetrics(quint32 ftype, quint32 label) {
+QFontMetricsF *UiStyle::fontMetrics(quint32 ftype, quint32 label) const {
   // QFontMetricsF is not assignable, so we need to store pointers :/
   quint64 key = ftype | ((quint64)label << 32);
 
@@ -310,7 +310,7 @@ QFontMetricsF *UiStyle::fontMetrics(quint32 ftype, quint32 label) {
 
 // NOTE: This and the following functions are intimately tied to the values in FormatType. Don't change this
 //       until you _really_ know what you do!
-QTextCharFormat UiStyle::format(quint32 ftype, quint32 label_) {
+QTextCharFormat UiStyle::format(quint32 ftype, quint32 label_) const {
   if(ftype == Invalid)
     return QTextCharFormat();
 
@@ -332,7 +332,7 @@ QTextCharFormat UiStyle::format(quint32 ftype, quint32 label_) {
   return fmt;
 }
 
-void UiStyle::mergeFormat(QTextCharFormat &fmt, quint32 ftype, quint64 label) {
+void UiStyle::mergeFormat(QTextCharFormat &fmt, quint32 ftype, quint64 label) const {
   mergeSubElementFormat(fmt, ftype & 0x00ff, label);
 
   // TODO: allow combinations for mirc formats and colors (each), e.g. setting a special format for "bold and italic"
@@ -362,7 +362,7 @@ void UiStyle::mergeFormat(QTextCharFormat &fmt, quint32 ftype, quint64 label) {
 }
 
 // Merge a subelement format into an existing message format
-void UiStyle::mergeSubElementFormat(QTextCharFormat& fmt, quint32 ftype, quint64 label) {
+void UiStyle::mergeSubElementFormat(QTextCharFormat& fmt, quint32 ftype, quint64 label) const {
   quint64 key = ftype | label;
   fmt.merge(format(key & Q_UINT64_C(0x0000ffffffffff00)));  // label + subelement
   fmt.merge(format(key & Q_UINT64_C(0x0000ffffffffffff)));  // label + subelement + msgtype
@@ -406,6 +406,8 @@ UiStyle::FormatType UiStyle::formatType(Message::Type msgType) {
       return NetsplitJoinMsg;
     case Message::NetsplitQuit:
       return NetsplitQuitMsg;
+    case Message::Invite:
+      return InviteMsg;
   }
   //Q_ASSERT(false); // we need to handle all message types
   qWarning() << Q_FUNC_INFO << "Unknown message type:" << msgType;
@@ -421,7 +423,7 @@ QString UiStyle::formatCode(FormatType ftype) {
   return _formatCodes.key(ftype);
 }
 
-QList<QTextLayout::FormatRange> UiStyle::toTextLayoutList(const FormatList &formatList, int textLength, quint32 messageLabel) {
+QList<QTextLayout::FormatRange> UiStyle::toTextLayoutList(const FormatList &formatList, int textLength, quint32 messageLabel) const {
   QList<QTextLayout::FormatRange> formatRanges;
   QTextLayout::FormatRange range;
   int i = 0;
@@ -504,6 +506,7 @@ UiStyle::StyledString UiStyle::styleString(const QString &s_, quint32 baseFormat
 QString UiStyle::mircToInternal(const QString &mirc_) {
   QString mirc = mirc_;
   mirc.replace('%', "%%");      // escape % just to be sure
+  mirc.replace('\t', "        ");      // tabs break layout, also this is italics in Konversation
   mirc.replace('\x02', "%B");
   mirc.replace('\x0f', "%O");
   mirc.replace('\x12', "%R");
@@ -657,6 +660,9 @@ void UiStyle::StyledMessage::style() const {
         t.append(tr("%DN%1%DN (%2 more)").arg(static_cast<QStringList>(users.mid(0, maxNetsplitNicks)).join(", ")).arg(users.count() - maxNetsplitNicks));
       }
       break;
+    case Message::Invite:
+      //: Invite Message
+      t = tr("%1").arg(txt); break;
     default:
       t = tr("[%1]").arg(txt);
   }
@@ -698,37 +704,39 @@ QString UiStyle::StyledMessage::decoratedSender() const {
     case Message::Notice:
       return tr("[%1]").arg(plainSender()); break;
     case Message::Action:
-      return tr("-*-"); break;
+      return "-*-"; break;
     case Message::Nick:
-      return tr("<->"); break;
+      return "<->"; break;
     case Message::Mode:
-      return tr("***"); break;
+      return "***"; break;
     case Message::Join:
-      return tr("-->"); break;
+      return "-->"; break;
     case Message::Part:
-      return tr("<--"); break;
+      return "<--"; break;
     case Message::Quit:
-      return tr("<--"); break;
+      return "<--"; break;
     case Message::Kick:
-      return tr("<-*"); break;
+      return "<-*"; break;
     case Message::Kill:
-      return tr("<-x"); break;
+      return "<-x"; break;
     case Message::Server:
-      return tr("*"); break;
+      return "*"; break;
     case Message::Info:
-      return tr("*"); break;
+      return "*"; break;
     case Message::Error:
-      return tr("*"); break;
+      return "*"; break;
     case Message::DayChange:
-      return tr("-"); break;
+      return "-"; break;
     case Message::Topic:
-      return tr("*"); break;
+      return "*"; break;
     case Message::NetsplitJoin:
-      return tr("=>"); break;
+      return "=>"; break;
     case Message::NetsplitQuit:
-      return tr("<="); break;
+      return "<="; break;
+    case Message::Invite:
+      return "->"; break;
     default:
-      return tr("%1").arg(plainSender());
+      return QString("%1").arg(plainSender());
   }
 }