Changeset 6090 for trunk/qt4-gui/src/config

Timestamp:

03/11/08 01:51:12 (9 months ago)

Author:

flynd

Message:

Revised r6089. Toggle only online notify as we may get other popup notifications in the future. Use more specific variable/function names.

Location:

trunk/qt4-gui/src/config

Files:

• general.cpp (modified) (3 diffs)
• general.h (modified) (3 diffs)

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

@@ -99 +99 @@
 #endif
   iniFile.ReadBool("TrayBlink", myTrayBlink, true);
-  iniFile.ReadBool("TrayShowMessage", myShowMessage, true);
+  iniFile.ReadBool("TrayMsgOnlineNotify", myTrayMsgOnlineNotify, true);
 
   iniFile.SetSection("startup");
@@ -156 +156 @@
 #endif
   iniFile.WriteBool("TrayBlink", myTrayBlink);
-  iniFile.WriteBool("TrayShowMessage", myShowMessage);
+  iniFile.WriteBool("TrayMsgOnlineNotify", myTrayMsgOnlineNotify);
 
   iniFile.SetSection("startup");
@@ -397 +397 @@
 }
 
-void Config::General::setShowMessage(bool showMessage)
-{
-  if (showMessage == myShowMessage)
-    return;
-
-  myShowMessage = showMessage;
-  if (myDockMode != DockTray)
-    return;
-
-  if (myBlockUpdates)
-    myDockHasChanged = true;
-  else
-    emit dockChanged();
+void Config::General::setTrayMsgOnlineNotify(bool trayMsgOnlineNotify)
+{
+  if (trayMsgOnlineNotify == myTrayMsgOnlineNotify)
+    return;
+
+  myTrayMsgOnlineNotify = trayMsgOnlineNotify;
 }
 

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

@@ -97 +97 @@
 #endif
   bool trayBlink() const { return myTrayBlink; }
-  bool showMessage() const { return myShowMessage; }
+  bool trayMsgOnlineNotify() const { return myTrayMsgOnlineNotify; }
 
   unsigned short autoLogon() const { return myAutoLogon; }
@@ -138 +138 @@
 #endif
   void setTrayBlink(bool trayBlink);
-  void setShowMessage(bool showMessage);
+  void setTrayMsgOnlineNotify(bool trayMsgOnlineNotify);
 
   void setAutoLogon(unsigned short autoLogon);
@@ -211 +211 @@
 #endif
   bool myTrayBlink;
-  bool myShowMessage;
+  bool myTrayMsgOnlineNotify;
 
   // Auto status configuration