From 7b4f45b68643e28a35d060cf6bd35db2ea51f200 Mon Sep 17 00:00:00 2001
From: thunder2 <retroshare.project@gmail.com>
Date: Mon, 16 May 2011 21:24:16 +0000
Subject: [PATCH] Removed the + button in channels and forums and moved the
 post button to the right side.

git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@4205 b45a01b8-16f6-495d-af2f-9b41ad6348cc
---
 retroshare-gui/src/gui/ChannelFeed.cpp  |   8 +-
 retroshare-gui/src/gui/ChannelFeed.ui   | 168 ++++++++++--------------
 retroshare-gui/src/gui/ForumsDialog.cpp |   7 +-
 retroshare-gui/src/gui/ForumsDialog.ui  | 124 +++++++----------
 4 files changed, 115 insertions(+), 192 deletions(-)

diff --git a/retroshare-gui/src/gui/ChannelFeed.cpp b/retroshare-gui/src/gui/ChannelFeed.cpp
index 1ec23841b..73837dbe2 100644
--- a/retroshare-gui/src/gui/ChannelFeed.cpp
+++ b/retroshare-gui/src/gui/ChannelFeed.cpp
@@ -57,7 +57,7 @@ ChannelFeed::ChannelFeed(QWidget *parent)
     /* Invoke the Qt Designer generated object setup routine */
     setupUi(this);
 
-    connect(actionCreate_Channel, SIGNAL(triggered()), this, SLOT(createChannel()));
+	connect(newChannelButton, SIGNAL(clicked()), this, SLOT(createChannel()));
     connect(postButton, SIGNAL(clicked()), this, SLOT(createMsg()));
     connect(subscribeButton, SIGNAL( clicked( void ) ), this, SLOT( subscribeChannel ( void ) ) );
     connect(unsubscribeButton, SIGNAL( clicked( void ) ), this, SLOT( unsubscribeChannel ( void ) ) );
@@ -93,12 +93,6 @@ ChannelFeed::ChannelFeed(QWidget *parent)
     nameLabel->setFont(QFont("MS SANS SERIF", 22));
     nameLabel->setMinimumWidth(20);
 
-    // Setup Channel Menu:
-    QMenu *channelmenu = new QMenu();
-    channelmenu->addAction(actionCreate_Channel); 
-    channelmenu->addSeparator();
-    channelpushButton->setMenu(channelmenu);
-
     /* load settings */
     processSettings(true);
 
diff --git a/retroshare-gui/src/gui/ChannelFeed.ui b/retroshare-gui/src/gui/ChannelFeed.ui
index 1601a847d..ae31412e6 100644
--- a/retroshare-gui/src/gui/ChannelFeed.ui
+++ b/retroshare-gui/src/gui/ChannelFeed.ui
@@ -139,88 +139,6 @@ p, li { white-space: pre-wrap; }
             </property>
            </spacer>
           </item>
-          <item row="0" column="4">
-           <widget class="QPushButton" name="channelpushButton">
-            <property name="enabled">
-             <bool>true</bool>
-            </property>
-            <property name="focusPolicy">
-             <enum>Qt::NoFocus</enum>
-            </property>
-            <property name="toolTip">
-             <string>Add</string>
-            </property>
-            <property name="styleSheet">
-             <string notr="true">QPushButton::menu-indicator {
-     subcontrol-origin: padding;
-     subcontrol-position: bottom right;
- }
-
- QPushButton::menu-indicator:pressed, QPushButton::menu-indicator:open {
-     position: relative;
-     top: 2px; left: 2px; /* shift the arrow by 2 px */
- }
-
- QPushButton:hover {
-	border: 1px solid #CCCCCC;
- }</string>
-            </property>
-            <property name="text">
-             <string/>
-            </property>
-            <property name="icon">
-             <iconset resource="images.qrc">
-              <normaloff>:/images/edit_add24.png</normaloff>:/images/edit_add24.png</iconset>
-            </property>
-            <property name="default">
-             <bool>false</bool>
-            </property>
-            <property name="flat">
-             <bool>true</bool>
-            </property>
-           </widget>
-          </item>
-          <item row="0" column="2">
-           <widget class="QToolButton" name="postButton">
-            <property name="sizePolicy">
-             <sizepolicy hsizetype="Preferred" vsizetype="Fixed">
-              <horstretch>0</horstretch>
-              <verstretch>0</verstretch>
-             </sizepolicy>
-            </property>
-            <property name="minimumSize">
-             <size>
-              <width>0</width>
-              <height>25</height>
-             </size>
-            </property>
-            <property name="maximumSize">
-             <size>
-              <width>16777215</width>
-              <height>26</height>
-             </size>
-            </property>
-            <property name="focusPolicy">
-             <enum>Qt::NoFocus</enum>
-            </property>
-            <property name="toolTip">
-             <string>Post to Channel</string>
-            </property>
-            <property name="styleSheet">
-             <string notr="true"/>
-            </property>
-            <property name="text">
-             <string/>
-            </property>
-            <property name="icon">
-             <iconset resource="images.qrc">
-              <normaloff>:/images/mail_send.png</normaloff>:/images/mail_send.png</iconset>
-            </property>
-            <property name="autoRaise">
-             <bool>true</bool>
-            </property>
-           </widget>
-          </item>
           <item row="0" column="3">
            <widget class="QPushButton" name="displayButton">
             <property name="focusPolicy">
