projects
/
quassel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
using the extended away icon for away state as proposed by jussi01
[quassel.git]
/
src
/
qtui
/
mainwin.h
diff --git
a/src/qtui/mainwin.h
b/src/qtui/mainwin.h
index
74953c0
..
682b37b
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 *
@@
-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,8
+34,11
@@
#include "titlesetter.h"
class ActionCollection;
#include "titlesetter.h"
class ActionCollection;
+class BufferView;
class BufferViewConfig;
class BufferViewConfig;
+class BufferViewDock;
class BufferWidget;
class BufferWidget;
+class InputWidget;
class MsgProcessorStatusWidget;
class NickListWidget;
class SystemTrayIcon;
class MsgProcessorStatusWidget;
class NickListWidget;
class SystemTrayIcon;
@@
-38,8
+46,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:
@@
-48,11
+63,16
@@
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);
@@
-65,8
+85,7
@@
class MainWin : public QMainWindow {
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 systrayActivated(QSystemTrayIcon::ActivationReason);
void disconnectedFromCore();
void setDisconnectedState();
void systrayActivated(QSystemTrayIcon::ActivationReason);
@@
-77,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_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);
@@
-100,6
+126,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;
@@
-111,7
+140,6
@@
class MainWin : public QMainWindow {
void setupActions();
void setupBufferWidget();
void setupMenus();
void setupActions();
void setupBufferWidget();
void setupMenus();
- void setupViews();
void setupNickWidget();
void setupChatMonitor();
void setupInputWidget();
void setupNickWidget();
void setupChatMonitor();
void setupInputWidget();
@@
-121,14
+149,16
@@
class MainWin : public QMainWindow {
void setupTitleSetter();
void updateIcon();
void setupTitleSetter();
void updateIcon();
- void toggleVisibility();
+ void hideToTray();
+ void toggleMinimizedToTray();
void enableMenus();
QSystemTrayIcon *_trayIcon;
void enableMenus();
QSystemTrayIcon *_trayIcon;
- QList<
QDockWidget *> _net
Views;
+ QList<
BufferViewDock *> _buffer
Views;
BufferWidget *_bufferWidget;
NickListWidget *_nickListWidget;
BufferWidget *_bufferWidget;
NickListWidget *_nickListWidget;
+ InputWidget *_inputWidget;
QMenu *_fileMenu, *_networksMenu, *_viewMenu, *_bufferViewsMenu, *_settingsMenu, *_helpMenu, *_helpDebugMenu;
QMenu *_fileMenu, *_networksMenu, *_viewMenu, *_bufferViewsMenu, *_settingsMenu, *_helpMenu, *_helpDebugMenu;