-tooltip in the buffer list is now translatable

-fixed strange formating issue (extra lines between channel name and the rest in windows)

diff --git a/src/client/networkmodel.cpp b/src/client/networkmodel.cpp
index e40c505..5b2f953 100644 (file)
--- a/src/client/networkmodel.cpp
+++ b/src/client/networkmodel.cpp
@@ -288,14 +288,14 @@ QString BufferItem::toolTip(int column) const {
   switch(bufferType()) {
     case BufferInfo::StatusBuffer: {
       QString netName = Client::network(bufferInfo().networkId())->networkName();
   switch(bufferType()) {
     case BufferInfo::StatusBuffer: {
       QString netName = Client::network(bufferInfo().networkId())->networkName();

-      toolTip.append(QString("<b>Status buffer from %1</b>").arg(netName));
+      toolTip.append(tr("<b>Status buffer from %1</b>").arg(netName));

       break;
     }
     case BufferInfo::ChannelBuffer:
       break;
     }
     case BufferInfo::ChannelBuffer:

-      toolTip.append(QString("<h4>Channel %1</h4>").arg(bufferName()));
+      toolTip.append(tr("<b>Channel %1</b>").arg(bufferName()));

       if(isActive()) {
         //TODO: add channel modes 
       if(isActive()) {
         //TODO: add channel modes 

-        toolTip.append(QString("<b>Users:</b> %1").arg(nickCount()));
+        toolTip.append(tr("<b>Users:</b> %1").arg(nickCount()));

 
         BufferSettings s;
         bool showTopic = s.value("DisplayTopicInTooltip", QVariant(false)).toBool();
 
         BufferSettings s;
         bool showTopic = s.value("DisplayTopicInTooltip", QVariant(false)).toBool();


@@ -305,23 +305,23 @@ QString BufferItem::toolTip(int column) const {
             _topic.replace(QString("<"), QString("&lt;"));
             _topic.replace(QString(">"), QString("&gt;"));
             toolTip.append(QString("<font size='-2'>&nbsp;</font>"));
             _topic.replace(QString("<"), QString("&lt;"));
             _topic.replace(QString(">"), QString("&gt;"));
             toolTip.append(QString("<font size='-2'>&nbsp;</font>"));

-            toolTip.append(QString("<b>Topic:</b> %1").arg(_topic));
+            toolTip.append(tr("<b>Topic:</b> %1").arg(_topic));

           }
         }
       } else {
           }
         }
       } else {

-        toolTip.append(QString("Not active <br /> Double-click to join"));
+        toolTip.append(tr("Not active <br /> Double-click to join"));

       }
       break;
     case BufferInfo::QueryBuffer:
       }
       break;
     case BufferInfo::QueryBuffer:

-      toolTip.append(QString("<b>Query with %1</b>").arg(bufferName()));
-      if(topic() != "") toolTip.append(QString("Away Message: %1").arg(topic()));
+      toolTip.append(tr("<b>Query with %1</b>").arg(bufferName()));
+      if(topic() != "") toolTip.append(tr("Away Message: %1").arg(topic()));

       break;
     default: //this should not happen
       break;
     default: //this should not happen

-      toolTip.append(QString("%1 - %2").arg(bufferInfo().bufferId().toInt()).arg(bufferName()));
+      toolTip.append(tr("%1 - %2").arg(bufferInfo().bufferId().toInt()).arg(bufferName()));

       break;
   }
 
       break;
   }
 

-  return QString("<p> %1 </p>").arg(toolTip.join("<br />"));
+  return tr("<p> %1 </p>").arg(toolTip.join("<br />"));

 }
 
 /*
 }
 
 /*

diff --git a/src/uisupport/bufferviewfilter.cpp b/src/uisupport/bufferviewfilter.cpp
index af1686e..a4ece41 100644 (file)
--- a/src/uisupport/bufferviewfilter.cpp
+++ b/src/uisupport/bufferviewfilter.cpp
@@ -171,19 +171,17 @@ QVariant BufferViewFilter::foreground(const QModelIndex &index) const {
   QVariant otherActivity = s.value("otherActivityFG", QVariant(QColor(Qt::darkGreen)));
 
   if(!index.data(NetworkModel::ItemActiveRole).toBool())
   QVariant otherActivity = s.value("otherActivityFG", QVariant(QColor(Qt::darkGreen)));
 
   if(!index.data(NetworkModel::ItemActiveRole).toBool())

-    return inactiveActivity.value<QColor>();
+    return inactiveActivity;

 
   Buffer::ActivityLevel activity = (Buffer::ActivityLevel)index.data(NetworkModel::BufferActivityRole).toInt();
 
   if(activity & Buffer::Highlight)
 
   Buffer::ActivityLevel activity = (Buffer::ActivityLevel)index.data(NetworkModel::BufferActivityRole).toInt();
 
   if(activity & Buffer::Highlight)

-    return highlightActivity.value<QColor>();
+    return highlightActivity;

   if(activity & Buffer::NewMessage)
   if(activity & Buffer::NewMessage)

-    return newMessageActivity.value<QColor>();
+    return newMessageActivity;

   if(activity & Buffer::OtherActivity)
   if(activity & Buffer::OtherActivity)

-    return otherActivity.value<QColor>();
-  
-  return noActivity.value<QColor>();
-  
-  // FIXME:: make colors configurable;
+    return otherActivity;
+
+  return noActivity;

 
 }
 
 }