Changeset 6043

Timestamp:

01/14/08 09:41:27 (10 months ago)

Author:

eugene

Message:

• Revised the mainwin geometry save/restore logic;
• Revised the skin handling mechanism;
• General code cleanup.

Location:

branches/qt-gui_qt4/src/core

Files:

• licqgui.cpp (modified) (4 diffs)
• licqgui.h (modified) (2 diffs)
• mainwin.cpp (modified) (19 diffs)
• mainwin.h (modified) (4 diffs)

branches/qt-gui_qt4/src/core/licqgui.cpp

@@ -240 +240 @@
 
   // QLocale::system() uses LC_ALL, LC_NUMERIC and LANG (in that
-  // order) when detmening system locale. We want LC_MESSAGES instead
+  // order) when determines system locale. We want LC_MESSAGES instead
   // of LC_NUMERIC so we have to do it ourselves.
 #ifdef Q_OS_UNIX
@@ -365 +365 @@
   Config::Skin::active()->setFrameStyle(skinFrameStyle);
   Config::Skin::active()->setFrameTransparent(skinFrameTransparent);
-
-  // Get saved position and size for mainwin
-  licqConf.SetSection("geometry");
-  unsigned short xPos, yPos, hVal, wVal;
-  licqConf.ReadNum("x", xPos, 100);
-  licqConf.ReadNum("y", yPos, 100);
-  licqConf.ReadNum("h", hVal, 400);
-  licqConf.ReadNum("w", wVal, 150);
-  gLog.Info("%sGeometry configuration (%d, %d) (%d x %d)\n", L_INITxSTR,
-            xPos, yPos, wVal, hVal);
-  if (yPos > QApplication::desktop()->height() - 16)
-    yPos = 0;
-  if (xPos > QApplication::desktop()->width() - 16)
-    xPos = 0;
-  myMainwinRect.setRect(xPos, yPos, wVal, hVal);
 }
 
@@ -415 +400 @@
 void LicqGui::saveConfig()
 {
-  // Tell the daemon to save it's options
+  // Tell the daemon to save its options
   myLicqDaemon->SaveConf();
 
@@ -525 +510 @@
 #endif /* defined(USE_SCRNSAVER) */
 
-  myMainWindow = new MainWindow(myStartHidden, myMainwinRect);
+  myMainWindow = new MainWindow(myStartHidden);
 
   loadFloatiesConfig();

branches/qt-gui_qt4/src/core/licqgui.h

@@ -30 +30 @@
 
 #include <QList>
-#include <QRect>
 #include <QStringList>
 #include <QTimer>
@@ -262 +261 @@
   QString myIcons;
   QString myExtendedIcons;
-  QRect myMainwinRect;
 
   bool myStartHidden;

branches/qt-gui_qt4/src/core/mainwin.cpp

@@ -114 +114 @@
 MainWindow* LicqQtGui::gMainWindow = NULL;
 
-MainWindow::MainWindow(bool bStartHidden, QRect startRect, QWidget* parent)
+MainWindow::MainWindow(bool bStartHidden, QWidget* parent)
   : QWidget(parent),
-    myInMiniMode(false),
-    myPositionChanges(0)
+    myInMiniMode(false)
 {
   Support::setWidgetProps(this, "MainWindow");
@@ -123 +122 @@
   gMainWindow = this;
 
-  connect(qApp, SIGNAL(aboutToQuit()), SLOT(slot_aboutToQuit()));
-
-  connect(Config::General::instance(),
-      SIGNAL(mainwinChanged()), SLOT(updateConfig()));
+  Config::General* conf = Config::General::instance();
+
+  connect(conf, SIGNAL(mainwinChanged()), SLOT(updateConfig()));
   connect(Config::ContactList::instance(),
       SIGNAL(currentListChanged()), SLOT(updateCurrentGroup()));
-
-  myRealHeight = startRect.height();
 
   myCaption = "Licq";
@@ -180 +176 @@
   shortcut = new QShortcut(Qt::Key_Delete, this);
   connect(shortcut, SIGNAL(activated()), SLOT(removeUserFromGroup()));
-
-  updateSkin(true);
-  connect(Config::Skin::active(), SIGNAL(changed()), SLOT(updateSkin()));
 
   CreateUserView();
@@ -225 +218 @@
       SLOT(slot_protocolPlugin(unsigned long)));
 
+  if (conf->mainwinRect().isValid())
+    setGeometry(conf->mainwinRect());
+  else
+  {
+    myUserView->resize(myUserView->sizeHint());
+    adjustSize();
+  }
+  updateSkin();
+  connect(Config::Skin::active(), SIGNAL(changed()), SLOT(updateSkin()));
+
   updateStatus();
   updateEvents();
   updateGroups(true);
 
-  setGeometry(startRect);
-  setMiniMode(Config::General::instance()->miniMode());
-  if (!Config::General::instance()->mainwinStartHidden() && !bStartHidden)
-    show();
+  setMiniMode(conf->miniMode());
+  setVisible(!conf->mainwinStartHidden() && !bStartHidden);
 
   // verify we exist
@@ -329 +330 @@
 }
 
