X-Git-Url: https://git.quassel-irc.org/?a=blobdiff_plain;f=src%2Fqtui%2Fmainwin.cpp;h=27ac628d58d06aae6da9ff6930ed2ed0c2474b9b;hb=a3e9fc8ef08339fb19eacd0c9c35733792f770ca;hp=b5d90a44641289b9adffed814417eee496e985fd;hpb=982359db5545edf340a246cd13dfcdc9bf2ccf33;p=quassel.git

diff --git a/src/qtui/mainwin.cpp b/src/qtui/mainwin.cpp
index b5d90a44..27ac628d 100644
--- a/src/qtui/mainwin.cpp
+++ b/src/qtui/mainwin.cpp
@@ -223,6 +223,7 @@ void MainWin::setupActions() {
   // View
   coll->addAction("ConfigureBufferViews", new Action(tr("&Configure Buffer Views..."), coll,
                                              this, SLOT(on_actionConfigureViews_triggered())));
+
   QAction *lockAct = coll->addAction("LockDockPositions", new Action(tr("&Lock Dock Positions"), coll));
   lockAct->setCheckable(true);
   connect(lockAct, SIGNAL(toggled(bool)), SLOT(on_actionLockDockPositions_toggled(bool)));
@@ -276,6 +277,7 @@ void MainWin::setupMenus() {
   _viewMenu = menuBar()->addMenu(tr("&View"));
   _bufferViewsMenu = _viewMenu->addMenu(tr("&Buffer Views"));
   _bufferViewsMenu->addAction(coll->action("ConfigureBufferViews"));
+  _toolbarMenu = _viewMenu->addMenu(tr("&Toolbars"));
   _viewMenu->addSeparator();
   _viewMenu->addAction(coll->action("ToggleSearchBar"));
 
@@ -528,17 +530,18 @@ void MainWin::setupToolBars() {
   connect(_nickListWidget, SIGNAL(nickSelectionChanged(QModelIndexList)),
           QtUi::toolBarActionProvider(), SLOT(nickSelectionChanged(QModelIndexList)));
 
-  _networkToolBar = addToolBar("Network");
-  _networkToolBar->setObjectName("NetworkToolBar");
-  QtUi::toolBarActionProvider()->addActions(_networkToolBar, ToolBarActionProvider::NetworkToolBar);
+  _mainToolBar = addToolBar("Main Toolbar");
+  _mainToolBar->setObjectName("MainToolBar");
+  QtUi::toolBarActionProvider()->addActions(_mainToolBar, ToolBarActionProvider::MainToolBar);
+  _toolbarMenu->addAction(_mainToolBar->toggleViewAction());
 
-  _nickToolBar = addToolBar("User");
-  _nickToolBar->setObjectName("NickToolBar");
-  QtUi::toolBarActionProvider()->addActions(_nickToolBar, ToolBarActionProvider::NickToolBar);
+  //_nickToolBar = addToolBar("User");
+  //_nickToolBar->setObjectName("NickToolBar");
+  //QtUi::toolBarActionProvider()->addActions(_nickToolBar, ToolBarActionProvider::NickToolBar);
 
 #ifdef HAVE_KDE
-  _networkToolBar->setToolButtonStyle(Qt::ToolButtonTextUnderIcon);
-  _nickToolBar->setToolButtonStyle(Qt::ToolButtonTextUnderIcon);
+  _mainToolBar->setToolButtonStyle(Qt::ToolButtonTextUnderIcon);
+  //_nickToolBar->setToolButtonStyle(Qt::ToolButtonTextUnderIcon);
 #endif
 }
 
@@ -587,6 +590,8 @@ void MainWin::setConnectedState() {
   // _viewMenu->setEnabled(true);
   if(!Client::internalCore())
     statusBar()->showMessage(tr("Connected to core."));
+  else
+    statusBar()->clearMessage();
 
   if(Client::signalProxy()->isSecure()) {
     sslLabel->setPixmap(SmallIcon("security-high"));