[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    kdenonbeta/kopete/kopete
From:       Grzegorz Jaskiewicz <gj () pointblue ! com ! pl>
Date:       2003-07-29 21:37:42
[Download RAW message or body]

CVS commit by gj: 

another evil tooltip change. This was a long time waiting one. Aprroved by other \
guys, reedited by Martijn.  It will be included in 0.7, jupi :-)


  M +30 -2     kopetewindow.cpp   1.125


--- kdenonbeta/kopete/kopete/kopetewindow.cpp  #1.124:1.125
@@ -516,6 +516,34 @@ void KopeteWindow::slotAccountStatusIcon
         // over one protocol
         
-        QToolTip::remove(i);
-        QToolTip::add(i, contact->account()->accountId());
+        QToolTip::remove( i );
+        
+        QString contactLabel;
+        if ( contact->displayName() == contact->account()->accountId() )
+        {
+                contactLabel = contact->displayName();
+        }
+        else
+        {
+                // FIXME: Make this string i18n() after 0.7 - Martijn
+                contactLabel = QString::fromLatin1( "%1 <%2>" ).
+#if QT_VERSION < 0x030200
+                        arg( contact->displayName() ).arg( \
contact->account()->accountId() ); +#else
+                        arg( contact->displayName(), contact->account()->accountId() \
); +#endif
+        }
+
+        // FIXME: Make this string i18n() after 0.7 - Martijn
+        QString tooltip = QString::fromLatin1( "%1 (%2)" ).
+#if QT_VERSION < 0x030200
+                arg( contactLabel ).arg( status.description() );
+#else
+                arg( contactLabel, status.description() );
+#endif
+        
+        if ( !contact->statusDescription().isNull() )
+                tooltip += QString::fromLatin1( "\n" ) + \
contact->statusDescription(); +
+        QToolTip::add( i, tooltip );
 
         // Because we want null pixmaps to detect the need for a loadMovie


[prev in list] [next in list] [prev in thread] [next in thread]