X-Git-Url: https://git.quassel-irc.org/?a=blobdiff_plain;f=src%2Fqtui%2Fmainwin.h;h=2a53f752cf960d03b2b04e50ffe4f848cfd08e8d;hb=e7494078ad676d9fd14fab0396f51608a3ad46dc;hp=29b705f068266529d7d388e617858b12935d3f11;hpb=da36a0b99d48fac1dfd70951ed2b4d83269fa8ce;p=quassel.git

diff --git a/src/qtui/mainwin.h b/src/qtui/mainwin.h
index 29b705f0..2a53f752 100644
--- a/src/qtui/mainwin.h
+++ b/src/qtui/mainwin.h
@@ -21,20 +21,23 @@
 #ifndef MAINWIN_H_
 #define MAINWIN_H_
 
+#include <QMainWindow>
 #include <QSystemTrayIcon>
 
-#include "ui_mainwin.h"
-
 #include "qtui.h"
 #include "sessionsettings.h"
 #include "titlesetter.h"
 
 class ActionCollection;
 class BufferViewConfig;
+class BufferWidget;
 class MsgProcessorStatusWidget;
 class NickListWidget;
 class SystemTrayIcon;
 
+class QMenu;
+class QLabel;
+
 //!\brief The main window of Quassel's QtUi.
 class MainWin : public QMainWindow {
   Q_OBJECT
@@ -53,6 +56,7 @@ class MainWin : public QMainWindow {
   public slots:
     void saveStateToSession(const QString &sessionId);
     void saveStateToSessionSettings(SessionSettings &s);
+    void showStatusBarMessage(const QString &message);
 
   protected:
     void closeEvent(QCloseEvent *event);
@@ -79,7 +83,9 @@ class MainWin : public QMainWindow {
     void on_actionEditNetworks_triggered();
     void on_actionManageViews_triggered();
     void on_actionLockDockPositions_toggled(bool lock);
-    void on_actionDebugNetworkModel_triggered(bool);
+    void on_actionDebugNetworkModel_triggered();
+    void on_actionDebugMessageModel_triggered();
+    void on_actionDebugLog_triggered();
 
     void clientNetworkCreated(NetworkId);
     void clientNetworkRemoved(NetworkId);
@@ -96,7 +102,6 @@ class MainWin : public QMainWindow {
     void disconnectFromCore();
 
   private:
-    Ui::MainWin ui;
 
     QMenu *systrayMenu;
     QLabel *coreLagLabel;
@@ -106,6 +111,7 @@ class MainWin : public QMainWindow {
     TitleSetter _titleSetter;
 
     void setupActions();
+    void setupBufferWidget();
     void setupMenus();
     void setupViews();
     void setupNickWidget();
@@ -114,6 +120,7 @@ class MainWin : public QMainWindow {
     void setupTopicWidget();
     void setupStatusBar();
     void setupSystray();
+    void setupTitleSetter();
 
     void updateIcon();
     void toggleVisibility();
@@ -122,9 +129,10 @@ class MainWin : public QMainWindow {
     QSystemTrayIcon *_trayIcon;
 
     QList<QDockWidget *> _netViews;
-    NickListWidget *nickListWidget;
+    BufferWidget *_bufferWidget;
+    NickListWidget *_nickListWidget;
 
-    ActionCollection *_actionCollection;
+    QMenu *_fileMenu, *_networksMenu, *_viewMenu, *_bufferViewsMenu, *_settingsMenu, *_helpMenu, *_helpDebugMenu;
 
     friend class QtUi;
 };