X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fqtui%2Fmainwin.h;h=74953c092f9b8cc6525db3d1ff57dc32adf73685;hp=6a41a1078326f873d52cd49f5900fe0d189baa54;hb=8f0946673bc3edc84b6f13e16cbe8ece912b4a3b;hpb=3dfc65182f8e847d815c3fc7350fa676a37de45a

diff --git a/src/qtui/mainwin.h b/src/qtui/mainwin.h
index 6a41a107..74953c09 100644
--- a/src/qtui/mainwin.h
+++ b/src/qtui/mainwin.h
@@ -21,26 +21,22 @@
 #ifndef MAINWIN_H_
 #define MAINWIN_H_
 
-#include "ui_mainwin.h"
+#include <QMainWindow>
+#include <QSystemTrayIcon>
 
 #include "qtui.h"
-#include "titlesetter.h"
 #include "sessionsettings.h"
-
-#include <QPixmap>
-#include <QSystemTrayIcon>
-#include <QTimer>
+#include "titlesetter.h"
 
 class ActionCollection;
-class Buffer;
 class BufferViewConfig;
+class BufferWidget;
 class MsgProcessorStatusWidget;
-class Message;
 class NickListWidget;
+class SystemTrayIcon;
 
-#ifdef HAVE_DBUS
-#  include "desktopnotifications.h"
-#endif
+class QMenu;
+class QLabel;
 
 //!\brief The main window of Quassel's QtUi.
 class MainWin : public QMainWindow {
@@ -54,17 +50,13 @@ class MainWin : public QMainWindow {
 
     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);
+    void showStatusBarMessage(const QString &message);
 
   protected:
     void closeEvent(QCloseEvent *event);
@@ -77,45 +69,37 @@ 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 on_actionDebugNetworkModel_triggered();
 
     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();
 
   private:
-    Ui::MainWin ui;
 
     QMenu *systrayMenu;
     QLabel *coreLagLabel;
@@ -125,6 +109,7 @@ class MainWin : public QMainWindow {
     TitleSetter _titleSetter;
 
     void setupActions();
+    void setupBufferWidget();
     void setupMenus();
     void setupViews();
     void setupNickWidget();
@@ -133,31 +118,25 @@ class MainWin : public QMainWindow {
     void setupTopicWidget();
     void setupStatusBar();
     void setupSystray();
+    void setupTitleSetter();
 
+    void updateIcon();
     void toggleVisibility();
     void enableMenus();
 
-    QSystemTrayIcon *systray;
-    QPixmap activeTrayIcon;
-    QPixmap onlineTrayIcon;
-    QPixmap offlineTrayIcon;
-    bool trayIconActive;
-    QTimer *timer;
-
-    BufferId currentBuffer;
-    QString currentProfile;
+    QSystemTrayIcon *_trayIcon;
 
     QList<QDockWidget *> _netViews;
-    NickListWidget *nickListWidget;
-
-    ActionCollection *_actionCollection;
+    BufferWidget *_bufferWidget;
+    NickListWidget *_nickListWidget;
 
-#ifdef HAVE_DBUS
-    org::freedesktop::Notifications *desktopNotifications;
-    quint32 notificationId;
-#endif
+    QMenu *_fileMenu, *_networksMenu, *_viewMenu, *_bufferViewsMenu, *_settingsMenu, *_helpMenu, *_helpDebugMenu;
 
     friend class QtUi;
 };
 
+QSystemTrayIcon *MainWin::systemTrayIcon() const {
+  return _trayIcon;
+}
+
 #endif