Changeset 6058

Timestamp:

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

Author:

eugene

Message:

Major docking fix.

Location:

branches/qt-gui_qt4/src

Files:

• dockicons/CMakeLists.txt (modified) (2 diffs)
• dockicons/defaultdockicon.cpp (modified) (3 diffs)
• dockicons/defaultdockicon.h (modified) (3 diffs)
• dockicons/dockicon.cpp (modified) (10 diffs)
• dockicons/dockicon.h (modified) (7 diffs)
• dockicons/dockiconwidget.cpp (modified) (2 diffs)
• dockicons/dockiconwidget.h (modified) (4 diffs)
• dockicons/systemtrayicon.cpp (modified) (5 diffs)
• dockicons/systemtrayicon.h (modified) (2 diffs)
• dockicons/themeddockicon.cpp (modified) (7 diffs)
• dockicons/themeddockicon.h (modified) (1 diff)
• helpers/support.cpp (modified) (2 diffs)
• helpers/support.h (modified) (1 diff)

branches/qt-gui_qt4/src/dockicons/CMakeLists.txt

@@ -2 +2 @@
 set(dockicons_SRCS
   dockicon.cpp
-  dockiconwidget.cpp
   systemtrayicon.cpp
 )
@@ -8 +7 @@
 # Other dock icons not available with kde
 if (NOT WITH_KDE)
-  list(APPEND dockicons_SRCS defaultdockicon.cpp themeddockicon.cpp)
+  list(APPEND dockicons_SRCS dockiconwidget.cpp defaultdockicon.cpp themeddockicon.cpp)
 endif (NOT WITH_KDE)
 

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

@@ -48 +48 @@
 
 DefaultDockIcon::DefaultDockIcon(QMenu* menu)
-  : DockIcon(menu)
+  : DockIcon()
 {
+  myIcon = new DockIconWidget(menu);
+  relayDockIconSignals();
   updateConfig();
-}
-
-DefaultDockIcon::~DefaultDockIcon()
-{
-  delete pix;
 }
 
@@ -62 +59 @@
   myFortyEight = Config::General::instance()->defaultIconFortyEight();
 
-  delete myIcon;
+  QPixmap* pic = new QPixmap(myFortyEight ? back48_xpm : back64_xpm);
+  QBitmap bmp = QBitmap(myFortyEight ? mask48_xpm : mask64_xpm);
+  pic->setMask(bmp);
+  myIcon->setFace(pic);
+  delete pic;
 
-  if (myFortyEight)
-  {
-    pix = new QPixmap(back48_xpm);
-    QBitmap b;
-    b = QPixmap(mask48_xpm);
-    pix->setMask(b);
-    myIcon = new DockIconWidget(pix, this);
-  }
-  else
-  {
-    pix = new QPixmap(back64_xpm);
-    QBitmap b;
-    b = QPixmap(mask64_xpm);
-    pix->setMask(b);
-    myIcon = new DockIconWidget(pix, this);
-  }
-  X11Init();
+  updateStatusIcon();
+  updateIconMessages(myNewMsg, mySysMsg);
 }
 
@@ -87 +73 @@
   DockIcon::updateStatusIcon();
 
+  if (!myFortyEight && myNewMsg == 0 && mySysMsg == 0)
+    drawIcon64(myStatusIcon);
+
   QPixmap m;
-  switch (myStatus)
-  {
-    case ICQ_STATUS_ONLINE: m = QPixmap(online_xpm); break;
-    case ICQ_STATUS_AWAY: m = QPixmap(away_xpm); break;
-    case ICQ_STATUS_NA: m = QPixmap(na_xpm); break;
-    case ICQ_STATUS_OCCUPIED: m = QPixmap(occupied_xpm); break;
-    case ICQ_STATUS_DND: m = QPixmap(dnd_xpm); break;
-    case ICQ_STATUS_FREEFORCHAT: m = QPixmap(ffc_xpm); break;
-    case ICQ_STATUS_OFFLINE: m = QPixmap(offline_xpm); break;
-  }
   if (myInvisible)
     m = QPixmap(invisible_xpm);
