Moar cleanups

diff --git a/src/qtui/mainwin.cpp b/src/qtui/mainwin.cpp
index 9179516..3485cca 100644 (file)
--- a/src/qtui/mainwin.cpp
+++ b/src/qtui/mainwin.cpp
@@ -22,41 +22,31 @@
 #include "aboutdlg.h"
 #include "action.h"
 #include "actioncollection.h"
-#include "bufferview.h"
-#include "bufferviewconfig.h"
-#include "bufferviewfilter.h"
+#include "buffermodel.h"
 #include "bufferviewmanager.h"
 #include "channellistdlg.h"
 #include "chatlinemodel.h"
 #include "chatmonitorfilter.h"
 #include "chatmonitorview.h"
 #include "chatview.h"
-#include "chatviewsearchbar.h"
 #include "client.h"
 #include "clientbacklogmanager.h"
 #include "coreinfodlg.h"
 #include "coreconnectdlg.h"
 #include "iconloader.h"
+#include "inputwidget.h"
+#include "irclistmodel.h"
+#include "jumpkeyhandler.h"
 #include "msgprocessorstatuswidget.h"
-#include "qtuimessageprocessor.h"
-#include "qtuiapplication.h"
-#include "networkmodel.h"
-#include "buffermodel.h"
 #include "nicklistwidget.h"
+#include "qtuiapplication.h"
+#include "qtuimessageprocessor.h"
+#include "qtuisettings.h"
+#include "sessionsettings.h"
 #include "settingsdlg.h"
 #include "settingspagedlg.h"
-#include "signalproxy.h"
 #include "topicwidget.h"
-#include "inputwidget.h"
-#include "irclistmodel.h"
 #include "verticaldock.h"
-#include "uisettings.h"
-#include "qtuisettings.h"
-#include "jumpkeyhandler.h"
-#include "sessionsettings.h"
-
-#include "selectionmodelsynchronizer.h"
-#include "mappedselectionmodel.h"
 
 #include "desktopnotificationbackend.h"
 #include "systraynotificationbackend.h"
@@ -72,34 +62,24 @@
 #include "settingspages/networkssettingspage.h"
 #include "settingspages/notificationssettingspage.h"
 
-#include "qtuistyle.h"
-
 MainWin::MainWin(QWidget *parent)
   : QMainWindow(parent),
     coreLagLabel(new QLabel()),
     sslLabel(new QLabel()),
     msgProcessorStatusWidget(new MsgProcessorStatusWidget()),
-
     _titleSetter(this),
     _trayIcon(new QSystemTrayIcon(this)),
-
-    activeTrayIcon(DesktopIcon("quassel_newmessage", IconLoader::SizeEnormous)),
-    onlineTrayIcon(DesktopIcon("quassel", IconLoader::SizeEnormous)),
-    offlineTrayIcon(DesktopIcon("quassel_disconnected", IconLoader::SizeEnormous)),
-
     _actionCollection(new ActionCollection(this))
 {
-  UiSettings uiSettings;
+  QtUiSettings uiSettings;
   QString style = uiSettings.value("Style", QString("")).toString();
   if(style != "") {
     QApplication::setStyle(style);
   }
   ui.setupUi(this);
   setWindowTitle("Quassel IRC");
-  setWindowIcon(offlineTrayIcon);
-  qApp->setWindowIcon(offlineTrayIcon);
-  systemTrayIcon()->setIcon(offlineTrayIcon);
   setWindowIconText("Quassel IRC");
+  updateIcon();
 
   QtUi::actionCollection()->addAssociatedWidget(this);
 
@@ -177,6 +157,17 @@ MainWin::~MainWin() {
   s.setValue("MainWinState", saveState());
 }
 
+void MainWin::updateIcon() {
+  QPixmap icon;
+  if(Client::isConnected())
+    icon = DesktopIcon("quassel", IconLoader::SizeEnormous);
+  else
+    icon = DesktopIcon("quassel_disconnected", IconLoader::SizeEnormous);
+  setWindowIcon(icon);
+  qApp->setWindowIcon(icon);
+  systemTrayIcon()->setIcon(icon);
+}
+
 void MainWin::setupActions() {
   // TODO don't get these from *.ui anymore... we shouldn't need one
   ui.actionQuit->setIcon(SmallIcon("application-exit"));
@@ -422,11 +413,9 @@ void MainWin::setConnectedState() {
   ui.menuViews->setEnabled(true);
   ui.bufferWidget->show();
   statusBar()->showMessage(tr("Connected to core."));
-  setWindowIcon(onlineTrayIcon);
-  qApp->setWindowIcon(onlineTrayIcon);
-  systemTrayIcon()->setIcon(onlineTrayIcon);
   if(sslLabel->width() == 0)
     sslLabel->setPixmap(SmallIcon("security-low"));
+  updateIcon();
 }
 
 void MainWin::loadLayout() {
@@ -480,10 +469,8 @@ void MainWin::setDisconnectedState() {
   ui.menuViews->setEnabled(false);
   ui.bufferWidget->hide();
   statusBar()->showMessage(tr("Not connected to core."));
-  setWindowIcon(offlineTrayIcon);
-  qApp->setWindowIcon(offlineTrayIcon);
-  systemTrayIcon()->setIcon(offlineTrayIcon);
   sslLabel->setPixmap(QPixmap());
+  updateIcon();
 }
 
 void MainWin::showCoreConnectionDlg(bool autoConnect) {

diff --git a/src/qtui/mainwin.h b/src/qtui/mainwin.h
index 258116d..29b705f 100644 (file)
--- a/src/qtui/mainwin.h
+++ b/src/qtui/mainwin.h
@@ -21,21 +21,17 @@
 #ifndef MAINWIN_H_
 #define MAINWIN_H_
 
+#include <QSystemTrayIcon>
+
 #include "ui_mainwin.h"
 
 #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 MsgProcessorStatusWidget;
-class Message;
 class NickListWidget;
 class SystemTrayIcon;
 
@@ -119,16 +115,11 @@ class MainWin : public QMainWindow {
     void setupStatusBar();
     void setupSystray();
 
+    void updateIcon();
     void toggleVisibility();
     void enableMenus();
 
     QSystemTrayIcon *_trayIcon;
-    QPixmap activeTrayIcon;
-    QPixmap onlineTrayIcon;
-    QPixmap offlineTrayIcon;
-
-    BufferId currentBuffer;
-    QString currentProfile;
 
     QList<QDockWidget *> _netViews;
     NickListWidget *nickListWidget;