some general api changes

git-svn-id: http://svn.code.sf.net/p/qmmp-dev/code/trunk/qmmp@755 90c681e8-e032-0410-971d-27865f9a5e38

16 files changed, 41 insertions, 29 deletions

diff --git a/src/qmmpui/filedialog.cpp b/src/qmmpui/filedialog.cpp
index 9ec68290a..9ab1c57c2 100644
--- a/src/qmmpui/filedialog.cpp
+++ b/src/qmmpui/filedialog.cpp
@@ -151,7 +151,7 @@ void FileDialog::registerBuiltinFactories()
 {
     FileDialogFactory *fct = new QtFileDialogFactory();
     qApp->installTranslator(fct->createTranslator(qApp));
-    registerFactory(fct, "qt_dialog");
+    registerFactory(fct);
 }
 
 void FileDialog::registerExternalFactories()
@@ -175,7 +175,7 @@ void FileDialog::registerExternalFactories()
 
         if (fct)
         {
-            if (!registerFactory(fct, fileName))
+            if (!registerFactory(fct))
                 qDebug("Warning: Plugin with name %s is already registered...",
                        qPrintable(fileName));
             qApp->installTranslator(fct->createTranslator(qApp));
@@ -183,11 +183,11 @@ void FileDialog::registerExternalFactories()
     }
 }
 
-bool FileDialog::registerFactory(FileDialogFactory *factory, const QString &name)
+bool FileDialog::registerFactory(FileDialogFactory *factory)
 {
-    if (!factories.contains(name))
+    if (!factories.contains(factory->properties().shortName))
     {
-        factories.insert(name, factory);
+        factories.insert(factory->properties().shortName, factory);
         return true;
     }
     return false;
diff --git a/src/qmmpui/filedialog.h b/src/qmmpui/filedialog.h
index 259021e14..fd87b47fa 100644
--- a/src/qmmpui/filedialog.h
+++ b/src/qmmpui/filedialog.h
@@ -127,7 +127,7 @@ protected:
 
     static FileDialog* instance();
     static FileDialog* defaultInstance();
-    static bool registerFactory(FileDialogFactory *factory, const QString &name);
+    static bool registerFactory(FileDialogFactory *factory);
     static void registerBuiltinFactories();
     static void registerExternalFactories();
 
diff --git a/src/qmmpui/filedialogfactory.h b/src/qmmpui/filedialogfactory.h
index 68e866e0e..5aaceac1f 100644
--- a/src/qmmpui/filedialogfactory.h
+++ b/src/qmmpui/filedialogfactory.h
@@ -24,10 +24,16 @@ class QObject;
 class QTranslator;
 class FileDialog;
 
-struct FileDialogProperties
+class FileDialogProperties
 {
-    QString name;
+public:
+    FileDialogProperties()
+    {
+        hasAbout = FALSE;
+    }
     bool hasAbout;
+    QString name;
+    QString shortName;
 };
 
 
diff --git a/src/qmmpui/general.cpp b/src/qmmpui/general.cpp
index 6d43d3c68..9f47ddc1f 100644
--- a/src/qmmpui/general.cpp
+++ b/src/qmmpui/general.cpp
@@ -101,9 +101,9 @@ void General::setEnabled(GeneralFactory* factory, bool enable)
     if (!factories->contains(factory))
         return;
 
-    QString name = files.at(factories->indexOf(factory)).section('/',-1);
+    QString name = factory->properties().shortName;
     QSettings settings ( Qmmp::configFile(), QSettings::IniFormat );
-    QStringList genList = settings.value("General/plugin_files").toStringList();
+    QStringList genList = settings.value("General/enabled_plugins").toStringList();
 
     if (enable)
     {
@@ -112,7 +112,7 @@ void General::setEnabled(GeneralFactory* factory, bool enable)
     }
     else
         genList.removeAll(name);
-    settings.setValue("General/plugin_files", genList);
+    settings.setValue("General/enabled_plugins", genList);
 }
 
 bool General::isEnabled(GeneralFactory* factory)
@@ -120,9 +120,7 @@ bool General::isEnabled(GeneralFactory* factory)
     checkFactories();
     if (!factories->contains(factory))
         return FALSE;