+  else
+    switch (myStatus)
+    {
+      case ICQ_STATUS_ONLINE: m = QPixmap(online_xpm); break;
+      case ICQ_STATUS_AWAY: m = QPixmap(away_xpm); break;
+      case ICQ_STATUS_NA: m = QPixmap(na_xpm); break;
+      case ICQ_STATUS_OCCUPIED: m = QPixmap(occupied_xpm); break;
+      case ICQ_STATUS_DND: m = QPixmap(dnd_xpm); break;
+      case ICQ_STATUS_FREEFORCHAT: m = QPixmap(ffc_xpm); break;
+      case ICQ_STATUS_OFFLINE: m = QPixmap(offline_xpm); break;
+    }
 
-  QPainter painter(myIcon->vis);
-  if (!myFortyEight)
-  {
-    painter.drawPixmap(0, 44, m);
-    // Draw the little icon if no new messages
-    if (myNewMsg == 0 && mySysMsg == 0)
-    {
-      QPixmap* p = &myStatusIcon;
-      painter.fillRect(31, 6, 27, 16, QColor(0,0,0));
-      if (p != NULL)
-      {
-        int w = p->width() > 27 ? 27 : p->width();
-        int h = p->height() > 16 ? 16 : p->height();
-        int x = 45 - (w / 2);
-        int y = 14 - (h / 2);
-        painter.drawPixmap(x, y, *p, 0, 0, w, h);
-      }
-    }
-  }
-  else
-    painter.drawPixmap(0, 27, m);
+  QPixmap* face = myIcon->face();
+  QPainter painter(face);
+  painter.drawPixmap(0, myFortyEight ? 27 : 44, m);
   painter.end();
 
-  myIcon->repaint();
-  repaint();
-}
-
-void DefaultDockIcon::splitDigits(int num, int& low, int &high)
-{
-  if (num > 99)
-  {
-    low = 9;
-    high = 9;
-  }
-  else
-  {
-    low = num % 10;
-    high = num / 10;
-  }
+  myIcon->setFace(face);
+  delete face;
 }
 
 void DefaultDockIcon::updateIconMessages(int newMsg, int sysMsg)
 {
-  QPainter p(myIcon->vis);
-  int d1, d10;
+  DockIcon::updateIconMessages(newMsg, sysMsg);
 
-  // set the new msg digits
-  splitDigits(newMsg, d1, d10);
+  int low, high;
 
-  if (!myFortyEight)
-  {
-    p.drawPixmap(44, 26, digits[d10]);
-    p.drawPixmap(50, 26, digits[d1]);
-  }
-  else
-  {
-    p.drawPixmap(44, 9, digits[d10]);
-    p.drawPixmap(50, 9, digits[d1]);
-  }
+#define SPLIT(num) \
+  (num) = qMin(num, 99); \
+  low = (num) % 10; \
+  high = (num) / 10;
 
-  // set the system msg digits
-  splitDigits(sysMsg, d1, d10);
+  QPixmap* face = myIcon->face();
+  QPainter p(face);
 
-  if (!myFortyEight)
-  {
-    p.drawPixmap(44, 38, digits[d10]);
-    p.drawPixmap(50, 38, digits[d1]);
-  }
-  else
-  {
-    p.drawPixmap(44, 21, digits[d10]);
-    p.drawPixmap(50, 21, digits[d1]);
-  }
+  SPLIT(newMsg);
+  p.drawPixmap(44, myFortyEight ? 8 : 26, digits[high]);
+  p.drawPixmap(50, myFortyEight ? 8 : 26, digits[low]);
+
+  SPLIT(sysMsg);
+  p.drawPixmap(44, myFortyEight ? 20 : 38, digits[high]);
+  p.drawPixmap(50, myFortyEight ? 20 : 38, digits[low]);
+
   p.end();
 
-  // Base class will trigger updateEventIcon to actually paint the icon
-  DockIcon::updateIconMessages(newMsg, sysMsg);
+  myIcon->setFace(face);
+  delete face;
 }
 
 void DefaultDockIcon::updateEventIcon()
 {
-  if (!myFortyEight)
-  {
-    QPainter p(myIcon->vis);
+  DockIcon::updateEventIcon();
 
-    // Draw the little icon now
-    QPixmap* m = NULL;
-    if (mySysMsg > 0 || myNewMsg > 0)
-      m = &myEventIcon;
-    else
-      m = &myStatusIcon;
-    p.fillRect(31, 6, 27, 16, QColor(0,0,0));
-    if (m != NULL)
-    {
-      int w = m->width() > 27 ? 27 : m->width();
-      int h = m->height() > 16 ? 16 : m->height();
-      int x = 45 - (w / 2);
-      int y = 14 - (h / 2);
-      p.drawPixmap(x, y, *m, 0, 0, w, h);
-    }
+  if (myFortyEight)
+    return;
 
-    p.end();
-  }
+  drawIcon64((mySysMsg > 0 || myNewMsg > 0) ? myEventIcon : myStatusIcon);
+}
 
