Added a warning MessageBox when closing Forum Post Dialog.

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

retroshare-gui/src/gui/gxsforums/CreateGxsForumMsg.cpp

@@ -60,13 +60,13 @@ CreateGxsForumMsg::CreateGxsForumMsg(const RsGxsGroupId &fId, const RsGxsMessage
 
 	/* Setup UI helper */
 	mStateHelper = new UIStateHelper(this);
-	mStateHelper->addWidget(CREATEGXSFORUMMSG_FORUMINFO, ui.buttonBox->button(QDialogButtonBox::Ok));
+	mStateHelper->addWidget(CREATEGXSFORUMMSG_FORUMINFO, ui.sendButton);
 	mStateHelper->addWidget(CREATEGXSFORUMMSG_FORUMINFO, ui.innerFrame);
 	mStateHelper->addLoadPlaceholder(CREATEGXSFORUMMSG_FORUMINFO, ui.forumName);
 	mStateHelper->addLoadPlaceholder(CREATEGXSFORUMMSG_FORUMINFO, ui.forumSubject);
 	mStateHelper->addClear(CREATEGXSFORUMMSG_FORUMINFO, ui.forumName);
 
-	mStateHelper->addWidget(CREATEGXSFORUMMSG_PARENTMSG, ui.buttonBox->button(QDialogButtonBox::Ok));
+	mStateHelper->addWidget(CREATEGXSFORUMMSG_PARENTMSG, ui.sendButton);
 	mStateHelper->addWidget(CREATEGXSFORUMMSG_PARENTMSG, ui.innerFrame);
 	mStateHelper->addLoadPlaceholder(CREATEGXSFORUMMSG_PARENTMSG, ui.forumName);
 	mStateHelper->addLoadPlaceholder(CREATEGXSFORUMMSG_PARENTMSG, ui.forumSubject);
@@ -85,8 +85,8 @@ CreateGxsForumMsg::CreateGxsForumMsg(const RsGxsGroupId &fId, const RsGxsMessage
 	connect(ui.hashBox, SIGNAL(fileHashingFinished(QList<HashedFile>)), this, SLOT(fileHashingFinished(QList<HashedFile>)));
 
 	// connect up the buttons.
-	connect(ui.buttonBox, SIGNAL(accepted()), this, SLOT(createMsg()));
+	connect(ui.sendButton, SIGNAL(clicked()), this, SLOT(createMsg()));
-	connect(ui.buttonBox, SIGNAL(rejected()), this, SLOT(close()));
+	connect(ui.buttonBox, SIGNAL(rejected()), this, SLOT(reject()));
 	connect(ui.emoticonButton, SIGNAL(clicked()), this, SLOT(smileyWidgetForums()));
 	connect(ui.attachFileButton, SIGNAL(clicked()), this, SLOT(addFile()));
 	connect(ui.generateCheckBox, SIGNAL(toggled(bool)), ui.generateSpinBox, SLOT(setEnabled(bool)));
@@ -259,7 +259,7 @@ void  CreateGxsForumMsg::createMsg()
 
 	RsHtml::optimizeHtml(ui.forumMessage, desc);
 
-	if(name.isEmpty()) {
+	if(name.isEmpty() | desc.isEmpty()) {
 		/* error message */
 		QMessageBox::warning(this, tr("RetroShare"),tr("Please set a Forum Subject and Forum Message"), QMessageBox::Ok, QMessageBox::Ok);
 
@@ -350,6 +350,27 @@ void CreateGxsForumMsg::closeEvent (QCloseEvent * /*event*/)
 	Settings->saveWidgetInformation(this);
 }
 
+void CreateGxsForumMsg::reject()
+{
+    if (ui.forumMessage->document()->isModified()) {
+        QMessageBox::StandardButton ret;
+        ret = QMessageBox::warning(this, tr("Forum Message"),
+                                   tr("Forum Message has not been Sent.\n"
+                                      "Do you want to reject this message?"),
+                                   QMessageBox::Yes | QMessageBox::No);
+        switch (ret) {
+        case QMessageBox::Yes:
+            break;
+        case QMessageBox::No:
+            return; // don't close
+        default:
+            break;
+        }
+    }
+
+    QDialog::reject();
+}
+
 void CreateGxsForumMsg::smileyWidgetForums()
 {
 	Emoticons::showSmileyWidget(this, ui.emoticonButton, SLOT(addSmileys()), false);

retroshare-gui/src/gui/gxsforums/CreateGxsForumMsg.h

@@ -50,6 +50,7 @@ private slots:
 	void smileyWidgetForums();
 	void addSmileys();
 	void addFile();
+	void reject();
 
 protected:
 	void closeEvent (QCloseEvent * event);

retroshare-gui/src/gui/gxsforums/CreateGxsForumMsg.ui

@@ -6,8 +6,8 @@
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>482</width>
+    <width>640</width>
-    <height>448</height>
+    <height>465</height>
    </rect>
   </property>
   <property name="windowTitle">
@@ -35,8 +35,8 @@
      <property name="frameShadow">
       <enum>QFrame::Raised</enum>
      </property>
-     <layout class="QVBoxLayout" name="verticalLayout_2">
+     <layout class="QGridLayout" name="gridLayout_2">
-      <item>
+      <item row="0" column="0">
        <widget class="QFrame" name="innerFrame">
         <layout class="QVBoxLayout" name="verticalLayout_3">
          <property name="margin">
@@ -148,6 +148,19 @@
               </property>
              </widget>
             </item>
+            <item>
+             <spacer>
+              <property name="orientation">
+               <enum>Qt::Horizontal</enum>
+              </property>
+              <property name="sizeHint" stdset="0">
+               <size>
+                <width>40</width>
+                <height>15</height>
+               </size>
+              </property>
+             </spacer>
+            </item>
             <item>
              <widget class="QCheckBox" name="signBox">
               <property name="focusPolicy">
@@ -213,19 +226,6 @@
               </property>
              </widget>
             </item>
-            <item>
-             <spacer>
-              <property name="orientation">
-               <enum>Qt::Horizontal</enum>
-              </property>
-              <property name="sizeHint" stdset="0">
-               <size>
-                <width>40</width>
-                <height>15</height>
-               </size>
-              </property>
-             </spacer>
-            </item>
            </layout>
           </widget>
          </item>
@@ -258,7 +258,7 @@ p, li { white-space: pre-wrap; }
             <item row="0" column="0">
              <widget class="HashBox" name="hashBox">
               <property name="sizePolicy">
-               <sizepolicy hsizetype="Expanding" vsizetype="MinimumExpanding">
+               <sizepolicy hsizetype="Expanding" vsizetype="Minimum">
                 <horstretch>0</horstretch>
                 <verstretch>0</verstretch>
                </sizepolicy>
@@ -277,7 +277,7 @@ p, li { white-space: pre-wrap; }
         </layout>
        </widget>
       </item>
-      <item>
+      <item row="1" column="0">
        <layout class="QHBoxLayout" name="horizontalLayout">
         <item>
          <widget class="QCheckBox" name="generateCheckBox">
@@ -296,10 +296,45 @@ p, li { white-space: pre-wrap; }
           </property>
          </widget>
         </item>
+        <item>
+         <spacer name="horizontalSpacer">
+          <property name="orientation">
+           <enum>Qt::Horizontal</enum>
+          </property>
+          <property name="sizeHint" stdset="0">
+           <size>
+            <width>242</width>
+            <height>20</height>
+           </size>
+          </property>
+         </spacer>
+        </item>
+        <item>
+         <widget class="QPushButton" name="sendButton">
+          <property name="sizePolicy">
+           <sizepolicy hsizetype="Minimum" vsizetype="Fixed">
+            <horstretch>0</horstretch>
+            <verstretch>0</verstretch>
+           </sizepolicy>
+          </property>
+          <property name="text">
+           <string>Send</string>
+          </property>
+          <property name="default">
+           <bool>true</bool>
+          </property>
+         </widget>
+        </item>
         <item>
          <widget class="QDialogButtonBox" name="buttonBox">
+          <property name="sizePolicy">
+           <sizepolicy hsizetype="Maximum" vsizetype="Fixed">
+            <horstretch>0</horstretch>
+            <verstretch>0</verstretch>
+           </sizepolicy>
+          </property>
           <property name="standardButtons">
-           <set>QDialogButtonBox::Cancel|QDialogButtonBox::Ok</set>
+           <set>QDialogButtonBox::Cancel</set>
           </property>
          </widget>
         </item>