X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fuisupport%2Fgraphicalui.cpp;h=19a28c2078d8b728b84e75311196ffe511c51172;hp=2d1943ffa0392fcff317ae91f19ddcb7f1d18036;hb=c64a887d0f05222590299fb2bb8d56fa9fadb16d;hpb=74a5ad0fb62894e054dabbad11c9ad9dad4941ec

diff --git a/src/uisupport/graphicalui.cpp b/src/uisupport/graphicalui.cpp
index 2d1943ff..19a28c20 100644
--- a/src/uisupport/graphicalui.cpp
+++ b/src/uisupport/graphicalui.cpp
@@ -1,5 +1,5 @@
 /***************************************************************************
- *   Copyright (C) 2005-2010 by the Quassel Project                        *
+ *   Copyright (C) 2005-2012 by the Quassel Project                        *
  *   devel@quassel-irc.org                                                 *
  *                                                                         *
  *   This contains code from KStatusNotifierItem, part of the KDE libs     *
@@ -18,13 +18,15 @@
  *   You should have received a copy of the GNU General Public License     *
  *   along with this program; if not, write to the                         *
  *   Free Software Foundation, Inc.,                                       *
- *   59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.             *
+ *   51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.         *
  ***************************************************************************/
 
 #include "graphicalui.h"
 
 #include "actioncollection.h"
+#include "uisettings.h"
 #include "contextmenuactionprovider.h"
+#include "toolbaractionprovider.h"
 
 #ifdef Q_WS_X11
 #  include <QX11Info>
@@ -42,161 +44,231 @@ ToolBarActionProvider *GraphicalUi::_toolBarActionProvider = 0;
 UiStyle *GraphicalUi::_uiStyle = 0;
 bool GraphicalUi::_onAllDesktops = false;
 