@@ -253,6 +171,26 @@ p, li { white-space: pre-wrap; }
             </property>
            </widget>
           </item>
+          <item row="0" column="4">
+           <widget class="QToolButton" name="newChannelButton">
+            <property name="enabled">
+             <bool>true</bool>
+            </property>
+            <property name="focusPolicy">
+             <enum>Qt::NoFocus</enum>
+            </property>
+            <property name="toolTip">
+             <string>Create Channel</string>
+            </property>
+            <property name="icon">
+             <iconset resource="images.qrc">
+              <normaloff>:/images/add_channel24.png</normaloff>:/images/add_channel24.png</iconset>
+            </property>
+            <property name="autoRaise">
+             <bool>true</bool>
+            </property>
+           </widget>
+          </item>
          </layout>
         </widget>
        </item>
@@ -355,12 +293,12 @@ p, li { white-space: pre-wrap; }
           <item row="2" column="0">
            <layout class="QGridLayout" name="gridLayout">
             <property name="leftMargin">
-             <number>9</number>
+             <number>2</number>
             </property>
             <property name="rightMargin">
-             <number>9</number>
+             <number>2</number>
             </property>
-            <item row="0" column="3">
+            <item row="0" column="4">
              <widget class="QPushButton" name="unsubscribeButton">
               <property name="sizePolicy">
                <sizepolicy hsizetype="Minimum" vsizetype="Fixed">
@@ -402,7 +340,7 @@ border-image: url(:/images/btn_26_pressed.png) 4;
               </property>
              </widget>
             </item>
-            <item row="0" column="2">
+            <item row="0" column="3">
              <widget class="QPushButton" name="subscribeButton">
               <property name="sizePolicy">
                <sizepolicy hsizetype="Minimum" vsizetype="Fixed">
@@ -454,7 +392,7 @@ border-image: url(:/images/btn_26_pressed.png) 4;
               </property>
              </widget>
             </item>
-            <item row="0" column="1">
+            <item row="0" column="2">
              <spacer name="horizontalSpacer">
               <property name="orientation">
                <enum>Qt::Horizontal</enum>
@@ -467,7 +405,7 @@ border-image: url(:/images/btn_26_pressed.png) 4;
               </property>
              </spacer>
             </item>
-            <item row="0" column="4">
+            <item row="0" column="5">
              <widget class="QToolButton" name="setAllAsReadButton">
               <property name="sizePolicy">
                <sizepolicy hsizetype="Minimum" vsizetype="Fixed">
@@ -506,7 +444,7 @@ border-image: url(:/images/btn_26_pressed.png) 4;
               </property>
              </widget>
             </item>
-            <item row="0" column="5">
+            <item row="0" column="6">
              <widget class="QPushButton" name="autoDownload">
               <property name="minimumSize">
                <size>
@@ -539,6 +477,47 @@ border-image: url(:/images/btn_26_pressed.png) 4;
               </property>
              </widget>
             </item>
+            <item row="0" column="1">
+             <widget class="QToolButton" name="postButton">
+              <property name="sizePolicy">
+               <sizepolicy hsizetype="Preferred" vsizetype="Fixed">
+                <horstretch>0</horstretch>
+                <verstretch>0</verstretch>
+               </sizepolicy>
+              </property>
+              <property name="minimumSize">
+               <size>
+                <width>0</width>
+                <height>25</height>
+               </size>
+              </property>
+              <property name="maximumSize">
+               <size>
+                <width>16777215</width>
+                <height>26</height>
+               </size>
+              </property>
+              <property name="focusPolicy">
+               <enum>Qt::NoFocus</enum>
+              </property>
+              <property name="toolTip">
+               <string>Post to Channel</string>
+              </property>
+              <property name="styleSheet">
+               <string notr="true"/>
+              </property>
+              <property name="text">
+               <string/>
+              </property>
+              <property name="icon">
+               <iconset resource="images.qrc">
+                <normaloff>:/images/mail_send.png</normaloff>:/images/mail_send.png</iconset>
+              </property>
+              <property name="autoRaise">
+               <bool>true</bool>
+              </property>
+             </widget>
+            </item>
            </layout>
           </item>
          </layout>
