Changeset 6139

Timestamp:

04/10/08 02:50:04 (8 months ago)

Author:

flynd

Message:

Added option to not change status until away message dialog is closed. This closes #1421.

Location:

trunk/qt4-gui/src

Files:

• config/general.cpp (modified) (3 diffs)
• config/general.h (modified) (3 diffs)
• core/systemmenu.cpp (modified) (2 diffs)
• dialogs/awaymsgdlg.cpp (modified) (6 diffs)
• dialogs/awaymsgdlg.h (modified) (3 diffs)
• settings/status.cpp (modified) (4 diffs)
• settings/status.h (modified) (1 diff)

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

@@ -64 +64 @@
   iniFile.ReadStr("MsgPopupKey", szTemp, "none");
   myMsgPopupKey = (strcmp(szTemp, "none") != 0 ? QString::fromLatin1(szTemp) : QString());
+  iniFile.ReadBool("DelayStatusChange", myDelayStatusChange, false);
 
   iniFile.SetSection("appearance");
@@ -133 +134 @@
   iniFile.SetSection("functions");
   iniFile.WriteStr("MsgPopupKey", myMsgPopupKey.isEmpty() ? "none" : myMsgPopupKey.toLatin1());
+  iniFile.WriteBool("DelayStatusChange", myDelayStatusChange);
 
   iniFile.SetSection("appearance");
@@ -208 +210 @@
 }
 
+void Config::General::setDelayStatusChange(bool delayStatusChange)
+{
+  if (delayStatusChange == myDelayStatusChange)
+    return;
+
+  myDelayStatusChange = delayStatusChange;
+}
+
 void Config::General::setMsgPopupKey(QString msgPopupKey)
 {

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

@@ -78 +78 @@
   bool useDoubleReturn() const { return myUseDoubleReturn; }
   QString msgPopupKey() const { return myMsgPopupKey; }
+  bool delayStatusChange() const { return myDelayStatusChange; }
   QFont defaultFont() const { return myDefaultFont; }
   QFont normalFont() const;
@@ -120 +121 @@
   void setUseDoubleReturn(bool useDoubleReturn);
   void setMsgPopupKey(QString msgPopupKey);
+  void setDelayStatusChange(bool delayStatusChange);
   void setNormalFont(QString normalFont);
   void setEditFont(QString editFont);
@@ -189 +191 @@
   bool myUseDoubleReturn;
   QString myMsgPopupKey;
+  bool myDelayStatusChange;
   QFont myDefaultFont;
   QFont myEditFont;

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

@@ -445 +445 @@
 {
   unsigned long status = action->data().toUInt();
-
-  if (status != ICQ_STATUS_OFFLINE && status != ICQ_STATUS_ONLINE)
-    AwayMsgDlg::showAwayMsgDlg(status, true);
-
-  LicqGui::instance()->changeStatus(status, myStatusInvisibleAction->isChecked());
+  bool withMsg = (status != ICQ_STATUS_OFFLINE && status != ICQ_STATUS_ONLINE);
+  bool changeNow = !Config::General::instance()->delayStatusChange();
+
+  if (withMsg)
+    AwayMsgDlg::showAwayMsgDlg(status, true, 0, myStatusInvisibleAction->isChecked(), !changeNow);
+
+  if (changeNow || !withMsg)
+    LicqGui::instance()->changeStatus(status, myStatusInvisibleAction->isChecked());
 }
 
@@ -697 +700 @@
 {
   int status = action->data().toInt();
-  if (status != ICQ_STATUS_OFFLINE && status != ICQ_STATUS_ONLINE)
-    AwayMsgDlg::showAwayMsgDlg(status, true);
-  LicqGui::instance()->changeStatus(status, myPpid, myStatusInvisibleAction->isChecked());
+  bool withMsg = (status != ICQ_STATUS_OFFLINE && status != ICQ_STATUS_ONLINE);
+  bool changeNow = !Config::General::instance()->delayStatusChange();
+
+  if (withMsg)
+    AwayMsgDlg::showAwayMsgDlg(status, true, myPpid, myStatusInvisibleAction->isChecked(), !changeNow);
+
+  if (changeNow || !withMsg)
+    LicqGui::instance()->changeStatus(status, myPpid, myStatusInvisibleAction->isChecked());
 }
 

trunk/qt4-gui/src/dialogs/awaymsgdlg.cpp

@@ -40 +40 @@
 #include <licq_user.h>
 
+#include "core/licqgui.h"
+
 #include "helpers/licqstrings.h"
 #include "helpers/support.h"
@@ -55 +57 @@
 AwayMsgDlg* AwayMsgDlg::myInstance = NULL;
 
-void AwayMsgDlg::showAwayMsgDlg(unsigned short status, bool autoClose)
+void AwayMsgDlg::showAwayMsgDlg(unsigned short status, bool autoClose,
+    unsigned long ppid, bool invisible, bool setStatus)
 {
   if (myInstance == NULL)
@@ -62 +65 @@
     myInstance->raise();
 
-  myInstance->selectAutoResponse(status, autoClose);
+  myInstance->selectAutoResponse(status, autoClose, ppid, invisible, setStatus);
 }
 
@@ -109 +112 @@
 }
 