-GraphicalUi::GraphicalUi(QObject *parent) : AbstractUi(parent) {
-  Q_ASSERT(!_instance);
-  _instance = this;
+GraphicalUi::GraphicalUi(QObject *parent) : AbstractUi(parent)
+{
+    Q_ASSERT(!_instance);
+    _instance = this;
 
 #ifdef Q_WS_WIN
-  _dwTickCount = 0;
+    _dwTickCount = 0;
 #endif
 }
 
-void GraphicalUi::init() {
+
+void GraphicalUi::init()
+{
 #ifdef Q_WS_WIN
-  mainWidget()->installEventFilter(this);
+    mainWidget()->installEventFilter(this);
 #endif
 }
 
-ActionCollection *GraphicalUi::actionCollection(const QString &category) {
-  if(_actionCollections.contains(category))
-    return _actionCollections.value(category);
-  ActionCollection *coll = new ActionCollection(_mainWidget);
-  if(_mainWidget)
-    coll->addAssociatedWidget(_mainWidget);
-  _actionCollections.insert(category, coll);
-  return coll;
+
+ActionCollection *GraphicalUi::actionCollection(const QString &category, const QString &translatedCategory)
+{
+    if (_actionCollections.contains(category))
+        return _actionCollections.value(category);
+    ActionCollection *coll = new ActionCollection(_mainWidget);
+
+    if (!translatedCategory.isEmpty())
+        coll->setProperty("Category", translatedCategory);
+    else
+        coll->setProperty("Category", category);
+
+    if (_mainWidget)
+        coll->addAssociatedWidget(_mainWidget);
+    _actionCollections.insert(category, coll);
+    return coll;
 }
 
-void GraphicalUi::setMainWidget(QWidget *widget) {
-  _mainWidget = widget;
+
+QHash<QString, ActionCollection *> GraphicalUi::actionCollections()
+{
+    return _actionCollections;
 }
 
-void GraphicalUi::setContextMenuActionProvider(ContextMenuActionProvider *provider) {
-  _contextMenuActionProvider = provider;
+
+void GraphicalUi::loadShortcuts()
+{
+    foreach(ActionCollection *coll, actionCollections())
+    coll->readSettings();
 }
 
-void GraphicalUi::setToolBarActionProvider(ToolBarActionProvider *provider) {
-  _toolBarActionProvider = provider;
+
+void GraphicalUi::saveShortcuts()
+{
+    ShortcutSettings s;
+    s.clear();
+    foreach(ActionCollection *coll, actionCollections())
+    coll->writeSettings();
 }
 
-void GraphicalUi::setUiStyle(UiStyle *style) {
-  _uiStyle = style;
+
+void GraphicalUi::setMainWidget(QWidget *widget)
+{
+    _mainWidget = widget;
 }
 
-bool GraphicalUi::eventFilter(QObject *obj, QEvent *event) {
-#ifdef Q_WS_WIN
-  if(obj == mainWidget() && event->type() == QEvent::ActivationChange) {
-    _dwTickCount = GetTickCount();
-  }
-#endif
-  return AbstractUi::eventFilter(obj, event);
+
+void GraphicalUi::setContextMenuActionProvider(ContextMenuActionProvider *provider)
+{
+    _contextMenuActionProvider = provider;
 }
 
-// Code taken from KStatusNotifierItem for handling minimize/restore
 
-bool GraphicalUi::checkMainWidgetVisibility(bool perform) {
-#ifdef Q_WS_WIN
-  // the problem is that we lose focus when the systray icon is activated
-  // and we don't know the former active window
-  // therefore we watch for activation event and use our stopwatch :)
-  if(GetTickCount() - _dwTickCount < 300) {
-    // we were active in the last 300ms -> hide it
-    minimizeRestore(false);
-  } else {
-    minimizeRestore(true);
-  }
+void GraphicalUi::setToolBarActionProvider(ToolBarActionProvider *provider)
+{
+    _toolBarActionProvider = provider;
+}
 
-#elif defined(HAVE_KDE) && defined(Q_WS_X11)
-  KWindowInfo info1 = KWindowSystem::windowInfo(mainWidget()->winId(), NET::XAWMState | NET::WMState | NET::WMDesktop);
-  // mapped = visible (but possibly obscured)
-  bool mapped = (info1.mappingState() == NET::Visible) && !info1.isMinimized();
-
-  //    - not mapped -> show, raise, focus
-  //    - mapped
-  //        - obscured -> raise, focus
-  //        - not obscured -> hide
-  //info1.mappingState() != NET::Visible -> window on another desktop?
-  if(!mapped) {
-    if(perform)
-      minimizeRestore(true);
-    return true;
 
-  } else {
-    QListIterator< WId > it (KWindowSystem::stackingOrder());
-    it.toBack();
-    while(it.hasPrevious()) {
-      WId id = it.previous();
-      if(id == mainWidget()->winId())
-        break;
+void GraphicalUi::setUiStyle(UiStyle *style)
+{
+    _uiStyle = style;
+}
 
-      KWindowInfo info2 = KWindowSystem::windowInfo(id, NET::WMDesktop | NET::WMGeometry | NET::XAWMState | NET::WMState | NET::WMWindowType);
 
-      if(info2.mappingState() != NET::Visible)
-        continue; // not visible on current desktop -> ignore
+void GraphicalUi::disconnectedFromCore()
+{
+    _contextMenuActionProvider->disconnectedFromCore();
+    _toolBarActionProvider->disconnectedFromCore();
+    AbstractUi::disconnectedFromCore();
+}
 
-      if(!info2.geometry().intersects(mainWidget()->geometry()))
-        continue; // not obscuring the window -> ignore
 
-      if(!info1.hasState(NET::KeepAbove) && info2.hasState(NET::KeepAbove))
-        continue; // obscured by window kept above -> ignore
+bool GraphicalUi::eventFilter(QObject *obj, QEvent *event)
+{
+#ifdef Q_WS_WIN
+    if (obj == mainWidget() && event->type() == QEvent::ActivationChange) {
+        _dwTickCount = GetTickCount();
+    }
+#endif
+    return AbstractUi::eventFilter(obj, event);
+}
 
-      NET::WindowType type = info2.windowType(NET::NormalMask | NET::DesktopMask
-                                              | NET::DockMask | NET::ToolbarMask | NET::MenuMask | NET::DialogMask
-                                              | NET::OverrideMask | NET::TopMenuMask | NET::UtilityMask | NET::SplashMask);
 
-      if(type == NET::Dock || type == NET::TopMenu)
-        continue; // obscured by dock or topmenu -> ignore
+// Code taken from KStatusNotifierItem for handling minimize/restore
 
-      if(perform) {
-        KWindowSystem::raiseWindow(mainWidget()->winId());
-        KWindowSystem::activateWindow(mainWidget()->winId());
-      }
-      return true;
+bool GraphicalUi::checkMainWidgetVisibility(bool perform)
+{
+#ifdef Q_WS_WIN
+    // the problem is that we lose focus when the systray icon is activated
+    // and we don't know the former active window
+    // therefore we watch for activation event and use our stopwatch :)
+    if (GetTickCount() - _dwTickCount < 300) {
+        // we were active in the last 300ms -> hide it
+        if (perform)
+            minimizeRestore(false);
+        return false;
     }
-
-    //not on current desktop?
-    if(!info1.isOnCurrentDesktop()) {
-      if(perform)
-        KWindowSystem::activateWindow(mainWidget()->winId());
-      return true;
+    else {
+        if (perform)
+            minimizeRestore(true);
+        return true;
     }
 
-    if(perform)
-      minimizeRestore(false); // hide
-    return false;
-  }
+#elif defined(HAVE_KDE) && defined(Q_WS_X11)
+    KWindowInfo info1 = KWindowSystem::windowInfo(mainWidget()->winId(), NET::XAWMState | NET::WMState | NET::WMDesktop);
+    // mapped = visible (but possibly obscured)
+    bool mapped = (info1.mappingState() == NET::Visible) && !info1.isMinimized();
+
+    //    - not mapped -> show, raise, focus
+    //    - mapped
+    //        - obscured -> raise, focus
+    //        - not obscured -> hide
+    //info1.mappingState() != NET::Visible -> window on another desktop?
+    if (!mapped) {
+        if (perform)
+            minimizeRestore(true);
+        return true;
+    }
+    else {
+        QListIterator<WId> it(KWindowSystem::stackingOrder());
+        it.toBack();
+        while (it.hasPrevious()) {
+            WId id = it.previous();
+            if (id == mainWidget()->winId())
+                break;
+
+            KWindowInfo info2 = KWindowSystem::windowInfo(id, NET::WMDesktop | NET::WMGeometry | NET::XAWMState | NET::WMState | NET::WMWindowType);
+
+            if (info2.mappingState() != NET::Visible)
+                continue;  // not visible on current desktop -> ignore
+
+            if (!info2.geometry().intersects(mainWidget()->geometry()))
+                continue;  // not obscuring the window -> ignore
+
+            if (!info1.hasState(NET::KeepAbove) && info2.hasState(NET::KeepAbove))
+                continue;  // obscured by window kept above -> ignore
+
+            NET::WindowType type = info2.windowType(NET::NormalMask | NET::DesktopMask
+                | NET::DockMask | NET::ToolbarMask | NET::MenuMask | NET::DialogMask
+                | NET::OverrideMask | NET::TopMenuMask | NET::UtilityMask | NET::SplashMask);
+
+            if (type == NET::Dock || type == NET::TopMenu)
+                continue;  // obscured by dock or topmenu -> ignore
+
+            if (perform) {
+                KWindowSystem::raiseWindow(mainWidget()->winId());
+                KWindowSystem::activateWindow(mainWidget()->winId());
+            }
+            return true;
+        }
+
+        //not on current desktop?
+        if (!info1.isOnCurrentDesktop()) {
+            if (perform)
+                KWindowSystem::activateWindow(mainWidget()->winId());
+            return true;
+        }
+
+        if (perform)
+            minimizeRestore(false);  // hide
+        return false;
+    }
 #else
 
-  if(!mainWidget()->isVisible() || mainWidget()->isMinimized()) {
-    if(perform)
-      minimizeRestore(true);
-    return true;
-  } else {
-    if(perform)
-      minimizeRestore(false);
-    return false;
-  }
+    if (!mainWidget()->isVisible() || mainWidget()->isMinimized() || !mainWidget()->isActiveWindow()) {
+        if (perform)
+            minimizeRestore(true);
+        return true;
+    }
+    else {
+        if (perform)
+            minimizeRestore(false);
+        return false;
+    }
 
 #endif
 
-  return true;
+    return true;
 }
 
-void GraphicalUi::minimizeRestore(bool show) {
-  if(show)
-    activateMainWidget();
-  else
-    hideMainWidget();
+
+bool GraphicalUi::isMainWidgetVisible()
+{
+    return !instance()->checkMainWidgetVisibility(false);
 }
 
-void GraphicalUi::activateMainWidget() {
+
+void GraphicalUi::minimizeRestore(bool show)
+{
+    if (show)
+        activateMainWidget();
+    else
+        hideMainWidget();
+}
+
+
+void GraphicalUi::activateMainWidget()
+{
 #ifdef HAVE_KDE
 #  ifdef Q_WS_X11
     KWindowInfo info = KWindowSystem::windowInfo(mainWidget()->winId(), NET::WMDesktop | NET::WMFrameExtents);
-    if(_onAllDesktops) {
-      KWindowSystem::setOnAllDesktops(mainWidget()->winId(), true);
-    } else {
-      KWindowSystem::setCurrentDesktop(info.desktop());
+    if (_onAllDesktops) {
+        KWindowSystem::setOnAllDesktops(mainWidget()->winId(), true);
+    }
+    else {
+        KWindowSystem::setCurrentDesktop(info.desktop());
     }
 
     mainWidget()->move(info.frameGeometry().topLeft()); // avoid placement policies
@@ -213,35 +285,38 @@ void GraphicalUi::activateMainWidget() {
 #else /* HAVE_KDE */
 
 #ifdef Q_WS_X11
-  // Bypass focus stealing prevention
-  QX11Info::setAppUserTime(QX11Info::appTime());
+    // Bypass focus stealing prevention
+    QX11Info::setAppUserTime(QX11Info::appTime());
 #endif
 
-  if(mainWidget()->windowState() & Qt::WindowMinimized) {
-    // restore
-    mainWidget()->setWindowState((mainWidget()->windowState() & ~Qt::WindowMinimized) | Qt::WindowActive);
-  }
+    if (mainWidget()->windowState() & Qt::WindowMinimized) {
+        // restore
+        mainWidget()->setWindowState((mainWidget()->windowState() & ~Qt::WindowMinimized) | Qt::WindowActive);
+    }
 
-  // this does not actually work on all platforms... and causes more evil than good
-  // mainWidget()->move(mainWidget()->frameGeometry().topLeft()); // avoid placement policies
-  mainWidget()->show();
-  mainWidget()->raise();
-  mainWidget()->activateWindow();
+    // this does not actually work on all platforms... and causes more evil than good
+    // mainWidget()->move(mainWidget()->frameGeometry().topLeft()); // avoid placement policies
+    mainWidget()->show();
+    mainWidget()->raise();
+    mainWidget()->activateWindow();
 
 #endif /* HAVE_KDE */
 }
 
-void GraphicalUi::hideMainWidget() {
 
+void GraphicalUi::hideMainWidget()
+{
 #if defined(HAVE_KDE) && defined(Q_WS_X11)
-  KWindowInfo info = KWindowSystem::windowInfo(mainWidget()->winId(), NET::WMDesktop | NET::WMFrameExtents);
-  _onAllDesktops = info.onAllDesktops();
+    KWindowInfo info = KWindowSystem::windowInfo(mainWidget()->winId(), NET::WMDesktop | NET::WMFrameExtents);
+    _onAllDesktops = info.onAllDesktops();
 #endif
 
-  if(instance()->isHidingMainWidgetAllowed())
-    mainWidget()->hide();
+    if (instance()->isHidingMainWidgetAllowed())
+        mainWidget()->hide();
 }
 
-void GraphicalUi::toggleMainWidget() {
-  instance()->checkMainWidgetVisibility(true);
+
+void GraphicalUi::toggleMainWidget()
+{
+    instance()->checkMainWidgetVisibility(true);
 }