-  myIcon->repaint();
-  repaint();
+void DefaultDockIcon::drawIcon64(QPixmap* icon)
+{
+  if (icon == NULL || icon->isNull())
+    return;
+
+  QPixmap* face = myIcon->face();
+  QPainter p(face);
+
+  // Clear the icon area
+  p.fillRect(31, 6, 27, 16, Qt::black);
+
+  // Calculate drawing coordinates
+  int w = qMin(icon->width(), 27);
+  int h = qMin(icon->height(), 16);
+  int x = 45 - (w / 2);
+  int y = 14 - (h / 2);
+
+  p.drawPixmap(x, y, *icon, 0, 0, w, h);
+  p.end();
+
+  myIcon->setFace(face);
+  delete face;
 }

branches/qt-gui_qt4/src/dockicons/defaultdockicon.h

@@ -22 +22 @@
 #define DEFAULTDOCKICON_H
 
+class QMenu;
+class QPixmap;
+
 #include "dockicon.h"
 
@@ -41 +44 @@
    */
   DefaultDockIcon(QMenu* menu);
-
-  /**
-   * Destructor
-   */
-  virtual ~DefaultDockIcon();
 
   /**
@@ -73 +71 @@
 private:
   /**
-   * Get the two lower digits from a number
+   * Draws a given @a icon into the 64x64 dock icon area
    *
-   * @param num Number to split
-   * @param low Return variable for lower digit
-   * @param high Return variable for second lowest digit
+   * @param icon The icon to draw
    */
-  void splitDigits(int num, int& low, int& high);
+  void drawIcon64(QPixmap* icon);
 
-  QPixmap* pix;
   bool myFortyEight;
 };

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();
-}

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

@@ -22 +22 @@
 #define DOCKICON_H
 
-#include <QWidget>
+#include <QObject>
 
-class QMenu;
+class QPixmap;
 
 class ICQOwner;
@@ -36 +36 @@
  * Only holds state and common functions needed by dock icon implementations
  */