-void AwayMsgDlg::selectAutoResponse(unsigned short status, bool autoClose)
+void AwayMsgDlg::selectAutoResponse(unsigned short status, bool autoClose,
+    unsigned long ppid, bool invisible, bool setStatus)
 {
   switch (status & 0x00FF)
@@ -120 +124 @@
 
   myStatus = status;
+  myInvisible = invisible;
+  myPpid = ppid;
+  mySetStatus = setStatus;
 
   // Fill in the select menu
@@ -235 +242 @@
   myAutoCloseCounter = -1;
 
+  if (mySetStatus)
+  {
+    if (myPpid == 0)
+      LicqGui::instance()->changeStatus(myStatus, myInvisible);
+    else
+      LicqGui::instance()->changeStatus(myStatus, myPpid, myInvisible);
+  }
+
   QString s = myAwayMsg->toPlainText().trimmed();
 

trunk/qt4-gui/src/dialogs/awaymsgdlg.h

@@ -43 +43 @@
    * @param status Status to prompt for away message to
    * @param autoClose True if dialog should close after a timeout
+   * @param ppid Protocol to set status for or 0 to change globaly
+   * @param invisible True if new status is also invisible
+   * @param setStatus True if status should be set when dialog is closed
    */
-  static void showAwayMsgDlg(unsigned short status, bool autoClose = false);
+  static void showAwayMsgDlg(unsigned short status, bool autoClose = false,
+      unsigned long ppid = 0, bool invisible = false, bool setStatus = false);
 
   static void showAutoResponseHints(QWidget* parent = 0);
@@ -53 +57 @@
   AwayMsgDlg(QWidget* parent = 0);
   ~AwayMsgDlg();
-  void selectAutoResponse(unsigned short status, bool autoClose = false);
+  void selectAutoResponse(unsigned short status, bool autoClose = false,
+      unsigned long ppid = 0, bool invisible = false, bool setStatus = false);
 
   MLEdit* myAwayMsg;
@@ -61 +66 @@
 
   unsigned short myStatus;
+  bool myInvisible;
+  unsigned long myPpid;
+  bool mySetStatus;
   short mySAR;
   int myAutoCloseCounter;

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

@@ -63 +63 @@
   myPageStatusLayout->setContentsMargins(0, 0, 0, 0);
 
+  myGeneralBox = new QGroupBox(tr("General Status Options"));
+  myGeneralLayout = new QVBoxLayout(myGeneralBox);
+
+  myDelayStatusChangeCheck = new QCheckBox(tr("Delay status changes"));
+  myDelayStatusChangeCheck->setToolTip(tr("Set status after closing the away message dialog instead of setting it directly."));
+  myGeneralLayout->addWidget(myDelayStatusChangeCheck);
+
   myAutoLogonBox = new QGroupBox(tr("Startup"));
   myAutoLogonLayout = new QVBoxLayout(myAutoLogonBox);
@@ -120 +127 @@
   buildAutoStatusCombos(1);
 
+  myPageStatusLayout->addWidget(myGeneralBox);
   myPageStatusLayout->addWidget(myAutoLogonBox);
   myPageStatusLayout->addWidget(myAutoAwayBox);
@@ -264 +272 @@
   Config::General* generalConfig = Config::General::instance();
 
+  myDelayStatusChangeCheck->setChecked(generalConfig->delayStatusChange());
   myAutoAwaySpin->setValue(generalConfig->autoAwayTime());
   myAutoNaSpin->setValue(generalConfig->autoNaTime());
@@ -278 +287 @@
   generalConfig->blockUpdates(true);
 
+  generalConfig->setDelayStatusChange(myDelayStatusChangeCheck->isChecked());
   generalConfig->setAutoAwayTime(myAutoAwaySpin->value());
   generalConfig->setAutoNaTime(myAutoNaSpin->value());

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

@@ -76 +76 @@
 
   // Widgets for status settings
+  QGroupBox* myGeneralBox;
+  QVBoxLayout* myGeneralLayout;
+  QCheckBox* myDelayStatusChangeCheck;
   QVBoxLayout* myPageStatusLayout;
   QGroupBox* myAutoLogonBox;