X-Git-Url: https://git.quassel-irc.org/?a=blobdiff_plain;ds=sidebyside;f=src%2Fqtui%2Fmainwin.h;h=29b705f068266529d7d388e617858b12935d3f11;hb=01cfbba296ffa89627284fbbe07cb76d7ff3cc29;hp=eb3f8153349ef629e418941501e6c22f9ddf048f;hpb=130fde74cee428ec2e3285db89c4348c3091b2aa;p=quassel.git

diff --git a/src/qtui/mainwin.h b/src/qtui/mainwin.h
index eb3f8153..29b705f0 100644
--- a/src/qtui/mainwin.h
+++ b/src/qtui/mainwin.h
@@ -18,27 +18,22 @@
  *   59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.             *
  ***************************************************************************/
 
-#ifndef _MAINWIN_H_
-#define _MAINWIN_H_
+#ifndef MAINWIN_H_
+#define MAINWIN_H_
+
+#include <QSystemTrayIcon>
 
 #include "ui_mainwin.h"
 
 #include "qtui.h"
+#include "sessionsettings.h"
 #include "titlesetter.h"
-#include "sessionsettings.h" 
 
-#include <QSystemTrayIcon>
-#include <QTimer>
-
-class Buffer;
+class ActionCollection;
 class BufferViewConfig;
 class MsgProcessorStatusWidget;
-class Message;
 class NickListWidget;
-
-#ifdef HAVE_DBUS
-#  include "desktopnotifications.h"
-#endif
+class SystemTrayIcon;
 
 //!\brief The main window of Quassel's QtUi.
 class MainWin : public QMainWindow {
@@ -49,17 +44,13 @@ class MainWin : public QMainWindow {
     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
+    inline QSystemTrayIcon *systemTrayIcon() const;
 
     virtual bool event(QEvent *event);
   public slots:
-    void setTrayIconActivity(bool active = false);
     void saveStateToSession(const QString &sessionId);
     void saveStateToSessionSettings(SessionSettings &s);
 
@@ -74,43 +65,35 @@ class MainWin : public QMainWindow {
     void securedConnection();
     void disconnectedFromCore();
     void setDisconnectedState();
-    void systrayActivated( QSystemTrayIcon::ActivationReason );
+    void systrayActivated(QSystemTrayIcon::ActivationReason);
 
   private slots:
     void addBufferView(int bufferViewConfigId);
     void removeBufferView(int bufferViewConfigId);
     void messagesInserted(const QModelIndex &parent, int start, int end);
+    void showAboutDlg();
     void showChannelList(NetworkId netId = NetworkId());
+    void showCoreConnectionDlg(bool autoConnect = false);
     void showCoreInfoDlg();
     void showSettingsDlg();
     void on_actionEditNetworks_triggered();
     void on_actionManageViews_triggered();
     void on_actionLockDockPositions_toggled(bool lock);
-    void showAboutDlg();
     void on_actionDebugNetworkModel_triggered(bool);
 
-    void showCoreConnectionDlg(bool autoConnect = false);
-
     void clientNetworkCreated(NetworkId);
     void clientNetworkRemoved(NetworkId);
     void clientNetworkUpdated();
     void connectOrDisconnectFromNet();
 
-    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;
@@ -122,6 +105,7 @@ class MainWin : public QMainWindow {
 
     TitleSetter _titleSetter;
 
+    void setupActions();
     void setupMenus();
     void setupViews();
     void setupNickWidget();
@@ -131,28 +115,22 @@ class MainWin : public QMainWindow {
     void setupStatusBar();
     void setupSystray();
 
+    void updateIcon();
     void toggleVisibility();
     void enableMenus();
 
-    QSystemTrayIcon *systray;
-    QIcon activeTrayIcon;
-    QIcon onlineTrayIcon;
-    QIcon offlineTrayIcon;
-    bool trayIconActive;
-    QTimer *timer;
-
-    BufferId currentBuffer;
-    QString currentProfile;
+    QSystemTrayIcon *_trayIcon;
 
     QList<QDockWidget *> _netViews;
     NickListWidget *nickListWidget;
 
-#ifdef HAVE_DBUS
-    org::freedesktop::Notifications *desktopNotifications;
-    quint32 notificationId;
-#endif
+    ActionCollection *_actionCollection;
 
     friend class QtUi;
 };
 
+QSystemTrayIcon *MainWin::systemTrayIcon() const {
+  return _trayIcon;
+}
+
 #endif