X-Git-Url: https://git.quassel-irc.org/?a=blobdiff_plain;f=src%2Fuisupport%2Fgraphicalui.cpp;h=59ea3210d7cd09e9f5d21b260a3245394977a7b9;hb=fc07679cda72e37ef2d2c3e6ed4468c5563f679e;hp=5d9a4198260954bedc4a03dbbc5e554e13a32879;hpb=2e9492d9ef198bde37da1f858602ab9624c0a12a;p=quassel.git

diff --git a/src/uisupport/graphicalui.cpp b/src/uisupport/graphicalui.cpp
index 5d9a4198..59ea3210 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>
@@ -48,14 +50,12 @@ GraphicalUi::GraphicalUi(QObject *parent) : AbstractUi(parent) {
 
 #ifdef Q_WS_WIN
   _dwTickCount = 0;
-  mainWidget()->installEventFilter(this);
 #endif
-
 }
 
-GraphicalUi::~GraphicalUi() {
+void GraphicalUi::init() {
 #ifdef Q_WS_WIN
-  mainWidget()->removeEventFilter(this);
+  mainWidget()->installEventFilter(this);
 #endif
 }
 
@@ -63,12 +63,29 @@ ActionCollection *GraphicalUi::actionCollection(const QString &category) {
   if(_actionCollections.contains(category))
     return _actionCollections.value(category);
   ActionCollection *coll = new ActionCollection(_mainWidget);
+  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;
 }
@@ -85,6 +102,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) {
@@ -103,9 +126,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)
@@ -184,6 +211,10 @@ bool GraphicalUi::checkMainWidgetVisibility(bool perform) {
   return true;
 }
 
+bool GraphicalUi::isMainWidgetVisible() {
+  return !instance()->checkMainWidgetVisibility(false);
+}
+
 void GraphicalUi::minimizeRestore(bool show) {
   if(show)
     activateMainWidget();