Changeset 6143

Timestamp:

04/11/08 04:54:45 (8 months ago)

Author:

flynd

Message:

Changed 'Auto popup message' setting to be user configurable which statuses to allow it for. This closes #1416.

Location:

trunk/qt4-gui/src

Files:

• config/chat.cpp (modified) (3 diffs)
• config/chat.h (modified) (3 diffs)
• core/licqgui.cpp (modified) (2 diffs)
• settings/events.cpp (modified) (4 diffs)
• settings/events.h (modified) (2 diffs)

trunk/qt4-gui/src/config/chat.cpp

@@ -95 +95 @@
   iniFile.SetSection("functions");
   iniFile.ReadBool("AutoClose", myAutoClose, true);
-  iniFile.ReadBool("AutoPopup", myAutoPopup, false);
+  iniFile.ReadNum("AutoPopup", myAutoPopup, 0);
   iniFile.ReadBool("AutoFocus", myAutoFocus, true);
   iniFile.ReadBool("PopupAutoResponse", myPopupAutoResponse, true);
@@ -154 +154 @@
   iniFile.SetSection("functions");
   iniFile.WriteBool("AutoClose", myAutoClose);
-  iniFile.WriteBool("AutoPopup", myAutoPopup);
+  iniFile.WriteNum("AutoPopup", myAutoPopup);
   iniFile.WriteBool("AutoFocus", myAutoFocus);
   iniFile.WriteBool("PopupAutoResponse", myPopupAutoResponse);
@@ -191 +191 @@
 }
 
