Add toolbar support to the MainWin.

Actions are mosty unfunctional yet, as ToolBarActionProvider is still far from
complete.

diff --git a/src/qtui/mainwin.cpp b/src/qtui/mainwin.cpp
index 7c75310..b3e724d 100644 (file)
--- a/src/qtui/mainwin.cpp
+++ b/src/qtui/mainwin.cpp
@@ -63,6 +63,7 @@
 #include "sessionsettings.h"
 #include "settingsdlg.h"
 #include "settingspagedlg.h"
 #include "sessionsettings.h"
 #include "settingsdlg.h"
 #include "settingspagedlg.h"

+#include "toolbaractionprovider.h"

 #include "topicwidget.h"
 #include "verticaldock.h"
 
 #include "topicwidget.h"
 #include "verticaldock.h"
 


@@ -153,6 +154,7 @@ void MainWin::init() {
   setupNickWidget();
   setupInputWidget();
   setupStatusBar();
   setupNickWidget();
   setupInputWidget();
   setupStatusBar();

+  setupToolBars();

   setupSystray();
   setupTitleSetter();
 
   setupSystray();
   setupTitleSetter();
 


@@ -520,6 +522,21 @@ void MainWin::setupSystray() {
 #endif
 }
 
 #endif
 }
 

+void MainWin::setupToolBars() {
+  _networkToolBar = addToolBar("Network");
+  _networkToolBar->setObjectName("NetworkToolBar");
+  QtUi::toolBarActionProvider()->addActions(_networkToolBar, ToolBarActionProvider::NetworkToolBar);
+
+  _nickToolBar = addToolBar("User");
+  _nickToolBar->setObjectName("NickToolBar");
+  QtUi::toolBarActionProvider()->addActions(_nickToolBar, ToolBarActionProvider::NickToolBar);
+
+#ifdef HAVE_KDE
+  _networkToolBar->setToolButtonStyle(Qt::ToolButtonTextUnderIcon);
+  _nickToolBar->setToolButtonStyle(Qt::ToolButtonTextUnderIcon);
+#endif
+}
+

 void MainWin::changeEvent(QEvent *event) {
   if(event->type() == QEvent::WindowStateChange) {
     if(windowState() & Qt::WindowMinimized) {
 void MainWin::changeEvent(QEvent *event) {
   if(event->type() == QEvent::WindowStateChange) {
     if(windowState() & Qt::WindowMinimized) {

diff --git a/src/qtui/mainwin.h b/src/qtui/mainwin.h
index a4f6496..656a009 100644 (file)
--- a/src/qtui/mainwin.h
+++ b/src/qtui/mainwin.h
@@ -45,6 +45,7 @@ class SystemTrayIcon;
 
 class QMenu;
 class QLabel;
 
 class QMenu;
 class QLabel;

+class QToolBar;

 
 class KHelpMenu;
 
 
 class KHelpMenu;
 


@@ -149,6 +150,7 @@ class MainWin
     void setupStatusBar();
     void setupSystray();
     void setupTitleSetter();
     void setupStatusBar();
     void setupSystray();
     void setupTitleSetter();

+    void setupToolBars();

 
     void updateIcon();
     void hideToTray();
 
     void updateIcon();
     void hideToTray();


@@ -163,6 +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;

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