projects
/
quassel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Reset certFile instead of reopening in SslServer::setCertificate.
[quassel.git]
/
src
/
qtui
/
mainwin.h
diff --git
a/src/qtui/mainwin.h
b/src/qtui/mainwin.h
index
721cc3e
..
e3fdb61
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 *
@@
-18,47
+18,65
@@
* 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. *
***************************************************************************/
* 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. *
***************************************************************************/
-#ifndef
_
MAINWIN_H_
-#define
_
MAINWIN_H_
+#ifndef MAINWIN_H_
+#define MAINWIN_H_
-#include "ui_mainwin.h"
-
-#include "qtui.h"
-#include "titlesetter.h"
+#ifdef HAVE_KDE
+# include <KMainWindow>
+#else
+# include <QMainWindow>
+#endif
#include <QSystemTrayIcon>
#include <QSystemTrayIcon>
-#include <QTimer>
+#include "qtui.h"
+#include "sessionsettings.h"
+#include "titlesetter.h"
-class ServerListDlg;
-class ChannelListDlg;
-class CoreConnectDlg;
-class Buffer;
+class ActionCollection;
+class BufferView;
class BufferViewConfig;
class BufferViewConfig;
-class SettingsDlg;
-class QtUi;
-class Message;
+class BufferViewDock;
+class BufferWidget;
+class InputWidget;
+class MsgProcessorStatusWidget;
class NickListWidget;
class NickListWidget;
-class
DebugConsole
;
+class
SystemTrayIcon
;
+class QMenu;
+class QLabel;
+
+class KHelpMenu;
//!\brief The main window of Quassel's QtUi.
//!\brief The main window of Quassel's QtUi.
-class MainWin : public QMainWindow {
+class MainWin
+#ifdef HAVE_KDE
+: public KMainWindow {
+#else
+: public QMainWindow {
+#endif
Q_OBJECT
public:
Q_OBJECT
public:
- MainWin(Q
tUi *gui, Q
Widget *parent = 0);
+ MainWin(QWidget *parent = 0);
virtual ~MainWin();
void init();
virtual ~MainWin();
void init();
- void addBufferView(BufferViewConfig *config = 0);
- void displayTrayIconMessage(const QString &title, const QString &message);
+ void addBufferView(BufferViewConfig *config);
+ BufferView *allBuffersView() const;
+
+ inline QSystemTrayIcon *systemTrayIcon() const;
virtual bool event(QEvent *event);
virtual 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(); }
+
public slots:
public slots:
- void setTrayIconActivity(bool active = false);
+ void saveStateToSession(const QString &sessionId);
+ void saveStateToSessionSettings(SessionSettings &s);
+ void showStatusBarMessage(const QString &message);
protected:
void closeEvent(QCloseEvent *event);
protected:
void closeEvent(QCloseEvent *event);
@@
-67,86
+85,87
@@
class MainWin : public QMainWindow {
protected slots:
void connectedToCore();
void setConnectedState();
protected slots:
void connectedToCore();
void setConnectedState();
- void
securedConnection(
);
+ void
updateLagIndicator(int lag = -1
);
void disconnectedFromCore();
void setDisconnectedState();
void disconnectedFromCore();
void setDisconnectedState();
- void systrayActivated(
QSystemTrayIcon::ActivationReason
);
+ void systrayActivated(
QSystemTrayIcon::ActivationReason
);
private slots:
void addBufferView(int bufferViewConfigId);
void removeBufferView(int bufferViewConfigId);
private slots:
void addBufferView(int bufferViewConfigId);
void removeBufferView(int bufferViewConfigId);
- void receiveMessage(const Message &msg);
+ void messagesInserted(const QModelIndex &parent, int start, int end);
+ void showAboutDlg();
void showChannelList(NetworkId netId = NetworkId());
void showChannelList(NetworkId netId = NetworkId());
+ void startInternalCore();
+ void showCoreConnectionDlg(bool autoConnect = false);
+ void showCoreInfoDlg();
void showSettingsDlg();
void showSettingsDlg();
- void on_actionEditNetworks_triggered();
- void on_actionManageViews_triggered();
+ void showNotificationsDlg();
+#ifdef HAVE_KDE
+ void showShortcutsDlg();
+#endif
+ void on_actionConfigureNetworks_triggered();
+ void on_actionConfigureViews_triggered();
void on_actionLockDockPositions_toggled(bool lock);
void on_actionLockDockPositions_toggled(bool lock);
- void showAboutDlg();
- void showDebugConsole();
-
- void showCoreConnectionDlg(bool autoConnect = false);
- void coreConnectionDlgFinished(int result);
+ void on_actionDebugNetworkModel_triggered();
+ void on_actionDebugMessageModel_triggered();
+ void on_actionDebugLog_triggered();
void clientNetworkCreated(NetworkId);
void clientNetworkRemoved(NetworkId);
void clientNetworkUpdated();
void connectOrDisconnectFromNet();
void clientNetworkCreated(NetworkId);
void clientNetworkRemoved(NetworkId);
void clientNetworkUpdated();
void connectOrDisconnectFromNet();
- void changeTopic(const QString &topic);
- void makeTrayIconBlink();
void saveStatusBarStatus(bool enabled);
void loadLayout();
void saveLayout();
void saveStatusBarStatus(bool enabled);
void loadLayout();
void saveLayout();
-
+
signals:
void connectToCore(const QVariantMap &connInfo);
void disconnectFromCore();
signals:
void connectToCore(const QVariantMap &connInfo);
void disconnectFromCore();
- void requestBacklog(BufferInfo, QVariant, QVariant);
private:
private:
- Ui::MainWin ui;
- QtUi *gui;
+#ifdef HAVE_KDE
+ KHelpMenu *_kHelpMenu;
+#endif
QMenu *systrayMenu;
QMenu *systrayMenu;
+ QLabel *coreLagLabel;
QLabel *sslLabel;
QLabel *sslLabel;
+ MsgProcessorStatusWidget *msgProcessorStatusWidget;
TitleSetter _titleSetter;
TitleSetter _titleSetter;
+ void setupActions();
+ void setupBufferWidget();
void setupMenus();
void setupMenus();
- void setupViews();
void setupNickWidget();
void setupChatMonitor();
void setupInputWidget();
void setupTopicWidget();
void setupStatusBar();
void setupSystray();
void setupNickWidget();
void setupChatMonitor();
void setupInputWidget();
void setupTopicWidget();
void setupStatusBar();
void setupSystray();
+ void setupTitleSetter();
- void setupSettingsDlg();
-
+ void updateIcon();
void toggleVisibility();
void toggleVisibility();
-
void enableMenus();
void enableMenus();
- QSystemTrayIcon *systray;
- QIcon activeTrayIcon;
- QIcon onlineTrayIcon;
- QIcon offlineTrayIcon;
- bool trayIconActive;
- QTimer *timer;
+ QSystemTrayIcon *_trayIcon;
-
CoreConnectDlg *coreConnectDlg
;
-
ChannelListDlg *channelListDlg
;
-
SettingsDlg *settingsDlg
;
-
DebugConsole *debugConsole
;
+
QList<BufferViewDock *> _bufferViews
;
+
BufferWidget *_bufferWidget
;
+
NickListWidget *_nickListWidget
;
+
InputWidget *_inputWidget
;
- BufferId currentBuffer;
- QString currentProfile;
-
- QList<QDockWidget *> _netViews;
- NickListWidget *nickListWidget;
+ QMenu *_fileMenu, *_networksMenu, *_viewMenu, *_bufferViewsMenu, *_settingsMenu, *_helpMenu, *_helpDebugMenu;
friend class QtUi;
};
friend class QtUi;
};
+QSystemTrayIcon *MainWin::systemTrayIcon() const {
+ return _trayIcon;
+}
+
#endif
#endif