@@ -575,7 +554,7 @@ border-image: url(:/images/btn_26_pressed.png) 4;
               <rect>
                <x>0</x>
                <y>0</y>
-               <width>452</width>
+               <width>484</width>
                <height>331</height>
               </rect>
              </property>
@@ -617,15 +596,6 @@ border-image: url(:/images/btn_26_pressed.png) 4;
     </widget>
    </item>
   </layout>
-  <action name="actionCreate_Channel">
-   <property name="icon">
-    <iconset resource="images.qrc">
-     <normaloff>:/images/add_channel24.png</normaloff>:/images/add_channel24.png</iconset>
-   </property>
-   <property name="text">
-    <string>Create Channel</string>
-   </property>
-  </action>
  </widget>
  <customwidgets>
   <customwidget>
diff --git a/retroshare-gui/src/gui/ForumsDialog.cpp b/retroshare-gui/src/gui/ForumsDialog.cpp
index d8aa037ae..ec629626d 100644
--- a/retroshare-gui/src/gui/ForumsDialog.cpp
+++ b/retroshare-gui/src/gui/ForumsDialog.cpp
@@ -135,7 +135,7 @@ ForumsDialog::ForumsDialog(QWidget *parent)
     connect( ui.forumTreeWidget, SIGNAL( treeCustomContextMenuRequested( QPoint ) ), this, SLOT( forumListCustomPopupMenu( QPoint ) ) );
     connect( ui.threadTreeWidget, SIGNAL( customContextMenuRequested( QPoint ) ), this, SLOT( threadListCustomPopupMenu( QPoint ) ) );
 
-    connect(ui.actionCreate_Forum, SIGNAL(triggered()), this, SLOT(newforum()));
+	connect(ui.newForumButton, SIGNAL(clicked()), this, SLOT(newforum()));
     connect(ui.newmessageButton, SIGNAL(clicked()), this, SLOT(createmessage()));
     connect(ui.newthreadButton, SIGNAL(clicked()), this, SLOT(createthread()));
 
@@ -181,11 +181,6 @@ ForumsDialog::ForumsDialog(QWidget *parent)
     ui.forumName->setFont(m_ForumNameFont);
     ui.threadTitle->setFont(m_ForumNameFont);
 
-    QMenu *forummenu = new QMenu();
-    forummenu->addAction(ui.actionCreate_Forum);
-    forummenu->addSeparator();
-    ui.forumpushButton->setMenu(forummenu);
-
     /* Initialize group tree */
     ui.forumTreeWidget->initDisplayMenu(ui.displayButton);
 
diff --git a/retroshare-gui/src/gui/ForumsDialog.ui b/retroshare-gui/src/gui/ForumsDialog.ui
index dc9e23929..0637b97b0 100644
--- a/retroshare-gui/src/gui/ForumsDialog.ui
+++ b/retroshare-gui/src/gui/ForumsDialog.ui
@@ -617,70 +617,6 @@ p, li { white-space: pre-wrap; }
             </property>
            </spacer>
           </item>
-          <item row="0" column="5">
-           <widget class="QPushButton" name="forumpushButton">
-            <property name="focusPolicy">
-             <enum>Qt::NoFocus</enum>
-            </property>
-            <property name="toolTip">
-             <string>Add</string>
-            </property>
-            <property name="styleSheet">
-             <string notr="true">QPushButton::menu-indicator {
-     subcontrol-origin: padding;
-     subcontrol-position: bottom right;
- }
-
- QPushButton::menu-indicator:pressed, QPushButton::menu-indicator:open {
-     position: relative;
-     top: 2px; left: 2px; /* shift the arrow by 2 px */
- }
-
- QPushButton:hover {
-	border: 1px solid #CCCCCC;
- }</string>
-            </property>
-            <property name="text">
-             <string/>
-            </property>
-            <property name="icon">
-             <iconset resource="images.qrc">
-              <normaloff>:/images/edit_add24.png</normaloff>:/images/edit_add24.png</iconset>
-            </property>
-            <property name="default">
-             <bool>false</bool>
-            </property>
-            <property name="flat">
-             <bool>true</bool>
-            </property>
-           </widget>
-          </item>
-          <item row="0" column="3">
-           <widget class="QToolButton" name="newthreadButton">
-            <property name="maximumSize">
-             <size>
-              <width>24</width>
-              <height>24</height>
-             </size>
-            </property>
-            <property name="focusPolicy">
-             <enum>Qt::NoFocus</enum>
-            </property>
-            <property name="toolTip">
-             <string>Start new Thread for Selected Forum</string>
-            </property>
-            <property name="text">
-             <string/>
-            </property>
-            <property name="icon">
-             <iconset resource="images.qrc">
-              <normaloff>:/images/mail_new.png</normaloff>:/images/mail_new.png</iconset>
-            </property>
-            <property name="autoRaise">
-             <bool>true</bool>
-            </property>
-           </widget>
-          </item>
           <item row="0" column="4">
            <widget class="QPushButton" name="displayButton">
             <property name="focusPolicy">
