X-Git-Url: https://git.quassel-irc.org/?a=blobdiff_plain;f=src%2Fuisupport%2Fgraphicalui.cpp;h=6bccbc70d1bbe62732437229b3ced955da348222;hb=982bfbf8081be22ce7ce08adcf3ba92361ee7ca5;hp=59ea3210d7cd09e9f5d21b260a3245394977a7b9;hpb=7f3d50af3f94bd5fc423c83ac21c460da2edf88b;p=quassel.git

diff --git a/src/uisupport/graphicalui.cpp b/src/uisupport/graphicalui.cpp
index 59ea3210..6bccbc70 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     *
@@ -59,11 +59,16 @@ void GraphicalUi::init() {
 #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);
-  coll->setProperty("Category", category);
+
+  if(!translatedCategory.isEmpty())
+    coll->setProperty("Category", translatedCategory);
+  else
+    coll->setProperty("Category", category);
+
   if(_mainWidget)
     coll->addAssociatedWidget(_mainWidget);
   _actionCollections.insert(category, coll);
@@ -196,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;