Changeset 6058 for branches/qt-gui_qt4/src/dockicons/dockicon.cpp

Timestamp:

01/24/08 21:40:25 (10 months ago)

Author:

eugene

Message:

Major docking fix.

Files:

• branches/qt-gui_qt4/src/dockicons/dockicon.cpp (modified) (10 diffs)

branches/qt-gui_qt4/src/dockicons/dockicon.cpp

@@ -23 +23 @@
 #include "config.h"
 
-#include <QBitmap>
-#include <QCloseEvent>
-#include <QMenu>
-#include <QMouseEvent>
-#include <QPainter>
-
-#ifdef Q_WS_X11
-#include <QX11Info>
-#include <X11/Xlib.h>
-#include <X11/Xutil.h>
-#undef Status
-#endif
-
 #include <licq_user.h>
 
@@ -42 +29 @@
 
 #include "helpers/licqstrings.h"
-#include "helpers/support.h"
 
 #include "dockiconwidget.h"
@@ -49 +35 @@
 /* TRANSLATOR LicqQtGui::DockIcon */
 
-DockIcon::DockIcon(QMenu* menu)
-  : QWidget(NULL),
-    myMenu(menu),
+DockIcon::DockIcon()
+  : QObject(),
     myIcon(NULL),
     myNewMsg(0),
@@ -58 +43 @@
     myInvisible(false)
 {
-  Support::setWidgetProps(this, "Wharf");
-  setWindowFlags(Qt::Window);
-  setWindowTitle("LicqWharf");
-  setBackgroundRole(QPalette::NoRole);
-
   // Get icon set updates
   connect(IconManager::instance(), SIGNAL(statusIconsChanged()), SLOT(updateStatusIcon()));
@@ -69 +49 @@
   // Get configuration updates
   connect(Config::General::instance(), SIGNAL(dockChanged()), SLOT(updateConfig()));
+
+  unsigned short sysMsg = 0;
+
+  FOR_EACH_OWNER_START(LOCK_R)
+  {
+    sysMsg += pOwner->NewMessages();
+  }
+  FOR_EACH_OWNER_END
+
+  unsigned short newMsg = ICQUser::getNumUserEvents() - sysMsg;
+
+  updateIconMessages(newMsg, sysMsg);
+  updateIconStatus();
 }
 
@@ -74 +67 @@
 {
   delete myIcon;
-}
-
-void DockIcon::X11Init()
-{
-  // set the hints
-#if defined(Q_WS_X11) && !defined(USE_KDE)
-  Display* dsp = x11Info().display();  // get the display
-  WId win = winId();     // get the window
-
-  XSizeHints sizeHints;
-  sizeHints.flags = USPosition;
-  sizeHints.x = 0;
-  sizeHints.y = 0;
-  XSetWMNormalHints(dsp, win, &sizeHints);
-
-  XWMHints* hints = XAllocWMHints();  // hints
-  hints->initial_state = WithdrawnState;
-  hints->icon_x = 0;
-  hints->icon_y = 0;
-  hints->icon_window = myIcon->winId();
-  hints->window_group = win;  // set the window hint
-  hints->flags = WindowGroupHint | IconWindowHint | IconPositionHint | StateHint; // set the window group hint
-  XSetWMHints(dsp, win, hints);  // set the window hints for WM to use.
-  XFree(hints);
-
-  XMapWindow(dsp, myIcon->winId());
-  XMapWindow(dsp, win);
-  XSync(dsp, False);
-
-#endif /* defined(Q_WS_X11) && !defined(USE_KDE) */
-
-  resize(myIcon->size());
-  setMask(myIcon->mask());
-  move(-100, -100);
-  updateToolTip();
-  show();
-#if defined(Q_WS_X11) && !defined(USE_KDE)
-  XWithdrawWindow(dsp, win, XScreenNumberOfScreen(DefaultScreenOfDisplay(dsp)));
-#endif /* defined(Q_WS_X11) && !defined(USE_KDE) */
 }
 
@@ -124 +78 @@
   {
     OwnerList* ol = gUserManager.LockOwnerList(LOCK_R);
-    for (OwnerList::iterator i = ol->begin(); i != ol->end(); i++)
-    {
-      o = *i;
-      o->Lock(LOCK_R);
-      break;
-    }
+    o = ol->front();
+    o->Lock(LOCK_R);
     gUserManager.UnlockOwnerList();
   }
@@ -159 +109 @@
 void DockIcon::updateStatusIcon()
 {
-  myStatusIcon = IconManager::instance()->iconForStatus(myFullStatus, myId, myPpid);
+  myStatusIcon = const_cast<QPixmap*>
+    (&IconManager::instance()->iconForStatus(myFullStatus, myId, myPpid));
 }
 
@@ -174 +125 @@
 {
   if (mySysMsg > 0)
-    myEventIcon = IconManager::instance()->getIcon(IconManager::ReqAuthorizeMessageIcon);
+    myEventIcon = const_cast<QPixmap*>
+      (&IconManager::instance()->getIcon(IconManager::ReqAuthorizeMessageIcon));
   else if (myNewMsg > 0)
-    myEventIcon = IconManager::instance()->getIcon(IconManager::StandardMessageIcon);
+    myEventIcon = const_cast<QPixmap*>
+      (&IconManager::instance()->getIcon(IconManager::StandardMessageIcon));
   else
-    myEventIcon = QPixmap();
+    myEventIcon = NULL;
 }
 
@@ -201 +154 @@
     myIcon->setToolTip(s);
   else
-    setToolTip(s);
+    emit newToolTip(s);
 }
 
-void DockIcon::closeEvent(QCloseEvent* event)
+void DockIcon::relayDockIconSignals()
 {
-  event->ignore();
+  if (myIcon == NULL)
+    return;
+
+  connect(myIcon, SIGNAL(clicked()), SIGNAL(clicked()));
+  connect(myIcon, SIGNAL(middleClicked()), SIGNAL(middleClicked()));
 }
-
-void DockIcon::mousePressEvent(QMouseEvent* event)
-{
-  switch (event->button())
-  {
-    case Qt::LeftButton:
-      emit clicked();
-      break;
-
-    case Qt::MidButton:
-      emit middleClicked();
-      break;
-
-    case Qt::RightButton:
-      myMenu->popup(event->globalPos());
-      break;
-
-    default:
-      break;
-  }
-}
-
-void DockIcon::paintEvent(QPaintEvent* /* event */)
-{
-  QPainter painter(this);
-  myIcon->drawIcon(painter);
-  painter.end();
-}