-void MainWindow::updateSkin(bool initial)
+void MainWindow::updateSkin()
 {
   Config::Skin* skin = Config::Skin::active();
+
+#define CLEAR(elem) \
+  if ((elem) != NULL) \
+  { \
+    delete (elem); \
+    (elem) = NULL; \
+  }
 
   // Set the background pixmap and mask
@@ -340 +348 @@
     clearMask();
 
-  // Group Combo Box
-  myUserGroupsBox->applySkin(skin->cmbGroups);
-
   // System Button
-  if (mySystemButton != NULL)
-    delete mySystemButton;
-  if (myMenuBar != NULL)
-    delete myMenuBar;
-
-  if (!skin->frame.hasMenuBar)
-  {
-    mySystemButton = new SkinnableButton(skin->btnSys, tr("System"), this);
-    mySystemButton->setMenu(mySystemMenu);
-      myMenuBar = NULL;
-  }
-  else
+  CLEAR(mySystemButton);
+  CLEAR(myMenuBar);
+
+  if (skin->frame.hasMenuBar ||
+      skin->btnSys.rect.isNull())
   {
 #ifdef USE_KDE
@@ -367 +365 @@
     myMenuBar->setMinimumWidth(mySystemMenu->width());
     myMenuBar->show();
-    mySystemButton = NULL;
     skin->AdjustForMenuBar(myMenuBar->height());
+  }
+  else
+  {
+    mySystemButton = new SkinnableButton(skin->btnSys, tr("System"), this);
+    mySystemButton->setMenu(mySystemMenu);
+    mySystemButton->show();
   }
 
   unsigned minHeight = skin->frame.border.top + skin->frame.border.bottom;
   setMinimumHeight(minHeight);
-  setMaximumHeight(Config::General::instance()->miniMode() ? minHeight : QWIDGETSIZE_MAX);
+  setMaximumHeight(Config::General::instance()->miniMode() ?
+      minHeight : QWIDGETSIZE_MAX);
+
+  // Group Combo Box
+  myUserGroupsBox->applySkin(skin->cmbGroups);
+  myUserGroupsBox->setVisible(!skin->cmbGroups.rect.isNull());
 
   // Message Label
-  delete myMessageField;
-  myMessageField = new SkinnableLabel(skin->lblMsg, mySystemMenu->getGroupMenu(), this);
-  connect(myMessageField, SIGNAL(doubleClicked()), LicqGui::instance(), SLOT(showNextEvent()));
-  myMessageField->setToolTip(tr("Right click - User groups\n"
-                           "Double click - Show next message"));
+  CLEAR(myMessageField);
+  if (!skin->lblMsg.rect.isNull())
+  {
+    myMessageField = new SkinnableLabel(skin->lblMsg,
+        mySystemMenu->getGroupMenu(), this);
+    connect(myMessageField, SIGNAL(doubleClicked()),
+        LicqGui::instance(), SLOT(showNextEvent()));
+    myMessageField->setToolTip(tr("Right click - User groups\n"
+          "Double click - Show next message"));
+    myMessageField->show();
+  }
 
   // Status Label
-  delete myStatusField;
-  myStatusField = new SkinnableLabel(skin->lblStatus, mySystemMenu->getStatusMenu(), this);
-  connect(myStatusField, SIGNAL(doubleClicked()), SLOT(showAwayMsgDlg()));
-  myStatusField->setToolTip(tr("Right click - Status menu\n"
-                              "Double click - Set auto response"));
-
-  if (!initial)
-  {
-    resizeEvent(NULL);
-
-    if (mySystemButton != NULL)
-    {
-      if (skin->btnSys.rect.isNull())
-        mySystemButton->hide();
-      else
-        mySystemButton->show();
-    }
-    if (myStatusField != NULL)
-    {
-      if (skin->lblStatus.rect.isNull())
-        myStatusField->hide();
-      else
-        myStatusField->show();
-    }
-    if (myMessageField != NULL)
-    {
-      if (skin->lblMsg.rect.isNull())
-        myMessageField->hide();
-      else
-        myMessageField->show();
-    }
-    if (myUserGroupsBox != NULL)
-    {
-      if (skin->cmbGroups.rect.isNull())
-        myUserGroupsBox->hide();
-      else
-        myUserGroupsBox->show();
-    }
-    if (myMenuBar != NULL)
-      myMenuBar->show();
-    updateEvents();
-    updateStatus();
-  }
+  CLEAR(myStatusField);
+  if (!skin->lblStatus.rect.isNull())
+  {
+    myStatusField = new SkinnableLabel(skin->lblStatus,
+        mySystemMenu->getStatusMenu(), this);
+    connect(myStatusField, SIGNAL(doubleClicked()), SLOT(showAwayMsgDlg()));
+    myStatusField->setToolTip(tr("Right click - Status menu\n"
+          "Double click - Set auto response"));
+    myStatusField->show();
+  }
+
+#undef CLEAR
+
+  // update geometry and contents of the elements
+  resizeEvent(NULL);
+  updateEvents();
+  updateStatus();
 }
 