@@ -713,6 +649,23 @@ p, li { white-space: pre-wrap; }
             </property>
            </widget>
           </item>
+          <item row="0" column="5">
+           <widget class="QToolButton" name="newForumButton">
+            <property name="focusPolicy">
+             <enum>Qt::NoFocus</enum>
+            </property>
+            <property name="toolTip">
+             <string>Create Forum</string>
+            </property>
+            <property name="icon">
+             <iconset resource="images.qrc">
+              <normaloff>:/images/new_forum16.png</normaloff>:/images/new_forum16.png</iconset>
+            </property>
+            <property name="autoRaise">
+             <bool>true</bool>
+            </property>
+           </widget>
+          </item>
          </layout>
         </widget>
        </item>
@@ -1067,7 +1020,7 @@ border: 1px solid #CCCCCC;}</string>
            <property name="margin">
             <number>2</number>
            </property>
-           <item row="0" column="2">
+           <item row="0" column="3">
             <layout class="QHBoxLayout" name="horizontalLayout">
              <property name="spacing">
               <number>2</number>
@@ -1140,7 +1093,7 @@ border-image: url(:/images/closepressed.png)
              </item>
             </layout>
            </item>
-           <item row="0" column="3">
+           <item row="0" column="4">
             <widget class="QComboBox" name="filterColumnComboBox">
              <property name="minimumSize">
               <size>
@@ -1178,7 +1131,7 @@ border-image: url(:/images/closepressed.png)
              </item>
             </widget>
            </item>
-           <item row="0" column="0">
+           <item row="0" column="1">
             <widget class="QToolButton" name="newmessageButton">
              <property name="maximumSize">
               <size>
@@ -1192,9 +1145,6 @@ border-image: url(:/images/closepressed.png)
              <property name="toolTip">
               <string>Reply Message</string>
              </property>
-             <property name="text">
-              <string/>
-             </property>
              <property name="icon">
               <iconset resource="images.qrc">
                <normaloff>:/images/mail_reply.png</normaloff>:/images/mail_reply.png</iconset>
@@ -1204,7 +1154,7 @@ border-image: url(:/images/closepressed.png)
              </property>
             </widget>
            </item>
-           <item row="0" column="1">
+           <item row="0" column="2">
             <spacer name="horizontalSpacer">
              <property name="orientation">
               <enum>Qt::Horizontal</enum>
@@ -1220,6 +1170,29 @@ border-image: url(:/images/closepressed.png)
              </property>
             </spacer>
            </item>
+           <item row="0" column="0">
+            <widget class="QToolButton" name="newthreadButton">
+             <property name="maximumSize">
+              <size>
+               <width>24</width>
+               <height>24</height>
+              </size>
+             </property>
+             <property name="focusPolicy">
+              <enum>Qt::NoFocus</enum>
+             </property>
+             <property name="toolTip">
+              <string>Start new Thread for Selected Forum</string>
+             </property>
+             <property name="icon">
+              <iconset resource="images.qrc">
+               <normaloff>:/images/mail_new.png</normaloff>:/images/mail_new.png</iconset>
+             </property>
+             <property name="autoRaise">
+              <bool>true</bool>
+             </property>
+            </widget>
+           </item>
           </layout>
          </widget>
         </item>
@@ -1258,15 +1231,6 @@ border-image: url(:/images/closepressed.png)
     <string>PrintPreview</string>
    </property>
   </action>
-  <action name="actionCreate_Forum">
-   <property name="icon">
-    <iconset resource="images.qrc">
-     <normaloff>:/images/new_forum16.png</normaloff>:/images/new_forum16.png</iconset>
-   </property>
-   <property name="text">
-    <string>Create Forum</string>
-   </property>
-  </action>
  </widget>
  <customwidgets>
   <customwidget>