Added Cancel Buttons for Chat and Peer feed Items, and disable the Send Buttons by default, added for PeerItem to check if TextEdit is empty or not too.

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

retroshare-gui/src/gui/feeds/ChatMsgItem.cpp

@@ -50,6 +50,8 @@ ChatMsgItem::ChatMsgItem(FeedHolder *parent, uint32_t feedId, std::string peerId
     
     messageframe->setVisible(false);
     sendButton->hide();
+    cancelButton->hide();
+    sendButton->setEnabled(false);
 
     /* general ones */
     connect( clearButton, SIGNAL( clicked( void ) ), this, SLOT( removeItem ( void ) ) );
@@ -58,6 +60,7 @@ ChatMsgItem::ChatMsgItem(FeedHolder *parent, uint32_t feedId, std::string peerId
     connect( chatButton, SIGNAL( clicked( void ) ), this, SLOT( openChat ( void ) ) );
     connect( msgButton, SIGNAL( clicked( void ) ), this, SLOT( sendMsg ( void ) ) );
     connect( quickmsgButton, SIGNAL( clicked( ) ), this, SLOT( togglequickmessage() ) );
+    connect( cancelButton, SIGNAL( clicked( ) ), this, SLOT( togglequickmessage() ) );
     connect( sendButton, SIGNAL( clicked( ) ), this, SLOT( sendMessage() ) );
 
     connect(NotifyQt::getInstance(), SIGNAL(peerHasNewAvatar(const QString&)), this, SLOT(updateAvatar(const QString&)));
@@ -251,11 +254,13 @@ void ChatMsgItem::togglequickmessage()
 	{
         messageframe->setVisible(true);
         sendButton->show();
+        cancelButton->show();
     }
 	else
 	{
         messageframe->setVisible(false);
         sendButton->hide();
+        cancelButton->hide();
     }	
 
 }
@@ -274,6 +279,7 @@ void ChatMsgItem::sendMessage()
     quickmsgText->clear();
     messageframe->setVisible(false);
     sendButton->hide();
+    cancelButton->hide();
 }
 
 void ChatMsgItem::on_quickmsgText_textChanged()

retroshare-gui/src/gui/feeds/ChatMsgItem.ui

@@ -6,7 +6,7 @@
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>513</width>
+    <width>543</width>
     <height>213</height>
    </rect>
   </property>
@@ -193,7 +193,7 @@ border-radius: 10px}</string>
          <property name="margin">
           <number>0</number>
          </property>
-         <item row="0" column="0" colspan="5">
+         <item row="0" column="0" colspan="6">
           <widget class="QFrame" name="messageframe">
            <property name="frameShape">
             <enum>QFrame::StyledPanel</enum>
@@ -306,11 +306,21 @@ border-radius: 10px}</string>
            </property>
           </spacer>
          </item>
-         <item row="1" column="4">
+         <item row="1" column="5">
           <widget class="QPushButton" name="sendButton">
            <property name="text">
             <string>Send</string>
            </property>
+           <property name="default">
+            <bool>true</bool>
+           </property>
+          </widget>
+         </item>
+         <item row="1" column="4">
+          <widget class="QPushButton" name="cancelButton">
+           <property name="text">
+            <string>Cancel</string>
+           </property>
           </widget>
          </item>
         </layout>

retroshare-gui/src/gui/feeds/PeerItem.cpp

