Changeset 6089

Timestamp:

03/09/08 13:51:24 (9 months ago)

Author:

eugene

Message:

Made systray messages configurable.

Location:

trunk/qt4-gui/src

Files:

• config/general.cpp (modified) (4 diffs)
• config/general.h (modified) (3 diffs)
• dockicons/systemtrayicon.cpp (modified) (2 diffs)
• dockicons/systemtrayicon.h (modified) (1 diff)
• settings/general.cpp (modified) (7 diffs)
• settings/general.h (modified) (1 diff)

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

@@ -99 +99 @@
 #endif
   iniFile.ReadBool("TrayBlink", myTrayBlink, true);
+  iniFile.ReadBool("TrayShowMessage", myShowMessage, true);
 
   iniFile.SetSection("startup");
@@ -155 +156 @@
 #endif
   iniFile.WriteBool("TrayBlink", myTrayBlink);
+  iniFile.WriteBool("TrayShowMessage", myShowMessage);
 
   iniFile.SetSection("startup");
@@ -395 +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::setAutoLogon(unsigned short autoLogon)
 {
@@ -442 +459 @@
   myAutoNaMess = autoNaMess;
 }
-

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

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

trunk/qt4-gui/src/dockicons/systemtrayicon.cpp

@@ -72 +72 @@
 #endif
 {
+  if (!myShowMessage)
+    return;
+
 #ifdef USE_KDE
   // Escape HTML
@@ -102 +105 @@
 {
   myBlink = Config::General::instance()->trayBlink();
+  myShowMessage = Config::General::instance()->showMessage();
   updateIconMessages(myNewMsg, mySysMsg);
 }

trunk/qt4-gui/src/dockicons/systemtrayicon.h

@@ -108 +108 @@
   bool myTimerToggle;
   bool myBlink;
+  bool myShowMessage;
 };
 

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

@@ -91 +91 @@
   layDocking->addWidget(chkDockTrayBlink, 3, 1);
 
+  chkDockTrayMessage = new QCheckBox(tr("Show messages"));
+  chkDockTrayMessage->setToolTip(tr("Show balloon popup messages."));
+  layDocking->addWidget(chkDockTrayMessage, 4, 1);
+
   cmbDockTheme = new QComboBox();
   // Set the currently available themes
@@ -155 +159 @@
     chkDockFortyEight->setEnabled(false);
     chkDockTrayBlink->setEnabled(false);
+    chkDockTrayMessage->setEnabled(false);
 #endif
     chkHidden->setEnabled(false);
@@ -175 +180 @@
     cmbDockTheme->setEnabled(false);
     chkDockTrayBlink->setEnabled(false);
+    chkDockTrayMessage->setEnabled(false);
   }
   else if (rdbDockThemed->isChecked())
@@ -181 +187 @@
     cmbDockTheme->setEnabled(true);
     chkDockTrayBlink->setEnabled(false);
+    chkDockTrayMessage->setEnabled(false);
   }
   else if (rdbDockTray->isChecked())
@@ -187 +194 @@
     cmbDockTheme->setEnabled(false);
     chkDockTrayBlink->setEnabled(true);
+    chkDockTrayMessage->setEnabled(true);
   }
   else
@@ -219 +227 @@
   rdbDockTray->setChecked(generalConfig->dockMode() == Config::General::DockTray);
   chkDockTrayBlink->setChecked(generalConfig->trayBlink());
+  chkDockTrayMessage->setChecked(generalConfig->showMessage());
   slot_useDockToggled(chkUseDock->isChecked());
 
@@ -251 +260 @@
 #endif
   generalConfig->setTrayBlink(chkDockTrayBlink->isChecked());
+  generalConfig->setShowMessage(chkDockTrayMessage->isChecked());
 
   if (myNormalFontEdit->font() == Config::General::instance()->defaultFont())

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

@@ -81 +81 @@
   QCheckBox* chkDockFortyEight;
   QCheckBox* chkDockTrayBlink;
+  QCheckBox* chkDockTrayMessage;
   QRadioButton* rdbDockDefault;
   QRadioButton* rdbDockThemed;