fixed settings for tray message enable/disable

now it can be enabled and disabled at runtime

git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@3141 b45a01b8-16f6-495d-af2f-9b41ad6348cc

retroshare-gui/src/gui/MainWindow.cpp

@@ -357,6 +357,20 @@ void MainWindow::createTrayIcon()
     trayIcon->show();
 }
 
+/*static*/ void MainWindow::installGroupChatNotifier()
+{
+    if (_instance == NULL) {
+        // nothing to do
+        return;
+    }
+
+    if(Settings->getDisplayTrayGroupChat()) {
+        QObject::connect(_instance->peersDialog, SIGNAL(notifyGroupChat(const QString&,const QString&)), _instance, SLOT(displaySystrayMsg(const QString&,const QString&)), Qt::QueuedConnection);
+    } else {
+        QObject::disconnect(_instance->peersDialog, SIGNAL(notifyGroupChat(const QString&,const QString&)), _instance, SLOT(displaySystrayMsg(const QString&,const QString&)));
+    }
+}
+
 void MainWindow::displaySystrayMsg(const QString& title,const QString& msg)
 {
     trayIcon->showMessage(title, msg, QSystemTrayIcon::Information, 3000);

retroshare-gui/src/gui/MainWindow.h

@@ -134,6 +134,7 @@ public:
 #endif
     PluginsPage*   pluginsPage ;
 
+    static void installGroupChatNotifier();
 
 public slots:
     void updateHashingInfo(const QString&) ;

retroshare-gui/src/gui/settings/NotifyPage.cpp

@@ -28,6 +28,8 @@
 #include "rsiface/rsnotify.h"
 #include "rsharesettings.h"
 
+#include "gui/MainWindow.h"
+
 #include <QTimer>
 
 
@@ -106,7 +108,8 @@ NotifyPage::save(QString &errmsg)
     Settings->setNewsFeedFlags(newsflags);
     Settings->setChatFlags(chatflags);
 
-    Settings->setValue(QString::fromUtf8("DisplayTrayGroupChat"), trayGroupChat());   
+    Settings->setDisplayTrayGroupChat(ui.systray_GroupChat->isChecked());
+    MainWindow::installGroupChatNotifier();
 
     load();
     return true;
@@ -138,7 +141,7 @@ void NotifyPage::load()
     ui.chat_Reopen->setChecked(chatflags & RS_CHAT_REOPEN);
     ui.chat_Focus->setChecked(chatflags & RS_CHAT_FOCUS);
 
-    ui.systray_GroupChat->setChecked(Settings->value(QString::fromUtf8("DisplayTrayGroupChat"), false).toBool());
+    ui.systray_GroupChat->setChecked(Settings->getDisplayTrayGroupChat());
 
     /* disable ones that don't work yet */
     ui.notify_Chat->setEnabled(false);
@@ -149,11 +152,4 @@ void NotifyPage::load()
 /** Loads the settings for this page */
 void NotifyPage::updateStatus()
 {
-
 }
-
-bool NotifyPage::trayGroupChat() const {
-  if(ui.systray_GroupChat->isChecked()) return true;
-  return ui.systray_GroupChat->isChecked();
-}
-

retroshare-gui/src/gui/settings/NotifyPage.h

@@ -43,8 +43,6 @@ class NotifyPage : public ConfigPage
       /** Loads the settings for this page */
       void load();
 
-      bool trayGroupChat() const;
-
   public slots:
       void updateStatus();
 

retroshare-gui/src/gui/settings/rsharesettings.cpp

@@ -132,6 +132,8 @@ void RshareSettings::initSettings()
   setDefault(SETTING_NEWSFEED_FLAGS, defNewsFeed);
   setDefault(SETTING_CHAT_FLAGS, defChat);
   setDefault(SETTING_NOTIFY_FLAGS, defNotify);
+
+  setDefault("DisplayTrayGroupChat", true);
 }
 
 /** Gets/sets the currently saved chat avatar. */
@@ -264,6 +266,16 @@ void RshareSettings::setNotifyFlags(uint flags)
   setValue(SETTING_NOTIFY_FLAGS, flags);
 }
 
+bool RshareSettings::getDisplayTrayGroupChat()
+{
+    return value("DisplayTrayGroupChat").toBool();
+}
+
+void RshareSettings::setDisplayTrayGroupChat(bool bValue)
+{
+    setValue("DisplayTrayGroupChat", bValue);
+}
+
 /** Returns true if RetroShare is set to run on system boot. */
 bool
 RshareSettings::runRetroshareOnBoot()

retroshare-gui/src/gui/settings/rsharesettings.h

@@ -114,6 +114,9 @@ public:
   uint getNotifyFlags();
   void setNotifyFlags(uint flags);
 
+  bool getDisplayTrayGroupChat();
+  void setDisplayTrayGroupChat(bool bValue);
+
   //! Save placement, state and size information of a window.
   void saveWidgetInformation(QWidget *widget);
 

retroshare-gui/src/main.cpp

@@ -173,24 +173,17 @@ int main(int argc, char *argv[])
 	QObject::connect(ConfCertDialog::instance(),SIGNAL(configChanged()),w->networkDialog,SLOT(insertConnect())) ;
 	QObject::connect(w->peersDialog,SIGNAL(friendsUpdated()),w->networkDialog,SLOT(insertConnect())) ;
 
-	{
+	w->installGroupChatNotifier();
-        if(Settings->value(QString::fromUtf8("DisplayTrayGroupChat"), true).toBool())
-        { 
-            QObject::connect(w->peersDialog,SIGNAL(notifyGroupChat(const QString&,const QString&)),w,SLOT(displaySystrayMsg(const QString&,const QString&)),Qt::QueuedConnection) ;
-        }
-	}
 
 	QObject::connect(w->messengerWindow,SIGNAL(startChat(QTreeWidgetItem* )),w->peersDialog,SLOT(chatfriend(QTreeWidgetItem* ))) ;
 	QObject::connect(w->idle, SIGNAL(secondsIdle(int)), w->messengerWindow, SLOT(checkAndSetIdle(int)));
 
-	{
 	/* only show window, if not startMinimized */
 	if(!Settings->value(QString::fromUtf8("StartMinimized"), false).toBool())
 	{
 
 		w->show();
 	}
-	}
 
 	/* Startup a Timer to keep the gui's updated */
 	QTimer *timer = new QTimer(w);