fixed command line translation

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

2 files changed, 13 insertions, 24 deletions

diff --git a/src/plugins/CommandLineOptions/StatusOption/statusoption.cpp b/src/plugins/CommandLineOptions/StatusOption/statusoption.cpp
index 02500be13..cb19b4efc 100644
--- a/src/plugins/CommandLineOptions/StatusOption/statusoption.cpp
+++ b/src/plugins/CommandLineOptions/StatusOption/statusoption.cpp
@@ -25,6 +25,18 @@
 #include <qmmpui/metadataformatter.h>
 #include "statusoption.h"
 
+const CommandLineProperties StatusOption::properties() const
+{
+    CommandLineProperties properties;
+    properties.shortName = "StatusOption";
+    properties.translation = QLatin1String(":/status_plugin_");
+    properties.helpString << QString("--status") + "||" + tr("Print playback status")
+                          << QString("--nowplaying <fmt>") + "||"
+                             + tr("Print formatted track name (example: qmmp --nowplaying \"%t - %a\")")
+                          << QString("--nowplaying-syntax") + "||" + tr("Print --nowplaying syntax");
+    return properties;
+}
+
 bool StatusOption::identify(const QString &str) const
 {
     QStringList opts;
@@ -32,15 +44,6 @@ bool StatusOption::identify(const QString &str) const
     return opts.contains(str);
 }
 
-const QStringList StatusOption::helpString() const
-{
-    return QStringList()
-            << QString("--status") + "||" + tr("Print playback status")
-            << QString("--nowplaying <fmt>") + "||"
-               + tr("Print formatted track name (example: qmmp --nowplaying \"%t - %a\")")
-            << QString("--nowplaying-syntax") + "||" + tr("Print --nowplaying syntax");
-}
-
 QString StatusOption::executeCommand(const QString &opt_str, const QStringList &args)
 {
     SoundCore *core = SoundCore::instance();
@@ -104,19 +107,6 @@ QString StatusOption::executeCommand(const QString &opt_str, const QStringList &
     return out;
 }
 
-const QString StatusOption::name() const
-{
-    return "StatusOption";
-}
-
-/*QTranslator *StatusOption::createTranslator(QObject *parent)
-{
-    QTranslator *translator = new QTranslator(parent);
-    QString locale = Qmmp::systemLanguageID();
-    translator->load(QString(":/status_plugin_") + locale);
-    return translator;
-}*/
-
 QString StatusOption::genProgressBar()
 {
     SoundCore *core = SoundCore::instance();
diff --git a/src/plugins/CommandLineOptions/StatusOption/statusoption.h b/src/plugins/CommandLineOptions/StatusOption/statusoption.h
index 1cf69db67..d161d29be 100644
--- a/src/plugins/CommandLineOptions/StatusOption/statusoption.h
+++ b/src/plugins/CommandLineOptions/StatusOption/statusoption.h
@@ -36,9 +36,8 @@ Q_OBJECT
 Q_PLUGIN_METADATA(IID "org.qmmp.qmmpui.CommandLineOptionInterface.1.0")
 Q_INTERFACES(CommandLineOption)
 public:
+    virtual const CommandLineProperties properties() const;
     virtual bool identify(const QString& opt_str) const;
-    virtual const QString name() const;
-    virtual const QStringList helpString() const;
     virtual QString executeCommand(const QString& opt_str, const QStringList &args);
 
 private: