X-Git-Url: https://git.quassel-irc.org/?a=blobdiff_plain;f=src%2Fqtui%2Fmainwin.h;h=d14a7c633d0a210628830f2371ea63097201909f;hb=01e2f218ef5b1cf2e8c2eb1b0d3b7d9c3ad878e5;hp=011568d88617c56158a5e6532a736a4a7e5a5781;hpb=e543fd403c4315d8569ea09d868b6fface37b207;p=quassel.git

diff --git a/src/qtui/mainwin.h b/src/qtui/mainwin.h
index 011568d8..d14a7c63 100644
--- a/src/qtui/mainwin.h
+++ b/src/qtui/mainwin.h
@@ -34,13 +34,16 @@
 #include <QSystemTrayIcon>
 
 #include "qtui.h"
-#include "sessionsettings.h"
 #include "titlesetter.h"
+#include "uisettings.h"
 
 class ActionCollection;
+class BufferHotListFilter;
 class BufferView;
 class BufferViewConfig;
 class ClientBufferViewConfig;
+class CoreAccount;
+class CoreConnectionStatusWidget;
 class BufferViewDock;
 class BufferWidget;
 class InputWidget;
@@ -72,6 +75,8 @@ class MainWin
     void addBufferView(ClientBufferViewConfig *config);
     BufferView *allBuffersView() const;
 
+    BufferWidget *bufferWidget() const { return _bufferWidget; }
+
     inline SystemTray *systemTray() const;
 
     bool event(QEvent *event);
@@ -79,9 +84,10 @@ class MainWin
     static void flagRemoteCoreOnly(QObject *object) { object->setProperty("REMOTE_CORE_ONLY", true); }
     static bool isRemoteCoreOnly(QObject *object) { return object->property("REMOTE_CORE_ONLY").toBool(); }
 
+    void saveStateToSettings(UiSettings &);
+    void restoreStateFromSettings(UiSettings &);
+
   public slots:
-    void saveStateToSession(const QString &sessionId);
-    void saveStateToSessionSettings(SessionSettings &s);
     void showStatusBarMessage(const QString &message);
 
     void toggleMinimizedToTray();
@@ -89,9 +95,14 @@ class MainWin
     //! Bring window to front and focus it
     void forceActivated();
 
+    //! Quit application
+    void quit();
+
   protected:
     void closeEvent(QCloseEvent *event);
     void changeEvent(QEvent *event);
+    void moveEvent(QMoveEvent *event);
+    void resizeEvent(QResizeEvent *event);
 
   protected slots:
     void connectedToCore();
@@ -104,24 +115,29 @@ class MainWin
     void addBufferView(int bufferViewConfigId);
     void awayLogDestroyed();
     void removeBufferView(int bufferViewConfigId);
+    void currentBufferChanged(BufferId);
     void messagesInserted(const QModelIndex &parent, int start, int end);
     void showAboutDlg();
     void showChannelList(NetworkId netId = NetworkId());
     void startInternalCore();
-    void showCoreConnectionDlg(bool autoConnect = false);
+    void userAuthenticationRequired(CoreAccount *, bool *valid, const QString &errorMessage);
+    void showCoreConnectionDlg();
     void showCoreInfoDlg();
     void showAwayLog();
     void showSettingsDlg();
     void showNotificationsDlg();
+    void showIgnoreList(QString newRule = QString());
 #ifdef HAVE_KDE
     void showShortcutsDlg();
 #endif
     void on_actionConfigureNetworks_triggered();
     void on_actionConfigureViews_triggered();
     void on_actionLockLayout_toggled(bool lock);
+    void on_jumpHotBuffer_triggered();
     void on_actionDebugNetworkModel_triggered();
     void on_actionDebugBufferViewOverlay_triggered();
     void on_actionDebugMessageModel_triggered();
+    void on_actionDebugHotList_triggered();
     void on_actionDebugLog_triggered();
 
     void clientNetworkCreated(NetworkId);
@@ -129,6 +145,7 @@ class MainWin
     void clientNetworkUpdated();
     void connectOrDisconnectFromNet();
 
+    void saveMenuBarStatus(bool enabled);
     void saveStatusBarStatus(bool enabled);
 
     void loadLayout();
@@ -147,7 +164,8 @@ class MainWin
 
     QLabel *coreLagLabel;
     QLabel *sslLabel;
-    MsgProcessorStatusWidget *msgProcessorStatusWidget;
+    MsgProcessorStatusWidget *_msgProcessorStatusWidget;
+    CoreConnectionStatusWidget *_coreConnectionStatusWidget;
 
     TitleSetter _titleSetter;
 
@@ -162,6 +180,7 @@ class MainWin
     void setupSystray();
     void setupTitleSetter();
     void setupToolBars();
+    void setupHotList();
 
     void updateIcon();
     void enableMenus();
@@ -180,11 +199,19 @@ class MainWin
     QToolBar *_mainToolBar, *_chatViewToolBar, *_nickToolBar;
 
     QWidget *_awayLog;
-    friend class QtUi;
+
+    bool _layoutLoaded;
+
+    QSize _normalSize; //!< Size of the non-maximized window
+    QPoint _normalPos; //!< Position of the non-maximized window
 
 #ifdef Q_WS_WIN
     DWORD dwTickCount;
 #endif
+
+    BufferHotListFilter *_bufferHotList;
+
+    friend class QtUi;
 };
 
 SystemTray *MainWin::systemTray() const {