X-Git-Url: https://git.quassel-irc.org/?a=blobdiff_plain;f=src%2Fqtui%2Fmainwin.h;h=a317c7724f6f8a6e6e5fdeed0db61f366ea62ae4;hb=2ef12747a748a78311ee51b4bf833e1664347d47;hp=40764f311a30ccbbc4aadb9a418086ed98c50249;hpb=ba9d9d766830eab8cc238c60a69f67c8b527aa7e;p=quassel.git

diff --git a/src/qtui/mainwin.h b/src/qtui/mainwin.h
index 40764f31..a317c772 100644
--- a/src/qtui/mainwin.h
+++ b/src/qtui/mainwin.h
@@ -27,6 +27,7 @@
 #include "bufferviewfilter.h"
 
 #include <QSystemTrayIcon>
+#include <QTimer>
 
 class ServerListDlg;
 class CoreConnectDlg;
@@ -49,6 +50,12 @@ class MainWin : public QMainWindow {
     QDockWidget *addBufferView(const QString &, QAbstractItemModel *, const BufferViewFilter::Modes &, const QList<NetworkId> &);
 
     AbstractUiMsg *layoutMsg(const Message &);
+    void displayTrayIconMessage(const QString &title, const QString &message);
+
+    virtual bool event(QEvent *event);
+
+  public slots:
+    void setTrayIconActivity(bool active = false);
 
   protected:
     void closeEvent(QCloseEvent *event);
@@ -56,10 +63,12 @@ class MainWin : public QMainWindow {
 
   protected slots:
     void connectedToCore();
+    void securedConnection();
     void disconnectedFromCore();
     void systrayActivated( QSystemTrayIcon::ActivationReason );
 
   private slots:
+    void receiveMessage(const Message &msg);
     void showSettingsDlg();
     void showNetworkDlg();
     void showAboutDlg();
@@ -73,6 +82,9 @@ class MainWin : public QMainWindow {
     void clientNetworkUpdated();
     void connectOrDisconnectFromNet();
 
+    void changeTopic(const QString &topic);
+    void makeTrayIconBlink();
+
   signals:
     void connectToCore(const QVariantMap &connInfo);
     void disconnectFromCore();
@@ -83,6 +95,7 @@ class MainWin : public QMainWindow {
     QtUi *gui;
 
     QMenu *systrayMenu;
+    QLabel *sslLabel;
 
     void setupMenus();
     void setupViews();
@@ -99,6 +112,11 @@ class MainWin : public QMainWindow {
     void enableMenus();
 
     QSystemTrayIcon *systray;
+    QIcon activeTrayIcon;
+    QIcon onlineTrayIcon;
+    QIcon offlineTrayIcon;
+    bool trayIconActive;
+    QTimer *timer;
 
     CoreConnectDlg *coreConnectDlg;
     SettingsDlg *settingsDlg;
@@ -108,7 +126,6 @@ class MainWin : public QMainWindow {
     QString currentProfile;
 
     QList<QDockWidget *> netViews;
-    QDockWidget *nickDock;
     NickListWidget *nickListWidget;
 
     QAction *actionEditNetworks;