X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fuisupport%2Fgraphicalui.cpp;h=a35a2975ca2bb5431ab63ae21f8393ae0ff01b97;hp=f9a357412421f373bd725c9286760010011403be;hb=7a1f4908421fe7e542940aae057eeaf33b301c92;hpb=8a0d40791b63681ae500f6497a06fdd3f6b085ba

diff --git a/src/uisupport/graphicalui.cpp b/src/uisupport/graphicalui.cpp
index f9a35741..a35a2975 100644
--- a/src/uisupport/graphicalui.cpp
+++ b/src/uisupport/graphicalui.cpp
@@ -24,7 +24,9 @@
 #include "graphicalui.h"
 
 #include "actioncollection.h"
+#include "uisettings.h"
 #include "contextmenuactionprovider.h"
+#include "toolbaractionprovider.h"
 
 #ifdef Q_WS_X11
 #  include <QX11Info>
@@ -57,22 +59,38 @@ void GraphicalUi::init() {
 #endif
 }
 
-GraphicalUi::~GraphicalUi() {
-#ifdef Q_WS_WIN
-  mainWidget()->removeEventFilter(this);
-#endif
-}
-
-ActionCollection *GraphicalUi::actionCollection(const QString &category) {
+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;
 }
 
+QHash<QString, ActionCollection *> GraphicalUi::actionCollections() {
+  return _actionCollections;
+}
+
+void GraphicalUi::loadShortcuts() {
+  foreach(ActionCollection *coll, actionCollections())
+    coll->readSettings();
+}
+
+void GraphicalUi::saveShortcuts() {
+  ShortcutSettings s;
+  s.clear();
+  foreach(ActionCollection *coll, actionCollections())
+    coll->writeSettings();
+}
+
 void GraphicalUi::setMainWidget(QWidget *widget) {
   _mainWidget = widget;
 }
@@ -89,6 +107,12 @@ void GraphicalUi::setUiStyle(UiStyle *style) {
   _uiStyle = style;
 }
 
+void GraphicalUi::disconnectedFromCore() {
+  _contextMenuActionProvider->disconnectedFromCore();
+  _toolBarActionProvider->disconnectedFromCore();
+  AbstractUi::disconnectedFromCore();
+}
+
 bool GraphicalUi::eventFilter(QObject *obj, QEvent *event) {
 #ifdef Q_WS_WIN
   if(obj == mainWidget() && event->type() == QEvent::ActivationChange) {
@@ -107,9 +131,13 @@ bool GraphicalUi::checkMainWidgetVisibility(bool perform) {
   // 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);
+    if(perform)
+      minimizeRestore(false);
+    return false;
   } else {
-    minimizeRestore(true);
+    if(perform)
+      minimizeRestore(true);
+    return true;
   }
 
 #elif defined(HAVE_KDE) && defined(Q_WS_X11)
@@ -173,7 +201,7 @@ bool GraphicalUi::checkMainWidgetVisibility(bool perform) {
   }
 #else
 
-  if(!mainWidget()->isVisible() || mainWidget()->isMinimized()) {
+  if(!mainWidget()->isVisible() || mainWidget()->isMinimized() || !mainWidget()->isActiveWindow()) {
     if(perform)
       minimizeRestore(true);
     return true;
@@ -188,6 +216,10 @@ bool GraphicalUi::checkMainWidgetVisibility(bool perform) {
   return true;
 }
 
+bool GraphicalUi::isMainWidgetVisible() {
+  return !instance()->checkMainWidgetVisibility(false);
+}
+
 void GraphicalUi::minimizeRestore(bool show) {
   if(show)
     activateMainWidget();