@@ -443 +431 @@
                         width() - skin->frameWidth(), height() - skin->frameHeight());
 
-  if (!skin->frame.hasMenuBar)
-    mySystemMenu->setGeometry(skin->btnSys.borderToRect(this));
-
-  // Do this to save the new geometry
-  myPositionChanges++;
-
   // Resize the background pixmap and mask
   QPixmap pixmap = skin->mainwinPixmap(width(), height());
@@ -461 +443 @@
     setMask(mask);
 
-  /* Set geometry of our widgets
-   * Hide the widget if all position values are equal
-   * because this would result in a unusable 1-pixel widget */
-  if (myUserGroupsBox != NULL)
-  {
-    if (skin->cmbGroups.rect.isNull())
-      myUserGroupsBox->hide();
-    else
-      myUserGroupsBox->setGeometry(skin->cmbGroups.borderToRect(this));
-  }
-  if (myMessageField != NULL)
-  {
-    if (skin->lblMsg.rect.isNull())
-      myMessageField->hide();
-    else
-      myMessageField->setGeometry(skin->lblMsg.borderToRect(this));
-  }
-  if (myStatusField != NULL)
-  {
-    if (skin->lblStatus.rect.isNull())
-      myStatusField->hide();
-    else
-      myStatusField->setGeometry(skin->lblStatus.borderToRect(this));
-  }
-  if (mySystemButton != NULL)
-  {
-    if (skin->btnSys.rect.isNull())
-      mySystemButton->hide();
-    else
-      mySystemButton->setGeometry(skin->btnSys.borderToRect(this));
-  }
-}
-
-void MainWindow::moveEvent(QMoveEvent* e)
-{
+#define UPDATE(wid, group) \
+  if ((wid) != NULL) \
+    (wid)->setGeometry(skin->group.borderToRect(this));
+
+  // Set geometry of our widgets
+  UPDATE(myUserGroupsBox, cmbGroups);
+  UPDATE(myMessageField, lblMsg);
+  UPDATE(myStatusField, lblStatus);
+  UPDATE(mySystemButton, btnSys)
+  else
+    myMenuBar->resize(contentsRect().width(), myMenuBar->height());
+
+#undef UPDATE
+
   if (isVisible())
-    myPositionChanges++;
-
-  QWidget::moveEvent(e);
+    saveGeometry();
+}
+
+void MainWindow::saveGeometry()
+{
+  Config::General* conf = Config::General::instance();
+  QRect geom = geometry();
+
+  if (myInMiniMode)
+    geom.setHeight(conf->mainwinRect().height());
+
+  conf->setMainwinRect(geom);
+}
+
+void MainWindow::moveEvent(QMoveEvent* /* e */)
+{
+  saveGeometry();
 }
 
 void MainWindow::closeEvent(QCloseEvent* e)
 {
-  if (isVisible() && myPositionChanges > 1)
-  {
-    // save window position and size
-    char buf[MAX_FILENAME_LEN];
-    snprintf(buf, MAX_FILENAME_LEN, "%s%s", BASE_DIR, QTGUI_CONFIGFILE);
-    buf[MAX_FILENAME_LEN - 1] = '\0';
-    CIniFile licqConf(INI_FxALLOWxCREATE | INI_FxWARN);
-    // need some more error checking here...
-    licqConf.LoadFile(buf);
-
-    licqConf.SetSection("geometry");
-    licqConf.WriteNum("x", static_cast<short>(x()));
-    licqConf.WriteNum("y", static_cast<short>(y()));
-    licqConf.WriteNum("h", Config::General::instance()->miniMode() ?
-        static_cast<short>(myRealHeight) :
-        static_cast<short>(size().height()));
-    licqConf.WriteNum("w", static_cast<short>(size().width()));
-
-    licqConf.FlushFile();
-    licqConf.CloseFile();
-  }
-
   e->ignore();
 
@@ -725 +678 @@
   unsigned short nNumUserEvents = ICQUser::getNumUserEvents() - nNumOwnerEvents;
 
-  myMessageField->setBold(false);
+  if (myMessageField != NULL)
+    myMessageField->setBold(false);
   QString s, l;
 
@@ -732 +686 @@
     s = tr("SysMsg");
     l = tr("System Message");
-    if (Config::General::instance()->boldOnMsg())
+    if (Config::General::instance()->boldOnMsg() &&
+        myMessageField != NULL)
       myMessageField->setBold(true);
     szCaption = "* " + myCaption;
-//    myMessageField->setPrependPixmap(IconManager->instance()->iconForEvent(ICQ_MDxSUB_MSG));
   }
   else if (nNumUserEvents > 0)
