diff options
Diffstat (limited to 'src/app')
| -rw-r--r-- | src/app/builtincommandlineoption.cpp | 21 | ||||
| -rw-r--r-- | src/app/qmmpstarter.cpp | 4 |
2 files changed, 18 insertions, 7 deletions
diff --git a/src/app/builtincommandlineoption.cpp b/src/app/builtincommandlineoption.cpp index 68ad43771..f9d246c8f 100644 --- a/src/app/builtincommandlineoption.cpp +++ b/src/app/builtincommandlineoption.cpp @@ -21,7 +21,9 @@ #include <QApplication> #include <qmmp/soundcore.h> #include <qmmpui/mediaplayer.h> -#include <qmmpui/generalhandler.h> +#include <qmmpui/uihelper.h> +#include <qmmpui/filedialog.h> +#include <qmmp/metadatamanager.h> #include "builtincommandlineoption.h" BuiltinCommandLineOption::BuiltinCommandLineOption(QObject *parent) : QObject(parent) @@ -148,21 +150,30 @@ void BuiltinCommandLineOption::executeCommand(const QString &option_string, } else if (option_string == "--quit" || option_string == "-q") { - //mw->close(); qApp->closeAllWindows(); qApp->quit(); } else if (option_string == "--toggle-visibility") { - GeneralHandler::instance()->toggleVisibility(); + UiHelper::instance()->toggleVisibility(); } else if (option_string == "--add-file") { - //mw->addFile(); + QString m_lastDir; + QStringList filters; + filters << tr("All Supported Bitstreams")+" (" + + MetaDataManager::instance()->nameFilters().join (" ") +")"; + filters << MetaDataManager::instance()->filters(); + FileDialog::popup(qApp->activeWindow(), FileDialog::AddDirsFiles, &m_lastDir, + pl_manager->selectedPlayList(), SLOT(add(const QStringList&)), + tr("Select one or more files to open"), filters.join(";;")); } else if (option_string == "--add-dir") { - //mw->addDir(); + QString m_lastDir; + FileDialog::popup(qApp->activeWindow(), FileDialog::AddDirs, &m_lastDir, + pl_manager->selectedPlayList(), SLOT(add(const QStringList&)), + tr("Choose a directory")); } else if (option_string == "--volume" && !args.isEmpty()) { diff --git a/src/app/qmmpstarter.cpp b/src/app/qmmpstarter.cpp index e30036ee4..f62ec79be 100644 --- a/src/app/qmmpstarter.cpp +++ b/src/app/qmmpstarter.cpp @@ -32,7 +32,7 @@ #include <qmmpui/commandlinemanager.h> #include <qmmpui/mediaplayer.h> #include <qmmpui/playlistparser.h> -#include <qmmpui/generalhandler.h> +#include <qmmpui/uihelper.h> #include <qmmpui/uiloader.h> #include "qmmpstarter.h" #include "builtincommandlineoption.h" @@ -139,7 +139,7 @@ void QMMPStarter::startPlayer() //additional featuries new PlaylistParser(this); - new GeneralHandler(this); + new UiHelper(this); //interface UiFactory *factory = UiLoader::currentUiFactory(); |