-    QString name = files.at(factories->indexOf(factory)).section('/',-1);
-    QSettings settings ( Qmmp::configFile(), QSettings::IniFormat );
-    QStringList genList = settings.value("General/plugin_files").toStringList();
-    return genList.contains(name);
+    QSettings settings (Qmmp::configFile(), QSettings::IniFormat );
+    QStringList genList = settings.value("General/enabled_plugins").toStringList();
+    return genList.contains(factory->properties().shortName);
 }
-
diff --git a/src/qmmpui/generalfactory.h b/src/qmmpui/generalfactory.h
index 00acbc2ce..f0c9c61e3 100644
--- a/src/qmmpui/generalfactory.h
+++ b/src/qmmpui/generalfactory.h
@@ -30,9 +30,17 @@ class Control;
 
 class General;
 
-struct GeneralProperties
+class GeneralProperties
 {
+public:
+    GeneralProperties()
+    {
+        hasAbout = FALSE;
+        hasSettings = FALSE;
+        visibilityControl = FALSE;
+    }
     QString name;
+    QString shortName;
     bool hasAbout;
     bool hasSettings;
     bool visibilityControl;
diff --git a/src/qmmpui/generalhandler.cpp b/src/qmmpui/generalhandler.cpp
index a94a05341..06025586f 100644
--- a/src/qmmpui/generalhandler.cpp
+++ b/src/qmmpui/generalhandler.cpp
@@ -1,5 +1,5 @@
 /***************************************************************************
- *   Copyright (C) 2008 by Ilya Kotov                                      *
+ *   Copyright (C) 2008-2009 by Ilya Kotov                                 *
  *   forkotov02@hotmail.ru                                                 *
  *                                                                         *
  *   This program is free software; you can redistribute it and/or modify  *
diff --git a/src/qmmpui/generalhandler.h b/src/qmmpui/generalhandler.h
index 5e99bff80..295a2dd9c 100644
--- a/src/qmmpui/generalhandler.h
+++ b/src/qmmpui/generalhandler.h
@@ -1,5 +1,5 @@
 /***************************************************************************
- *   Copyright (C) 2008 by Ilya Kotov                                      *
+ *   Copyright (C) 2008-2009 by Ilya Kotov                                 *
  *   forkotov02@hotmail.ru                                                 *
  *                                                                         *
  *   This program is free software; you can redistribute it and/or modify  *
@@ -57,7 +57,7 @@ public:
     void showSettings(GeneralFactory* factory, QWidget* parentWidget);
     bool visibilityControl();
     void executeCommand(const QString &opt_str);
-    //actions 
+    //actions
     void addAction(QAction *action, MenuType type = TOOLS_MENU);
     void removeAction(QAction *action);
     QList<QAction *> actions(MenuType type = TOOLS_MENU);
diff --git a/src/qmmpui/qtfiledialog.cpp b/src/qmmpui/qtfiledialog.cpp
index 1d21ca3c5..64652d1f2 100644
--- a/src/qmmpui/qtfiledialog.cpp
+++ b/src/qmmpui/qtfiledialog.cpp
@@ -31,6 +31,7 @@ const FileDialogProperties QtFileDialogFactory::properties() const
 {
     FileDialogProperties properties;
     properties.name = tr("Qt File Dialog");
+    properties.shortName = "qt_dialog";
     properties.hasAbout = FALSE;
     return properties;
 }
diff --git a/src/qmmpui/translations/libqmmpui_cs.ts b/src/qmmpui/translations/libqmmpui_cs.ts
index 35359bb48..ed8d77c9b 100644
--- a/src/qmmpui/translations/libqmmpui_cs.ts
+++ b/src/qmmpui/translations/libqmmpui_cs.ts
@@ -36,7 +36,7 @@
 <context>
     <name>QtFileDialogFactory</name>
     <message>
-        <location filename="../qtfiledialog.cpp" line="36"/>
+        <location filename="../qtfiledialog.cpp" line="33"/>
         <source>Qt File Dialog</source>
         <translation>Souborový dialog Qt</translation>
     </message>
diff --git a/src/qmmpui/translations/libqmmpui_de.ts b/src/qmmpui/translations/libqmmpui_de.ts
index 78f8b3195..f0007661a 100644
--- a/src/qmmpui/translations/libqmmpui_de.ts
+++ b/src/qmmpui/translations/libqmmpui_de.ts
@@ -36,7 +36,7 @@
 <context>
     <name>QtFileDialogFactory</name>
     <message>
-        <location filename="../qtfiledialog.cpp" line="36"/>
+        <location filename="../qtfiledialog.cpp" line="33"/>
         <source>Qt File Dialog</source>
         <translation>Qt Datei-Dialog</translation>
     </message>
diff --git a/src/qmmpui/translations/libqmmpui_pt_BR.ts b/src/qmmpui/translations/libqmmpui_pt_BR.ts
index e4b9d9290..b177c63c1 100644
--- a/src/qmmpui/translations/libqmmpui_pt_BR.ts
+++ b/src/qmmpui/translations/libqmmpui_pt_BR.ts
@@ -36,7 +36,7 @@
 <context>
     <name>QtFileDialogFactory</name>
     <message>
-        <location filename="../qtfiledialog.cpp" line="36"/>
+        <location filename="../qtfiledialog.cpp" line="33"/>
         <source>Qt File Dialog</source>
         <translation type="unfinished"></translation>
     </message>
diff --git a/src/qmmpui/translations/libqmmpui_ru.ts b/src/qmmpui/translations/libqmmpui_ru.ts
index 9f1859bc4..235bc5ff2 100644
--- a/src/qmmpui/translations/libqmmpui_ru.ts
+++ b/src/qmmpui/translations/libqmmpui_ru.ts
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!DOCTYPE TS><TS version="1.1" language="ru">
-<defaultcodec></defaultcodec>
 <context>
     <name>PlayListModel</name>
     <message>
@@ -37,7 +36,7 @@
 <context>
     <name>QtFileDialogFactory</name>
     <message>
-        <location filename="../qtfiledialog.cpp" line="36"/>
+        <location filename="../qtfiledialog.cpp" line="33"/>
         <source>Qt File Dialog</source>
         <translation>Файловый диалог Qt</translation>
     </message>
diff --git a/src/qmmpui/translations/libqmmpui_tr.ts b/src/qmmpui/translations/libqmmpui_tr.ts
index e4b9d9290..b177c63c1 100644
--- a/src/qmmpui/translations/libqmmpui_tr.ts
+++ b/src/qmmpui/translations/libqmmpui_tr.ts
@@ -36,7 +36,7 @@
 <context>
     <name>QtFileDialogFactory</name>
     <message>
-        <location filename="../qtfiledialog.cpp" line="36"/>
+        <location filename="../qtfiledialog.cpp" line="33"/>
         <source>Qt File Dialog</source>
         <translation type="unfinished"></translation>
     </message>
diff --git a/src/qmmpui/translations/libqmmpui_uk_UA.ts b/src/qmmpui/translations/libqmmpui_uk_UA.ts
index 983a7a005..b0baa3d4c 100644
--- a/src/qmmpui/translations/libqmmpui_uk_UA.ts
+++ b/src/qmmpui/translations/libqmmpui_uk_UA.ts
@@ -36,7 +36,7 @@
 <context>
     <name>QtFileDialogFactory</name>
     <message>
-        <location filename="../qtfiledialog.cpp" line="36"/>
+        <location filename="../qtfiledialog.cpp" line="33"/>
         <source>Qt File Dialog</source>
         <translation>Файловий діалог Qt</translation>
     </message>
diff --git a/src/qmmpui/translations/libqmmpui_zh_CN.ts b/src/qmmpui/translations/libqmmpui_zh_CN.ts
index 30822a9ed..3295aba3b 100644
--- a/src/qmmpui/translations/libqmmpui_zh_CN.ts
+++ b/src/qmmpui/translations/libqmmpui_zh_CN.ts
@@ -36,7 +36,7 @@
 <context>
     <name>QtFileDialogFactory</name>
     <message>
-        <location filename="../qtfiledialog.cpp" line="36"/>
+        <location filename="../qtfiledialog.cpp" line="33"/>
         <source>Qt File Dialog</source>
         <translation>Qmmp 文件会话</translation>
     </message>
diff --git a/src/qmmpui/translations/libqmmpui_zh_TW.ts b/src/qmmpui/translations/libqmmpui_zh_TW.ts
index 3c30298e6..cbb2189a6 100644
--- a/src/qmmpui/translations/libqmmpui_zh_TW.ts
+++ b/src/qmmpui/translations/libqmmpui_zh_TW.ts
@@ -36,7 +36,7 @@
 <context>
     <name>QtFileDialogFactory</name>
     <message>
-        <location filename="../qtfiledialog.cpp" line="36"/>
+        <location filename="../qtfiledialog.cpp" line="33"/>
         <source>Qt File Dialog</source>
         <translation>Qmmp 檔案會話</translation>
     </message>