@@ -741 +695 @@
     s = tr("%1 msg%2").arg(nNumUserEvents).arg(nNumUserEvents == 1 ? tr(" ") : tr("s"));
     l = tr("%1 message%2").arg(nNumUserEvents).arg(nNumUserEvents == 1 ? tr(" ") : tr("s"));
-    if (Config::General::instance()->boldOnMsg())
+    if (Config::General::instance()->boldOnMsg() &&
+        myMessageField != NULL)
       myMessageField->setBold(true);
     szCaption = "* " + myCaption;
-//    myMessagesField->setPrependPixmap(QPixmap());
   }
   else
@@ -760 +714 @@
     }
     szCaption = myCaption;
-//    myMessageField->setPrependPixmap(QPixmap());
-  }
-  if (myMessageField->fontMetrics().width(l) + myMessageField->margin() > myMessageField->width())
-    myMessageField->setText(s);
-  else
-    myMessageField->setText(l);
-  myMessageField->update();
+  }
+
   setWindowTitle(szCaption);
+
+  if (myMessageField != NULL)
+  {
+    if (myMessageField->fontMetrics().width(l) +
+        myMessageField->margin() > myMessageField->width())
+      myMessageField->setText(s);
+    else
+      myMessageField->setText(l);
+    myMessageField->update();
+  }
 
   if (LicqGui::instance()->dockIcon() != NULL)
@@ -802 +761 @@
 
   // Update the msg label if necessary
-  if (Config::General::instance()->showGroupIfNoMsg() &&
+  if (myMessageField != NULL &&
+      Config::General::instance()->showGroupIfNoMsg() &&
       ICQUser::getNumUserEvents() == 0)
     myMessageField->setText(myUserGroupsBox->currentText());
@@ -841 +801 @@
 void MainWindow::updateStatus(CICQSignal* s)
 {
+  if (LicqGui::instance()->dockIcon() != NULL)
+    LicqGui::instance()->dockIcon()->updateIconStatus();
+
+  if (myStatusField == NULL)
+    return;
+
   Config::Skin* skin = Config::Skin::active();
   QColor theColor = skin->offlineColor;
@@ -939 +905 @@
     myStatusField->setPalette(pal);
   }
-
-  if (LicqGui::instance()->dockIcon() != NULL)
-    LicqGui::instance()->dockIcon()->updateIconStatus();
 }
 
@@ -963 +926 @@
 }
 
-void MainWindow::slot_aboutToQuit()
-{
-  // Empty
-}
-
 void MainWindow::slot_logon()
 {
   updateStatus();
-  //myStatusField->setEnabled(true);
 }
 
@@ -1029 +986 @@
     return;
 
+  myInMiniMode = miniMode;
+
   if (miniMode)
-  {
-    myRealHeight = height();
     setMaximumHeight(minimumHeight());
-  }
   else
   {
     setMaximumHeight(QWIDGETSIZE_MAX);
-    resize(width(), myRealHeight);
-  }
-
-  myInMiniMode = miniMode;
+    resize(width(), Config::General::instance()->mainwinRect().height());
+  }
+
   if (myUserView != NULL)
     myUserView->setVisible(!miniMode);
@@ -1050 +1005 @@
 
 #ifdef USE_KDE
-    kdeIMInterface->removeProtocol(_nPPID);
+  kdeIMInterface->removeProtocol(_nPPID);
 #endif
 }

branches/qt-gui_qt4/src/core/mainwin.h

@@ -76 +76 @@
 
 public:
-  MainWindow(bool bStartHidden, QRect startRect, QWidget* parent = 0);
+  MainWindow(bool bStartHidden, QWidget* parent = 0);
   virtual ~MainWindow();
 
@@ -119 +119 @@
   QString myCaption;
   bool myInMiniMode;
-  unsigned int myPositionChanges;
-  unsigned short myRealHeight;
 
   int myMouseX;
@@ -139 +137 @@
   SkinnableComboBox* myUserGroupsBox;
 
+  void saveGeometry();
+
 private slots:
   void updateConfig();
-  void updateSkin(bool initial = false);
+  void updateSkin();
   void updateEvents();
   void updateStatus(CICQSignal* = NULL);
@@ -151 +151 @@
   void slot_doneOwnerFcn(ICQEvent*);
   void slot_updateContactList();
-  void slot_aboutToQuit();
 
   void addUser(QString id, unsigned long ppid);