@@ -47,6 +47,7 @@ PeerItem::PeerItem(FeedHolder *parent, uint32_t feedId, std::string peerId, uint
     setupUi(this);
   
     messageframe->setVisible(false);
+    sendmsgButton->setEnabled(false);
 
     /* general ones */
     connect( expandButton, SIGNAL( clicked( void ) ), this, SLOT( toggle ( void ) ) );
@@ -57,6 +58,8 @@ PeerItem::PeerItem(FeedHolder *parent, uint32_t feedId, std::string peerId, uint
     connect( msgButton, SIGNAL( clicked( void ) ), this, SLOT( sendMsg ( void ) ) );
 
     connect( quickmsgButton, SIGNAL( clicked( ) ), this, SLOT( togglequickmessage() ) );
+    connect( cancelButton, SIGNAL( clicked( ) ), this, SLOT( togglequickmessage() ) );
+
     connect( sendmsgButton, SIGNAL( clicked( ) ), this, SLOT( sendMessage() ) );
 
     connect(NotifyQt::getInstance(), SIGNAL(peerHasNewAvatar(const QString&)), this, SLOT(updateAvatar(const QString&)));
@@ -378,3 +381,14 @@ void PeerItem::sendMessage()
     messageframe->setVisible(false);
 }
 
+void PeerItem::on_quickmsgText_textChanged()
+{
+    if (quickmsgText->toPlainText().isEmpty())
+    {
+        sendmsgButton->setEnabled(false);
+    }
+    else
+    {
+        sendmsgButton->setEnabled(true);
+    }
+}

retroshare-gui/src/gui/feeds/PeerItem.h

@@ -63,6 +63,9 @@ private slots:
     void togglequickmessage();
 	void sendMessage();
 	
+	void on_quickmsgText_textChanged();
+
+
 private:
 	FeedHolder *mParent;
 	uint32_t mFeedId;

retroshare-gui/src/gui/feeds/PeerItem.ui

@@ -6,8 +6,8 @@
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>589</width>
+    <width>632</width>
-    <height>370</height>
+    <height>354</height>
    </rect>
   </property>
   <property name="windowTitle">
@@ -31,6 +31,18 @@
                                      stop: 0 #BDDF7D, stop: 1 #649C35);
 border-radius: 10px}</string>
      </property>
+     <property name="frameShape">
+      <enum>QFrame::StyledPanel</enum>
+     </property>
+     <property name="frameShadow">
+      <enum>QFrame::Raised</enum>
+     </property>
+     <layout class="QGridLayout" name="gridLayout_5">
+      <property name="verticalSpacing">
+       <number>0</number>
+      </property>
+      <item row="0" column="0">
+       <widget class="QFrame" name="frame_2">
         <property name="frameShape">
          <enum>QFrame::StyledPanel</enum>
         </property>
@@ -38,6 +50,9 @@ border-radius: 10px}</string>
          <enum>QFrame::Raised</enum>
         </property>
         <layout class="QGridLayout" name="gridLayout_4">
+         <property name="margin">
+          <number>0</number>
+         </property>
          <item row="0" column="0" rowspan="2">
           <layout class="QGridLayout" name="gridLayout">
            <item row="0" column="0" rowspan="2">
@@ -274,7 +289,10 @@ border-radius: 10px}</string>
            </item>
           </layout>
          </item>
-      <item row="2" column="0" colspan="2">
+        </layout>
+       </widget>
+      </item>
+      <item row="1" column="0">
        <widget class="QFrame" name="messageframe">
         <property name="maximumSize">
          <size>
@@ -295,7 +313,7 @@ border-radius: 10px}</string>
          <property name="margin">
           <number>0</number>
          </property>
-         <item row="0" column="0" colspan="2">
+         <item row="0" column="0" colspan="3">
           <widget class="QTextEdit" name="quickmsgText"/>
          </item>
          <item row="1" column="0">
@@ -311,17 +329,30 @@ border-radius: 10px}</string>
            </property>
           </spacer>
          </item>
-         <item row="1" column="1">
+         <item row="1" column="2">
           <widget class="QPushButton" name="sendmsgButton">
            <property name="text">
             <string>Send</string>
            </property>
+           <property name="autoDefault">
+            <bool>false</bool>
+           </property>
+           <property name="default">
+            <bool>true</bool>
+           </property>
+          </widget>
+         </item>
+         <item row="1" column="1">
+          <widget class="QPushButton" name="cancelButton">
+           <property name="text">
+            <string>Cancel</string>
+           </property>
           </widget>
          </item>
         </layout>
        </widget>
       </item>
-      <item row="3" column="0" colspan="2">
+      <item row="2" column="0">
        <widget class="QFrame" name="expandFrame">
         <property name="frameShape">
          <enum>QFrame::StyledPanel</enum>
@@ -536,8 +567,8 @@ p, li { white-space: pre-wrap; }
            </property>
            <property name="sizeHint" stdset="0">
             <size>
-             <width>20</width>
+             <width>578</width>
-             <height>40</height>
+             <height>78</height>
             </size>
            </property>
           </spacer>
@@ -548,19 +579,6 @@ p, li { white-space: pre-wrap; }
      </layout>
     </widget>
    </item>
-   <item row="1" column="0">
-    <spacer name="verticalSpacer_2">
-     <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>
  </widget>
  <resources>