From 3445bc050f7a07462d63711613c005dd5e3f8904 Mon Sep 17 00:00:00 2001 From: trialuser02 Date: Thu, 16 Feb 2012 16:54:15 +0000 Subject: improved URL dialog git-svn-id: http://svn.code.sf.net/p/qmmp-dev/code/trunk/qmmp@2607 90c681e8-e032-0410-971d-27865f9a5e38 --- src/plugins/Ui/skinned/addurldialog.cpp | 14 ++++++++++---- src/plugins/Ui/skinned/forms/skinnedsettings.ui | 16 ++++++++++++++++ src/plugins/Ui/skinned/skinnedsettings.cpp | 3 +++ src/plugins/Ui/skinned/translations/skinned_plugin_cs.ts | 12 +++++++++++- src/plugins/Ui/skinned/translations/skinned_plugin_de.ts | 12 +++++++++++- src/plugins/Ui/skinned/translations/skinned_plugin_es.ts | 12 +++++++++++- src/plugins/Ui/skinned/translations/skinned_plugin_hu.ts | 12 +++++++++++- src/plugins/Ui/skinned/translations/skinned_plugin_it.ts | 12 +++++++++++- src/plugins/Ui/skinned/translations/skinned_plugin_ja.ts | 12 +++++++++++- src/plugins/Ui/skinned/translations/skinned_plugin_lt.ts | 12 +++++++++++- src/plugins/Ui/skinned/translations/skinned_plugin_nl.ts | 12 +++++++++++- .../Ui/skinned/translations/skinned_plugin_pl_PL.ts | 12 +++++++++++- .../Ui/skinned/translations/skinned_plugin_pt_BR.ts | 12 +++++++++++- src/plugins/Ui/skinned/translations/skinned_plugin_ru.ts | 12 +++++++++++- src/plugins/Ui/skinned/translations/skinned_plugin_sk.ts | 12 +++++++++++- src/plugins/Ui/skinned/translations/skinned_plugin_tr.ts | 12 +++++++++++- .../Ui/skinned/translations/skinned_plugin_uk_UA.ts | 12 +++++++++++- .../Ui/skinned/translations/skinned_plugin_zh_CN.ts | 12 +++++++++++- .../Ui/skinned/translations/skinned_plugin_zh_TW.ts | 12 +++++++++++- 19 files changed, 205 insertions(+), 20 deletions(-) (limited to 'src/plugins/Ui') 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 #include #include +#include #include #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::instance = 0; -void AddUrlDialog::popup(QWidget* parent,PlayListModel* model ) +void AddUrlDialog::popup(QWidget* parent, PlayListModel* model) { if (!instance) { diff --git a/src/plugins/Ui/skinned/forms/skinnedsettings.ui b/src/plugins/Ui/skinned/forms/skinnedsettings.ui index 1aa67ae2b..16e6e186c 100644 --- a/src/plugins/Ui/skinned/forms/skinnedsettings.ui +++ b/src/plugins/Ui/skinned/forms/skinnedsettings.ui @@ -462,6 +462,22 @@ + + + + URL Dialog + + + + + + Auto-paste URL from clipboard + + + + + + diff --git a/src/plugins/Ui/skinned/skinnedsettings.cpp b/src/plugins/Ui/skinned/skinnedsettings.cpp index 67f1585c1..956078ca7 100644 --- a/src/plugins/Ui/skinned/skinnedsettings.cpp +++ b/src/plugins/Ui/skinned/skinnedsettings.cpp @@ -215,6 +215,8 @@ void SkinnedSettings::readSettings() ui.hiddenCheckBox->setChecked(settings.value("start_hidden", false).toBool()); ui.hideOnCloseCheckBox->setChecked(settings.value("hide_on_close", false).toBool()); settings.endGroup(); + //url dialog + ui.clipboardCheckBox->setChecked(settings.value("URLDialog/use_clipboard", false).toBool()); } void SkinnedSettings::writeSettings() @@ -237,4 +239,5 @@ void SkinnedSettings::writeSettings() settings.setValue ("start_hidden", ui.hiddenCheckBox->isChecked()); settings.setValue ("hide_on_close", ui.hideOnCloseCheckBox->isChecked()); settings.endGroup(); + settings.setValue ("URLDialog/use_clipboard", ui.clipboardCheckBox->isChecked()); } diff --git a/src/plugins/Ui/skinned/translations/skinned_plugin_cs.ts b/src/plugins/Ui/skinned/translations/skinned_plugin_cs.ts index 56d9a90eb..73dabccb8 100644 --- a/src/plugins/Ui/skinned/translations/skinned_plugin_cs.ts +++ b/src/plugins/Ui/skinned/translations/skinned_plugin_cs.ts @@ -382,7 +382,7 @@ Přidat URL - + Error Chyba @@ -1234,6 +1234,16 @@ Andrey Adreev <andreev00@gmail.com> Playlist separator: + + + URL Dialog + + + + + Auto-paste URL from clipboard + + Show anchor diff --git a/src/plugins/Ui/skinned/translations/skinned_plugin_de.ts b/src/plugins/Ui/skinned/translations/skinned_plugin_de.ts index 07c3da147..913cfc009 100644 --- a/src/plugins/Ui/skinned/translations/skinned_plugin_de.ts +++ b/src/plugins/Ui/skinned/translations/skinned_plugin_de.ts @@ -382,7 +382,7 @@ Hinzuzufügende URL eingeben - + Error Fehler @@ -1237,6 +1237,16 @@ Andrey Adreev <andreev00@gmail.com> Playlist separator: Wiedergabelisten-Trenner: + + + URL Dialog + + + + + Auto-paste URL from clipboard + + Show anchor diff --git a/src/plugins/Ui/skinned/translations/skinned_plugin_es.ts b/src/plugins/Ui/skinned/translations/skinned_plugin_es.ts index 2533830f9..1e5bc0a65 100644 --- a/src/plugins/Ui/skinned/translations/skinned_plugin_es.ts +++ b/src/plugins/Ui/skinned/translations/skinned_plugin_es.ts @@ -377,7 +377,7 @@ AddUrlDialog - + Error Error @@ -1234,6 +1234,16 @@ Andrey Adreev <andreev00@gmail.com> Playlist separator: + + + URL Dialog + + + + + Auto-paste URL from clipboard + + Show anchor diff --git a/src/plugins/Ui/skinned/translations/skinned_plugin_hu.ts b/src/plugins/Ui/skinned/translations/skinned_plugin_hu.ts index 439dd16a0..2a6a02771 100644 --- a/src/plugins/Ui/skinned/translations/skinned_plugin_hu.ts +++ b/src/plugins/Ui/skinned/translations/skinned_plugin_hu.ts @@ -377,7 +377,7 @@ AddUrlDialog - + Error Hiba @@ -1234,6 +1234,16 @@ Andrey Adreev <andreev00@gmail.com> Playlist separator: + + + URL Dialog + + + + + Auto-paste URL from clipboard + + Show anchor diff --git a/src/plugins/Ui/skinned/translations/skinned_plugin_it.ts b/src/plugins/Ui/skinned/translations/skinned_plugin_it.ts index a7a8b166e..0680bcbb7 100644 --- a/src/plugins/Ui/skinned/translations/skinned_plugin_it.ts +++ b/src/plugins/Ui/skinned/translations/skinned_plugin_it.ts @@ -377,7 +377,7 @@ AddUrlDialog - + Error Errore @@ -1234,6 +1234,16 @@ Andrey Adreev <andreev00@gmail.com> Playlist separator: + + + URL Dialog + + + + + Auto-paste URL from clipboard + + Show anchor diff --git a/src/plugins/Ui/skinned/translations/skinned_plugin_ja.ts b/src/plugins/Ui/skinned/translations/skinned_plugin_ja.ts index beff9c4ab..d95d26365 100644 --- a/src/plugins/Ui/skinned/translations/skinned_plugin_ja.ts +++ b/src/plugins/Ui/skinned/translations/skinned_plugin_ja.ts @@ -392,7 +392,7 @@ キャンセル(&C) - + Error 事故 @@ -1238,6 +1238,16 @@ Andrey Adreev <andreev00@gmail.com> Playlist separator: プレイリストの区切り: + + + URL Dialog + + + + + Auto-paste URL from clipboard + + Show anchor diff --git a/src/plugins/Ui/skinned/translations/skinned_plugin_lt.ts b/src/plugins/Ui/skinned/translations/skinned_plugin_lt.ts index b08ff938b..5f2efaaf0 100644 --- a/src/plugins/Ui/skinned/translations/skinned_plugin_lt.ts +++ b/src/plugins/Ui/skinned/translations/skinned_plugin_lt.ts @@ -378,7 +378,7 @@ AddUrlDialog - + Error Klaida @@ -1235,6 +1235,16 @@ Andrey Adreev <andreev00@gmail.com> Playlist separator: + + + URL Dialog + + + + + Auto-paste URL from clipboard + + Show anchor diff --git a/src/plugins/Ui/skinned/translations/skinned_plugin_nl.ts b/src/plugins/Ui/skinned/translations/skinned_plugin_nl.ts index cbcbe3f17..9845047a1 100644 --- a/src/plugins/Ui/skinned/translations/skinned_plugin_nl.ts +++ b/src/plugins/Ui/skinned/translations/skinned_plugin_nl.ts @@ -382,7 +382,7 @@ URL om toe te voegen - + Error Fout @@ -1234,6 +1234,16 @@ Andrey Adreev <andreev00@gmail.com> Playlist separator: + + + URL Dialog + + + + + Auto-paste URL from clipboard + + Show anchor diff --git a/src/plugins/Ui/skinned/translations/skinned_plugin_pl_PL.ts b/src/plugins/Ui/skinned/translations/skinned_plugin_pl_PL.ts index 65ecd9e8f..e782e6656 100644 --- a/src/plugins/Ui/skinned/translations/skinned_plugin_pl_PL.ts +++ b/src/plugins/Ui/skinned/translations/skinned_plugin_pl_PL.ts @@ -377,7 +377,7 @@ AddUrlDialog - + Error Błąd @@ -1237,6 +1237,16 @@ Andrey Adreev <andreev00@gmail.com> Playlist separator: Separator listy: + + + URL Dialog + + + + + Auto-paste URL from clipboard + + Show anchor diff --git a/src/plugins/Ui/skinned/translations/skinned_plugin_pt_BR.ts b/src/plugins/Ui/skinned/translations/skinned_plugin_pt_BR.ts index 6a0eafc3d..6c6263304 100644 --- a/src/plugins/Ui/skinned/translations/skinned_plugin_pt_BR.ts +++ b/src/plugins/Ui/skinned/translations/skinned_plugin_pt_BR.ts @@ -377,7 +377,7 @@ AddUrlDialog - + Error @@ -1234,6 +1234,16 @@ Andrey Adreev <andreev00@gmail.com> Playlist separator: + + + URL Dialog + + + + + Auto-paste URL from clipboard + + Show anchor diff --git a/src/plugins/Ui/skinned/translations/skinned_plugin_ru.ts b/src/plugins/Ui/skinned/translations/skinned_plugin_ru.ts index 287b01684..ec3be8f48 100644 --- a/src/plugins/Ui/skinned/translations/skinned_plugin_ru.ts +++ b/src/plugins/Ui/skinned/translations/skinned_plugin_ru.ts @@ -377,7 +377,7 @@ AddUrlDialog - + Error Ошибка @@ -1237,6 +1237,16 @@ Andrey Adreev <andreev00@gmail.com> Playlist separator: Разделитель списков: + + + URL Dialog + + + + + Auto-paste URL from clipboard + + Show anchor diff --git a/src/plugins/Ui/skinned/translations/skinned_plugin_sk.ts b/src/plugins/Ui/skinned/translations/skinned_plugin_sk.ts index e63e9dbb2..286009f38 100644 --- a/src/plugins/Ui/skinned/translations/skinned_plugin_sk.ts +++ b/src/plugins/Ui/skinned/translations/skinned_plugin_sk.ts @@ -382,7 +382,7 @@ Pridať URL - + Error Chyba @@ -1234,6 +1234,16 @@ Andrey Adreev <andreev00@gmail.com> Playlist separator: + + + URL Dialog + + + + + Auto-paste URL from clipboard + + Show anchor diff --git a/src/plugins/Ui/skinned/translations/skinned_plugin_tr.ts b/src/plugins/Ui/skinned/translations/skinned_plugin_tr.ts index 75095447f..5d38999c6 100644 --- a/src/plugins/Ui/skinned/translations/skinned_plugin_tr.ts +++ b/src/plugins/Ui/skinned/translations/skinned_plugin_tr.ts @@ -377,7 +377,7 @@ AddUrlDialog - + Error Hata @@ -1234,6 +1234,16 @@ Andrey Adreev <andreev00@gmail.com> Playlist separator: + + + URL Dialog + + + + + Auto-paste URL from clipboard + + Show anchor diff --git a/src/plugins/Ui/skinned/translations/skinned_plugin_uk_UA.ts b/src/plugins/Ui/skinned/translations/skinned_plugin_uk_UA.ts index 6945a77bc..d5e917ba5 100644 --- a/src/plugins/Ui/skinned/translations/skinned_plugin_uk_UA.ts +++ b/src/plugins/Ui/skinned/translations/skinned_plugin_uk_UA.ts @@ -377,7 +377,7 @@ AddUrlDialog - + Error Помилка @@ -1237,6 +1237,16 @@ Andrey Adreev <andreev00@gmail.com> Playlist separator: Розділювач списків: + + + URL Dialog + + + + + Auto-paste URL from clipboard + + Show anchor diff --git a/src/plugins/Ui/skinned/translations/skinned_plugin_zh_CN.ts b/src/plugins/Ui/skinned/translations/skinned_plugin_zh_CN.ts index 593c9531e..302b37e43 100644 --- a/src/plugins/Ui/skinned/translations/skinned_plugin_zh_CN.ts +++ b/src/plugins/Ui/skinned/translations/skinned_plugin_zh_CN.ts @@ -377,7 +377,7 @@ AddUrlDialog - + Error 错误 @@ -1234,6 +1234,16 @@ Andrey Adreev <andreev00@gmail.com> Playlist separator: + + + URL Dialog + + + + + Auto-paste URL from clipboard + + Show anchor diff --git a/src/plugins/Ui/skinned/translations/skinned_plugin_zh_TW.ts b/src/plugins/Ui/skinned/translations/skinned_plugin_zh_TW.ts index ccc920589..051db96f1 100644 --- a/src/plugins/Ui/skinned/translations/skinned_plugin_zh_TW.ts +++ b/src/plugins/Ui/skinned/translations/skinned_plugin_zh_TW.ts @@ -377,7 +377,7 @@ AddUrlDialog - + Error 錯誤 @@ -1234,6 +1234,16 @@ Andrey Adreev <andreev00@gmail.com> Playlist separator: + + + URL Dialog + + + + + Auto-paste URL from clipboard + + Show anchor -- cgit v1.2.3-13-gbd6f