X-Git-Url: https://git.quassel-irc.org/?a=blobdiff_plain;f=src%2Fqtui%2Fmainwin.h;h=6a41a1078326f873d52cd49f5900fe0d189baa54;hb=339ed024e6cf074108e39360e7db58ea0961761b;hp=080e78f5c43000148318a20228903c98c42267ff;hpb=4df7862b00b2113dabdf52342b2c15560313f476;p=quassel.git

diff --git a/src/qtui/mainwin.h b/src/qtui/mainwin.h
index 080e78f5..6a41a107 100644
--- a/src/qtui/mainwin.h
+++ b/src/qtui/mainwin.h
@@ -18,21 +18,23 @@
  *   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 <QPixmap>
 #include <QSystemTrayIcon>
 #include <QTimer>
 
+class ActionCollection;
 class Buffer;
 class BufferViewConfig;
 class MsgProcessorStatusWidget;
-class QtUi;
 class Message;
 class NickListWidget;
 
@@ -49,6 +51,7 @@ class MainWin : public QMainWindow {
     virtual ~MainWin();
 
     void init();
+
     void addBufferView(BufferViewConfig *config = 0);
 
     void displayTrayIconMessage(const QString &title, const QString &message);
@@ -58,9 +61,10 @@ class MainWin : public QMainWindow {
 #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);
@@ -109,7 +113,6 @@ class MainWin : public QMainWindow {
   signals:
     void connectToCore(const QVariantMap &connInfo);
     void disconnectFromCore();
-    void requestBacklog(BufferInfo, QVariant, QVariant);
 
   private:
     Ui::MainWin ui;
@@ -121,6 +124,7 @@ class MainWin : public QMainWindow {
 
     TitleSetter _titleSetter;
 
+    void setupActions();
     void setupMenus();
     void setupViews();
     void setupNickWidget();
@@ -131,13 +135,12 @@ class MainWin : public QMainWindow {
     void setupSystray();
 
     void toggleVisibility();
-
     void enableMenus();
 
     QSystemTrayIcon *systray;
-    QIcon activeTrayIcon;
-    QIcon onlineTrayIcon;
-    QIcon offlineTrayIcon;
+    QPixmap activeTrayIcon;
+    QPixmap onlineTrayIcon;
+    QPixmap offlineTrayIcon;
     bool trayIconActive;
     QTimer *timer;
 
@@ -147,6 +150,8 @@ class MainWin : public QMainWindow {
     QList<QDockWidget *> _netViews;
     NickListWidget *nickListWidget;
 
+    ActionCollection *_actionCollection;
+
 #ifdef HAVE_DBUS
     org::freedesktop::Notifications *desktopNotifications;
     quint32 notificationId;