diff options
| author | trialuser02 <trialuser02@90c681e8-e032-0410-971d-27865f9a5e38> | 2012-02-16 16:54:15 +0000 |
|---|---|---|
| committer | trialuser02 <trialuser02@90c681e8-e032-0410-971d-27865f9a5e38> | 2012-02-16 16:54:15 +0000 |
| commit | 3445bc050f7a07462d63711613c005dd5e3f8904 (patch) | |
| tree | bff4a8cbbc58bc516492895eb4d2114cbf5c23e4 /src/plugins/Ui/skinned/addurldialog.cpp | |
| parent | 9eb58a188aca073554e11c338480a21563509fb8 (diff) | |
| download | qmmp-3445bc050f7a07462d63711613c005dd5e3f8904.tar.gz qmmp-3445bc050f7a07462d63711613c005dd5e3f8904.tar.bz2 qmmp-3445bc050f7a07462d63711613c005dd5e3f8904.zip | |
improved URL dialog
git-svn-id: http://svn.code.sf.net/p/qmmp-dev/code/trunk/qmmp@2607 90c681e8-e032-0410-971d-27865f9a5e38
Diffstat (limited to 'src/plugins/Ui/skinned/addurldialog.cpp')
| -rw-r--r-- | src/plugins/Ui/skinned/addurldialog.cpp | 14 |
1 files changed, 10 insertions, 4 deletions
diff --git a/src/plugins/Ui/skinned/addurldialog.cpp b/src/plugins/Ui/skinned/addurldialog.cpp index cc47e4b33..ffc705c97 100644 --- a/src/plugins/Ui/skinned/addurldialog.cpp +++ b/src/plugins/Ui/skinned/addurldialog.cpp @@ -31,12 +31,13 @@ #include <qmmpui/playlistformat.h> #include <qmmpui/playlistmodel.h> #include <qmmp/qmmpsettings.h> +#include <qmmp/metadatamanager.h> #include <qmmp/qmmp.h> #include "addurldialog.h" #define HISTORY_SIZE 10 -AddUrlDialog::AddUrlDialog( QWidget * parent, Qt::WindowFlags f) : QDialog(parent,f) +AddUrlDialog::AddUrlDialog(QWidget * parent, Qt::WindowFlags f) : QDialog(parent,f) { setupUi(this); setAttribute(Qt::WA_DeleteOnClose); @@ -44,7 +45,12 @@ AddUrlDialog::AddUrlDialog( QWidget * parent, Qt::WindowFlags f) : QDialog(paren QSettings settings(Qmmp::configFile(), QSettings::IniFormat); m_history = settings.value("URLDialog/history").toStringList(); urlComboBox->addItems(m_history); - urlComboBox->setEditText(QApplication::clipboard()->text().trimmed()); + if(settings.value("URLDialog/use_clipboard", false).toBool()) + { + QUrl url(QApplication::clipboard()->text().trimmed()); + if(url.isValid() && MetaDataManager::instance()->protocols().contains(url.scheme())) + urlComboBox->setEditText(QApplication::clipboard()->text().trimmed()); + } m_http = new QNetworkAccessManager(this); //load global proxy settings QmmpSettings *gs = QmmpSettings::instance(); @@ -62,7 +68,7 @@ AddUrlDialog::AddUrlDialog( QWidget * parent, Qt::WindowFlags f) : QDialog(paren AddUrlDialog::~AddUrlDialog() { - if ( m_history.size() > HISTORY_SIZE) + while (m_history.size() > HISTORY_SIZE) m_history.removeLast(); QSettings settings(Qmmp::configFile(), QSettings::IniFormat); settings.setValue("URLDialog/history", m_history); @@ -70,7 +76,7 @@ AddUrlDialog::~AddUrlDialog() QPointer<AddUrlDialog> AddUrlDialog::instance = 0; -void AddUrlDialog::popup(QWidget* parent,PlayListModel* model ) +void AddUrlDialog::popup(QWidget* parent, PlayListModel* model) { if (!instance) { |