X-Git-Url: https://git.quassel-irc.org/?a=blobdiff_plain;f=src%2Fqtui%2Fmainwin.h;h=6a41a1078326f873d52cd49f5900fe0d189baa54;hb=5776e0207b629451fec7ba3c25e0b221e3b42508;hp=eb3f8153349ef629e418941501e6c22f9ddf048f;hpb=130fde74cee428ec2e3285db89c4348c3091b2aa;p=quassel.git

diff --git a/src/qtui/mainwin.h b/src/qtui/mainwin.h
index eb3f8153..6a41a107 100644
--- a/src/qtui/mainwin.h
+++ b/src/qtui/mainwin.h
@@ -18,18 +18,20 @@
  *   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 "sessionsettings.h"
 
+#include <QPixmap>
 #include <QSystemTrayIcon>
 #include <QTimer>
 
+class ActionCollection;
 class Buffer;
 class BufferViewConfig;
 class MsgProcessorStatusWidget;
@@ -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);
@@ -110,7 +113,6 @@ class MainWin : public QMainWindow {
   signals:
     void connectToCore(const QVariantMap &connInfo);
     void disconnectFromCore();
-    void requestBacklog(BufferInfo, QVariant, QVariant);
 
   private:
     Ui::MainWin ui;
@@ -122,6 +124,7 @@ class MainWin : public QMainWindow {
 
     TitleSetter _titleSetter;
 
+    void setupActions();
     void setupMenus();
     void setupViews();
     void setupNickWidget();
@@ -135,9 +138,9 @@ class MainWin : public QMainWindow {
     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;