X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fqtui%2Fmainwin.h;h=ac79a8d767e512e6c4778970b9beee6e7992b7b8;hp=c293a909f4307b6709bec5361c47373c98c9dafd;hb=525d0aa9b754a04f3caaf3f00890894ea0208c46;hpb=f824db0e31b54969e0b7fa0b5405b1e9173d482c

diff --git a/src/qtui/mainwin.h b/src/qtui/mainwin.h
index c293a909..ac79a8d7 100644
--- a/src/qtui/mainwin.h
+++ b/src/qtui/mainwin.h
@@ -27,24 +27,30 @@
 #  include <QMainWindow>
 #endif
 
+#ifdef Q_WS_WIN
+#  include <windows.h>
+#endif
+
 #include <QSystemTrayIcon>
 
 #include "qtui.h"
-#include "sessionsettings.h"
 #include "titlesetter.h"
+#include "uisettings.h"
 
 class ActionCollection;
 class BufferView;
 class BufferViewConfig;
+class ClientBufferViewConfig;
 class BufferViewDock;
 class BufferWidget;
 class InputWidget;
 class MsgProcessorStatusWidget;
 class NickListWidget;
-class SystemTrayIcon;
+class SystemTray;
 
 class QMenu;
 class QLabel;
+class QToolBar;
 
 class KHelpMenu;
 
@@ -63,36 +69,45 @@ class MainWin
 
     void init();
 
-    void addBufferView(BufferViewConfig *config);
+    void addBufferView(ClientBufferViewConfig *config);
     BufferView *allBuffersView() const;
 
-    inline QSystemTrayIcon *systemTrayIcon() const;
+    inline SystemTray *systemTray() const;
 
-    virtual bool event(QEvent *event);
+    bool event(QEvent *event);
 
     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();
+
+    //! Bring window to front and focus it
+    void forceActivated();
+
   protected:
     void closeEvent(QCloseEvent *event);
-    virtual void changeEvent(QEvent *event);
+    void changeEvent(QEvent *event);
+    void moveEvent(QMoveEvent *event);
+    void resizeEvent(QResizeEvent *event);
 
   protected slots:
     void connectedToCore();
     void setConnectedState();
     void updateLagIndicator(int lag = -1);
-    void securedConnection();
     void disconnectedFromCore();
     void setDisconnectedState();
-    void systrayActivated(QSystemTrayIcon::ActivationReason);
 
   private slots:
     void addBufferView(int bufferViewConfigId);
+    void awayLogDestroyed();
     void removeBufferView(int bufferViewConfigId);
     void messagesInserted(const QModelIndex &parent, int start, int end);
     void showAboutDlg();
@@ -100,6 +115,7 @@ class MainWin
     void startInternalCore();
     void showCoreConnectionDlg(bool autoConnect = false);
     void showCoreInfoDlg();
+    void showAwayLog();
     void showSettingsDlg();
     void showNotificationsDlg();
 #ifdef HAVE_KDE
@@ -107,7 +123,7 @@ class MainWin
 #endif
     void on_actionConfigureNetworks_triggered();
     void on_actionConfigureViews_triggered();
-    void on_actionLockDockPositions_toggled(bool lock);
+    void on_actionLockLayout_toggled(bool lock);
     void on_actionDebugNetworkModel_triggered();
     void on_actionDebugMessageModel_triggered();
     void on_actionDebugLog_triggered();
@@ -118,6 +134,7 @@ class MainWin
     void connectOrDisconnectFromNet();
 
     void saveStatusBarStatus(bool enabled);
+    void aboutToQuit();
 
     void loadLayout();
     void saveLayout();
@@ -131,7 +148,6 @@ class MainWin
     KHelpMenu *_kHelpMenu;
 #endif
 
-    QMenu *systrayMenu;
     QLabel *coreLagLabel;
     QLabel *sslLabel;
     MsgProcessorStatusWidget *msgProcessorStatusWidget;
@@ -148,12 +164,14 @@ class MainWin
     void setupStatusBar();
     void setupSystray();
     void setupTitleSetter();
+    void setupToolBars();
 
     void updateIcon();
-    void toggleVisibility();
     void enableMenus();
 
-    QSystemTrayIcon *_trayIcon;
+    void hideToTray();
+
+    SystemTray *_systemTray;
 
     QList<BufferViewDock *> _bufferViews;
     BufferWidget *_bufferWidget;
@@ -161,12 +179,24 @@ class MainWin
     InputWidget *_inputWidget;
 
     QMenu *_fileMenu, *_networksMenu, *_viewMenu, *_bufferViewsMenu, *_settingsMenu, *_helpMenu, *_helpDebugMenu;
+    QMenu *_toolbarMenu;
+    QToolBar *_mainToolBar, *_chatViewToolBar, *_nickToolBar;
+
+    QWidget *_awayLog;
+
+    QSize _normalSize; //!< Size of the non-maximized window
+    QPoint _normalPos; //!< Position of the non-maximized window
+    bool _isHidden;
+
+#ifdef Q_WS_WIN
+    DWORD dwTickCount;
+#endif
 
     friend class QtUi;
 };
 
-QSystemTrayIcon *MainWin::systemTrayIcon() const {
-  return _trayIcon;
+SystemTray *MainWin::systemTray() const {
+  return _systemTray;
 }
 
 #endif