From: Manuel Nickschas Date: Sun, 8 Feb 2009 09:37:55 +0000 (+0100) Subject: Rename Network toolbar to Main toolbar X-Git-Tag: 0.4.0~110 X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=commitdiff_plain;h=4b901734bdcd469e5e91cb84f18db1887e6dde74 Rename Network toolbar to Main toolbar Kdevelop4's renaming feature totally rocks, btw. --- diff --git a/src/qtui/mainwin.cpp b/src/qtui/mainwin.cpp index f1e21175..1f42a747 100644 --- a/src/qtui/mainwin.cpp +++ b/src/qtui/mainwin.cpp @@ -528,9 +528,9 @@ 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"); + _mainToolBar->setObjectName("MainToolBar"); + QtUi::toolBarActionProvider()->addActions(_mainToolBar, ToolBarActionProvider::MainToolBar); //_nickToolBar = addToolBar("User"); //_nickToolBar->setObjectName("NickToolBar"); diff --git a/src/qtui/mainwin.h b/src/qtui/mainwin.h index 656a0090..b05b724d 100644 --- a/src/qtui/mainwin.h +++ b/src/qtui/mainwin.h @@ -165,7 +165,7 @@ class MainWin InputWidget *_inputWidget; QMenu *_fileMenu, *_networksMenu, *_viewMenu, *_bufferViewsMenu, *_settingsMenu, *_helpMenu, *_helpDebugMenu; - QToolBar *_networkToolBar, *_chatViewToolBar, *_nickToolBar; + QToolBar *_mainToolBar, *_chatViewToolBar, *_nickToolBar; QWidget *_awayLog; friend class QtUi; diff --git a/src/uisupport/toolbaractionprovider.cpp b/src/uisupport/toolbaractionprovider.cpp index c3ea90a0..43cb41d7 100644 --- a/src/uisupport/toolbaractionprovider.cpp +++ b/src/uisupport/toolbaractionprovider.cpp @@ -81,7 +81,7 @@ void ToolBarActionProvider::updateStates() { void ToolBarActionProvider::addActions(QToolBar *bar, ToolBarType type) { switch(type) { - case NetworkToolBar: + case MainToolBar: bar->addAction(action(NetworkConnectAll)); bar->addAction(action(NetworkDisconnectAll)); bar->addAction(action(JoinChannel)); diff --git a/src/uisupport/toolbaractionprovider.h b/src/uisupport/toolbaractionprovider.h index 0fcc9919..2ee82711 100644 --- a/src/uisupport/toolbaractionprovider.h +++ b/src/uisupport/toolbaractionprovider.h @@ -33,7 +33,7 @@ public: virtual ~ToolBarActionProvider(); enum ToolBarType { - NetworkToolBar, + MainToolBar, ChatViewToolBar, NickToolBar };