projects
/
quassel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Bring Quassel to front on tray icon click
[quassel.git]
/
src
/
uisupport
/
graphicalui.cpp
diff --git
a/src/uisupport/graphicalui.cpp
b/src/uisupport/graphicalui.cpp
index
59ea321
..
a35a297
100644
(file)
--- a/
src/uisupport/graphicalui.cpp
+++ b/
src/uisupport/graphicalui.cpp
@@
-59,11
+59,16
@@
void GraphicalUi::init() {
#endif
}
#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(_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);
if(_mainWidget)
coll->addAssociatedWidget(_mainWidget);
_actionCollections.insert(category, coll);
@@
-196,7
+201,7
@@
bool GraphicalUi::checkMainWidgetVisibility(bool perform) {
}
#else
}
#else
- if(!mainWidget()->isVisible() || mainWidget()->isMinimized()) {
+ if(!mainWidget()->isVisible() || mainWidget()->isMinimized()
|| !mainWidget()->isActiveWindow()
) {
if(perform)
minimizeRestore(true);
return true;
if(perform)
minimizeRestore(true);
return true;