projects
/
quassel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix menu names according to seele's review p.16
[quassel.git]
/
src
/
qtui
/
mainwin.h
diff --git
a/src/qtui/mainwin.h
b/src/qtui/mainwin.h
index
1bff138
..
670bcaf
100644
(file)
--- a/
src/qtui/mainwin.h
+++ b/
src/qtui/mainwin.h
@@
-21,7
+21,12
@@
#ifndef MAINWIN_H_
#define MAINWIN_H_
#ifndef MAINWIN_H_
#define MAINWIN_H_
-#include <QMainWindow>
+#ifdef HAVE_KDE
+# include <KMainWindow>
+#else
+# include <QMainWindow>
+#endif
+
#include <QSystemTrayIcon>
#include "qtui.h"
#include <QSystemTrayIcon>
#include "qtui.h"
@@
-29,7
+34,9
@@
#include "titlesetter.h"
class ActionCollection;
#include "titlesetter.h"
class ActionCollection;
+class BufferView;
class BufferViewConfig;
class BufferViewConfig;
+class BufferViewDock;
class BufferWidget;
class MsgProcessorStatusWidget;
class NickListWidget;
class BufferWidget;
class MsgProcessorStatusWidget;
class NickListWidget;
@@
-38,8
+45,15
@@
class SystemTrayIcon;
class QMenu;
class QLabel;
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:
@@
-49,6
+63,7
@@
class MainWin : public QMainWindow {
void init();
void addBufferView(BufferViewConfig *config = 0);
void init();
void addBufferView(BufferViewConfig *config = 0);
+ BufferView *allBuffersView() const;
inline QSystemTrayIcon *systemTrayIcon() const;
inline QSystemTrayIcon *systemTrayIcon() const;
@@
-56,6
+71,7
@@
class MainWin : public QMainWindow {
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);
@@
-79,10
+95,16
@@
class MainWin : public QMainWindow {
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_actionDebugNetworkModel_triggered();
void on_actionLockDockPositions_toggled(bool lock);
void on_actionDebugNetworkModel_triggered();
+ void on_actionDebugMessageModel_triggered();
+ void on_actionDebugLog_triggered();
void clientNetworkCreated(NetworkId);
void clientNetworkRemoved(NetworkId);
void clientNetworkCreated(NetworkId);
void clientNetworkRemoved(NetworkId);
@@
-99,6
+121,9
@@
class MainWin : public QMainWindow {
void disconnectFromCore();
private:
void disconnectFromCore();
private:
+#ifdef HAVE_KDE
+ KHelpMenu *_kHelpMenu;
+#endif
QMenu *systrayMenu;
QLabel *coreLagLabel;
QMenu *systrayMenu;
QLabel *coreLagLabel;
@@
-125,7
+150,7
@@
class MainWin : public QMainWindow {
QSystemTrayIcon *_trayIcon;
QSystemTrayIcon *_trayIcon;
- QList<
QDockWidget *> _net
Views;
+ QList<
BufferViewDock *> _buffer
Views;
BufferWidget *_bufferWidget;
NickListWidget *_nickListWidget;
BufferWidget *_bufferWidget;
NickListWidget *_nickListWidget;