projects
/
quassel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
fixing wrong usage of QList::erase(QList::iterator) (also for QHash)
[quassel.git]
/
src
/
qtui
/
mainwin.h
diff --git
a/src/qtui/mainwin.h
b/src/qtui/mainwin.h
index
29b705f
..
0d29393
100644
(file)
--- a/
src/qtui/mainwin.h
+++ b/
src/qtui/mainwin.h
@@
-21,22
+21,39
@@
#ifndef MAINWIN_H_
#define MAINWIN_H_
#ifndef MAINWIN_H_
#define MAINWIN_H_
-#include <QSystemTrayIcon>
+#ifdef HAVE_KDE
+# include <KMainWindow>
+#else
+# include <QMainWindow>
+#endif
-#include
"ui_mainwin.h"
+#include
<QSystemTrayIcon>
#include "qtui.h"
#include "sessionsettings.h"
#include "titlesetter.h"
class ActionCollection;
#include "qtui.h"
#include "sessionsettings.h"
#include "titlesetter.h"
class ActionCollection;
+class BufferView;
class BufferViewConfig;
class BufferViewConfig;
+class BufferViewDock;
+class BufferWidget;
class MsgProcessorStatusWidget;
class NickListWidget;
class SystemTrayIcon;
class MsgProcessorStatusWidget;
class NickListWidget;
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:
@@
-45,14
+62,20
@@
class MainWin : public QMainWindow {
void init();
void init();
- void addBufferView(BufferViewConfig *config = 0);
+ void addBufferView(BufferViewConfig *config);
+ BufferView *allBuffersView() const;
inline QSystemTrayIcon *systemTrayIcon() const;
virtual bool event(QEvent *event);
inline QSystemTrayIcon *systemTrayIcon() const;
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:
void saveStateToSession(const QString &sessionId);
void saveStateToSessionSettings(SessionSettings &s);
public slots:
void saveStateToSession(const QString &sessionId);
void saveStateToSessionSettings(SessionSettings &s);
+ void showStatusBarMessage(const QString &message);
protected:
void closeEvent(QCloseEvent *event);
protected:
void closeEvent(QCloseEvent *event);
@@
-73,13
+96,20
@@
class MainWin : public QMainWindow {
void messagesInserted(const QModelIndex &parent, int start, int end);
void showAboutDlg();
void showChannelList(NetworkId netId = NetworkId());
void messagesInserted(const QModelIndex &parent, int start, int end);
void showAboutDlg();
void showChannelList(NetworkId netId = NetworkId());
+ void startInternalCore();
void showCoreConnectionDlg(bool autoConnect = false);
void showCoreInfoDlg();
void showSettingsDlg();
void showCoreConnectionDlg(bool autoConnect = false);
void showCoreInfoDlg();
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 on_actionDebugNetworkModel_triggered(bool);
+ void on_actionDebugNetworkModel_triggered();
+ void on_actionDebugMessageModel_triggered();
+ void on_actionDebugLog_triggered();
void clientNetworkCreated(NetworkId);
void clientNetworkRemoved(NetworkId);
void clientNetworkCreated(NetworkId);
void clientNetworkRemoved(NetworkId);
@@
-96,7
+126,9
@@
class MainWin : public QMainWindow {
void disconnectFromCore();
private:
void disconnectFromCore();
private:
- Ui::MainWin ui;
+#ifdef HAVE_KDE
+ KHelpMenu *_kHelpMenu;
+#endif
QMenu *systrayMenu;
QLabel *coreLagLabel;
QMenu *systrayMenu;
QLabel *coreLagLabel;
@@
-106,14
+138,15
@@
class MainWin : public QMainWindow {
TitleSetter _titleSetter;
void setupActions();
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 updateIcon();
void toggleVisibility();
void updateIcon();
void toggleVisibility();
@@
-121,10
+154,11
@@
class MainWin : public QMainWindow {
QSystemTrayIcon *_trayIcon;
QSystemTrayIcon *_trayIcon;
- QList<QDockWidget *> _netViews;
- NickListWidget *nickListWidget;
+ QList<BufferViewDock *> _bufferViews;
+ BufferWidget *_bufferWidget;
+ NickListWidget *_nickListWidget;
-
ActionCollection *_actionCollection
;
+
QMenu *_fileMenu, *_networksMenu, *_viewMenu, *_bufferViewsMenu, *_settingsMenu, *_helpMenu, *_helpDebugMenu
;
friend class QtUi;
};
friend class QtUi;
};