diff options
Diffstat (limited to 'src/plugins')
13 files changed, 113 insertions, 110 deletions
diff --git a/src/plugins/General/lyrics/lyricswindow.cpp b/src/plugins/General/lyrics/lyricswindow.cpp index a3c9262bd..22b81b1b9 100644 --- a/src/plugins/General/lyrics/lyricswindow.cpp +++ b/src/plugins/General/lyrics/lyricswindow.cpp @@ -21,6 +21,7 @@ #include <QHttp> #include <QUrl> #include <QRegExp> +#include <qmmp/qmmpsettings.h> #include <qmmp/qmmp.h> #include "lyricswindow.h" @@ -35,12 +36,13 @@ LyricsWindow::LyricsWindow(const QString &artist, const QString &title, QWidget ui.artistLineEdit->setText(artist); ui.titleLineEdit->setText(title); m_http = new QHttp(this); - //load global proxy settings - if (Qmmp::useProxy()) - m_http->setProxy(Qmmp::proxy().host(), - Qmmp::proxy().port(), - Qmmp::useProxyAuth() ? Qmmp::proxy().userName() : QString(), - Qmmp::useProxyAuth() ? Qmmp::proxy().password() : QString()); + //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))); on_searchPushButton_clicked(); diff --git a/src/plugins/General/lyrics/translations/lyrics_plugin_cs.ts b/src/plugins/General/lyrics/translations/lyrics_plugin_cs.ts index 9b34d1a6f..fcdbd173b 100644 --- a/src/plugins/General/lyrics/translations/lyrics_plugin_cs.ts +++ b/src/plugins/General/lyrics/translations/lyrics_plugin_cs.ts @@ -45,48 +45,48 @@ <context> <name>LyricsWindow</name> <message> - <location filename="../lyricswindow.cpp" line="113"/> + <location filename="../lyricswindow.cpp" line="115"/> <source>Lyrics: %1 - %2</source> <translation>Text: %1 - %2</translation> </message> <message> - <location filename="../lyricswindow.cpp" line="88"/> + <location filename="../lyricswindow.cpp" line="90"/> <location filename="../lyricswindow.ui" line="67"/> <source>No connection</source> <translation>Nespojeno</translation> </message> <message> - <location filename="../lyricswindow.cpp" line="75"/> + <location filename="../lyricswindow.cpp" line="77"/> <source>Not found</source> <translation>Nenalezeno</translation> </message> <message> - <location filename="../lyricswindow.cpp" line="91"/> + <location filename="../lyricswindow.cpp" line="93"/> <source>Looking up host...</source> <translation>Vyhledávám hostitele...</translation> </message> <message> - <location filename="../lyricswindow.cpp" line="94"/> + <location filename="../lyricswindow.cpp" line="96"/> <source>Connecting...</source> <translation>Připojuji se...</translation> </message> <message> - <location filename="../lyricswindow.cpp" line="97"/> + <location filename="../lyricswindow.cpp" line="99"/> <source>Sending request...</source> <translation>Zasílám požadavek...</translation> </message> <message> - <location filename="../lyricswindow.cpp" line="100"/> + <location filename="../lyricswindow.cpp" line="102"/> <source>Receiving</source> <translation>Příjímám</translation> </message> <message> - <location filename="../lyricswindow.cpp" line="103"/> + <location filename="../lyricswindow.cpp" line="105"/> <source>Connected</source> <translation>Připojeno</translation> </message> <message> - <location filename="../lyricswindow.cpp" line="106"/> + <location filename="../lyricswindow.cpp" line="108"/> <source>Closing connection...</source> <translation>Zavírám spojení...</translation> </message> diff --git a/src/plugins/General/lyrics/translations/lyrics_plugin_de.ts b/src/plugins/General/lyrics/translations/lyrics_plugin_de.ts index 1d92d840e..4468195c3 100644 --- a/src/plugins/General/lyrics/translations/lyrics_plugin_de.ts +++ b/src/plugins/General/lyrics/translations/lyrics_plugin_de.ts @@ -45,48 +45,48 @@ <context> <name>LyricsWindow</name> <message> - <location filename="../lyricswindow.cpp" line="113"/> + <location filename="../lyricswindow.cpp" line="115"/> <source>Lyrics: %1 - %2</source> <translation>Liedtext: %1 - %2</translation> </message> <message> - <location filename="../lyricswindow.cpp" line="88"/> + <location filename="../lyricswindow.cpp" line="90"/> <location filename="../lyricswindow.ui" line="67"/> <source>No connection</source> <translation>Keine Verbindung</translation> </message> <message> - <location filename="../lyricswindow.cpp" line="75"/> + <location filename="../lyricswindow.cpp" line="77"/> <source>Not found</source> <translation>Es kann kein Liedtext für dieses Stück gefunden werden.</translation> </message> <message> - <location filename="../lyricswindow.cpp" line="91"/> + <location filename="../lyricswindow.cpp" line="93"/> <source>Looking up host...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../lyricswindow.cpp" line="94"/> + <location filename="../lyricswindow.cpp" line="96"/> <source>Connecting...</source> <translation>Verbindung wird hergestellt ...</translation> </message> <message> - <location filename="../lyricswindow.cpp" line="97"/> + <location filename="../lyricswindow.cpp" line="99"/> <source>Sending request...</source> <translation>Anfrage wird gesendet ...</translation> </message> <message> - <location filename="../lyricswindow.cpp" line="100"/> + <location filename="../lyricswindow.cpp" line="102"/> <source>Receiving</source> <translation>Daten werden empfangen</translation> </message> <message> - <location filename="../lyricswindow.cpp" line="103"/> + <location filename="../lyricswindow.cpp" line="105"/> <source>Connected</source> <translation>Verbunden</translation> </message> <message> - <location filename="../lyricswindow.cpp" line="106"/> + <location filename="../lyricswindow.cpp" line="108"/> <source>Closing connection...</source> <translation>Verbindung wird beendet ...</translation> </message> diff --git a/src/plugins/General/lyrics/translations/lyrics_plugin_it.ts b/src/plugins/General/lyrics/translations/lyrics_plugin_it.ts index 6b33254dc..96d95caf7 100644 --- a/src/plugins/General/lyrics/translations/lyrics_plugin_it.ts +++ b/src/plugins/General/lyrics/translations/lyrics_plugin_it.ts @@ -45,48 +45,48 @@ <context> <name>LyricsWindow</name> <message> - <location filename="../lyricswindow.cpp" line="113"/> + <location filename="../lyricswindow.cpp" line="115"/> <source>Lyrics: %1 - %2</source> <translation>Testo: %1 - %2</translation> </message> <message> - <location filename="../lyricswindow.cpp" line="88"/> + <location filename="../lyricswindow.cpp" line="90"/> <location filename="../lyricswindow.ui" line="67"/> <source>No connection</source> <translation>Nessuna connessione</translation> </message> <message> - <location filename="../lyricswindow.cpp" line="75"/> + <location filename="../lyricswindow.cpp" line="77"/> <source>Not found</source> <translation>Non trovato</translation> </message> <message> - <location filename="../lyricswindow.cpp" line="91"/> + <location filename="../lyricswindow.cpp" line="93"/> <source>Looking up host...</source> <translation>Ricerca host</translation> </message> <message> - <location filename="../lyricswindow.cpp" line="94"/> + <location filename="../lyricswindow.cpp" line="96"/> <source>Connecting...</source> <translation>Connessione...</translation> </message> <message> - <location filename="../lyricswindow.cpp" line="97"/> + <location filename="../lyricswindow.cpp" line="99"/> <source>Sending request...</source> <translation>Invio richiesta...</translation> </message> <message> - <location filename="../lyricswindow.cpp" line="100"/> + <location filename="../lyricswindow.cpp" line="102"/> <source>Receiving</source> <translation>Ricezione</translation> </message> <message> - <location filename="../lyricswindow.cpp" line="103"/> + <location filename="../lyricswindow.cpp" line="105"/> <source>Connected</source> <translation>Connesso</translation> </message> <message> - <location filename="../lyricswindow.cpp" line="106"/> + <location filename="../lyricswindow.cpp" line="108"/> <source>Closing connection...</source> <translation>Chiusura connessione...</translation> </message> diff --git a/src/plugins/General/lyrics/translations/lyrics_plugin_lt.ts b/src/plugins/General/lyrics/translations/lyrics_plugin_lt.ts index 3d4679e70..2852b4c50 100644 --- a/src/plugins/General/lyrics/translations/lyrics_plugin_lt.ts +++ b/src/plugins/General/lyrics/translations/lyrics_plugin_lt.ts @@ -45,48 +45,48 @@ <context> <name>LyricsWindow</name> <message> - <location filename="../lyricswindow.cpp" line="113"/> + <location filename="../lyricswindow.cpp" line="115"/> <source>Lyrics: %1 - %2</source> <translation>Dainos tekstas: %1 - %2</translation> </message> <message> - <location filename="../lyricswindow.cpp" line="88"/> + <location filename="../lyricswindow.cpp" line="90"/> <location filename="../lyricswindow.ui" line="67"/> <source>No connection</source> <translation>Nėra ryšio</translation> </message> <message> - <location filename="../lyricswindow.cpp" line="75"/> + <location filename="../lyricswindow.cpp" line="77"/> <source>Not found</source> <translation>Nerasta</translation> </message> <message> - <location filename="../lyricswindow.cpp" line="91"/> + <location filename="../lyricswindow.cpp" line="93"/> <source>Looking up host...</source> <translation>Ieškau serverio...</translation> </message> <message> - <location filename="../lyricswindow.cpp" line="94"/> + <location filename="../lyricswindow.cpp" line="96"/> <source>Connecting...</source> <translation>Susijungiu...</translation> </message> <message> - <location filename="../lyricswindow.cpp" line="97"/> + <location filename="../lyricswindow.cpp" line="99"/> <source>Sending request...</source> <translation>Siunčiu užklausą...</translation> </message> <message> - <location filename="../lyricswindow.cpp" line="100"/> + <location filename="../lyricswindow.cpp" line="102"/> <source>Receiving</source> <translation>Gaunu</translation> </message> <message> - <location filename="../lyricswindow.cpp" line="103"/> + <location filename="../lyricswindow.cpp" line="105"/> <source>Connected</source> <translation>Susijungiau</translation> </message> <message> - <location filename="../lyricswindow.cpp" line="106"/> + <location filename="../lyricswindow.cpp" line="108"/> <source>Closing connection...</source> <translation>Atsijungiu...</translation> </message> diff --git a/src/plugins/General/lyrics/translations/lyrics_plugin_pl.ts b/src/plugins/General/lyrics/translations/lyrics_plugin_pl.ts index 172c2ad77..ed895ea69 100644 --- a/src/plugins/General/lyrics/translations/lyrics_plugin_pl.ts +++ b/src/plugins/General/lyrics/translations/lyrics_plugin_pl.ts @@ -45,48 +45,48 @@ <context> <name>LyricsWindow</name> <message> - <location filename="../lyricswindow.cpp" line="75"/> + <location filename="../lyricswindow.cpp" line="77"/> <source>Not found</source> <translation>Nie znaleziono</translation> </message> <message> - <location filename="../lyricswindow.cpp" line="88"/> + <location filename="../lyricswindow.cpp" line="90"/> <location filename="../lyricswindow.ui" line="67"/> <source>No connection</source> <translation>Nie połączony</translation> </message> <message> - <location filename="../lyricswindow.cpp" line="91"/> + <location filename="../lyricswindow.cpp" line="93"/> <source>Looking up host...</source> <translation>Szukanie hosta...</translation> </message> <message> - <location filename="../lyricswindow.cpp" line="94"/> + <location filename="../lyricswindow.cpp" line="96"/> <source>Connecting...</source> <translation>Łączenie...</translation> </message> <message> - <location filename="../lyricswindow.cpp" line="97"/> + <location filename="../lyricswindow.cpp" line="99"/> <source>Sending request...</source> <translation>Wysyłanie żądania...</translation> </message> <message> - <location filename="../lyricswindow.cpp" line="100"/> + <location filename="../lyricswindow.cpp" line="102"/> <source>Receiving</source> <translation>Odbieranie</translation> </message> <message> - <location filename="../lyricswindow.cpp" line="103"/> + <location filename="../lyricswindow.cpp" line="105"/> <source>Connected</source> <translation>Połączony</translation> </message> <message> - <location filename="../lyricswindow.cpp" line="106"/> + <location filename="../lyricswindow.cpp" line="108"/> <source>Closing connection...</source> <translation>Zamykanie połączenia...</translation> </message> <message> - <location filename="../lyricswindow.cpp" line="113"/> + <location filename="../lyricswindow.cpp" line="115"/> <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 22ed6ba07..1b74bc398 100644 --- a/src/plugins/General/lyrics/translations/lyrics_plugin_ru.ts +++ b/src/plugins/General/lyrics/translations/lyrics_plugin_ru.ts @@ -45,48 +45,48 @@ <context> <name>LyricsWindow</name> <message> - <location filename="../lyricswindow.cpp" line="113"/> + <location filename="../lyricswindow.cpp" line="115"/> <source>Lyrics: %1 - %2</source> <translation>Текст песни: %1 - %2</translation> </message> <message> - <location filename="../lyricswindow.cpp" line="88"/> + <location filename="../lyricswindow.cpp" line="90"/> <location filename="../lyricswindow.ui" line="67"/> <source>No connection</source> <translation>Нет соединения</translation> </message> <message> - <location filename="../lyricswindow.cpp" line="75"/> + <location filename="../lyricswindow.cpp" line="77"/> <source>Not found</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../lyricswindow.cpp" line="91"/> + <location filename="../lyricswindow.cpp" line="93"/> <source>Looking up host...</source> <translation>Поиск сервера...</translation> </message> <message> - <location filename="../lyricswindow.cpp" line="94"/> + <location filename="../lyricswindow.cpp" line="96"/> <source>Connecting...</source> <translation>Соединение...</translation> </message> <message> - <location filename="../lyricswindow.cpp" line="97"/> + <location filename="../lyricswindow.cpp" line="99"/> <source>Sending request...</source> <translation>Отправка запроса...</translation> </message> <message> - <location filename="../lyricswindow.cpp" line="100"/> + <location filename="../lyricswindow.cpp" line="102"/> <source>Receiving</source> <translation>Получение</translation> </message> <message> - <location filename="../lyricswindow.cpp" line="103"/> + <location filename="../lyricswindow.cpp" line="105"/> <source>Connected</source> <translation>Соединено</translation> </message> <message> - <location filename="../lyricswindow.cpp" line="106"/> + <location filename="../lyricswindow.cpp" line="108"/> <source>Closing connection...</source> <translation>Завершение соединения...</translation> </message> diff --git a/src/plugins/General/lyrics/translations/lyrics_plugin_tr.ts b/src/plugins/General/lyrics/translations/lyrics_plugin_tr.ts index c650efd79..43666207f 100644 --- a/src/plugins/General/lyrics/translations/lyrics_plugin_tr.ts +++ b/src/plugins/General/lyrics/translations/lyrics_plugin_tr.ts @@ -45,48 +45,48 @@ <context> <name>LyricsWindow</name> <message> - <location filename="../lyricswindow.cpp" line="75"/> + <location filename="../lyricswindow.cpp" line="77"/> <source>Not found</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../lyricswindow.cpp" line="88"/> + <location filename="../lyricswindow.cpp" line="90"/> <location filename="../lyricswindow.ui" line="67"/> <source>No connection</source> <translation>Bağlantı yok</translation> </message> <message> - <location filename="../lyricswindow.cpp" line="91"/> + <location filename="../lyricswindow.cpp" line="93"/> <source>Looking up host...</source> <translation>Sunucu aranıyor...</translation> </message> <message> - <location filename="../lyricswindow.cpp" line="94"/> + <location filename="../lyricswindow.cpp" line="96"/> <source>Connecting...</source> <translation>Bağlanıyor...</translation> </message> <message> - <location filename="../lyricswindow.cpp" line="97"/> + <location filename="../lyricswindow.cpp" line="99"/> <source>Sending request...</source> <translation>İstek gönderiliyor...</translation> </message> <message> - <location filename="../lyricswindow.cpp" line="100"/> + <location filename="../lyricswindow.cpp" line="102"/> <source>Receiving</source> <translation>Alınıyor</translation> </message> <message> - <location filename="../lyricswindow.cpp" line="103"/> + <location filename="../lyricswindow.cpp" line="105"/> <source>Connected</source> <translation>Bağlandı</translation> </message> <message> - <location filename="../lyricswindow.cpp" line="106"/> + <location filename="../lyricswindow.cpp" line="108"/> <source>Closing connection...</source> <translation>Bağlantı kapatılıyor...</translation> </message> <message> - <location filename="../lyricswindow.cpp" line="113"/> + <location filename="../lyricswindow.cpp" line="115"/> <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 95fee4347..c779dee83 100644 --- a/src/plugins/General/lyrics/translations/lyrics_plugin_uk_UA.ts +++ b/src/plugins/General/lyrics/translations/lyrics_plugin_uk_UA.ts @@ -45,48 +45,48 @@ <context> <name>LyricsWindow</name> <message> - <location filename="../lyricswindow.cpp" line="113"/> + <location filename="../lyricswindow.cpp" line="115"/> <source>Lyrics: %1 - %2</source> <translation>Тексти: %1 - %2</translation> </message> <message> - <location filename="../lyricswindow.cpp" line="88"/> + <location filename="../lyricswindow.cpp" line="90"/> <location filename="../lyricswindow.ui" line="67"/> <source>No connection</source> <translation>Немає з'єднання</translation> </message> <message> - <location filename="../lyricswindow.cpp" line="75"/> + <location filename="../lyricswindow.cpp" line="77"/> <source>Not found</source> <translation>Не знайдено</translation> </message> <message> - <location filename="../lyricswindow.cpp" line="91"/> + <location filename="../lyricswindow.cpp" line="93"/> <source>Looking up host...</source> <translation>Пошук хоста...</translation> </message> <message> - <location filename="../lyricswindow.cpp" line="94"/> + <location filename="../lyricswindow.cpp" line="96"/> <source>Connecting...</source> <translation>З'єднання...</translation> </message> <message> - <location filename="../lyricswindow.cpp" line="97"/> + <location filename="../lyricswindow.cpp" line="99"/> <source>Sending request...</source> <translation>Відсилання запиту...</translation> </message> <message> - <location filename="../lyricswindow.cpp" line="100"/> + <location filename="../lyricswindow.cpp" line="102"/> <source>Receiving</source> <translation>Отримання</translation> </message> <message> - <location filename="../lyricswindow.cpp" line="103"/> + <location filename="../lyricswindow.cpp" line="105"/> <source>Connected</source> <translation>З'єднано</translation> </message> <message> - <location filename="../lyricswindow.cpp" line="106"/> + <location filename="../lyricswindow.cpp" line="108"/> <source>Closing connection...</source> <translation>Закриття з'єднання...</translation> </message> 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 e3c947fbc..f80d1053d 100644 --- a/src/plugins/General/lyrics/translations/lyrics_plugin_zh_CN.ts +++ b/src/plugins/General/lyrics/translations/lyrics_plugin_zh_CN.ts @@ -45,48 +45,48 @@ <context> <name>LyricsWindow</name> <message> - <location filename="../lyricswindow.cpp" line="113"/> + <location filename="../lyricswindow.cpp" line="115"/> <source>Lyrics: %1 - %2</source> <translation>歌词：%1 - %2</translation> </message> <message> - <location filename="../lyricswindow.cpp" line="88"/> + <location filename="../lyricswindow.cpp" line="90"/> <location filename="../lyricswindow.ui" line="67"/> <source>No connection</source> <translation>无连接</translation> </message> <message> - <location filename="../lyricswindow.cpp" line="75"/> + <location filename="../lyricswindow.cpp" line="77"/> <source>Not found</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../lyricswindow.cpp" line="91"/> + <location filename="../lyricswindow.cpp" line="93"/> <source>Looking up host...</source> <translation>查找主机...</translation> </message> <message> - <location filename="../lyricswindow.cpp" line="94"/> + <location filename="../lyricswindow.cpp" line="96"/> <source>Connecting...</source> <translation>连接...</translation> </message> <message> - <location filename="../lyricswindow.cpp" line="97"/> + <location filename="../lyricswindow.cpp" line="99"/> <source>Sending request...</source> <translation>发送请求...</translation> </message> <message> - <location filename="../lyricswindow.cpp" line="100"/> + <location filename="../lyricswindow.cpp" line="102"/> <source>Receiving</source> <translation>接受</translation> </message> <message> - <location filename="../lyricswindow.cpp" line="103"/> + <location filename="../lyricswindow.cpp" line="105"/> <source>Connected</source> <translation>已连接</translation> </message> <message> - <location filename="../lyricswindow.cpp" line="106"/> + <location filename="../lyricswindow.cpp" line="108"/> <source>Closing connection...</source> <translation>关闭连接...</translation> </message> 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 0772fc458..b89a1f1c9 100644 --- a/src/plugins/General/lyrics/translations/lyrics_plugin_zh_TW.ts +++ b/src/plugins/General/lyrics/translations/lyrics_plugin_zh_TW.ts @@ -45,48 +45,48 @@ <context> <name>LyricsWindow</name> <message> - <location filename="../lyricswindow.cpp" line="113"/> + <location filename="../lyricswindow.cpp" line="115"/> <source>Lyrics: %1 - %2</source> <translation>歌詞：%1 - %2</translation> </message> <message> - <location filename="../lyricswindow.cpp" line="88"/> + <location filename="../lyricswindow.cpp" line="90"/> <location filename="../lyricswindow.ui" line="67"/> <source>No connection</source> <translation>無連接</translation> </message> <message> - <location filename="../lyricswindow.cpp" line="75"/> + <location filename="../lyricswindow.cpp" line="77"/> <source>Not found</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../lyricswindow.cpp" line="91"/> + <location filename="../lyricswindow.cpp" line="93"/> <source>Looking up host...</source> <translation>找尋主機...</translation> </message> <message> - <location filename="../lyricswindow.cpp" line="94"/> + <location filename="../lyricswindow.cpp" line="96"/> <source>Connecting...</source> <translation>連接...</translation> </message> <message> - <location filename="../lyricswindow.cpp" line="97"/> + <location filename="../lyricswindow.cpp" line="99"/> <source>Sending request...</source> <translation>發送請求...</translation> </message> <message> - <location filename="../lyricswindow.cpp" line="100"/> + <location filename="../lyricswindow.cpp" line="102"/> <source>Receiving</source> <translation>接受</translation> </message> <message> - <location filename="../lyricswindow.cpp" line="103"/> + <location filename="../lyricswindow.cpp" line="105"/> <source>Connected</source> <translation>已連接</translation> </message> <message> - <location filename="../lyricswindow.cpp" line="106"/> + <location filename="../lyricswindow.cpp" line="108"/> <source>Closing connection...</source> <translation>關閉連接...</translation> </message> diff --git a/src/plugins/General/scrobbler/scrobbler.cpp b/src/plugins/General/scrobbler/scrobbler.cpp index c263ba8b9..5d6b38f76 100644 --- a/src/plugins/General/scrobbler/scrobbler.cpp +++ b/src/plugins/General/scrobbler/scrobbler.cpp @@ -27,6 +27,7 @@ #include <QDateTime> #include <QDir> #include <qmmp/soundcore.h> +#include <qmmp/qmmpsettings.h> #include <qmmp/qmmp.h> #include "scrobbler.h" @@ -51,11 +52,12 @@ Scrobbler::Scrobbler(const QString &url, m_server = url; m_name = name; //load global proxy settings - if (Qmmp::useProxy()) - m_http->setProxy(Qmmp::proxy().host(), - Qmmp::proxy().port(), - Qmmp::useProxyAuth() ? Qmmp::proxy().userName() : QString(), - Qmmp::useProxyAuth() ? Qmmp::proxy().password() : QString()); + QmmpSettings *gs = QmmpSettings::instance(); //TODO use QmmpSettings::networkSettingsChanged() + if (gs->isProxyEnabled()) + m_http->setProxy(gs->proxy().host(), + gs->proxy().port(), + gs->useProxyAuth() ? gs->proxy().userName() : QString(), + gs->useProxyAuth() ? gs->proxy().password() : QString()); m_disabled = m_login.isEmpty() || m_passw.isEmpty(); m_passw = QString(QCryptographicHash::hash(m_passw.toAscii(), QCryptographicHash::Md5).toHex()); diff --git a/src/plugins/Transports/http/downloader.cpp b/src/plugins/Transports/http/downloader.cpp index 76f7c31ac..37e9c3061 100644 --- a/src/plugins/Transports/http/downloader.cpp +++ b/src/plugins/Transports/http/downloader.cpp @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (C) 2006-2009 by Ilya Kotov * + * Copyright (C) 2006-2010 by Ilya Kotov * * forkotov02@hotmail.ru * * * * This program is free software; you can redistribute it and/or modify * @@ -20,11 +20,11 @@ #include <QApplication> #include <QStringList> -#include <QSettings> #include <QDir> #include <QMap> #include <stdint.h> #include <stdlib.h> +#include <qmmp/qmmpsettings.h> #include <qmmp/qmmp.h> #include <qmmp/statehandler.h> #include "downloader.h" @@ -215,17 +215,16 @@ void Downloader::run() qDebug("Downloader: starting download thread"); m_handle = curl_easy_init(); //proxy - QSettings settings ( Qmmp::configFile(), QSettings::IniFormat ); - if (Qmmp::useProxy()) + if (QmmpSettings::instance()->isProxyEnabled()) curl_easy_setopt(m_handle, CURLOPT_PROXY, - strdup((Qmmp::proxy().host() + ":" + - QString("%1").arg(Qmmp::proxy().port())). + strdup((QmmpSettings::instance()->proxy().host() + ":" + + QString("%1").arg(QmmpSettings::instance()->proxy().port())). toLatin1 ().constData ())); - if (Qmmp::useProxyAuth()) + if (QmmpSettings::instance()->useProxyAuth()) curl_easy_setopt(m_handle, CURLOPT_PROXYUSERPWD, - strdup((Qmmp::proxy().userName() + ":" + - Qmmp::proxy().password()). + strdup((QmmpSettings::instance()->proxy().userName() + ":" + + QmmpSettings::instance()->proxy().password()). toLatin1 ().constData ())); // Set url to download |