diff options
Diffstat (limited to 'src/plugins')
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 <QHttp> +#include <QNetworkAccessManager> +#include <QNetworkReply> +#include <QNetworkProxy> #include <QUrl> #include <QRegExp> #include <qmmp/qmmpsettings.h> #include <qmmp/qmmp.h> - #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("<div id=\\\"artist\\\">([^<]*)</div>"); QRegExp title_regexp("<div id=\\\"title\\\">([^<]*)</div>"); @@ -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 <forkotov02@hotmail.ru> @@ -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,52 +45,36 @@ <context> <name>LyricsWindow</name> <message> - <location filename="../lyricswindow.cpp" line="115"/> + <location filename="../lyricswindow.cpp" line="63"/> + <source>Done</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../lyricswindow.cpp" line="66"/> + <source>Error</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../lyricswindow.cpp" line="95"/> <source>Lyrics: %1 - %2</source> <translation>Text: %1 - %2</translation> </message> <message> <location filename="../lyricswindow.ui" line="67"/> - <location filename="../lyricswindow.cpp" line="90"/> <source>No connection</source> <translation>Nespojeno</translation> </message> <message> - <location filename="../lyricswindow.cpp" line="77"/> + <location filename="../lyricswindow.cpp" line="84"/> <source>Not found</source> <translation>Nenalezeno</translation> </message> <message> - <location filename="../lyricswindow.cpp" line="93"/> - <source>Looking up host...</source> - <translation>Vyhledávám hostitele...</translation> - </message> - <message> - <location filename="../lyricswindow.cpp" line="96"/> - <source>Connecting...</source> - <translation>Připojuji se...</translation> - </message> - <message> - <location filename="../lyricswindow.cpp" line="99"/> - <source>Sending request...</source> - <translation>Zasílám požadavek...</translation> - </message> - <message> - <location filename="../lyricswindow.cpp" line="102"/> + <location filename="../lyricswindow.cpp" line="94"/> <source>Receiving</source> <translation>Příjímám</translation> </message> <message> - <location filename="../lyricswindow.cpp" line="105"/> - <source>Connected</source> - <translation>Připojeno</translation> - </message> - <message> - <location filename="../lyricswindow.cpp" line="108"/> - <source>Closing connection...</source> - <translation>Zavírám spojení...</translation> - </message> - <message> <location filename="../lyricswindow.ui" line="14"/> <source>Lyrics Plugin</source> <translation>Modul pro texty písní</translation> 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,52 +45,36 @@ <context> <name>LyricsWindow</name> <message> - <location filename="../lyricswindow.cpp" line="115"/> + <location filename="../lyricswindow.cpp" line="63"/> + <source>Done</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../lyricswindow.cpp" line="66"/> + <source>Error</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../lyricswindow.cpp" line="95"/> <source>Lyrics: %1 - %2</source> <translation>Liedtext: %1 - %2</translation> </message> <message> <location filename="../lyricswindow.ui" line="67"/> - <location filename="../lyricswindow.cpp" line="90"/> <source>No connection</source> <translation>Keine Verbindung</translation> </message> <message> - <location filename="../lyricswindow.cpp" line="77"/> + <location filename="../lyricswindow.cpp" line="84"/> <source>Not found</source> <translation>Es kann kein Liedtext für dieses Stück gefunden werden.</translation> </message> <message> - <location filename="../lyricswindow.cpp" line="93"/> - <source>Looking up host...</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../lyricswindow.cpp" line="96"/> - <source>Connecting...</source> - <translation>Verbindung wird hergestellt …</translation> - </message> - <message> - <location filename="../lyricswindow.cpp" line="99"/> - <source>Sending request...</source> - <translation>Anfrage wird gesendet …</translation> - </message> - <message> - <location filename="../lyricswindow.cpp" line="102"/> + <location filename="../lyricswindow.cpp" line="94"/> <source>Receiving</source> <translation>Daten werden empfangen</translation> </message> <message> - <location filename="../lyricswindow.cpp" line="105"/> - <source>Connected</source> - <translation>Verbunden</translation> - </message> - <message> - <location filename="../lyricswindow.cpp" line="108"/> - <source>Closing connection...</source> - <translation>Verbindung wird beendet …</translation> - </message> - <message> <location filename="../lyricswindow.ui" line="14"/> <source>Lyrics Plugin</source> <translation>Liedtext-Modul</translation> 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,52 +45,36 @@ <context> <name>LyricsWindow</name> <message> - <location filename="../lyricswindow.cpp" line="115"/> + <location filename="../lyricswindow.cpp" line="63"/> + <source>Done</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../lyricswindow.cpp" line="66"/> + <source>Error</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../lyricswindow.cpp" line="95"/> <source>Lyrics: %1 - %2</source> <translation>Testo: %1 - %2</translation> </message> <message> <location filename="../lyricswindow.ui" line="67"/> - <location filename="../lyricswindow.cpp" line="90"/> <source>No connection</source> <translation>Nessuna connessione</translation> </message> <message> - <location filename="../lyricswindow.cpp" line="77"/> + <location filename="../lyricswindow.cpp" line="84"/> <source>Not found</source> <translation>Non trovato</translation> </message> <message> - <location filename="../lyricswindow.cpp" line="93"/> - <source>Looking up host...</source> - <translation>Ricerca host</translation> - </message> - <message> - <location filename="../lyricswindow.cpp" line="96"/> - <source>Connecting...</source> - <translation>Connessione...</translation> - </message> - <message> - <location filename="../lyricswindow.cpp" line="99"/> - <source>Sending request...</source> - <translation>Invio richiesta...</translation> - </message> - <message> - <location filename="../lyricswindow.cpp" line="102"/> + <location filename="../lyricswindow.cpp" line="94"/> <source>Receiving</source> <translation>Ricezione</translation> </message> <message> - <location filename="../lyricswindow.cpp" line="105"/> - <source>Connected</source> - <translation>Connesso</translation> - </message> - <message> - <location filename="../lyricswindow.cpp" line="108"/> - <source>Closing connection...</source> - <translation>Chiusura connessione...</translation> - </message> - <message> <location filename="../lyricswindow.ui" line="14"/> <source>Lyrics Plugin</source> <translation>Modulo Lirica</translation> 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,52 +45,36 @@ <context> <name>LyricsWindow</name> <message> - <location filename="../lyricswindow.cpp" line="115"/> + <location filename="../lyricswindow.cpp" line="63"/> + <source>Done</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../lyricswindow.cpp" line="66"/> + <source>Error</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../lyricswindow.cpp" line="95"/> <source>Lyrics: %1 - %2</source> <translation>Dainos tekstas: %1 - %2</translation> </message> <message> <location filename="../lyricswindow.ui" line="67"/> - <location filename="../lyricswindow.cpp" line="90"/> <source>No connection</source> <translation>Nėra ryšio</translation> </message> <message> - <location filename="../lyricswindow.cpp" line="77"/> + <location filename="../lyricswindow.cpp" line="84"/> <source>Not found</source> <translation>Nerasta</translation> </message> <message> - <location filename="../lyricswindow.cpp" line="93"/> - <source>Looking up host...</source> - <translation>Ieškau serverio...</translation> - </message> - <message> - <location filename="../lyricswindow.cpp" line="96"/> - <source>Connecting...</source> - <translation>Susijungiu...</translation> - </message> - <message> - <location filename="../lyricswindow.cpp" line="99"/> - <source>Sending request...</source> - <translation>Siunčiu užklausą...</translation> - </message> - <message> - <location filename="../lyricswindow.cpp" line="102"/> + <location filename="../lyricswindow.cpp" line="94"/> <source>Receiving</source> <translation>Gaunu</translation> </message> <message> - <location filename="../lyricswindow.cpp" line="105"/> - <source>Connected</source> - <translation>Susijungiau</translation> - </message> - <message> - <location filename="../lyricswindow.cpp" line="108"/> - <source>Closing connection...</source> - <translation>Atsijungiu...</translation> - </message> - <message> <location filename="../lyricswindow.ui" line="14"/> <source>Lyrics Plugin</source> <translation>Lyrics įskiepis</translation> 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 @@ <context> <name>LyricsWindow</name> <message> - <location filename="../lyricswindow.cpp" line="77"/> + <location filename="../lyricswindow.cpp" line="63"/> + <source>Done</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../lyricswindow.cpp" line="66"/> + <source>Error</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../lyricswindow.cpp" line="84"/> <source>Not found</source> <translation>Nie znaleziono</translation> </message> <message> <location filename="../lyricswindow.ui" line="67"/> - <location filename="../lyricswindow.cpp" line="90"/> <source>No connection</source> <translation>Nie połączony</translation> </message> <message> - <location filename="../lyricswindow.cpp" line="93"/> - <source>Looking up host...</source> - <translation>Szukanie hosta...</translation> - </message> - <message> - <location filename="../lyricswindow.cpp" line="96"/> - <source>Connecting...</source> - <translation>Łączenie...</translation> - </message> - <message> - <location filename="../lyricswindow.cpp" line="99"/> - <source>Sending request...</source> - <translation>Wysyłanie żądania...</translation> - </message> - <message> - <location filename="../lyricswindow.cpp" line="102"/> + <location filename="../lyricswindow.cpp" line="94"/> <source>Receiving</source> <translation>Odbieranie</translation> </message> <message> - <location filename="../lyricswindow.cpp" line="105"/> - <source>Connected</source> - <translation>Połączony</translation> - </message> - <message> - <location filename="../lyricswindow.cpp" line="108"/> - <source>Closing connection...</source> - <translation>Zamykanie połączenia...</translation> - </message> - <message> - <location filename="../lyricswindow.cpp" line="115"/> + <location filename="../lyricswindow.cpp" line="95"/> <source>Lyrics: %1 - %2</source> <translation>Teksty: %1 - %2</translation> </message> 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,52 +45,36 @@ <context> <name>LyricsWindow</name> <message> - <location filename="../lyricswindow.cpp" line="115"/> + <location filename="../lyricswindow.cpp" line="63"/> + <source>Done</source> + <translation>Готово</translation> + </message> + <message> + <location filename="../lyricswindow.cpp" line="66"/> + <source>Error</source> + <translation>Ошибка</translation> + </message> + <message> + <location filename="../lyricswindow.cpp" line="95"/> <source>Lyrics: %1 - %2</source> <translation>Текст песни: %1 - %2</translation> </message> <message> <location filename="../lyricswindow.ui" line="67"/> - <location filename="../lyricswindow.cpp" line="90"/> <source>No connection</source> <translation>Нет соединения</translation> </message> <message> - <location filename="../lyricswindow.cpp" line="77"/> + <location filename="../lyricswindow.cpp" line="84"/> <source>Not found</source> <translation>Не найдено</translation> </message> <message> - <location filename="../lyricswindow.cpp" line="93"/> - <source>Looking up host...</source> - <translation>Поиск сервера...</translation> - </message> - <message> - <location filename="../lyricswindow.cpp" line="96"/> - <source>Connecting...</source> - <translation>Соединение...</translation> - </message> - <message> - <location filename="../lyricswindow.cpp" line="99"/> - <source>Sending request...</source> - <translation>Отправка запроса...</translation> - </message> - <message> - <location filename="../lyricswindow.cpp" line="102"/> + <location filename="../lyricswindow.cpp" line="94"/> <source>Receiving</source> <translation>Получение</translation> </message> <message> - <location filename="../lyricswindow.cpp" line="105"/> - <source>Connected</source> - <translation>Соединено</translation> - </message> - <message> - <location filename="../lyricswindow.cpp" line="108"/> - <source>Closing connection...</source> - <translation>Завершение соединения...</translation> - </message> - <message> <location filename="../lyricswindow.ui" line="14"/> <source>Lyrics Plugin</source> <translation>Модуль показа текстов</translation> 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 @@ <context> <name>LyricsWindow</name> <message> - <location filename="../lyricswindow.cpp" line="77"/> - <source>Not found</source> + <location filename="../lyricswindow.cpp" line="63"/> + <source>Done</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../lyricswindow.ui" line="67"/> - <location filename="../lyricswindow.cpp" line="90"/> - <source>No connection</source> - <translation>Bağlantı yok</translation> - </message> - <message> - <location filename="../lyricswindow.cpp" line="93"/> - <source>Looking up host...</source> - <translation>Sunucu aranıyor...</translation> + <location filename="../lyricswindow.cpp" line="66"/> + <source>Error</source> + <translation type="unfinished"></translation> </message> <message> - <location filename="../lyricswindow.cpp" line="96"/> - <source>Connecting...</source> - <translation>Bağlanıyor...</translation> + <location filename="../lyricswindow.cpp" line="84"/> + <source>Not found</source> + <translation type="unfinished"></translation> </message> <message> - <location filename="../lyricswindow.cpp" line="99"/> - <source>Sending request...</source> - <translation>İstek gönderiliyor...</translation> + <location filename="../lyricswindow.ui" line="67"/> + <source>No connection</source> + <translation>Bağlantı yok</translation> </message> <message> - <location filename="../lyricswindow.cpp" line="102"/> + <location filename="../lyricswindow.cpp" line="94"/> <source>Receiving</source> <translation>Alınıyor</translation> </message> <message> - <location filename="../lyricswindow.cpp" line="105"/> - <source>Connected</source> - <translation>Bağlandı</translation> - </message> - <message> - <location filename="../lyricswindow.cpp" line="108"/> - <source>Closing connection...</source> - <translation>Bağlantı kapatılıyor...</translation> - </message> - <message> - <location filename="../lyricswindow.cpp" line="115"/> + <location filename="../lyricswindow.cpp" line="95"/> <source>Lyrics: %1 - %2</source> <translation>Şarkı Sözü: %1 - %2</translation> </message> 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,52 +45,36 @@ <context> <name>LyricsWindow</name> <message> - <location filename="../lyricswindow.cpp" line="115"/> + <location filename="../lyricswindow.cpp" line="63"/> + <source>Done</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../lyricswindow.cpp" line="66"/> + <source>Error</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../lyricswindow.cpp" line="95"/> <source>Lyrics: %1 - %2</source> <translation>Тексти: %1 - %2</translation> </message> <message> <location filename="../lyricswindow.ui" line="67"/> - <location filename="../lyricswindow.cpp" line="90"/> <source>No connection</source> <translation>Немає з'єднання</translation> </message> <message> - <location filename="../lyricswindow.cpp" line="77"/> + <location filename="../lyricswindow.cpp" line="84"/> <source>Not found</source> <translation>Не знайдено</translation> </message> <message> - <location filename="../lyricswindow.cpp" line="93"/> - <source>Looking up host...</source> - <translation>Пошук хоста...</translation> - </message> - <message> - <location filename="../lyricswindow.cpp" line="96"/> - <source>Connecting...</source> - <translation>З'єднання...</translation> - </message> - <message> - <location filename="../lyricswindow.cpp" line="99"/> - <source>Sending request...</source> - <translation>Відсилання запиту...</translation> - </message> - <message> - <location filename="../lyricswindow.cpp" line="102"/> + <location filename="../lyricswindow.cpp" line="94"/> <source>Receiving</source> <translation>Отримання</translation> </message> <message> - <location filename="../lyricswindow.cpp" line="105"/> - <source>Connected</source> - <translation>З'єднано</translation> - </message> - <message> - <location filename="../lyricswindow.cpp" line="108"/> - <source>Closing connection...</source> - <translation>Закриття з'єднання...</translation> - </message> - <message> <location filename="../lyricswindow.ui" line="14"/> <source>Lyrics Plugin</source> <translation>Модуль текстів</translation> 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,52 +45,36 @@ <context> <name>LyricsWindow</name> <message> - <location filename="../lyricswindow.cpp" line="115"/> + <location filename="../lyricswindow.cpp" line="63"/> + <source>Done</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../lyricswindow.cpp" line="66"/> + <source>Error</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../lyricswindow.cpp" line="95"/> <source>Lyrics: %1 - %2</source> <translation>歌词：%1 - %2</translation> </message> <message> <location filename="../lyricswindow.ui" line="67"/> - <location filename="../lyricswindow.cpp" line="90"/> <source>No connection</source> <translation>无连接</translation> </message> <message> - <location filename="../lyricswindow.cpp" line="77"/> + <location filename="../lyricswindow.cpp" line="84"/> <source>Not found</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../lyricswindow.cpp" line="93"/> - <source>Looking up host...</source> - <translation>查找主机...</translation> - </message> - <message> - <location filename="../lyricswindow.cpp" line="96"/> - <source>Connecting...</source> - <translation>连接...</translation> - </message> - <message> - <location filename="../lyricswindow.cpp" line="99"/> - <source>Sending request...</source> - <translation>发送请求...</translation> - </message> - <message> - <location filename="../lyricswindow.cpp" line="102"/> + <location filename="../lyricswindow.cpp" line="94"/> <source>Receiving</source> <translation>接受</translation> </message> <message> - <location filename="../lyricswindow.cpp" line="105"/> - <source>Connected</source> - <translation>已连接</translation> - </message> - <message> - <location filename="../lyricswindow.cpp" line="108"/> - <source>Closing connection...</source> - <translation>关闭连接...</translation> - </message> - <message> <location filename="../lyricswindow.ui" line="14"/> <source>Lyrics Plugin</source> <translation>歌词插件</translation> 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,52 +45,36 @@ <context> <name>LyricsWindow</name> <message> - <location filename="../lyricswindow.cpp" line="115"/> + <location filename="../lyricswindow.cpp" line="63"/> + <source>Done</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../lyricswindow.cpp" line="66"/> + <source>Error</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../lyricswindow.cpp" line="95"/> <source>Lyrics: %1 - %2</source> <translation>歌詞：%1 - %2</translation> </message> <message> <location filename="../lyricswindow.ui" line="67"/> - <location filename="../lyricswindow.cpp" line="90"/> <source>No connection</source> <translation>無連接</translation> </message> <message> - <location filename="../lyricswindow.cpp" line="77"/> + <location filename="../lyricswindow.cpp" line="84"/> <source>Not found</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../lyricswindow.cpp" line="93"/> - <source>Looking up host...</source> - <translation>找尋主機...</translation> - </message> - <message> - <location filename="../lyricswindow.cpp" line="96"/> - <source>Connecting...</source> - <translation>連接...</translation> - </message> - <message> - <location filename="../lyricswindow.cpp" line="99"/> - <source>Sending request...</source> - <translation>發送請求...</translation> - </message> - <message> - <location filename="../lyricswindow.cpp" line="102"/> + <location filename="../lyricswindow.cpp" line="94"/> <source>Receiving</source> <translation>接受</translation> </message> <message> - <location filename="../lyricswindow.cpp" line="105"/> - <source>Connected</source> - <translation>已連接</translation> - </message> - <message> - <location filename="../lyricswindow.cpp" line="108"/> - <source>Closing connection...</source> - <translation>關閉連接...</translation> - </message> - <message> <location filename="../lyricswindow.ui" line="14"/> <source>Lyrics Plugin</source> <translation>歌詞插件</translation> |