X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fqtui%2Fqtui.cpp;h=f3bb9a6df405c474ef1064b053625695d03e33e1;hp=27cf97151698fbefc8546354ffece1bce5139412;hb=647215f1dd8ea6fdb6e4fb747c5dc3e19c4ec3fc;hpb=3af9d3aeccfac1218ad3342434e5fda0c4ad1266

diff --git a/src/qtui/qtui.cpp b/src/qtui/qtui.cpp
index 27cf9715..f3bb9a6d 100644
--- a/src/qtui/qtui.cpp
+++ b/src/qtui/qtui.cpp
@@ -1,5 +1,5 @@
 /***************************************************************************
- *   Copyright (C) 2005-08 by the Quassel Project                          *
+ *   Copyright (C) 2005-2010 by the Quassel Project                        *
  *   devel@quassel-irc.org                                                 *
  *                                                                         *
  *   This program is free software; you can redistribute it and/or modify  *
@@ -21,37 +21,44 @@
 #include "qtui.h"
 
 #include "abstractnotificationbackend.h"
-#include "actioncollection.h"
+#include "buffermodel.h"
 #include "chatlinemodel.h"
+#include "contextmenuactionprovider.h"
 #include "mainwin.h"
-#include "networkmodelactionprovider.h"
 #include "qtuimessageprocessor.h"
 #include "qtuisettings.h"
 #include "qtuistyle.h"
+#include "systemtray.h"
+#include "toolbaractionprovider.h"
 #include "types.h"
 #include "util.h"
 
-QHash<QString, ActionCollection *> QtUi::_actionCollections;
-QPointer<QtUi> QtUi::_instance = 0;
-QPointer<MainWin> QtUi::_mainWin = 0;
+#ifdef Q_WS_X11
+#  include <QX11Info>
+#endif
+
+QtUi *QtUi::_instance = 0;
+MainWin *QtUi::_mainWin = 0;
 QList<AbstractNotificationBackend *> QtUi::_notificationBackends;
 QList<AbstractNotificationBackend::Notification> QtUi::_notifications;
-QtUiStyle *QtUi::_style = 0;
 
-QtUi::QtUi() : AbstractUi() {
+QtUi::QtUi() : GraphicalUi() {
   if(_instance != 0) {
     qWarning() << "QtUi has been instantiated again!";
     return;
   }
   _instance = this;
 
-  _actionProvider = new NetworkModelActionProvider(this);
-
   QtUiSettings uiSettings;
-  loadTranslation(uiSettings.value("Locale", QLocale::system()).value<QLocale>());
+  Quassel::loadTranslation(uiSettings.value("Locale", QLocale::system()).value<QLocale>());
+
+  setContextMenuActionProvider(new ContextMenuActionProvider(this));
+  setToolBarActionProvider(new ToolBarActionProvider(this));
 
+  setUiStyle(new QtUiStyle(this));
   _mainWin = new MainWin();
-  _style = new QtUiStyle;
+
+  setMainWidget(_mainWin);
 
   connect(_mainWin, SIGNAL(connectToCore(const QVariantMap &)), this, SIGNAL(connectToCore(const QVariantMap &)));
   connect(_mainWin, SIGNAL(disconnectFromCore()), this, SIGNAL(disconnectFromCore()));
@@ -59,21 +66,17 @@ QtUi::QtUi() : AbstractUi() {
 
 QtUi::~QtUi() {
   unregisterAllNotificationBackends();
-  delete _style;
   delete _mainWin;
+  _mainWin = 0;
+  _instance = 0;
 }
 
 void QtUi::init() {
   _mainWin->init();
-}
+  QtUiSettings uiSettings;
+  uiSettings.initAndNotify("UseSystemTrayIcon", this, SLOT(useSystemTrayChanged(QVariant)), true);
 
-ActionCollection *QtUi::actionCollection(const QString &category) {
-  if(_actionCollections.contains(category))
-    return _actionCollections.value(category);
-  ActionCollection *coll = new ActionCollection(mainWindow());
-  coll->addAssociatedWidget(mainWindow());
-  _actionCollections.insert(category, coll);
-  return coll;
+  GraphicalUi::init(); // needs to be called after the mainWin is initialized
 }
 
 MessageModel *QtUi::createMessageModel(QObject *parent) {
@@ -90,12 +93,45 @@ void QtUi::connectedToCore() {
 
 void QtUi::disconnectedFromCore() {
   _mainWin->disconnectedFromCore();
+  GraphicalUi::disconnectedFromCore();
+}
+
+void QtUi::useSystemTrayChanged(const QVariant &v) {
+  _useSystemTray = v.toBool();
+  SystemTray *tray = mainWindow()->systemTray();
+  if(_useSystemTray) {
+    if(tray->isSystemTrayAvailable())
+      tray->setVisible(true);
+  } else {
+    if(tray->isSystemTrayAvailable() && mainWindow()->isVisible())
+      tray->setVisible(false);
+  }
+}
+
+bool QtUi::haveSystemTray() {
+  return mainWindow()->systemTray()->isSystemTrayAvailable() && instance()->_useSystemTray;
+}
+
+bool QtUi::isHidingMainWidgetAllowed() const {
+  return haveSystemTray();
+}
+
+void QtUi::minimizeRestore(bool show) {
+  SystemTray *tray = mainWindow()->systemTray();
+  if(show) {
+    if(tray && !_useSystemTray)
+      tray->setVisible(false);
+  } else {
+    if(tray && _useSystemTray)
+      tray->setVisible(true);
+  }
+  GraphicalUi::minimizeRestore(show);
 }
 
 void QtUi::registerNotificationBackend(AbstractNotificationBackend *backend) {
   if(!_notificationBackends.contains(backend)) {
     _notificationBackends.append(backend);
-    instance()->connect(backend, SIGNAL(activated()), SLOT(notificationActivated()));
+    instance()->connect(backend, SIGNAL(activated(uint)), SLOT(notificationActivated(uint)));
   }
 }
 
@@ -111,10 +147,10 @@ const QList<AbstractNotificationBackend *> &QtUi::notificationBackends() {
   return _notificationBackends;
 }
 
-uint QtUi::invokeNotification(BufferId bufId, const QString &sender, const QString &text) {
+uint QtUi::invokeNotification(BufferId bufId, AbstractNotificationBackend::NotificationType type, const QString &sender, const QString &text) {
   static int notificationId = 0;
-  //notificationId++;
-  AbstractNotificationBackend::Notification notification(++notificationId, bufId, sender, text);
+
+  AbstractNotificationBackend::Notification notification(++notificationId, bufId, type, sender, text);
   _notifications.append(notification);
   foreach(AbstractNotificationBackend *backend, _notificationBackends)
     backend->notify(notification);
@@ -124,27 +160,22 @@ uint QtUi::invokeNotification(BufferId bufId, const QString &sender, const QStri
 void QtUi::closeNotification(uint notificationId) {
   QList<AbstractNotificationBackend::Notification>::iterator i = _notifications.begin();
   while(i != _notifications.end()) {
-    if((*i).notificationId == notificationId) {
+    if(i->notificationId == notificationId) {
       foreach(AbstractNotificationBackend *backend, _notificationBackends)
         backend->close(notificationId);
       i = _notifications.erase(i);
-      break;
-    } else {
-      ++i;
-    }
+    } else ++i;
   }
 }
 
 void QtUi::closeNotifications(BufferId bufferId) {
   QList<AbstractNotificationBackend::Notification>::iterator i = _notifications.begin();
   while(i != _notifications.end()) {
-    if(!bufferId.isValid() || (*i).bufferId == bufferId) {
+    if(!bufferId.isValid() || i->bufferId == bufferId) {
       foreach(AbstractNotificationBackend *backend, _notificationBackends)
-        backend->close((*i).notificationId);
+        backend->close(i->notificationId);
       i = _notifications.erase(i);
-    } else {
-      ++i;
-    }
+    } else ++i;
   }
 }
 
@@ -152,8 +183,20 @@ const QList<AbstractNotificationBackend::Notification> &QtUi::activeNotification
   return _notifications;
 }
 
-void QtUi::notificationActivated() {
-  // this might not work with some window managers
-  _mainWin->raise();
-  _mainWin->activateWindow();
+void QtUi::notificationActivated(uint notificationId) {
+  if(notificationId != 0) {
+    QList<AbstractNotificationBackend::Notification>::iterator i = _notifications.begin();
+    while(i != _notifications.end()) {
+      if(i->notificationId == notificationId) {
+        BufferId bufId = i->bufferId;
+        if(bufId.isValid())
+          Client::bufferModel()->switchToBuffer(bufId);
+        break;
+      }
+      ++i;
+    }
+  }
+  closeNotification(notificationId);
+
+  activateMainWidget();
 }