Changeset 6079 for trunk/qt4-gui/src/core

Timestamp:

03/02/08 23:16:21 (9 months ago)

Author:

flynd

Message:

Move popup implementation to dock icon as kde want's the tray icon as reference. Added use of showMessage when building without kde support.

Files:

• trunk/qt4-gui/src/core/mainwin.cpp (modified) (2 diffs)

trunk/qt4-gui/src/core/mainwin.cpp

@@ -34 +34 @@
 #include <KDE/KIconLoader>
 #include <KDE/KUrl>
-#include <KDE/KPassivePopup>
 #else
 #include <QApplication>
@@ -630 +629 @@
           sig->Argument() == 1)
       {
-#if defined(USE_KDE)
         // User on notify list went online -> show popup at systray icon
         if (LicqGui::instance()->dockIcon() != NULL && u->OnlineNotify())
         {
           QString alias = QString::fromUtf8(u->GetAlias());
-          // Escape HTML
-          alias.replace(QChar('&'), "&amp;");
-          alias.replace(QChar('<'), "&lt;");
-          alias.replace(QChar('>'), "&gt;");
-
-          QString msg(tr("%1 is online").arg("<b>" + alias + "</b>"));
           QPixmap px = IconManager::instance()->iconForStatus(u->StatusFull(), u->IdString(), u->PPID());
-          KPassivePopup::message("Licq", msg, px, LicqGui::instance()->dockIcon(), 4000);
+          LicqGui::instance()->dockIcon()->popupMessage(alias, tr("is online"), px, 4000);
         }
-#endif
       }