Action pimping, MainWin cleansing, deuification

[quassel.git] / src / qtui / qtui.cpp

diff --git a/src/qtui/qtui.cpp b/src/qtui/qtui.cpp
index 8cb8347..8ec12ef 100644 (file)
--- a/src/qtui/qtui.cpp
+++ b/src/qtui/qtui.cpp
@@ -30,7 +30,7 @@
 #include "uisettings.h"
 #include "util.h"
 
-ActionCollection *QtUi::_actionCollection = 0;
+QHash<QString, ActionCollection *> QtUi::_actionCollections;
 MainWin *QtUi::_mainWin = 0;
 QList<AbstractNotificationBackend *> QtUi::_notificationBackends;
 QList<AbstractNotificationBackend::Notification> QtUi::_notifications;
@@ -41,7 +41,6 @@ QtUi::QtUi() : AbstractUi() {
     qWarning() << "QtUi has been instantiated again!";
     return;
   }
-  _actionCollection = new ActionCollection(this);
 
   UiSettings uiSettings;
   loadTranslation(uiSettings.value("Locale", QLocale::system()).value<QLocale>());
@@ -63,6 +62,15 @@ void QtUi::init() {
   _mainWin->init();
 }
 
+ActionCollection *QtUi::actionCollection(const QString &category) {
+  if(_actionCollections.contains(category))
+    return _actionCollections.value(category);
+  ActionCollection *coll = new ActionCollection(mainWindow());
+  coll->addAssociatedWidget(mainWindow());
+  _actionCollections.insert(category, coll);
+  return coll;
+}
+
 MessageModel *QtUi::createMessageModel(QObject *parent) {
   return new ChatLineModel(parent);
 }