4 files changed, 64 insertions, 53 deletions

diff --git a/src/qmmpui/general.cpp b/src/qmmpui/general.cpp
index ebe462715..8b2b36f22 100644
--- a/src/qmmpui/general.cpp
+++ b/src/qmmpui/general.cpp
@@ -27,6 +27,8 @@
 
 QList<GeneralFactory*> *General::m_factories = 0;
 QStringList General::m_files;
+QMap <GeneralFactory*, General*> *General::m_generals = 0;
+QObject *General::m_parent = 0;
 
 void General::checkFactories()
 {
@@ -69,6 +71,23 @@ General::General(QObject *parent)
 General::~General()
 {}
 
+void General::create(QObject *parent)
+{
+    if(m_generals)
+        return;
+    m_generals = new QMap <GeneralFactory*, General*>();
+    m_parent = parent;
+    checkFactories();
+    foreach(GeneralFactory* factory, *General::factories())
+    {
+        if (General::isEnabled(factory))
+        {
+            General *general = factory->create(parent);
+            m_generals->insert(factory, general);
+        }
+    }
+}
+
 QList<GeneralFactory*> *General::factories()
 {
     checkFactories();
@@ -99,6 +118,37 @@ void General::setEnabled(GeneralFactory* factory, bool enable)
     else
         genList.removeAll(name);
     settings.setValue("General/enabled_plugins", genList);
+    if(!m_generals)
+        return;
+
+
+    if (enable == m_generals->keys().contains(factory))
+        return;
+    if (enable)
+    {
+        General *general = factory->create(m_parent);
+        m_generals->insert(factory, general);
+    }
+    else
+    {
+        delete m_generals->value(factory);
+        m_generals->remove(factory);
+    }
+}
+
+void General::showSettings(GeneralFactory* factory, QWidget* parentWidget)
+{
+    QDialog *dialog = factory->createConfigDialog(parentWidget);
+    if (!dialog)
+        return;
+
+    if (m_generals && dialog->exec() == QDialog::Accepted && m_generals->keys().contains(factory))
+    {
+        delete m_generals->value(factory);
+        General *general = factory->create(m_parent);
+        m_generals->insert(factory, general);
+    }
+    dialog->deleteLater();
 }
 
 bool General::isEnabled(GeneralFactory* factory)
diff --git a/src/qmmpui/general.h b/src/qmmpui/general.h
index 96d69b72a..6afd75517 100644
--- a/src/qmmpui/general.h
+++ b/src/qmmpui/general.h
@@ -42,6 +42,11 @@ public:
      */
     ~General();
     /*!
+     * Prepares general plugins for usage.
+     * @param parent Parent object.
+     */
+    static void create(QObject *parent);
+    /*!
      * Returns a list of the loaded general plugin factories.
      */
     static QList<GeneralFactory*> *factories();
@@ -56,6 +61,12 @@ public:
      */
     static void setEnabled(GeneralFactory* factory, bool enable = true);
     /*!
+     * Shows configuration dialog and updates settings automatically.
+     * @param factory General plugin factory.
+     * @param parentWidget Parent widget.
+     */
+    static void showSettings(GeneralFactory* factory, QWidget* parentWidget);
+    /*!
      * Returns \b true if general plugin is enabled, otherwise returns \b false
      * @param factory General plugin factory.
      */
@@ -68,6 +79,8 @@ private:
     static QList<GeneralFactory*> *m_factories;
     static QStringList m_files;
     static void checkFactories();
+    static QMap <GeneralFactory*, General*> *m_generals;
+    static QObject *m_parent;
 };
 
 #endif
diff --git a/src/qmmpui/uihelper.cpp b/src/qmmpui/uihelper.cpp
index 5448725aa..158bab3c5 100644
--- a/src/qmmpui/uihelper.cpp
+++ b/src/qmmpui/uihelper.cpp
@@ -34,52 +34,12 @@ UiHelper::UiHelper(QObject *parent)
     m_instance = this;
     m_toolsMenu = 0;
     m_playlistMenu = 0;
-    GeneralFactory* factory;
-    foreach(factory, *General::factories())
-    {
-        if (General::isEnabled(factory))
-        {
-            General *general = factory->create(parent);
-            m_generals.insert(factory, general);
-        }
-    }
+    General::create(parent);
 }
 
 UiHelper::~UiHelper()
 {}
 
-void UiHelper::setEnabled(GeneralFactory* factory, bool enable)
-{
-    if (enable == m_generals.keys().contains(factory))
-        return;
-    if (enable)
-    {
-        General *general = factory->create(parent());
-        m_generals.insert(factory, general);
-    }
-    else
-    {
-        delete m_generals.value(factory);
-        m_generals.remove(factory);
-    }
-    General::setEnabled(factory, enable);
-}
-
-void UiHelper::showSettings(GeneralFactory* factory, QWidget* parentWidget)
-{
-    QDialog *dialog = factory->createConfigDialog(parentWidget);
-    if (!dialog)
-        return;
-
-    if (dialog->exec() == QDialog::Accepted && m_generals.keys().contains(factory))
-    {
-        delete m_generals.value(factory);
-        General *general = factory->create(parent());
-        m_generals[factory] = general;
-    }
-    dialog->deleteLater();
-}
-
 bool UiHelper::visibilityControl()
 {
     GeneralFactory* factory;
diff --git a/src/qmmpui/uihelper.h b/src/qmmpui/uihelper.h
index a44fd22f7..efc623bb7 100644
--- a/src/qmmpui/uihelper.h
+++ b/src/qmmpui/uihelper.h
@@ -57,18 +57,6 @@ public:
         PLAYLIST_MENU   /*!< playlist context menu */
     };
     /*!
-     * Sets whether the general plugin is enabled.
-     * @param factory General plugin factory.
-     * @param enable Plugin enable state (\b true - enable, \b false - disable)
-     */
-    void setEnabled(GeneralFactory* factory, bool enable);
-    /*!
-     * Shows configuration dialog and updates settings automatically.
-     * @param factory General plugin factory.
-     * @param parentWidget Parent widget.
-     */
-    void showSettings(GeneralFactory* factory, QWidget* parentWidget);
-    /*!
      * Returns \b true if one of the general plugin can change visibility, otherwise returns \b false
      */
     bool visibilityControl();