added view button

let left toolbar moveable to right side.

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

retroshare-gui/src/gui/MainWindow.ui

@@ -1052,7 +1052,7 @@
     <string>toolBar_2</string>
    </property>
    <property name="allowedAreas" >
-    <set>Qt::LeftToolBarArea</set>
+    <set>Qt::LeftToolBarArea|Qt::RightToolBarArea</set>
    </property>
    <attribute name="toolBarArea" >
     <enum>LeftToolBarArea</enum>

retroshare-gui/src/gui/NetworkDialog.cpp

@@ -126,6 +126,13 @@ NetworkDialog::NetworkDialog(QWidget *parent)
     
     setLogInfo(tr("Welcome to RetroShare."), QString::fromUtf8("blue"));
      
+    QMenu *menu = new QMenu("View");
+    menu->addAction(ui.actionTabsright); 
+    menu->addAction(ui.actionTabswest);
+    menu->addAction(ui.actionTabssouth); 
+    menu->addAction(ui.actionTabsnorth); 
+    ui.viewButton->setMenu(menu);
+    
 
   /* Hide platform specific features */
 #ifdef Q_WS_WIN
@@ -583,3 +590,23 @@ void NetworkDialog::displayInfoLogMenu(const QPoint& pos) {
   // XXX: Why mapToGlobal() is not enough?
   myLogMenu.exec(mapToGlobal(pos)+QPoint(0,320));
 }
+
+void NetworkDialog::on_actionTabsright_activated()
+{
+  ui.networkTab->setTabPosition(QTabWidget::East);
+}
+
+void NetworkDialog::on_actionTabsnorth_activated()
+{
+  ui.networkTab->setTabPosition(QTabWidget::North);
+}
+
+void NetworkDialog::on_actionTabssouth_activated()
+{
+  ui.networkTab->setTabPosition(QTabWidget::South);
+}
+
+void NetworkDialog::on_actionTabswest_activated()
+{
+  ui.networkTab->setTabPosition(QTabWidget::West);
+}

retroshare-gui/src/gui/NetworkDialog.h

@@ -69,6 +69,12 @@ private slots:
   void on_actionClearLog_triggered();
   void displayInfoLogMenu(const QPoint& pos);
   
+  void on_actionTabsright_activated();
+  void on_actionTabsnorth_activated();
+  void on_actionTabssouth_activated();
+  void on_actionTabswest_activated();
+
+
 private:
 
 

retroshare-gui/src/gui/NetworkDialog.ui

@@ -85,6 +85,13 @@ p, li { white-space: pre-wrap; }
            </property>
           </spacer>
          </item>
+         <item row="0" column="3" >
+          <widget class="QPushButton" name="viewButton" >
+           <property name="text" >
+            <string>View</string>
+           </property>
+          </widget>
+         </item>
         </layout>
        </item>
        <item row="1" column="0" >
@@ -231,6 +238,26 @@ p, li { white-space: pre-wrap; }
     <string>Clear</string>
    </property>
   </action>
+  <action name="actionTabsright" >
+   <property name="text" >
+    <string>Set Tabs Right</string>
+   </property>
+  </action>
+  <action name="actionTabsnorth" >
+   <property name="text" >
+    <string>Set Tabs North</string>
+   </property>
+  </action>
+  <action name="actionTabssouth" >
+   <property name="text" >
+    <string>Set Tabs South</string>
+   </property>
+  </action>
+  <action name="actionTabswest" >
+   <property name="text" >
+    <string>Set Tabs Left</string>
+   </property>
+  </action>
  </widget>
  <resources/>
  <connections/>