From 0e39c8c1da7e497398d4cef3f58f1ff435ac7fe5 Mon Sep 17 00:00:00 2001 From: trialuser02 Date: Wed, 24 Feb 2010 10:33:48 +0000 Subject: lyrics plugin: removed deprecated code git-svn-id: http://svn.code.sf.net/p/qmmp-dev/code/trunk/qmmp@1576 90c681e8-e032-0410-971d-27865f9a5e38 --- src/plugins/General/lyrics/lyricswindow.cpp | 75 +++++++++------------- src/plugins/General/lyrics/lyricswindow.h | 10 +-- .../lyrics/translations/lyrics_plugin_cs.ts | 42 ++++-------- .../lyrics/translations/lyrics_plugin_de.ts | 42 ++++-------- .../lyrics/translations/lyrics_plugin_it.ts | 42 ++++-------- .../lyrics/translations/lyrics_plugin_lt.ts | 42 ++++-------- .../lyrics/translations/lyrics_plugin_pl.ts | 42 ++++-------- .../lyrics/translations/lyrics_plugin_ru.ts | 42 ++++-------- .../lyrics/translations/lyrics_plugin_tr.ts | 42 ++++-------- .../lyrics/translations/lyrics_plugin_uk_UA.ts | 42 ++++-------- .../lyrics/translations/lyrics_plugin_zh_CN.ts | 42 ++++-------- .../lyrics/translations/lyrics_plugin_zh_TW.ts | 42 ++++-------- 12 files changed, 165 insertions(+), 340 deletions(-) diff --git a/src/plugins/General/lyrics/lyricswindow.cpp b/src/plugins/General/lyrics/lyricswindow.cpp index 22b81b1b9..8ee9ada9b 100644 --- a/src/plugins/General/lyrics/lyricswindow.cpp +++ b/src/plugins/General/lyrics/lyricswindow.cpp @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (C) 2009 by Ilya Kotov * + * Copyright (C) 2009-2010 by Ilya Kotov * * forkotov02@hotmail.ru * * * * This program is free software; you can redistribute it and/or modify * @@ -18,12 +18,13 @@ * 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. * ***************************************************************************/ -#include +#include +#include +#include #include #include #include #include - #include "lyricswindow.h" LyricsWindow::LyricsWindow(const QString &artist, const QString &title, QWidget *parent) @@ -35,16 +36,20 @@ LyricsWindow::LyricsWindow(const QString &artist, const QString &title, QWidget setAttribute(Qt::WA_QuitOnClose, FALSE); ui.artistLineEdit->setText(artist); ui.titleLineEdit->setText(title); - m_http = new QHttp(this); + m_http = new QNetworkAccessManager(this); //load global proxy settings QmmpSettings *gs = QmmpSettings::instance(); if (gs->isProxyEnabled()) - m_http->setProxy(gs->proxy().host(), - gs->proxy().port(), - gs->useProxyAuth() ? gs->proxy().userName() : QString(), - gs->useProxyAuth() ? gs->proxy().password() : QString()); - connect(m_http, SIGNAL(done(bool)), SLOT(showText(bool))); - connect(m_http, SIGNAL(stateChanged(int)), SLOT(showState (int))); + { + QNetworkProxy proxy(QNetworkProxy::HttpProxy, gs->proxy().host(), gs->proxy().port()); + if(gs->useProxyAuth()) + { + proxy.setUser(gs->proxy().userName()); + proxy.setPassword(gs->proxy().password()); + } + m_http->setProxy(proxy); + } + connect(m_http, SIGNAL(finished (QNetworkReply *)), SLOT(showText(QNetworkReply *))); on_searchPushButton_clicked(); } @@ -53,14 +58,16 @@ LyricsWindow::~LyricsWindow() { } -void LyricsWindow::showText(bool error) +void LyricsWindow::showText(QNetworkReply *reply) { - if (error) + ui.stateLabel->setText(tr("Done")); + if (reply->error() != QNetworkReply::NoError) { - ui.textEdit->setText(m_http->errorString()); + ui.stateLabel->setText(tr("Error")); + ui.textEdit->setText(reply->errorString()); return; } - QString content = QString::fromUtf8(m_http->readAll().constData()); + QString content = QString::fromUtf8(reply->readAll().constData()); QRegExp artist_regexp("
([^<]*)
"); QRegExp title_regexp("
([^<]*)
"); @@ -82,37 +89,15 @@ void LyricsWindow::showText(bool error) } } -void LyricsWindow::showState(int state) -{ - switch ((int) state) - { - case QHttp::Unconnected: - ui.stateLabel->setText(tr("No connection")); - break; - case QHttp::HostLookup: - ui.stateLabel->setText(tr("Looking up host...")); - break; - case QHttp::Connecting: - ui.stateLabel->setText(tr("Connecting...")); - break; - case QHttp::Sending: - ui.stateLabel->setText(tr("Sending request...")); - break; - case QHttp::Reading: - ui.stateLabel->setText(tr("Receiving")); - break; - case QHttp::Connected: - ui.stateLabel->setText(tr("Connected")); - break; - case QHttp::Closing: - ui.stateLabel->setText(tr("Closing connection...")); - } -} - void LyricsWindow::on_searchPushButton_clicked() { - m_http->setHost("www.lyricsplugin.com"); - setWindowTitle(QString(tr("Lyrics: %1 - %2")).arg(ui.artistLineEdit->text()).arg(ui.titleLineEdit->text())); - m_http->get("/winamp03/plugin/?artist=" + QUrl::toPercentEncoding(ui.artistLineEdit->text()) - +"&title=" + QUrl::toPercentEncoding(ui.titleLineEdit->text())); + ui.stateLabel->setText(tr("Receiving")); + setWindowTitle(QString(tr("Lyrics: %1 - %2")).arg(ui.artistLineEdit->text()) + .arg(ui.titleLineEdit->text())); + QNetworkRequest request; + request.setUrl(QUrl("http://www.lyricsplugin.com/winamp03/plugin/?artist=" + + QUrl::toPercentEncoding(ui.artistLineEdit->text())+"&title=" + + QUrl::toPercentEncoding(ui.titleLineEdit->text()))); + request.setRawHeader("User-Agent", QString("qmmp/%1").arg(Qmmp::strVersion()).toAscii()); + m_http->get(request); } diff --git a/src/plugins/General/lyrics/lyricswindow.h b/src/plugins/General/lyrics/lyricswindow.h index 51e8218b3..5363963a2 100644 --- a/src/plugins/General/lyrics/lyricswindow.h +++ b/src/plugins/General/lyrics/lyricswindow.h @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (C) 2009 by Ilya Kotov * + * Copyright (C) 2009-2010 by Ilya Kotov * * forkotov02@hotmail.ru * * * * This program is free software; you can redistribute it and/or modify * @@ -24,7 +24,8 @@ #include "ui_lyricswindow.h" -class QHttp; +class QNetworkAccessManager; +class QNetworkReply; /** @author Ilya Kotov @@ -38,13 +39,12 @@ public: ~LyricsWindow(); private slots: - void showText(bool error); - void showState(int state); + void showText(QNetworkReply *reply); void on_searchPushButton_clicked(); private: Ui::LyricsWindow ui; - QHttp *m_http; + QNetworkAccessManager *m_http; }; diff --git a/src/plugins/General/lyrics/translations/lyrics_plugin_cs.ts b/src/plugins/General/lyrics/translations/lyrics_plugin_cs.ts index 1a8ffc6b7..1ecde8a37 100644 --- a/src/plugins/General/lyrics/translations/lyrics_plugin_cs.ts +++ b/src/plugins/General/lyrics/translations/lyrics_plugin_cs.ts @@ -45,51 +45,35 @@ LyricsWindow - + + Done + + + + + Error + + + + Lyrics: %1 - %2 Text: %1 - %2 - No connection Nespojeno - + Not found Nenalezeno - - Looking up host... - Vyhledávám hostitele... - - - - Connecting... - Připojuji se... - - - - Sending request... - Zasílám požadavek... - - - + Receiving Příjímám - - - Connected - Připojeno - - - - Closing connection... - Zavírám spojení... - Lyrics Plugin diff --git a/src/plugins/General/lyrics/translations/lyrics_plugin_de.ts b/src/plugins/General/lyrics/translations/lyrics_plugin_de.ts index 9c2ff86d6..d264a86fc 100644 --- a/src/plugins/General/lyrics/translations/lyrics_plugin_de.ts +++ b/src/plugins/General/lyrics/translations/lyrics_plugin_de.ts @@ -45,51 +45,35 @@ LyricsWindow - + + Done + + + + + Error + + + + Lyrics: %1 - %2 Liedtext: %1 - %2 - No connection Keine Verbindung - + Not found Es kann kein Liedtext für dieses Stück gefunden werden. - - Looking up host... - - - - - Connecting... - Verbindung wird hergestellt … - - - - Sending request... - Anfrage wird gesendet … - - - + Receiving Daten werden empfangen - - - Connected - Verbunden - - - - Closing connection... - Verbindung wird beendet … - Lyrics Plugin diff --git a/src/plugins/General/lyrics/translations/lyrics_plugin_it.ts b/src/plugins/General/lyrics/translations/lyrics_plugin_it.ts index 5f6064364..d624c1b3d 100644 --- a/src/plugins/General/lyrics/translations/lyrics_plugin_it.ts +++ b/src/plugins/General/lyrics/translations/lyrics_plugin_it.ts @@ -45,51 +45,35 @@ LyricsWindow - + + Done + + + + + Error + + + + Lyrics: %1 - %2 Testo: %1 - %2 - No connection Nessuna connessione - + Not found Non trovato - - Looking up host... - Ricerca host - - - - Connecting... - Connessione... - - - - Sending request... - Invio richiesta... - - - + Receiving Ricezione - - - Connected - Connesso - - - - Closing connection... - Chiusura connessione... - Lyrics Plugin diff --git a/src/plugins/General/lyrics/translations/lyrics_plugin_lt.ts b/src/plugins/General/lyrics/translations/lyrics_plugin_lt.ts index d6b6d1968..f5597d7f2 100644 --- a/src/plugins/General/lyrics/translations/lyrics_plugin_lt.ts +++ b/src/plugins/General/lyrics/translations/lyrics_plugin_lt.ts @@ -45,51 +45,35 @@ LyricsWindow - + + Done + + + + + Error + + + + Lyrics: %1 - %2 Dainos tekstas: %1 - %2 - No connection Nėra ryšio - + Not found Nerasta - - Looking up host... - Ieškau serverio... - - - - Connecting... - Susijungiu... - - - - Sending request... - Siunčiu užklausą... - - - + Receiving Gaunu - - - Connected - Susijungiau - - - - Closing connection... - Atsijungiu... - Lyrics Plugin diff --git a/src/plugins/General/lyrics/translations/lyrics_plugin_pl.ts b/src/plugins/General/lyrics/translations/lyrics_plugin_pl.ts index a51e01cf2..c02967faf 100644 --- a/src/plugins/General/lyrics/translations/lyrics_plugin_pl.ts +++ b/src/plugins/General/lyrics/translations/lyrics_plugin_pl.ts @@ -45,48 +45,32 @@ LyricsWindow - + + Done + + + + + Error + + + + Not found Nie znaleziono - No connection Nie połączony - - Looking up host... - Szukanie hosta... - - - - Connecting... - Łączenie... - - - - Sending request... - Wysyłanie żądania... - - - + Receiving Odbieranie - - Connected - Połączony - - - - Closing connection... - Zamykanie połączenia... - - - + Lyrics: %1 - %2 Teksty: %1 - %2 diff --git a/src/plugins/General/lyrics/translations/lyrics_plugin_ru.ts b/src/plugins/General/lyrics/translations/lyrics_plugin_ru.ts index 5e9dcb420..869f7c63c 100644 --- a/src/plugins/General/lyrics/translations/lyrics_plugin_ru.ts +++ b/src/plugins/General/lyrics/translations/lyrics_plugin_ru.ts @@ -45,51 +45,35 @@ LyricsWindow - + + Done + Готово + + + + Error + Ошибка + + + Lyrics: %1 - %2 Текст песни: %1 - %2 - No connection Нет соединения - + Not found Не найдено - - Looking up host... - Поиск сервера... - - - - Connecting... - Соединение... - - - - Sending request... - Отправка запроса... - - - + Receiving Получение - - - Connected - Соединено - - - - Closing connection... - Завершение соединения... - Lyrics Plugin diff --git a/src/plugins/General/lyrics/translations/lyrics_plugin_tr.ts b/src/plugins/General/lyrics/translations/lyrics_plugin_tr.ts index 857f22b3c..bbc1c5709 100644 --- a/src/plugins/General/lyrics/translations/lyrics_plugin_tr.ts +++ b/src/plugins/General/lyrics/translations/lyrics_plugin_tr.ts @@ -45,48 +45,32 @@ LyricsWindow - - Not found + + Done - - - No connection - Bağlantı yok - - - - Looking up host... - Sunucu aranıyor... + + Error + - - Connecting... - Bağlanıyor... + + Not found + - - Sending request... - İstek gönderiliyor... + + No connection + Bağlantı yok - + Receiving Alınıyor - - Connected - Bağlandı - - - - Closing connection... - Bağlantı kapatılıyor... - - - + Lyrics: %1 - %2 Şarkı Sözü: %1 - %2 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 f14f8e845..eaa686f65 100644 --- a/src/plugins/General/lyrics/translations/lyrics_plugin_uk_UA.ts +++ b/src/plugins/General/lyrics/translations/lyrics_plugin_uk_UA.ts @@ -45,51 +45,35 @@ LyricsWindow - + + Done + + + + + Error + + + + Lyrics: %1 - %2 Тексти: %1 - %2 - No connection Немає з'єднання - + Not found Не знайдено - - Looking up host... - Пошук хоста... - - - - Connecting... - З'єднання... - - - - Sending request... - Відсилання запиту... - - - + Receiving Отримання - - - Connected - З'єднано - - - - Closing connection... - Закриття з'єднання... - Lyrics Plugin 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 c1ed710b1..fb2d2371d 100644 --- a/src/plugins/General/lyrics/translations/lyrics_plugin_zh_CN.ts +++ b/src/plugins/General/lyrics/translations/lyrics_plugin_zh_CN.ts @@ -45,51 +45,35 @@ LyricsWindow - + + Done + + + + + Error + + + + Lyrics: %1 - %2 歌词：%1 - %2 - No connection 无连接 - + Not found - - Looking up host... - 查找主机... - - - - Connecting... - 连接... - - - - Sending request... - 发送请求... - - - + Receiving 接受 - - - Connected - 已连接 - - - - Closing connection... - 关闭连接... - Lyrics Plugin 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 6fe69de73..cc85a0a3a 100644 --- a/src/plugins/General/lyrics/translations/lyrics_plugin_zh_TW.ts +++ b/src/plugins/General/lyrics/translations/lyrics_plugin_zh_TW.ts @@ -45,51 +45,35 @@ LyricsWindow - + + Done + + + + + Error + + + + Lyrics: %1 - %2 歌詞：%1 - %2 - No connection 無連接 - + Not found - - Looking up host... - 找尋主機... - - - - Connecting... - 連接... - - - - Sending request... - 發送請求... - - - + Receiving 接受 - - - Connected - 已連接 - - - - Closing connection... - 關閉連接... - Lyrics Plugin -- cgit v1.2.3-13-gbd6f