From d693d842a6b2293f13bcbf4f093d581a180cdc5a Mon Sep 17 00:00:00 2001 From: trialuser02 Date: Thu, 19 Feb 2009 10:20:48 +0000 Subject: improved lyrics plugin git-svn-id: http://svn.code.sf.net/p/qmmp-dev/code/trunk/qmmp@797 90c681e8-e032-0410-971d-27865f9a5e38 --- src/plugins/General/lyrics/lyricswindow.cpp | 12 ++- src/plugins/General/lyrics/lyricswindow.h | 1 + src/plugins/General/lyrics/lyricswindow.ui | 91 ++++++++++++++-------- .../lyrics/translations/lyrics_plugin_cs.ts | 39 +++++++--- .../lyrics/translations/lyrics_plugin_de.ts | 39 +++++++--- .../lyrics/translations/lyrics_plugin_ru.ts | 39 +++++++--- .../lyrics/translations/lyrics_plugin_uk_UA.ts | 39 +++++++--- .../lyrics/translations/lyrics_plugin_zh_CN.ts | 39 +++++++--- .../lyrics/translations/lyrics_plugin_zh_TW.ts | 39 +++++++--- 9 files changed, 239 insertions(+), 99 deletions(-) (limited to 'src/plugins/General') diff --git a/src/plugins/General/lyrics/lyricswindow.cpp b/src/plugins/General/lyrics/lyricswindow.cpp index dc781bcc4..d5c733b71 100644 --- a/src/plugins/General/lyrics/lyricswindow.cpp +++ b/src/plugins/General/lyrics/lyricswindow.cpp @@ -30,7 +30,8 @@ LyricsWindow::LyricsWindow(const QString &artist, const QString &title, QWidget ui.setupUi(this); setWindowFlags(Qt::Dialog); setAttribute(Qt::WA_DeleteOnClose); - setWindowTitle(QString(tr("Lyrics: %1 - %2")).arg(artist).arg(title)); + ui.artistLineEdit->setText(artist); + ui.titleLineEdit->setText(title); m_http = new QHttp(this); //load global proxy settings if (Qmmp::useProxy()) @@ -41,7 +42,7 @@ LyricsWindow::LyricsWindow(const QString &artist, const QString &title, QWidget connect(m_http, SIGNAL(done(bool)), SLOT(showText(bool))); connect(m_http, SIGNAL(stateChanged(int)), SLOT(showState (int))); m_http->setHost("lyricwiki.org"); - m_http->get("/api.php?func=getSong&artist=" + QUrl::toPercentEncoding(artist) +"&song=" + QUrl::toPercentEncoding(title) +"&fmt=html"); + on_searchPushButton_clicked(); } @@ -83,3 +84,10 @@ void LyricsWindow::showState(int state) ui.stateLabel->setText(tr("Closing connection...")); } } + +void LyricsWindow::on_searchPushButton_clicked() +{ + setWindowTitle(QString(tr("Lyrics: %1 - %2")).arg(ui.artistLineEdit->text()).arg(ui.titleLineEdit->text())); + m_http->get("/api.php?func=getSong&artist=" + QUrl::toPercentEncoding(ui.artistLineEdit->text()) + +"&song=" + QUrl::toPercentEncoding(ui.titleLineEdit->text()) +"&fmt=html"); +} diff --git a/src/plugins/General/lyrics/lyricswindow.h b/src/plugins/General/lyrics/lyricswindow.h index 9d0f97a0b..51e8218b3 100644 --- a/src/plugins/General/lyrics/lyricswindow.h +++ b/src/plugins/General/lyrics/lyricswindow.h @@ -40,6 +40,7 @@ public: private slots: void showText(bool error); void showState(int state); + void on_searchPushButton_clicked(); private: Ui::LyricsWindow ui; diff --git a/src/plugins/General/lyrics/lyricswindow.ui b/src/plugins/General/lyrics/lyricswindow.ui index 25c916f30..a63f99424 100644 --- a/src/plugins/General/lyrics/lyricswindow.ui +++ b/src/plugins/General/lyrics/lyricswindow.ui @@ -1,50 +1,79 @@ - + + LyricsWindow - - + + 0 0 - 464 - 400 + 513 + 420 - + Lyrics Plugin - - - 4 + + + 6 - - 9 + + 6 - - 4 + + 6 - - 4 - - - - + + + + + + Artist: + + + + + + + + + + Title: + + + + + + + + + + Search + + + + + + + + true - - - + + + No connection - - - + + + Qt::Horizontal - + 383 20 @@ -52,9 +81,9 @@ - - - + + + Close @@ -69,11 +98,11 @@ LyricsWindow close() - + 440 333 - + 174 343 diff --git a/src/plugins/General/lyrics/translations/lyrics_plugin_cs.ts b/src/plugins/General/lyrics/translations/lyrics_plugin_cs.ts index 8ee2c207f..91c5cdd1e 100644 --- a/src/plugins/General/lyrics/translations/lyrics_plugin_cs.ts +++ b/src/plugins/General/lyrics/translations/lyrics_plugin_cs.ts @@ -1,5 +1,6 @@ - + + Lyrics @@ -39,52 +40,68 @@ LyricsWindow - + Lyrics: %1 - %2 - + + No connection - + Looking up host... - + Connecting... - + Sending request... - + Receiving - + Connected - + Closing connection... - + Lyrics Plugin - + + Artist: + + + + + Title: + + + + + Search + + + + Close diff --git a/src/plugins/General/lyrics/translations/lyrics_plugin_de.ts b/src/plugins/General/lyrics/translations/lyrics_plugin_de.ts index 280bf90ee..6f04c9cf0 100644 --- a/src/plugins/General/lyrics/translations/lyrics_plugin_de.ts +++ b/src/plugins/General/lyrics/translations/lyrics_plugin_de.ts @@ -1,5 +1,6 @@ - + + Lyrics @@ -40,52 +41,68 @@ LyricsWindow - + Lyrics: %1 - %2 Liedtext: %1 - %2 - + + No connection Keine Verbindung - + Looking up host... - + Connecting... Verbinde... - + Sending request... Sende Anfrage... - + Receiving Empfange - + Connected Verbunden - + Closing connection... Beende Verbindung... - + Lyrics Plugin Liedtext-Plugin - + + Artist: + + + + + Title: + + + + + Search + + + + Close Schließen diff --git a/src/plugins/General/lyrics/translations/lyrics_plugin_ru.ts b/src/plugins/General/lyrics/translations/lyrics_plugin_ru.ts index 1a09bccf9..528d6adec 100644 --- a/src/plugins/General/lyrics/translations/lyrics_plugin_ru.ts +++ b/src/plugins/General/lyrics/translations/lyrics_plugin_ru.ts @@ -1,5 +1,6 @@ - + + Lyrics @@ -39,52 +40,68 @@ LyricsWindow - + Lyrics: %1 - %2 Текст песни: %1 - %2 - + + No connection Нет соединения - + Looking up host... Поиск сервера... - + Connecting... Соединение... - + Sending request... Отправка запроса... - + Receiving Получение - + Connected Соединено - + Closing connection... Завершение соединения... - + Lyrics Plugin Модуль показа текстов - + + Artist: + Исполнитель: + + + + Title: + Название: + + + + Search + Поиск + + + Close Закрыть diff --git a/src/plugins/General/lyrics/translations/lyrics_plugin_uk_UA.ts b/src/plugins/General/lyrics/translations/lyrics_plugin_uk_UA.ts index e8f590ad9..7b958cda8 100644 --- a/src/plugins/General/lyrics/translations/lyrics_plugin_uk_UA.ts +++ b/src/plugins/General/lyrics/translations/lyrics_plugin_uk_UA.ts @@ -1,5 +1,6 @@ - + + Lyrics @@ -39,52 +40,68 @@ LyricsWindow - + Lyrics: %1 - %2 Тексти: %1 - %2 - + + No connection Немає з'єднання - + Looking up host... Пошук хоста... - + Connecting... З'єднання... - + Sending request... Відсилання запиту... - + Receiving Отримання - + Connected З'єднано - + Closing connection... Закриття з'єднання... - + Lyrics Plugin Модуль текстів - + + Artist: + + + + + Title: + + + + + Search + + + + Close Закрити diff --git a/src/plugins/General/lyrics/translations/lyrics_plugin_zh_CN.ts b/src/plugins/General/lyrics/translations/lyrics_plugin_zh_CN.ts index 8ee2c207f..91c5cdd1e 100644 --- a/src/plugins/General/lyrics/translations/lyrics_plugin_zh_CN.ts +++ b/src/plugins/General/lyrics/translations/lyrics_plugin_zh_CN.ts @@ -1,5 +1,6 @@ - + + Lyrics @@ -39,52 +40,68 @@ LyricsWindow - + Lyrics: %1 - %2 - + + No connection - + Looking up host... - + Connecting... - + Sending request... - + Receiving - + Connected - + Closing connection... - + Lyrics Plugin - + + Artist: + + + + + Title: + + + + + Search + + + + Close diff --git a/src/plugins/General/lyrics/translations/lyrics_plugin_zh_TW.ts b/src/plugins/General/lyrics/translations/lyrics_plugin_zh_TW.ts index 8ee2c207f..91c5cdd1e 100644 --- a/src/plugins/General/lyrics/translations/lyrics_plugin_zh_TW.ts +++ b/src/plugins/General/lyrics/translations/lyrics_plugin_zh_TW.ts @@ -1,5 +1,6 @@ - + + Lyrics @@ -39,52 +40,68 @@ LyricsWindow - + Lyrics: %1 - %2 - + + No connection - + Looking up host... - + Connecting... - + Sending request... - + Receiving - + Connected - + Closing connection... - + Lyrics Plugin - + + Artist: + + + + + Title: + + + + + Search + + + + Close -- cgit v1.2.3-13-gbd6f