added hide feature for toolbarservice, by default now hided

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

retroshare-gui/src/gui/MainWindow.cpp

@@ -67,7 +67,7 @@
 #define IMAGE_STATISTIC         ":/images/utilities-system-monitor.png"
 #define IMAGE_MESSAGES          ":/images/evolution.png"
 #define IMAGE_BWGRAPH           ":/images/ksysguard.png"
-#define IMAGE_RSM32             ":/images/rsmessenger32.png"
+#define IMAGE_RSM32             ":/images/kdmconfig.png"
 #define IMAGE_RSM16             ":/images/rsmessenger16.png"
 #define IMAGE_CLOSE             ":/images/close_normal.png"
 #define IMAGE_SMPLAYER		    ":/images/smplayer_icon32.png"
@@ -104,10 +104,9 @@ MainWindow::MainWindow(QWidget* parent, Qt::WFlags flags)
   
     /* Hide Console frame */
     //showConsoleFrame(false);
-    //connect(ui.btnToggleConsole, SIGNAL(toggled(bool)), this, SLOT(showConsoleFrame(bool)));
-	
-    /* Hide ToolBox frame */
-    //showToolboxFrame(true);
+    //connect(ui.btnToggleConsole, SIGNAL(toggled(bool)), this, SLOT(showConsoleFrame(bool)));	
+
+	ui.toolBarservice->hide();
 	
     // Setting icons
     this->setWindowIcon(QIcon(QString::fromUtf8(":/images/rstray3.png")));
@@ -128,17 +127,11 @@ MainWindow::MainWindow(QWidget* parent, Qt::WFlags flags)
     /** Games ToolBox*/
 	//connect(ui.qbackgammonButton, SIGNAL(clicked( bool )), this, SLOT( startgammon()) );
 	//connect(ui.qcheckersButton, SIGNAL(clicked( bool )), this, SLOT( startqcheckers()) );
-	
-	
-    //ui.addfriendButton->setToolTip(tr("Add a Friend"));
-    //ui.invitefriendButton->setToolTip(tr("Invite a Friend"));
-    //ui.addshareButton->setToolTip(tr("Add a Share"));
-    //ui.optionsButton->setToolTip(tr("Options"));
+	 
         
     /** adjusted quit behaviour: trigger a warning that can be switched off in the saved
         config file RetroShare.conf */
     //ui.actionQuit->setToolTip(tr("Quit"));
-    //connect(ui.quitButton, SIGNAL(clicked()), qApp, SLOT(quit()));
    connect(ui.actionQuit, SIGNAL(triggered()), this, SLOT(doQuit()));
 
     /* load the StyleSheet*/
@@ -215,8 +208,11 @@ MainWindow::MainWindow(QWidget* parent, Qt::WFlags flags)
     addAction(new QAction(QIcon(IMAGE_BLOCK), tr("Unfinished"), ui.toolBar), SLOT(showApplWindow()));
 #endif
 
-    //addAction(new QAction(QIcon(IMAGE_COLOR), tr("Color"), ui.toolBar), SLOT(setStyle()));
-
+    toolAct = ui.toolBarservice->toggleViewAction();
+    toolAct->setText("Service");
+    toolAct->setShortcut(tr("Ctrl+T"));
+    toolAct->setIcon(QIcon(":/images/blockdevice2.png"));
+    ui.toolBar->addAction(toolAct);
  
 
     /* Select the first action */
@@ -224,11 +220,7 @@ MainWindow::MainWindow(QWidget* parent, Qt::WFlags flags)
     /* Select the first action */
         /* Create the Service pages and actions */
     QActionGroup *servicegrp = new QActionGroup(this);
-    
-     /* Create and bind the Add Friend button */
-    //addActionservice(new QAction(QIcon(IMAGE_ADDFRIEND), tr("Add Friend"), ui.toolBarservice), SLOT(addFriend()));
-    //addActionservice(new QAction(QIcon(IMAGE_INVITEFRIEND), tr("Invite Friend"), ui.toolBarservice), SLOT(inviteFriend()));
-    //addActionservice(new QAction(QIcon(IMAGE_ADDSHARE), tr("Add Share"), ui.toolBarservice), SLOT(addSharedDirectory()));
+   
                            
     LinksDialog *linksDialog = NULL;
     ui.stackPages->add(linksDialog = new LinksDialog(ui.stackPages),
@@ -677,3 +669,12 @@ void MainWindow::setStyle()
  
 }
 
+/*void MainWindow::toggleViewAction ()
+{    
+
+        ui.toolBarservice->toggleViewAction();
+
+        //ui.toolBarservice->show();
+
+}*/
+

retroshare-gui/src/gui/MainWindow.h

@@ -136,6 +136,9 @@ private slots:
     
     /** Called when user attempts to quit via quit button*/
     void doQuit();
+    
+    //void toggleViewAction ();
+
 
 
 protected:
@@ -177,7 +180,7 @@ private:
     void loadStyleSheet(const QString &sheetName);
     
     QSystemTrayIcon *trayIcon;
-    QAction *toggleVisibilityAction;
+    QAction *toggleVisibilityAction, *toolAct;
     QMenu *menu;
        
     /** Qt Designer generated object */

retroshare-gui/src/gui/images.qrc

@@ -6,6 +6,7 @@
         <file>images/addfriendlabel.png</file>
         <file>images/backgroundl.png</file>
         <file>images/blockdevice.png</file>
+        <file>images/blockdevice2.png</file>
         <file>images/channels.png</file>        
         <file>images/channeldelete.png</file>
         <file>images/channelsubscribe.png</file>
@@ -127,6 +128,7 @@
         <file>images/invite-friend24.png</file>
         <file>images/invitefriendlabel.png</file>
         <file>images/kbackgammon.png</file>
+        <file>images/kdmconfig.png</file>
         <file>images/konsole.png</file>
         <file>images/ksysguard.png</file>
         <file>images/ktorrent.png</file>