-class DockIcon : public QWidget
+class DockIcon : public QObject
 {
   Q_OBJECT
@@ -43 +43 @@
   /**
    * Constructor
-   *
-   * @param menu System menu to popup from dock icon on right click
    */
-  DockIcon(QMenu* menu);
+  DockIcon();
 
   /**
@@ -79 +77 @@
   void middleClicked();
 
+  /**
+   * New tooltip is available
+   * Emitted when myIcon isn't set
+   */
+  void newToolTip(QString tooltip);
+
 protected slots:
   /**
@@ -97 +101 @@
 protected:
   /**
-   * Setup X hints needed to mark icon window as dockable by some window managers
-   */
-  void X11Init();
-
-  /**
    * Update tool tip text for dock icon
    */
@@ -107 +106 @@
 
   /**
-   * User has clicked on icon
-   *
-   * @param event Event object
+   * Connects signals from myIcon onto this
    */
-  virtual void mousePressEvent(QMouseEvent* event);
+  void relayDockIconSignals();
 
-  /**
-   * User tried to close icon window
-   *
-   * @param event Event object
-   */
-  virtual void closeEvent(QCloseEvent* event);
-
-  /**
-   * Repaint icon window
-   *
-   * @param event Event object
-   */
-  virtual void paintEvent(QPaintEvent* event);
-
-  QMenu* myMenu;
   DockIconWidget* myIcon;
   int myNewMsg;
@@ -134 +116 @@
   unsigned short myStatus;
   bool myInvisible;
-  QPixmap myStatusIcon;
-  QPixmap myEventIcon;
-
-  friend class DockIconWidget;
+  QPixmap* myStatusIcon;
+  QPixmap* myEventIcon;
 
 private:

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

@@ -23 +23 @@
 #include "config.h"
 
+#include <QCloseEvent>
 #include <QBitmap>
+#include <QMenu>
 #include <QPainter>
+
+#include "helpers/support.h"
 
 #include "dockicon.h"
@@ -30 +34 @@
 using namespace LicqQtGui;
 
-DockIconWidget::DockIconWidget(QPixmap* pix, DockIcon* parent)
-  : QWidget(parent),
-    vis(NULL)
+DockIconWidget::DockIconWidget(QMenu* menu)
+  : QWidget(),
+    myMenu(menu),
+    myFace(NULL)
 {
-  setObjectName("DockIconWidget");
-  Set(pix);
-}
-
-void DockIconWidget::Set(QPixmap* pix)
-{
-  delete vis;
-  vis = new QPixmap(*pix);
-  resize(vis->size());
-  setMask(vis->mask());
-  repaint();
+  resize(64, 64);
+  setAttribute(Qt::WA_NoSystemBackground, true);
+  setAttribute(Qt::WA_AlwaysShowToolTips, true);
+  Support::setWidgetProps(this, "DockIconWidget");
+  myHandler = Support::dockWindow(winId());
+  show();
 }
 
 DockIconWidget::~DockIconWidget()
 {
-  delete vis;
+  Support::undockWindow(winId(), myHandler);
+  delete myFace;
+}
+
+void DockIconWidget::setFace(QPixmap* newFace, bool updateMask)
+{
+  if (newFace == NULL || newFace->isNull())
+    return;
+
+  delete myFace;
+  myFace = new QPixmap(*newFace);
+  resize(myFace->size());
+  if (updateMask)
+    setMask(myFace->mask());
+  update();
+}
+
+QPixmap* DockIconWidget::face()
+{
+  if (myFace == NULL)
+    return NULL;
+
+  return new QPixmap(*myFace);
+}
+
+void DockIconWidget::closeEvent(QCloseEvent* event)
+{
+  event->ignore();
 }
 
 void DockIconWidget::mousePressEvent(QMouseEvent* event)
 {
-  dynamic_cast<DockIcon*>(parent())->mousePressEvent(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 DockIconWidget::drawIcon(QPainter& painter)
+void DockIconWidget::paintEvent(QPaintEvent* event)
 {
-  if (!vis)
+  if (myFace == NULL)
     return;
-  painter.drawPixmap(0, 0, *vis);
+
+  event->ignore();
+  QPainter painter(this);
+  painter.drawPixmap(0, 0, *myFace);
 }
-
-void DockIconWidget::paintEvent(QPaintEvent* /* event */)
-{
-  QPainter painter(this);
-  drawIcon(painter);
-  painter.end();
-}

branches/qt-gui_qt4/src/dockicons/dockiconwidget.h

@@ -24 +24 @@
 #include <QWidget>
 
+class QMenu;
+