projects
/
quassel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Make SessionSettings derive from UiSettings
[quassel.git]
/
src
/
qtui
/
mainwin.h
diff --git
a/src/qtui/mainwin.h
b/src/qtui/mainwin.h
index
cc8d8d1
..
86c8de0
100644
(file)
--- a/
src/qtui/mainwin.h
+++ b/
src/qtui/mainwin.h
@@
-1,5
+1,5
@@
/***************************************************************************
/***************************************************************************
- * Copyright (C) 2005-0
8
by the Quassel Project *
+ * Copyright (C) 2005-0
9
by the Quassel Project *
* devel@quassel-irc.org *
* *
* This program is free software; you can redistribute it and/or modify *
* devel@quassel-irc.org *
* *
* This program is free software; you can redistribute it and/or modify *
@@
-27,23
+27,30
@@
# 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 BufferView;
class BufferViewConfig;
class ActionCollection;
class BufferView;
class BufferViewConfig;
+class ClientBufferViewConfig;
class BufferViewDock;
class BufferWidget;
class BufferViewDock;
class BufferWidget;
+class InputWidget;
class MsgProcessorStatusWidget;
class NickListWidget;
class MsgProcessorStatusWidget;
class NickListWidget;
-class SystemTray
Icon
;
+class SystemTray;
class QMenu;
class QLabel;
class QMenu;
class QLabel;
+class QToolBar;
class KHelpMenu;
class KHelpMenu;
@@
-62,13
+69,12
@@
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 BufferWidget *bufferWidget() 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(); }
@@
-78,21
+84,25
@@
class MainWin
void saveStateToSessionSettings(SessionSettings &s);
void showStatusBarMessage(const QString &message);
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);
protected:
void closeEvent(QCloseEvent *event);
- v
irtual v
oid changeEvent(QEvent *event);
+ void changeEvent(QEvent *event);
protected slots:
void connectedToCore();
void setConnectedState();
protected slots:
void connectedToCore();
void setConnectedState();
- void updateLagIndicator(int lag);
- void securedConnection();
+ void updateLagIndicator(int lag = -1);
void disconnectedFromCore();
void setDisconnectedState();
void disconnectedFromCore();
void setDisconnectedState();
- void systrayActivated(QSystemTrayIcon::ActivationReason);
private slots:
void addBufferView(int bufferViewConfigId);
private slots:
void addBufferView(int bufferViewConfigId);
+ void awayLogDestroyed();
void removeBufferView(int bufferViewConfigId);
void messagesInserted(const QModelIndex &parent, int start, int end);
void showAboutDlg();
void removeBufferView(int bufferViewConfigId);
void messagesInserted(const QModelIndex &parent, int start, int end);
void showAboutDlg();
@@
-100,6
+110,7
@@
class MainWin
void startInternalCore();
void showCoreConnectionDlg(bool autoConnect = false);
void showCoreInfoDlg();
void startInternalCore();
void showCoreConnectionDlg(bool autoConnect = false);
void showCoreInfoDlg();
+ void showAwayLog();
void showSettingsDlg();
void showNotificationsDlg();
#ifdef HAVE_KDE
void showSettingsDlg();
void showNotificationsDlg();
#ifdef HAVE_KDE
@@
-107,8
+118,9
@@
class MainWin
#endif
void on_actionConfigureNetworks_triggered();
void on_actionConfigureViews_triggered();
#endif
void on_actionConfigureNetworks_triggered();
void on_actionConfigureViews_triggered();
- void on_actionLock
DockPositions
_toggled(bool lock);
+ void on_actionLock
Layout
_toggled(bool lock);
void on_actionDebugNetworkModel_triggered();
void on_actionDebugNetworkModel_triggered();
+ void on_actionDebugBufferViewOverlay_triggered();
void on_actionDebugMessageModel_triggered();
void on_actionDebugLog_triggered();
void on_actionDebugMessageModel_triggered();
void on_actionDebugLog_triggered();
@@
-122,6
+134,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();
@@
-131,7
+145,6
@@
class MainWin
KHelpMenu *_kHelpMenu;
#endif
KHelpMenu *_kHelpMenu;
#endif
- QMenu *systrayMenu;
QLabel *coreLagLabel;
QLabel *sslLabel;
MsgProcessorStatusWidget *msgProcessorStatusWidget;
QLabel *coreLagLabel;
QLabel *sslLabel;
MsgProcessorStatusWidget *msgProcessorStatusWidget;
@@
-148,28
+161,34
@@
class MainWin
void setupStatusBar();
void setupSystray();
void setupTitleSetter();
void setupStatusBar();
void setupSystray();
void setupTitleSetter();
+ void setupToolBars();
void updateIcon();
void updateIcon();
- void toggleVisibility();
void enableMenus();
void enableMenus();
- QSystemTrayIcon *_trayIcon;
+ void hideToTray();
+
+ SystemTray *_systemTray;
QList<BufferViewDock *> _bufferViews;
BufferWidget *_bufferWidget;
NickListWidget *_nickListWidget;
QList<BufferViewDock *> _bufferViews;
BufferWidget *_bufferWidget;
NickListWidget *_nickListWidget;
+ InputWidget *_inputWidget;
QMenu *_fileMenu, *_networksMenu, *_viewMenu, *_bufferViewsMenu, *_settingsMenu, *_helpMenu, *_helpDebugMenu;
QMenu *_fileMenu, *_networksMenu, *_viewMenu, *_bufferViewsMenu, *_settingsMenu, *_helpMenu, *_helpDebugMenu;
+ QMenu *_toolbarMenu;
+ QToolBar *_mainToolBar, *_chatViewToolBar, *_nickToolBar;
+ QWidget *_awayLog;
friend class QtUi;
friend class QtUi;
-};
-QSystemTrayIcon *MainWin::systemTrayIcon() const {
- return _trayIcon;
-}
+#ifdef Q_WS_WIN
+ DWORD dwTickCount;
+#endif
+};
-
BufferWidget *MainWin::bufferWidget
() const {
- return _
bufferWidget
;
+
SystemTray *MainWin::systemTray
() const {
+ return _
systemTray
;
}
#endif
}
#endif