X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fqtui%2Fmainwin.h;h=ffa2ade13744d662fa43a3e8a7a8102ef5f30231;hp=0abcf56ce4f04f1e2206185ac177c800b61335a3;hb=f091c08e33f4cc2ed63afebab0ae90f2dad55139;hpb=cd3dc8132fa88bd81e8aa2c9947d3540e1f56f37

diff --git a/src/qtui/mainwin.h b/src/qtui/mainwin.h
index 0abcf56c..ffa2ade1 100644
--- a/src/qtui/mainwin.h
+++ b/src/qtui/mainwin.h
@@ -18,48 +18,52 @@
  *   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"
+#include "sessionsettings.h"
 
 #include <QSystemTrayIcon>
 #include <QTimer>
 
-
-class ServerListDlg;
-class ChannelListDlg;
-class CoreConnectDlg;
+class ActionCollection;
 class Buffer;
 class BufferViewConfig;
-class SettingsDlg;
-class QtUi;
+class MsgProcessorStatusWidget;
 class Message;
 class NickListWidget;
-class DebugConsole;
 
+#ifdef HAVE_DBUS
+#  include "desktopnotifications.h"
+#endif
 
 //!\brief The main window of Quassel's QtUi.
 class MainWin : public QMainWindow {
   Q_OBJECT
 
   public:
-    MainWin(QtUi *gui, QWidget *parent = 0);
+    MainWin(QWidget *parent = 0);
     virtual ~MainWin();
 
     void init();
+
     void addBufferView(BufferViewConfig *config = 0);
 
     void displayTrayIconMessage(const QString &title, const QString &message);
+
+#ifdef HAVE_DBUS
     void sendDesktopNotification(const QString &title, const QString &message);
+#endif
 
     virtual bool event(QEvent *event);
-
   public slots:
     void setTrayIconActivity(bool active = false);
+    void saveStateToSession(const QString &sessionId);
+    void saveStateToSessionSettings(SessionSettings &s);
 
   protected:
     void closeEvent(QCloseEvent *event);
@@ -77,7 +81,7 @@ class MainWin : public QMainWindow {
   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 showChannelList(NetworkId netId = NetworkId());
     void showCoreInfoDlg();
     void showSettingsDlg();
@@ -85,38 +89,41 @@ class MainWin : public QMainWindow {
     void on_actionManageViews_triggered();
     void on_actionLockDockPositions_toggled(bool lock);
     void showAboutDlg();
-    void showDebugConsole();
+    void on_actionDebugNetworkModel_triggered(bool);
 
     void showCoreConnectionDlg(bool autoConnect = false);
-    void coreConnectionDlgFinished(int result);
 
     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();
 
+#ifdef HAVE_DBUS
+    void desktopNotificationClosed(uint id, uint reason);
+    void desktopNotificationInvoked(uint id, const QString & action);
+#endif
+
   signals:
     void connectToCore(const QVariantMap &connInfo);
     void disconnectFromCore();
-    void requestBacklog(BufferInfo, QVariant, QVariant);
 
   private:
     Ui::MainWin ui;
-    QtUi *gui;
 
     QMenu *systrayMenu;
     QLabel *coreLagLabel;
     QLabel *sslLabel;
+    MsgProcessorStatusWidget *msgProcessorStatusWidget;
 
     TitleSetter _titleSetter;
 
+    void setupActions();
     void setupMenus();
     void setupViews();
     void setupNickWidget();
@@ -126,10 +133,7 @@ class MainWin : public QMainWindow {
     void setupStatusBar();
     void setupSystray();
 
-    void setupSettingsDlg();
-
     void toggleVisibility();
-
     void enableMenus();
 
     QSystemTrayIcon *systray;
@@ -139,17 +143,19 @@ class MainWin : public QMainWindow {
     bool trayIconActive;
     QTimer *timer;
 
-    CoreConnectDlg *coreConnectDlg;
-    ChannelListDlg *channelListDlg;
-    SettingsDlg *settingsDlg;
-    DebugConsole *debugConsole;
-
     BufferId currentBuffer;
     QString currentProfile;
 
     QList<QDockWidget *> _netViews;
     NickListWidget *nickListWidget;
 
+    ActionCollection *_actionCollection;
+
+#ifdef HAVE_DBUS
+    org::freedesktop::Notifications *desktopNotifications;
+    quint32 notificationId;
+#endif
+
     friend class QtUi;
 };