-void Config::Chat::setAutoPopup(bool autoPopup)
+void Config::Chat::setAutoPopup(unsigned short autoPopup)
 {
   if (autoPopup == myAutoPopup)

trunk/qt4-gui/src/config/chat.h

@@ -67 +67 @@
   // Get functions
   bool autoClose() const { return myAutoClose; }
-  bool autoPopup() const { return myAutoPopup; }
+  unsigned short autoPopup() const { return myAutoPopup; }
   bool autoFocus() const { return myAutoFocus; }
   bool manualNewUser() const { return myManualNewUser; }
@@ -117 +117 @@
   // Set functions
   void setAutoClose(bool autoClose);
-  void setAutoPopup(bool autoPopup);
+  void setAutoPopup(unsigned short autoPopup);
   void setAutoFocus(bool autoFocus);
   void setManualNewUser(bool manualNewUser);
@@ -165 +165 @@
 
   bool myAutoFocus;
-  bool myAutoPopup;
+  unsigned short myAutoPopup;
   bool myAutoClose;
   bool myManualNewUser;

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

@@ -1480 +1480 @@
         break;
 
-      if (Config::Chat::instance()->autoPopup() && sig->Argument() > 0)
-      {
-        bool popCheck = false;
+      if (sig->Argument() > 0)
+      {
+        unsigned short popCheck = 99;
 
         ICQOwner* o = gUserManager.FetchOwner(ppid, LOCK_R);
@@ -1491 +1491 @@
             case ICQ_STATUS_ONLINE:
             case ICQ_STATUS_FREEFORCHAT:
-              popCheck = true;
-            default:
-              gUserManager.DropOwner(ppid);
+              popCheck = 1;
+              break;
+            case ICQ_STATUS_AWAY:
+              popCheck = 2;
+              break;
+            case ICQ_STATUS_NA:
+              popCheck = 3;
+              break;
+            case ICQ_STATUS_OCCUPIED:
+              popCheck = 4;
+              break;
+            case ICQ_STATUS_DND:
+              popCheck = 5;
+              break;
           }
+          gUserManager.DropOwner(ppid);
         }
 
-        if (popCheck)
+        if (Config::Chat::instance()->autoPopup() >= popCheck)
         {
           ICQUser* u = gUserManager.FetchUser(id.toLatin1(), ppid, LOCK_R);

trunk/qt4-gui/src/settings/events.cpp

@@ -24 +24 @@
 
 #include <QCheckBox>
+#include <QComboBox>
 #include <QGridLayout>
 #include <QGroupBox>
@@ -69 +70 @@
   myMsgActionsLayout->addWidget(myBoldOnMsgCheck, 0, 0);
 
-  myAutoPopupCheck = new QCheckBox(tr("Auto-popup message"));
-  myAutoPopupCheck->setToolTip(tr("Open all incoming messages automatically when received if we are online (or free for chat)"));
-  myMsgActionsLayout->addWidget(myAutoPopupCheck, 1, 0);
-
   myAutoFocusCheck = new QCheckBox(tr("Auto-focus message"));
   myAutoFocusCheck->setToolTip(tr("Automatically focus opened message windows."));
-  myMsgActionsLayout->addWidget(myAutoFocusCheck, 2, 0);
+  myMsgActionsLayout->addWidget(myAutoFocusCheck, 1, 0);
 
   myAutoRaiseCheck = new QCheckBox(tr("Auto-raise main window"));
   myAutoRaiseCheck->setToolTip(tr("Raise the main window on incoming messages"));
-  myMsgActionsLayout->addWidget(myAutoRaiseCheck, 3, 0);
+  myMsgActionsLayout->addWidget(myAutoRaiseCheck, 2, 0);
+
+  QHBoxLayout* autoPopupLayout = new QHBoxLayout();
+  QLabel* autoPopupLabel = new QLabel(tr("Auto-popup message:"));
+  autoPopupLayout->addWidget(autoPopupLabel);
+  myAutoPopupCombo = new QComboBox();
+  myAutoPopupCombo->addItem(tr("Never"));
+  myAutoPopupCombo->addItem(tr("Only when online"));
+  myAutoPopupCombo->addItem(tr("When online or away"));
+  myAutoPopupCombo->addItem(tr("When online, away or N/A"));
+  myAutoPopupCombo->addItem(tr("Always except DND"));
+  myAutoPopupCombo->addItem(tr("Always"));
+  myAutoPopupCombo->setToolTip(tr("Select for which statuses incoming messages should "
+      "open automatically.\nOnline also includes Free for chat."));
+  autoPopupLabel->setBuddy(myAutoPopupCombo);
+  autoPopupLayout->addWidget(myAutoPopupCombo);
+  myMsgActionsLayout->addLayout(autoPopupLayout, 3, 0);
 
   myFlashTaskbarCheck = new QCheckBox(tr("Flash taskbar"));
@@ -292 +305 @@
   myFlashAllCheck->setChecked(flash == Config::ContactList::FlashAll);
 
-  myAutoPopupCheck->setChecked(chatConfig->autoPopup());
+  myAutoPopupCombo->setCurrentIndex(chatConfig->autoPopup());
   myAutoFocusCheck->setChecked(chatConfig->autoFocus());
   myFlashTaskbarCheck->setChecked(chatConfig->flashTaskbar());
@@ -346 +359 @@
     contactListConfig->setFlash(Config::ContactList::FlashNone);
 
-  chatConfig->setAutoPopup(myAutoPopupCheck->isChecked());
+  chatConfig->setAutoPopup(myAutoPopupCombo->currentIndex());
   chatConfig->setAutoFocus(myAutoFocusCheck->isChecked());
   chatConfig->setFlashTaskbar(myFlashTaskbarCheck->isChecked());

trunk/qt4-gui/src/settings/events.h

@@ -26 +26 @@
 
 class QCheckBox;
+class QComboBox;
 class QGridLayout;
 class QGroupBox;
@@ -82 +83 @@
   QCheckBox* myAlwaysOnlineNotifyCheck;
   QCheckBox* myBoldOnMsgCheck;
-  QCheckBox* myAutoPopupCheck;
+  QComboBox* myAutoPopupCombo;
   QCheckBox* myAutoRaiseCheck;
   QCheckBox* myAutoFocusCheck;