projects
/
quassel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Make compile without webkit again
[quassel.git]
/
src
/
qtui
/
mainwin.h
diff --git
a/src/qtui/mainwin.h
b/src/qtui/mainwin.h
index
fdd8c5e
..
dd0459c
100644
(file)
--- a/
src/qtui/mainwin.h
+++ b/
src/qtui/mainwin.h
@@
-27,21
+27,27
@@
# include <QMainWindow>
#endif
# include <QMainWindow>
#endif
+#ifdef Q_WS_WIN
+# include <windows.h>
+#endif
+
#include <QSystemTrayIcon>
#include "qtui.h"
#include <QSystemTrayIcon>
#include "qtui.h"
-#include "sessionsettings.h"
#include "titlesetter.h"
#include "titlesetter.h"
+#include "uisettings.h"
class ActionCollection;
class ActionCollection;
+class BufferHotListFilter;
class BufferView;
class BufferViewConfig;
class BufferView;
class BufferViewConfig;
+class ClientBufferViewConfig;
class BufferViewDock;
class BufferWidget;
class InputWidget;
class MsgProcessorStatusWidget;
class NickListWidget;
class BufferViewDock;
class BufferWidget;
class InputWidget;
class MsgProcessorStatusWidget;
class NickListWidget;
-class SystemTray
Icon
;
+class SystemTray;
class QMenu;
class QLabel;
class QMenu;
class QLabel;
@@
-64,24
+70,35
@@
class MainWin
void init();
void init();
- void addBufferView(BufferViewConfig *config);
+ void addBufferView(
Client
BufferViewConfig *config);
BufferView *allBuffersView() const;
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(); }
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:
public slots:
- void saveStateToSession(const QString &sessionId);
- void saveStateToSessionSettings(SessionSettings &s);
void showStatusBarMessage(const QString &message);
void showStatusBarMessage(const QString &message);
+ void toggleMinimizedToTray();
+
+ //! Bring window to front and focus it
+ void forceActivated();
+
+ //! Quit application
+ void quit();
+
protected:
void closeEvent(QCloseEvent *event);
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();
protected slots:
void connectedToCore();
@@
-89,7
+106,6
@@
class MainWin
void updateLagIndicator(int lag = -1);
void disconnectedFromCore();
void setDisconnectedState();
void updateLagIndicator(int lag = -1);
void disconnectedFromCore();
void setDisconnectedState();
- void systrayActivated(QSystemTrayIcon::ActivationReason);
private slots:
void addBufferView(int bufferViewConfigId);
private slots:
void addBufferView(int bufferViewConfigId);
@@
-109,9
+125,12
@@
class MainWin
#endif
void on_actionConfigureNetworks_triggered();
void on_actionConfigureViews_triggered();
#endif
void on_actionConfigureNetworks_triggered();
void on_actionConfigureViews_triggered();
- void on_actionLockDockPositions_toggled(bool lock);
+ void on_actionLockLayout_toggled(bool lock);
+ void on_jumpHotBuffer_triggered();
void on_actionDebugNetworkModel_triggered();
void on_actionDebugNetworkModel_triggered();
+ void on_actionDebugBufferViewOverlay_triggered();
void on_actionDebugMessageModel_triggered();
void on_actionDebugMessageModel_triggered();
+ void on_actionDebugHotList_triggered();
void on_actionDebugLog_triggered();
void clientNetworkCreated(NetworkId);
void on_actionDebugLog_triggered();
void clientNetworkCreated(NetworkId);
@@
-124,6
+143,8
@@
class MainWin
void loadLayout();
void saveLayout();
void loadLayout();
void saveLayout();
+ void bufferViewToggled(bool enabled);
+
signals:
void connectToCore(const QVariantMap &connInfo);
void disconnectFromCore();
signals:
void connectToCore(const QVariantMap &connInfo);
void disconnectFromCore();
@@
-133,7
+154,6
@@
class MainWin
KHelpMenu *_kHelpMenu;
#endif
KHelpMenu *_kHelpMenu;
#endif
- QMenu *systrayMenu;
QLabel *coreLagLabel;
QLabel *sslLabel;
MsgProcessorStatusWidget *msgProcessorStatusWidget;
QLabel *coreLagLabel;
QLabel *sslLabel;
MsgProcessorStatusWidget *msgProcessorStatusWidget;
@@
-151,13
+171,14
@@
class MainWin
void setupSystray();
void setupTitleSetter();
void setupToolBars();
void setupSystray();
void setupTitleSetter();
void setupToolBars();
+ void setupHotList();
void updateIcon();
void updateIcon();
- void hideToTray();
- void toggleMinimizedToTray();
void enableMenus();
void enableMenus();
- QSystemTrayIcon *_trayIcon;
+ void hideToTray();
+
+ SystemTray *_systemTray;
QList<BufferViewDock *> _bufferViews;
BufferWidget *_bufferWidget;
QList<BufferViewDock *> _bufferViews;
BufferWidget *_bufferWidget;
@@
-169,11
+190,21
@@
class MainWin
QToolBar *_mainToolBar, *_chatViewToolBar, *_nickToolBar;
QWidget *_awayLog;
QToolBar *_mainToolBar, *_chatViewToolBar, *_nickToolBar;
QWidget *_awayLog;
+
+ 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;
};
friend class QtUi;
};
-
QSystemTrayIcon *MainWin::systemTrayIcon
() const {
- return _
trayIcon
;
+
SystemTray *MainWin::systemTray
() const {
+ return _
systemTray
;
}
#endif
}
#endif