Added NewsFeed / Popup / Chat Configuration options.

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

retroshare-gui/src/gui/Preferences/PreferencesWindow.cpp

@@ -63,6 +63,9 @@ PreferencesWindow::PreferencesWindow(QWidget *parent, Qt::WFlags flags)
   ui.stackPages->add(new AppearanceDialog(ui.stackPages),
                      createPageAction(QIcon(IMAGE_APPEARRANCE), tr("Appearance"), grp));
   
+  ui.stackPages->add(new NotifyDialog(ui.stackPages),
+                     createPageAction(QIcon(IMAGE_APPEARRANCE), tr("Notify"), grp));
+  
   /*foreach (ConfigPage *page, ui.stackPages->pages()) {
     connect(page, SIGNAL(helpRequested(QString)),
             this, SLOT(help(QString)));

retroshare-gui/src/gui/Preferences/PreferencesWindow.h

@@ -30,6 +30,7 @@
 #include "ServerDialog.h"
 #include "CryptographyDialog.h"
 #include "AppearanceDialog.h"
+#include "NotifyDialog.h"
 #include "gui/help/browser/helpbrowser.h"
 #include <gui/common/rwindow.h>
 
@@ -46,7 +47,8 @@ public:
     General 	  	= 0,  /** Preferences page. */
     Server,  			  /** Server page. */
     Directories,           /** Directories page. */
-    Appearance				/** Appearance page. */
+    Appearance,				/** Appearance page. */
+    Notify				/** Notify page. */
 
   };
 

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

@@ -30,6 +30,8 @@
 
 #include "rsharesettings.h"
 
+#include "rsiface/rsnotify.h"
+
 #include <QWidget>
 #include <QMainWindow>
 
@@ -49,6 +51,10 @@
 #define SETTING_BWGRAPH_OPACITY       "StatisticDialog/Opacity"
 #define SETTING_BWGRAPH_ALWAYS_ON_TOP "StatisticDialog/AlwaysOnTop"
 
+#define SETTING_NEWSFEED_FLAGS		"NewsFeedFlags"
+#define SETTING_CHAT_FLAGS		"ChatFlags"
+#define SETTING_NOTIFY_FLAGS		"NotifyFlags"
+
 /* Default Retroshare Settings */
 #define DEFAULT_OPACITY             100
 
@@ -87,6 +93,25 @@ RshareSettings::RshareSettings()
   setDefault(SETTING_LANGUAGE, LanguageSupport::defaultLanguageCode());
   setDefault(SETTING_SHEETNAME, true); 
   setDefault(SETTING_SHOW_MAINWINDOW_AT_START, true);
+
+  /* defaults here are not ideal.... but dusent matter */
+
+  uint defChat = (RS_CHAT_OPEN_NEW |
+		RS_CHAT_REOPEN );
+		// This is not default... RS_CHAT_FOCUS.
+
+  uint defNotify = (RS_POPUP_CONNECT | RS_POPUP_MSG |
+                	RS_POPUP_CHAT | RS_POPUP_CALL);
+
+  uint defNewsFeed = (RS_FEED_TYPE_PEER | RS_FEED_TYPE_CHAN |
+                RS_FEED_TYPE_FORUM | RS_FEED_TYPE_BLOG |
+                RS_FEED_TYPE_CHAT | RS_FEED_TYPE_MSG |
+                RS_FEED_TYPE_FILES);
+
+  setDefault(SETTING_NEWSFEED_FLAGS, defNewsFeed);
+  setDefault(SETTING_CHAT_FLAGS, defChat);
+  setDefault(SETTING_NOTIFY_FLAGS, defNotify);
+
 }
 
 
@@ -179,6 +204,37 @@ RshareSettings::setShowMainWindowAtStart(bool show)
   setValue(SETTING_SHOW_MAINWINDOW_AT_START, show);
 }
 
+/** Setting for Notify / Chat and NewsFeeds **/
+uint RshareSettings::getNewsFeedFlags()
+{
+  return value(SETTING_NEWSFEED_FLAGS).toUInt();
+}
+
+void RshareSettings::setNewsFeedFlags(uint flags)
+{
+  setValue(SETTING_NEWSFEED_FLAGS, flags);
+}
+
+uint RshareSettings::getChatFlags()
+{
+  return value(SETTING_CHAT_FLAGS).toUInt();
+}
+
+void RshareSettings::setChatFlags(uint flags)
+{
+  setValue(SETTING_CHAT_FLAGS, flags);
+}
+
+uint RshareSettings::getNotifyFlags()
+{
+  return value(SETTING_NOTIFY_FLAGS).toUInt();
+}
+
+void RshareSettings::setNotifyFlags(uint flags)
+{
+  setValue(SETTING_NOTIFY_FLAGS, flags);
+}
+
 /** Returns true if Vidalia is set to run on system boot. */
 bool
 RshareSettings::runRetroshareOnBoot()

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

@@ -99,6 +99,15 @@ public:
   /** Sets whether the bandwidth graph is always on top. */
   void setBWGraphAlwaysOnTop(bool alwaysOnTop);
   
+  uint getNewsFeedFlags();
+  void setNewsFeedFlags(uint flags);
+
+  uint getChatFlags();
+  void setChatFlags(uint flags);
+
+  uint getNotifyFlags();
+  void setNotifyFlags(uint flags);
+
 
         //! Save placement, state and size information of a window.
         void saveWidgetInformation(QWidget *widget);