changed command line api

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

10 files changed, 46 insertions, 51 deletions

diff --git a/src/plugins/CommandLineOptions/IncDecVolumeOption/incdecvolumeoption.cpp b/src/plugins/CommandLineOptions/IncDecVolumeOption/incdecvolumeoption.cpp
index b94b342fd..fbd8e3ef2 100644
--- a/src/plugins/CommandLineOptions/IncDecVolumeOption/incdecvolumeoption.cpp
+++ b/src/plugins/CommandLineOptions/IncDecVolumeOption/incdecvolumeoption.cpp
@@ -1,5 +1,5 @@
 /***************************************************************************
- *   Copyright (C) 2008-2016 by Ilya Kotov                                 *
+ *   Copyright (C) 2008-2017 by Ilya Kotov                                 *
  *   forkotov02@hotmail.ru                                                 *
  *                                                                         *
  *   This program is free software; you can redistribute it and/or modify  *
@@ -21,6 +21,7 @@
 #include <QtPlugin>
 #include <QTranslator>
 #include <QLocale>
+#include <QPair>
 #include <qmmp/soundcore.h>
 
 #include "incdecvolumeoption.h"
@@ -38,12 +39,11 @@ bool IncDecVolumeCommandLineOption::identify(const QString & str) const
     return false;
 }
 
-const QString IncDecVolumeCommandLineOption::helpString() const
+const QStringList IncDecVolumeCommandLineOption::helpString() const
 {
-    return  QString(
-                "--volume-inc             " + tr("Increase volume by 5 steps")+"\n"
-                "--volume-dec             " + tr("Decrease volume by 5 steps")+"\n"
-            );
+    return QStringList()
+            << QString("--volume-inc") + "||" + tr("Increase volume by 5 steps")
+            << QString("--volume-dec") + "||" + tr("Decrease volume by 5 steps");
 }
 
 QString IncDecVolumeCommandLineOption::executeCommand(const QString& opt_str, const QStringList &args)
diff --git a/src/plugins/CommandLineOptions/IncDecVolumeOption/incdecvolumeoption.h b/src/plugins/CommandLineOptions/IncDecVolumeOption/incdecvolumeoption.h
index b0a8edb6e..59ee80039 100644
--- a/src/plugins/CommandLineOptions/IncDecVolumeOption/incdecvolumeoption.h
+++ b/src/plugins/CommandLineOptions/IncDecVolumeOption/incdecvolumeoption.h
@@ -1,5 +1,5 @@
 /***************************************************************************
- *   Copyright (C) 2008-2012 by Ilya Kotov                                 *
+ *   Copyright (C) 2008-2017 by Ilya Kotov                                 *
  *   forkotov02@hotmail.ru                                                 *
  *                                                                         *
  *   This program is free software; you can redistribute it and/or modify  *
@@ -33,9 +33,9 @@ class IncDecVolumeCommandLineOption : public QObject, public CommandLineOption
 Q_OBJECT
 Q_INTERFACES(CommandLineOption)
 public:
-    virtual bool identify(const QString& opt_str)const;
-    virtual const QString name()const;
-    virtual const QString helpString()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);
     virtual QTranslator *createTranslator(QObject *parent);
 };
diff --git a/src/plugins/CommandLineOptions/PlayListOption/playlistoption.cpp b/src/plugins/CommandLineOptions/PlayListOption/playlistoption.cpp
index 185521b3d..ff94bbcef 100644
--- a/src/plugins/CommandLineOptions/PlayListOption/playlistoption.cpp
+++ b/src/plugins/CommandLineOptions/PlayListOption/playlistoption.cpp
@@ -1,5 +1,5 @@
 /***************************************************************************
- *   Copyright (C) 2011-2016 by Ilya Kotov                                 *
+ *   Copyright (C) 2011-2017 by Ilya Kotov                                 *
  *   forkotov02@hotmail.ru                                                 *
  *                                                                         *
  *   This program is free software; you can redistribute it and/or modify  *
@@ -40,11 +40,10 @@ bool PlayListOption::identify(const QString & str) const
             str == QString("--pl-state");
 }
 
-const QString PlayListOption::helpString() const
+const QStringList PlayListOption::helpString() const
 {
-    return QString(
-                "--pl-help                " + tr("Show playlist manipulation commands")+"\n"
-                );
+    return QStringList()
+            << QString("--pl-help") + "||" + tr("Show playlist manipulation commands");
 }
 
 QString PlayListOption::executeCommand(const QString& opt_str, const QStringList &args)
diff --git a/src/plugins/CommandLineOptions/PlayListOption/playlistoption.h b/src/plugins/CommandLineOptions/PlayListOption/playlistoption.h
index 2546449a8..ea8f0d600 100644
--- a/src/plugins/CommandLineOptions/PlayListOption/playlistoption.h
+++ b/src/plugins/CommandLineOptions/PlayListOption/playlistoption.h
@@ -1,5 +1,5 @@
 /***************************************************************************
- *   Copyright (C) 2011 by Ilya Kotov                                      *
+ *   Copyright (C) 2011-2017 by Ilya Kotov                                 *
  *   forkotov02@hotmail.ru                                                 *
  *                                                                         *
  *   This program is free software; you can redistribute it and/or modify  *
@@ -35,9 +35,9 @@ class PlayListOption : public QObject, public CommandLineOption
 Q_OBJECT
 Q_INTERFACES(CommandLineOption)
 public:
-    virtual bool identify(const QString& opt_str)const;
-    virtual const QString name()const;
-    virtual const QString helpString()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);
     virtual QTranslator *createTranslator(QObject *parent);
 
diff --git a/src/plugins/CommandLineOptions/SeekOption/seekoption.cpp b/src/plugins/CommandLineOptions/SeekOption/seekoption.cpp
index 427c99e6a..0219ddd28 100644
--- a/src/plugins/CommandLineOptions/SeekOption/seekoption.cpp
+++ b/src/plugins/CommandLineOptions/SeekOption/seekoption.cpp
@@ -1,5 +1,5 @@
 /***************************************************************************
- *   Copyright (C) 2010 by Ilya Kotov                                      *
+ *   Copyright (C) 2010-2017 by Ilya Kotov                                 *
  *   forkotov02@hotmail.ru                                                 *
  *                                                                         *
  *   This program is free software; you can redistribute it and/or modify  *
@@ -32,13 +32,12 @@ bool SeekOption::identify(const QString &str) const
     return opts.contains(str);
 }
 
-const QString SeekOption::helpString() const
+const QStringList SeekOption::helpString() const
 {
-    QString help;
-    help += QString("--seek <time>            ") + tr("Seek to position in the current track") + "\n";
-    help += QString("--seek-fwd <time>        ") + tr("Seek forward") + "\n";
-    help += QString("--seek-bwd <time>        ") + tr("Seek backwards") + "\n";
-    return  help;
+    return QStringList()
+            << QString("--seek <time>") + "||" + tr("Seek to position in the current track")
+            << QString("--seek-fwd <time>") + "||" + tr("Seek forward")
+            << QString("--seek-bwd <time>") + "||" + tr("Seek backwards");
 }
 
 QString SeekOption::executeCommand(const QString &opt_str, const QStringList &args)
diff --git a/src/plugins/CommandLineOptions/SeekOption/seekoption.h b/src/plugins/CommandLineOptions/SeekOption/seekoption.h
index ed1a36dea..dca61fbe7 100644
--- a/src/plugins/CommandLineOptions/SeekOption/seekoption.h
+++ b/src/plugins/CommandLineOptions/SeekOption/seekoption.h
@@ -1,5 +1,5 @@
 /***************************************************************************
- *   Copyright (C) 2010 by Ilya Kotov                                      *
+ *   Copyright (C) 2010-2017 by Ilya Kotov                                 *
  *   forkotov02@hotmail.ru                                                 *
  *                                                                         *
  *   This program is free software; you can redistribute it and/or modify  *
@@ -33,9 +33,9 @@ class SeekOption : public QObject, public CommandLineOption
 Q_OBJECT
 Q_INTERFACES(CommandLineOption)
 public:
-    virtual bool identify(const QString& opt_str)const;
-    virtual const QString name()const;
-    virtual const QString helpString()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);
     virtual QTranslator *createTranslator(QObject *parent);
 };
diff --git a/src/plugins/CommandLineOptions/StatusOption/statusoption.cpp b/src/plugins/CommandLineOptions/StatusOption/statusoption.cpp
index 7552c1a43..e9500f974 100644
--- a/src/plugins/CommandLineOptions/StatusOption/statusoption.cpp
+++ b/src/plugins/CommandLineOptions/StatusOption/statusoption.cpp
@@ -33,14 +33,13 @@ bool StatusOption::identify(const QString &str) const
     return opts.contains(str);
 }
 
-const QString StatusOption::helpString() const
+const QStringList StatusOption::helpString() const
 {
-    QString help;
-    help += QString("--status                 ") + tr("Print playback status") + "\n";
-    help += QString("--nowplaying <fmt>       ")
-            + tr("Print formatted track name (example: qmmp --nowplaying \"%t - %a\")") + "\n";
-    help += QString("--nowplaying-syntax      ") + tr("Print --nowplaying syntax") + "\n";
-    return  help;
+    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)
diff --git a/src/plugins/CommandLineOptions/StatusOption/statusoption.h b/src/plugins/CommandLineOptions/StatusOption/statusoption.h
index 7d9662b46..93fd91e51 100644
--- a/src/plugins/CommandLineOptions/StatusOption/statusoption.h
+++ b/src/plugins/CommandLineOptions/StatusOption/statusoption.h
@@ -1,5 +1,5 @@
 /***************************************************************************
- *   Copyright (C) 2011 by Ilya Kotov                                      *
+ *   Copyright (C) 2011-2017 by Ilya Kotov                                 *
  *   forkotov02@hotmail.ru                                                 *
  *                                                                         *
  *   This program is free software; you can redistribute it and/or modify  *
@@ -36,9 +36,9 @@ class StatusOption : public QObject, public CommandLineOption
 Q_OBJECT
 Q_INTERFACES(CommandLineOption)
 public:
-    virtual bool identify(const QString& opt_str)const;
-    virtual const QString name()const;
-    virtual const QString helpString()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);
     virtual QTranslator *createTranslator(QObject *parent);
 
diff --git a/src/plugins/CommandLineOptions/UninstallOption/uninstalloption.cpp b/src/plugins/CommandLineOptions/UninstallOption/uninstalloption.cpp
index 7e19020b8..14456e20b 100644
--- a/src/plugins/CommandLineOptions/UninstallOption/uninstalloption.cpp
+++ b/src/plugins/CommandLineOptions/UninstallOption/uninstalloption.cpp
@@ -1,5 +1,5 @@
 /***************************************************************************
- *   Copyright (C) 2014 by Ilya Kotov                                      *
+ *   Copyright (C) 2014-2017 by Ilya Kotov                                 *
  *   forkotov02@hotmail.ru                                                 *
  *                                                                         *
  *   This program is free software; you can redistribute it and/or modify  *
@@ -33,12 +33,10 @@ bool UninstallOption::identify(const QString &str) const
     return opts.contains(str);
 }
 
-const QString UninstallOption::helpString() const
+const QStringList UninstallOption::helpString() const
 {
-    QString help;
-    help += QString("--uninstall              ") + tr("Restore the old file associations and clean up the registry")
-            + "\n";
-    return  help;
+    return QStringList()
+            << QString("--uninstall") + "||" + tr("Restore the old file associations and clean up the registry");
 }
 
 QString UninstallOption::executeCommand(const QString &opt_str, const QStringList &args)
diff --git a/src/plugins/CommandLineOptions/UninstallOption/uninstalloption.h b/src/plugins/CommandLineOptions/UninstallOption/uninstalloption.h
index 71e99e3b4..5787e22f9 100644
--- a/src/plugins/CommandLineOptions/UninstallOption/uninstalloption.h
+++ b/src/plugins/CommandLineOptions/UninstallOption/uninstalloption.h
@@ -1,5 +1,5 @@
 /***************************************************************************
- *   Copyright (C) 2014 by Ilya Kotov                                      *
+ *   Copyright (C) 2014-2017 by Ilya Kotov                                 *
  *   forkotov02@hotmail.ru                                                 *
  *                                                                         *
  *   This program is free software; you can redistribute it and/or modify  *
@@ -35,9 +35,9 @@ class UninstallOption : public QObject, public CommandLineOption
 Q_OBJECT
 Q_INTERFACES(CommandLineOption)
 public:
-    virtual bool identify(const QString& opt_str)const;
-    virtual const QString name()const;
-    virtual const QString helpString()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);
     virtual QTranslator *createTranslator(QObject *parent);