From 5717444b38b4f45ad185bbc6ea81cdb141befb8c Mon Sep 17 00:00:00 2001 From: trialuser02 Date: Sat, 18 Sep 2010 16:50:38 +0000 Subject: added --status and --nowplaying command line option (Closes issue 266) git-svn-id: http://svn.code.sf.net/p/qmmp-dev/code/trunk/qmmp@1893 90c681e8-e032-0410-971d-27865f9a5e38 --- src/ui/mainwindow.cpp | 14 +++++++------- src/ui/mainwindow.h | 2 +- src/ui/qmmpstarter.cpp | 14 ++++++++++---- src/ui/translations/qmmp_cs.ts | 16 ++++++++-------- src/ui/translations/qmmp_de.ts | 16 ++++++++-------- src/ui/translations/qmmp_es.ts | 16 ++++++++-------- src/ui/translations/qmmp_hu.ts | 16 ++++++++-------- src/ui/translations/qmmp_it.ts | 16 ++++++++-------- src/ui/translations/qmmp_ja.ts | 16 ++++++++-------- src/ui/translations/qmmp_lt.ts | 16 ++++++++-------- src/ui/translations/qmmp_nl.ts | 16 ++++++++-------- src/ui/translations/qmmp_pl_PL.ts | 16 ++++++++-------- src/ui/translations/qmmp_pt_BR.ts | 16 ++++++++-------- src/ui/translations/qmmp_ru.ts | 16 ++++++++-------- src/ui/translations/qmmp_tr.ts | 16 ++++++++-------- src/ui/translations/qmmp_uk_UA.ts | 16 ++++++++-------- src/ui/translations/qmmp_zh_CN.ts | 16 ++++++++-------- src/ui/translations/qmmp_zh_TW.ts | 16 ++++++++-------- 18 files changed, 138 insertions(+), 132 deletions(-) (limited to 'src/ui') diff --git a/src/ui/mainwindow.cpp b/src/ui/mainwindow.cpp index 99cbc0ae2..27ac8217e 100644 --- a/src/ui/mainwindow.cpp +++ b/src/ui/mainwindow.cpp @@ -573,10 +573,10 @@ void MainWindow::playPause() play(); } -bool MainWindow::processCommandArgs(const QStringList &slist, const QString& cwd) +QString MainWindow::processCommandArgs(const QStringList &slist, const QString& cwd) { if(slist.isEmpty()) - return true; + return QString(); QStringList paths; foreach(QString arg, slist) { @@ -596,11 +596,11 @@ bool MainWindow::processCommandArgs(const QStringList &slist, const QString& cwd full_path_list << cwd + "/" + s; } setFileList(full_path_list); - return true; + return QString(); } QHash commands = m_option_manager->splitArgs(slist); if(commands.isEmpty()) - return false; + return QString(); foreach(QString key, commands.keys()) { if(key == "--enqueue" || key == "-e") @@ -619,13 +619,13 @@ bool MainWindow::processCommandArgs(const QStringList &slist, const QString& cwd m_pl_manager->currentPlayList()->addFileList(full_path_list); } else if (CommandLineManager::hasOption(key)) - m_generalHandler->executeCommand(key, commands.value(key)); + return CommandLineManager::executeCommand(key, commands.value(key)); else if (m_option_manager->identify(key)) m_option_manager->executeCommand(key, commands.value(key), this); else - return false; + return QString(); } - return true; + return QString(); } void MainWindow::jumpToFile() diff --git a/src/ui/mainwindow.h b/src/ui/mainwindow.h index 0fdabdd7b..1b8d1784b 100644 --- a/src/ui/mainwindow.h +++ b/src/ui/mainwindow.h @@ -60,7 +60,7 @@ public: void setVolume(int volume, int balance); SoundCore* soundCore()const; MainDisplay* mainDisplay()const; - bool processCommandArgs(const QStringList &list,const QString& cwd); + QString processCommandArgs(const QStringList &list,const QString& cwd); public slots: void seek(qint64); diff --git a/src/ui/qmmpstarter.cpp b/src/ui/qmmpstarter.cpp index bccd6e250..05422d4e7 100644 --- a/src/ui/qmmpstarter.cpp +++ b/src/ui/qmmpstarter.cpp @@ -136,6 +136,9 @@ void QMMPStarter::writeCommand() barray.remove(0, size); } m_socket->flush(); + //reading answer + if(m_socket->waitForReadyRead(1500)) + cout << m_socket->readAll().data(); } else { @@ -148,17 +151,20 @@ void QMMPStarter::writeCommand() void QMMPStarter::readCommand() { QLocalSocket *socket = m_server->nextPendingConnection(); - socket->waitForDisconnected(); + socket->waitForReadyRead(); QByteArray inputArray = socket->readAll(); - socket->deleteLater(); if(inputArray.isEmpty()) return; QStringList slist = QString::fromUtf8(inputArray.data()).split("\n",QString::SkipEmptyParts); QString cwd = slist.takeAt(0); - if (mw) + QString out = mw ? mw->processCommandArgs(slist, cwd) : QString(); + if(!out.isEmpty()) { - mw->processCommandArgs(slist,cwd); + //writing answer + socket->write(out.toLocal8Bit()); + socket->flush(); } + socket->deleteLater(); } void QMMPStarter::printUsage() diff --git a/src/ui/translations/qmmp_cs.ts b/src/ui/translations/qmmp_cs.ts index cab2d97ca..a24c8de31 100644 --- a/src/ui/translations/qmmp_cs.ts +++ b/src/ui/translations/qmmp_cs.ts @@ -1567,27 +1567,27 @@ QMMPStarter - + Usage: qmmp [options] [files] Použití: qmmp [volby] [soubory] - + Options: Volby: - + Print version number and exit Vypsat číslo verze a skončit - + Ideas, patches, bugreports send to forkotov02@hotmail.ru Nápady, patche, hlášení chyb posílejte na forkotov02@hotmail.ru (anglicky) - + Display this text and exit Zobrazit tento text a skončit @@ -1597,17 +1597,17 @@ Neznámý příkaz - + QMMP version: Verze QMMP: - + Don't clear the playlist Nevyprazdňovat seznam skladeb - + Qt version: Verze Qt: diff --git a/src/ui/translations/qmmp_de.ts b/src/ui/translations/qmmp_de.ts index 779150097..3a8ddbaf3 100644 --- a/src/ui/translations/qmmp_de.ts +++ b/src/ui/translations/qmmp_de.ts @@ -1567,27 +1567,27 @@ QMMPStarter - + Usage: qmmp [options] [files] Aufruf: qmmp [Optionen] [Dateien] - + Options: Optionen: - + Print version number and exit Gibt die Versionsnummer aus - + Ideas, patches, bugreports send to forkotov02@hotmail.ru Ideen, Patches und Bugreports an <forkotov02@hotmail.ru> senden - + Display this text and exit Zeigt diesen Hilfetext an @@ -1597,17 +1597,17 @@ Unbekannter Befehl - + QMMP version: Qmmp-Version: - + Don't clear the playlist Titel an Wiedergabeliste anhängen - + Qt version: Qt-Version: diff --git a/src/ui/translations/qmmp_es.ts b/src/ui/translations/qmmp_es.ts index 18c0c1a39..b85221f9e 100644 --- a/src/ui/translations/qmmp_es.ts +++ b/src/ui/translations/qmmp_es.ts @@ -1567,37 +1567,37 @@ QMMPStarter - + Usage: qmmp [options] [files] Uso: qmmp [opciones] [archivos] - + Options: Opciones: - + Don't clear the playlist No limpiar la lista de reproducción - + Print version number and exit Mostrar el número de versión y salir - + Ideas, patches, bugreports send to forkotov02@hotmail.ru Enviar ideas, parches, errores a: forkotov02@hotmail.ru - + Qt version: Versión de Qt: - + Display this text and exit Muestra este texto y sale @@ -1607,7 +1607,7 @@ Comando desconocido - + QMMP version: Versión de QMMP: diff --git a/src/ui/translations/qmmp_hu.ts b/src/ui/translations/qmmp_hu.ts index 610b97663..b8d1b48a2 100644 --- a/src/ui/translations/qmmp_hu.ts +++ b/src/ui/translations/qmmp_hu.ts @@ -1572,42 +1572,42 @@ Ismeretlen parancs - + Usage: qmmp [options] [files] Használat: qmmp [opciók] [fájlok] - + Options: Opciók: - + Don't clear the playlist Ne töröld a lejátszási listát - + Display this text and exit Mutasd ezt a szöveget, majd lépj ki - + Print version number and exit Mutasd a verziószámot, majd lépj ki - + Ideas, patches, bugreports send to forkotov02@hotmail.ru Ötleteket, foltokat, hibajelentéseket küld a forkotov02@hotmail.ru címre - + QMMP version: QMMP verzió: - + Qt version: Qt verzió: diff --git a/src/ui/translations/qmmp_it.ts b/src/ui/translations/qmmp_it.ts index 1ab789db0..6ee34b2ea 100644 --- a/src/ui/translations/qmmp_it.ts +++ b/src/ui/translations/qmmp_it.ts @@ -1567,37 +1567,37 @@ QMMPStarter - + Usage: qmmp [options] [files] Uso: qmmp [options] [fichiers] - + Options: Opzioni: - + Don't clear the playlist Non ripulire la lista esecuzione - + Print version number and exit Stampa il numero di versione ed esci - + Ideas, patches, bugreports send to forkotov02@hotmail.ru Per idee, modifiche, segnalazione di errori scrivire a: forkotov02@hotmail.ru - + Qt version: Versione Qt: - + Display this text and exit Mostra questo testo ed esci @@ -1607,7 +1607,7 @@ Comando sconosciuto - + QMMP version: Versione di Qmmp: diff --git a/src/ui/translations/qmmp_ja.ts b/src/ui/translations/qmmp_ja.ts index a1db9a711..c47acee78 100644 --- a/src/ui/translations/qmmp_ja.ts +++ b/src/ui/translations/qmmp_ja.ts @@ -1572,42 +1572,42 @@ 不明なコマンドです - + Usage: qmmp [options] [files] 使用法: qmmp [オプション] [ファイル名:複数可] - + Options: オプション: - + Don't clear the playlist プレイリストをクリアしない - + Display this text and exit このメッセージを表示して終了 - + Print version number and exit バージョン番号を表示して終了 - + Ideas, patches, bugreports send to forkotov02@hotmail.ru 名案, パッチ, バグ報告は forkotov02@hotmail.ru まで - + QMMP version: QMMP 版番号: - + Qt version: Qt 版番号: diff --git a/src/ui/translations/qmmp_lt.ts b/src/ui/translations/qmmp_lt.ts index 1d3b96755..8e33814af 100644 --- a/src/ui/translations/qmmp_lt.ts +++ b/src/ui/translations/qmmp_lt.ts @@ -1568,22 +1568,22 @@ QMMPStarter - + Usage: qmmp [options] [files] Naudojimas: qmmp [nuostatos] [bylos] - + Options: Nustatymai: - + Print version number and exit Parodyti versiją ir išeiti - + Display this text and exit Parodyti šį tekstą ir išeiti @@ -1593,22 +1593,22 @@ Nežinoma komanda - + Ideas, patches, bugreports send to forkotov02@hotmail.ru Idėjas, pataisymus, klaidas siųsti forkotov02@hotmail.ru - + QMMP version: QMMP versija: - + Don't clear the playlist Neišvalyti sąrašo - + Qt version: Qt versija: diff --git a/src/ui/translations/qmmp_nl.ts b/src/ui/translations/qmmp_nl.ts index 6eb40190f..306eb65ed 100644 --- a/src/ui/translations/qmmp_nl.ts +++ b/src/ui/translations/qmmp_nl.ts @@ -1567,27 +1567,27 @@ QMMPStarter - + Usage: qmmp [options] [files] Gebruik: qmmp [opties] [bestanden] - + Options: Opties: - + Print version number and exit Print versienummer en sluit - + Ideas, patches, bugreports send to forkotov02@hotmail.ru Ideëen, patches, foutrapporten zenden naar forkotov02@hotmail.ru (anglicky) - + Display this text and exit Toon dit tekstje en sluit @@ -1597,17 +1597,17 @@ Onbekend commando - + QMMP version: QMMP versie: - + Don't clear the playlist Niet de afspellijst leeghalen - + Qt version: Qt versie: diff --git a/src/ui/translations/qmmp_pl_PL.ts b/src/ui/translations/qmmp_pl_PL.ts index 97f3c9444..3137fa701 100644 --- a/src/ui/translations/qmmp_pl_PL.ts +++ b/src/ui/translations/qmmp_pl_PL.ts @@ -1567,27 +1567,27 @@ QMMPStarter - + Usage: qmmp [options] [files] Użycie: qmmp [opcje] [pliki] - + Options: Opcje: - + Print version number and exit Wyświetla wersję programu i wychodzi - + Ideas, patches, bugreports send to forkotov02@hotmail.ru Pomysły, poprawki, raporty o błędach proszę wysyłać na forkotov02@hotmail.ru - + Display this text and exit Wyświetla ten tekst i wychodzi @@ -1597,17 +1597,17 @@ Nieznane polecenie - + QMMP version: Wersja QMMP: - + Don't clear the playlist Nie czyść listy - + Qt version: Wersja QT: diff --git a/src/ui/translations/qmmp_pt_BR.ts b/src/ui/translations/qmmp_pt_BR.ts index ddbd31e82..4b71c7fb0 100644 --- a/src/ui/translations/qmmp_pt_BR.ts +++ b/src/ui/translations/qmmp_pt_BR.ts @@ -1567,27 +1567,27 @@ QMMPStarter - + Usage: qmmp [options] [files] - + Options: - + Print version number and exit - + Ideas, patches, bugreports send to forkotov02@hotmail.ru - + Display this text and exit @@ -1597,17 +1597,17 @@ - + QMMP version: - + Don't clear the playlist - + Qt version: diff --git a/src/ui/translations/qmmp_ru.ts b/src/ui/translations/qmmp_ru.ts index 406616e98..db542b5d5 100644 --- a/src/ui/translations/qmmp_ru.ts +++ b/src/ui/translations/qmmp_ru.ts @@ -1567,27 +1567,27 @@ QMMPStarter - + Usage: qmmp [options] [files] Использование: qmmp [options] [files] - + Options: Опции: - + Print version number and exit Показать версии и выйти - + Ideas, patches, bugreports send to forkotov02@hotmail.ru Идеи, исправления, отчёты об ошибках: forkotov02@hotmail.ru - + Display this text and exit Показать этот текст и выйти @@ -1597,17 +1597,17 @@ Неизвестная команда - + QMMP version: Версия QMMP: - + Don't clear the playlist Не очищать лист - + Qt version: Версия Qt: diff --git a/src/ui/translations/qmmp_tr.ts b/src/ui/translations/qmmp_tr.ts index c1675a6d6..18c8a00e9 100644 --- a/src/ui/translations/qmmp_tr.ts +++ b/src/ui/translations/qmmp_tr.ts @@ -1567,27 +1567,27 @@ QMMPStarter - + Usage: qmmp [options] [files] Kullanım:qmmp [seçenek] [dosyalar] - + Options: Seçenekler: - + Print version number and exit Sürüm numarasını yazdır ve çık - + Ideas, patches, bugreports send to forkotov02@hotmail.ru Fikirleinizi, yamalarınızı, hata raporlarınızı forkotov02@hotmail.ru adresine gönderin - + Display this text and exit Bu metni göster ve çık @@ -1597,17 +1597,17 @@ - + QMMP version: QMMP sürümü: - + Don't clear the playlist Çalma listesini temizleme - + Qt version: Qt sürümü: diff --git a/src/ui/translations/qmmp_uk_UA.ts b/src/ui/translations/qmmp_uk_UA.ts index 4f8ed4a5b..cdc675a90 100644 --- a/src/ui/translations/qmmp_uk_UA.ts +++ b/src/ui/translations/qmmp_uk_UA.ts @@ -1567,27 +1567,27 @@ QMMPStarter - + Usage: qmmp [options] [files] Використання: qmmp [options] [files] - + Options: Опції: - + Print version number and exit Показати версію та вийти - + Ideas, patches, bugreports send to forkotov02@hotmail.ru Ідеї, виправлення, звіти про помилки: forkotov02@hotmail.ru - + Display this text and exit Показати цей текст та вийти @@ -1597,17 +1597,17 @@ Невідома команда - + QMMP version: Версія QMMP: - + Don't clear the playlist Не очищати список - + Qt version: Версія Qt: diff --git a/src/ui/translations/qmmp_zh_CN.ts b/src/ui/translations/qmmp_zh_CN.ts index 687ae441f..7c909a4b7 100644 --- a/src/ui/translations/qmmp_zh_CN.ts +++ b/src/ui/translations/qmmp_zh_CN.ts @@ -1567,27 +1567,27 @@ QMMPStarter - + Usage: qmmp [options] [files] 使用：qmmp [设置] [文件] - + Options: 设置： - + Print version number and exit 显示版本并退出 - + Ideas, patches, bugreports send to forkotov02@hotmail.ru 建议、补丁或提交 bug 请发送到 forkotov02@hotmail.ru - + Display this text and exit 显示这些文本并退出 @@ -1597,17 +1597,17 @@ - + QMMP version: Qmmp 版本： - + Don't clear the playlist 不要清除这个播放列表 - + Qt version: Qt 版本： diff --git a/src/ui/translations/qmmp_zh_TW.ts b/src/ui/translations/qmmp_zh_TW.ts index ad77ae070..e30dbf90a 100644 --- a/src/ui/translations/qmmp_zh_TW.ts +++ b/src/ui/translations/qmmp_zh_TW.ts @@ -1567,27 +1567,27 @@ QMMPStarter - + Usage: qmmp [options] [files] 使用：qmmp [設定] [檔案] - + Options: 設定： - + Print version number and exit 察看版本並結束 - + Ideas, patches, bugreports send to forkotov02@hotmail.ru 建議、補丁或提交 bug 請傳送到 forkotov02@hotmail.ru - + Display this text and exit 察看這些字檔並結束 @@ -1597,17 +1597,17 @@ - + QMMP version: Qmmp 版本： - + Don't clear the playlist 不要清除這個播放清單 - + Qt version: Qt 版本： -- cgit v1.2.3-13-gbd6f