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 f1e2117..1f42a74 100644 (file)
--- 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)));
 
   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");
 
   //_nickToolBar = addToolBar("User");
   //_nickToolBar->setObjectName("NickToolBar");

diff --git a/src/qtui/mainwin.h b/src/qtui/mainwin.h
index 656a009..b05b724 100644 (file)
--- 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;
     InputWidget *_inputWidget;
 
     QMenu *_fileMenu, *_networksMenu, *_viewMenu, *_bufferViewsMenu, *_settingsMenu, *_helpMenu, *_helpDebugMenu;

-    QToolBar *_networkToolBar, *_chatViewToolBar, *_nickToolBar;
+    QToolBar *_mainToolBar, *_chatViewToolBar, *_nickToolBar;

 
     QWidget *_awayLog;
     friend class QtUi;
 
     QWidget *_awayLog;
     friend class QtUi;

diff --git a/src/uisupport/toolbaractionprovider.cpp b/src/uisupport/toolbaractionprovider.cpp
index c3ea90a..43cb41d 100644 (file)
--- 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) {
 
 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));
       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 0fcc991..2ee8271 100644 (file)
--- a/src/uisupport/toolbaractionprovider.h
+++ b/src/uisupport/toolbaractionprovider.h
@@ -33,7 +33,7 @@ public:
   virtual ~ToolBarActionProvider();
 
   enum ToolBarType {
   virtual ~ToolBarActionProvider();
 
   enum ToolBarType {

-    NetworkToolBar,
+    MainToolBar,

     ChatViewToolBar,
     NickToolBar
   };
     ChatViewToolBar,
     NickToolBar
   };