cleaned the notify dialog a little. Added checkbox for group chat. Not enabled yet though.

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

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

@@ -69,7 +69,7 @@ NotifyDialog::save(QString &errmsg)
 	if (ui.popup_NewMsg->isChecked())
 		notifyflags |= RS_POPUP_MSG;
 
-	if (ui.popup_NewChat->isChecked())
+//	if (ui.popup_NewChat->isChecked())
 		notifyflags |= RS_POPUP_CHAT;
 
 	//if (ui.popup_Call->isChecked())
@@ -118,7 +118,8 @@ void NotifyDialog::load()
 
 	ui.popup_Connect->setChecked(notifyflags & RS_POPUP_CONNECT);
 	ui.popup_NewMsg->setChecked(notifyflags & RS_POPUP_MSG);
-	ui.popup_NewChat->setChecked(notifyflags & RS_POPUP_CHAT);
+	ui.systray_GroupChat->setChecked(true) ;
+//	ui.popup_NewChat->setChecked(notifyflags & RS_POPUP_CHAT);
 	//ui.popup_Call->setChecked(notifyflags & RS_POPUP_CALL);
 
 	ui.notify_Peers->setChecked(newsflags & RS_FEED_TYPE_PEER);
@@ -138,7 +139,8 @@ void NotifyDialog::load()
 	ui.notify_Chat->setEnabled(false);
 	ui.notify_Blogs->setEnabled(false);
 	ui.notify_Downloads->setEnabled(false);
-	ui.popup_NewChat->setEnabled(false);
+	ui.systray_GroupChat->setEnabled(false);
+//	ui.popup_NewChat->setEnabled(false);
 }
 
 

retroshare-gui/src/gui/Preferences/NotifyDialog.ui

@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
 <ui version="4.0">
  <class>NotifyDialog</class>
  <widget class="QWidget" name="NotifyDialog">
@@ -6,11 +7,11 @@
     <x>0</x>
     <y>0</y>
     <width>388</width>
-    <height>332</height>
+    <height>425</height>
    </rect>
   </property>
   <property name="sizePolicy">
-   <sizepolicy vsizetype="Expanding" hsizetype="Expanding" >
+   <sizepolicy hsizetype="Expanding" vsizetype="Expanding">
     <horstretch>0</horstretch>
     <verstretch>0</verstretch>
    </sizepolicy>
@@ -498,20 +499,12 @@
   <property name="contextMenuPolicy">
    <enum>Qt::NoContextMenu</enum>
   </property>
-  <layout class="QGridLayout" >
+  <layout class="QVBoxLayout" name="verticalLayout_4">
-   <property name="leftMargin" >
+   <item>
-    <number>6</number>
+    <layout class="QHBoxLayout" name="horizontalLayout">
-   </property>
+     <item>
-   <property name="topMargin" >
+      <layout class="QVBoxLayout" name="verticalLayout_3">
-    <number>6</number>
+       <item>
-   </property>
-   <property name="rightMargin" >
-    <number>6</number>
-   </property>
-   <property name="bottomMargin" >
-    <number>6</number>
-   </property>
-   <item rowspan="2" row="0" column="0" >
         <widget class="QGroupBox" name="notify_ForumNewMsg">
          <property name="title">
           <string>News Feed</string>
@@ -520,16 +513,7 @@
           <property name="spacing">
            <number>0</number>
           </property>
-      <property name="leftMargin" >
+          <property name="margin">
-       <number>6</number>
-      </property>
-      <property name="topMargin" >
-       <number>6</number>
-      </property>
-      <property name="rightMargin" >
-       <number>6</number>
-      </property>
-      <property name="bottomMargin" >
            <number>6</number>
           </property>
           <item>
@@ -584,10 +568,27 @@
          </layout>
         </widget>
        </item>
-   <item row="0" column="1" >
+       <item>
+        <spacer name="verticalSpacer">
+         <property name="orientation">
+          <enum>Qt::Vertical</enum>
+         </property>
+         <property name="sizeHint" stdset="0">
+          <size>
+           <width>20</width>
+           <height>40</height>
+          </size>
+         </property>
+        </spacer>
+       </item>
+      </layout>
+     </item>
+     <item>
+      <layout class="QVBoxLayout" name="verticalLayout">
+       <item>
         <widget class="QGroupBox" name="groupBox">
          <property name="title">
-      <string>Popups</string>
+          <string>Toasters</string>
          </property>
          <layout class="QVBoxLayout">
           <property name="leftMargin">
@@ -610,20 +611,13 @@
             </property>
            </widget>
           </item>
-      <item>
-       <widget class="QCheckBox" name="popup_NewChat" >
-        <property name="text" >
-         <string>New Chat</string>
-        </property>
-       </widget>
-      </item>
          </layout>
         </widget>
        </item>
-   <item row="1" column="1" >
+       <item>
         <widget class="QGroupBox" name="groupBox_2">
          <property name="title">
-      <string>Private Chat Behaviour</string>
+          <string>Private Chat</string>
          </property>
          <layout class="QVBoxLayout">
           <item>
@@ -650,15 +644,35 @@
          </layout>
         </widget>
        </item>
-   <item row="2" column="0" colspan="2" >
+       <item>
-    <spacer>
+        <widget class="QGroupBox" name="groupBox_3">
+         <property name="title">
+          <string>Group chat</string>
+         </property>
+         <layout class="QVBoxLayout" name="verticalLayout_2">
+          <item>
+           <widget class="QCheckBox" name="systray_GroupChat">
+            <property name="text">
+             <string>Display systray message</string>
+            </property>
+           </widget>
+          </item>
+         </layout>
+        </widget>
+       </item>
+      </layout>
+     </item>
+    </layout>
+   </item>
+   <item>
+    <spacer name="verticalSpacer_2">
      <property name="orientation">
       <enum>Qt::Vertical</enum>
      </property>
-     <property name="sizeHint" >
+     <property name="sizeHint" stdset="0">
       <size>
-       <width>361</width>
+       <width>20</width>
-       <height>40</height>
+       <height>130</height>
       </size>
      </property>
     </spacer>