diff options
| author | trialuser02 <trialuser02@90c681e8-e032-0410-971d-27865f9a5e38> | 2009-02-17 11:17:47 +0000 |
|---|---|---|
| committer | trialuser02 <trialuser02@90c681e8-e032-0410-971d-27865f9a5e38> | 2009-02-17 11:17:47 +0000 |
| commit | 0ffa05b536ad907e63d34a1ab7244ce159354269 (patch) | |
| tree | a257abfd1c102fe7391c34f0ec9be6eafcc9ab24 /src/plugins/General/lyrics/lyricswindow.cpp | |
| parent | 561b2b60ad553238fe4c13082d2e976d2ad392d0 (diff) | |
| download | qmmp-0ffa05b536ad907e63d34a1ab7244ce159354269.tar.gz qmmp-0ffa05b536ad907e63d34a1ab7244ce159354269.tar.bz2 qmmp-0ffa05b536ad907e63d34a1ab7244ce159354269.zip | |
fixed proxy support, fixed xspf version
git-svn-id: http://svn.code.sf.net/p/qmmp-dev/code/trunk/qmmp@790 90c681e8-e032-0410-971d-27865f9a5e38
Diffstat (limited to 'src/plugins/General/lyrics/lyricswindow.cpp')
| -rw-r--r-- | src/plugins/General/lyrics/lyricswindow.cpp | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/src/plugins/General/lyrics/lyricswindow.cpp b/src/plugins/General/lyrics/lyricswindow.cpp index 744ad07f0..dc781bcc4 100644 --- a/src/plugins/General/lyrics/lyricswindow.cpp +++ b/src/plugins/General/lyrics/lyricswindow.cpp @@ -20,6 +20,7 @@ #include <QHttp> #include <QUrl> +#include <qmmp/qmmp.h> #include "lyricswindow.h" @@ -30,8 +31,13 @@ LyricsWindow::LyricsWindow(const QString &artist, const QString &title, QWidget setWindowFlags(Qt::Dialog); setAttribute(Qt::WA_DeleteOnClose); setWindowTitle(QString(tr("Lyrics: %1 - %2")).arg(artist).arg(title)); - //TODO proxy support 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()); connect(m_http, SIGNAL(done(bool)), SLOT(showText(bool))); connect(m_http, SIGNAL(stateChanged(int)), SLOT(showState (int))); m_http->setHost("lyricwiki.org"); |