diff options
19 files changed, 205 insertions, 20 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) { 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 @@ -463,6 +463,22 @@ </widget> </item> <item> + <widget class="QGroupBox" name="groupBox_3"> + <property name="title"> + <string>URL Dialog</string> + </property> + <layout class="QVBoxLayout" name="verticalLayout_2"> + <item> + <widget class="QCheckBox" name="clipboardCheckBox"> + <property name="text"> + <string>Auto-paste URL from clipboard</string> + </property> + </widget> + </item> + </layout> + </widget> + </item> + <item> <spacer name="verticalSpacer_2"> <property name="orientation"> <enum>Qt::Vertical</enum> 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 @@ <translation>Přidat URL</translation> </message> <message> - <location filename="../addurldialog.cpp" line="117"/> + <location filename="../addurldialog.cpp" line="125"/> <source>Error</source> <translation>Chyba</translation> </message> @@ -1235,6 +1235,16 @@ Andrey Adreev <andreev00@gmail.com></source> <translation type="unfinished"></translation> </message> <message> + <location filename="../forms/skinnedsettings.ui" line="468"/> + <source>URL Dialog</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../forms/skinnedsettings.ui" line="474"/> + <source>Auto-paste URL from clipboard</source> + <translation type="unfinished"></translation> + </message> + <message> <location filename="../forms/skinnedsettings.ui" line="380"/> <source>Show anchor</source> <translation type="unfinished"></translation> 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 @@ <translation>Hinzuzufügende URL eingeben</translation> </message> <message> - <location filename="../addurldialog.cpp" line="117"/> + <location filename="../addurldialog.cpp" line="125"/> <source>Error</source> <translation>Fehler</translation> </message> @@ -1238,6 +1238,16 @@ Andrey Adreev <andreev00@gmail.com></translation> <translation>Wiedergabelisten-Trenner:</translation> </message> <message> + <location filename="../forms/skinnedsettings.ui" line="468"/> + <source>URL Dialog</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../forms/skinnedsettings.ui" line="474"/> + <source>Auto-paste URL from clipboard</source> + <translation type="unfinished"></translation> + </message> + <message> <location filename="../forms/skinnedsettings.ui" line="380"/> <source>Show anchor</source> <translation type="unfinished"></translation> 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 @@ <context> <name>AddUrlDialog</name> <message> - <location filename="../addurldialog.cpp" line="117"/> + <location filename="../addurldialog.cpp" line="125"/> <source>Error</source> <translation>Error</translation> </message> @@ -1235,6 +1235,16 @@ Andrey Adreev <andreev00@gmail.com></source> <translation type="unfinished"></translation> </message> <message> + <location filename="../forms/skinnedsettings.ui" line="468"/> + <source>URL Dialog</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../forms/skinnedsettings.ui" line="474"/> + <source>Auto-paste URL from clipboard</source> + <translation type="unfinished"></translation> + </message> + <message> <location filename="../forms/skinnedsettings.ui" line="380"/> <source>Show anchor</source> <translation type="unfinished">Mostrar ancla</translation> 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 @@ <context> <name>AddUrlDialog</name> <message> - <location filename="../addurldialog.cpp" line="117"/> + <location filename="../addurldialog.cpp" line="125"/> <source>Error</source> <translation>Hiba</translation> </message> @@ -1235,6 +1235,16 @@ Andrey Adreev <andreev00@gmail.com></source> <translation type="unfinished"></translation> </message> <message> + <location filename="../forms/skinnedsettings.ui" line="468"/> + <source>URL Dialog</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../forms/skinnedsettings.ui" line="474"/> + <source>Auto-paste URL from clipboard</source> + <translation type="unfinished"></translation> + </message> + <message> <location filename="../forms/skinnedsettings.ui" line="380"/> <source>Show anchor</source> <translation type="unfinished"></translation> 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 @@ <context> <name>AddUrlDialog</name> <message> - <location filename="../addurldialog.cpp" line="117"/> + <location filename="../addurldialog.cpp" line="125"/> <source>Error</source> <translation>Errore</translation> </message> @@ -1235,6 +1235,16 @@ Andrey Adreev <andreev00@gmail.com></source> <translation type="unfinished"></translation> </message> <message> + <location filename="../forms/skinnedsettings.ui" line="468"/> + <source>URL Dialog</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../forms/skinnedsettings.ui" line="474"/> + <source>Auto-paste URL from clipboard</source> + <translation type="unfinished"></translation> + </message> + <message> <location filename="../forms/skinnedsettings.ui" line="380"/> <source>Show anchor</source> <translation type="unfinished"></translation> 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 @@ <translation>キャンセル(&C)</translation> </message> <message> - <location filename="../addurldialog.cpp" line="117"/> + <location filename="../addurldialog.cpp" line="125"/> <source>Error</source> <translation>事故</translation> </message> @@ -1239,6 +1239,16 @@ Andrey Adreev <andreev00@gmail.com></source> <translation>プレイリストの区切り:</translation> </message> <message> + <location filename="../forms/skinnedsettings.ui" line="468"/> + <source>URL Dialog</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../forms/skinnedsettings.ui" line="474"/> + <source>Auto-paste URL from clipboard</source> + <translation type="unfinished"></translation> + </message> + <message> <location filename="../forms/skinnedsettings.ui" line="380"/> <source>Show anchor</source> <translation>アンカーを表示</translation> 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 @@ <context> <name>AddUrlDialog</name> <message> - <location filename="../addurldialog.cpp" line="117"/> + <location filename="../addurldialog.cpp" line="125"/> <source>Error</source> <translation>Klaida</translation> </message> @@ -1236,6 +1236,16 @@ Andrey Adreev <andreev00@gmail.com></source> <translation type="unfinished"></translation> </message> <message> + <location filename="../forms/skinnedsettings.ui" line="468"/> + <source>URL Dialog</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../forms/skinnedsettings.ui" line="474"/> + <source>Auto-paste URL from clipboard</source> + <translation type="unfinished"></translation> + </message> + <message> <location filename="../forms/skinnedsettings.ui" line="380"/> <source>Show anchor</source> <translation type="unfinished"></translation> 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 @@ <translation>URL om toe te voegen</translation> </message> <message> - <location filename="../addurldialog.cpp" line="117"/> + <location filename="../addurldialog.cpp" line="125"/> <source>Error</source> <translation>Fout</translation> </message> @@ -1235,6 +1235,16 @@ Andrey Adreev <andreev00@gmail.com></source> <translation type="unfinished"></translation> </message> <message> + <location filename="../forms/skinnedsettings.ui" line="468"/> + <source>URL Dialog</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../forms/skinnedsettings.ui" line="474"/> + <source>Auto-paste URL from clipboard</source> + <translation type="unfinished"></translation> + </message> + <message> <location filename="../forms/skinnedsettings.ui" line="380"/> <source>Show anchor</source> <translation type="unfinished"></translation> 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 @@ <context> <name>AddUrlDialog</name> <message> - <location filename="../addurldialog.cpp" line="117"/> + <location filename="../addurldialog.cpp" line="125"/> <source>Error</source> <translation>Błąd</translation> </message> @@ -1238,6 +1238,16 @@ Andrey Adreev <andreev00@gmail.com></translation> <translation>Separator listy:</translation> </message> <message> + <location filename="../forms/skinnedsettings.ui" line="468"/> + <source>URL Dialog</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../forms/skinnedsettings.ui" line="474"/> + <source>Auto-paste URL from clipboard</source> + <translation type="unfinished"></translation> + </message> + <message> <location filename="../forms/skinnedsettings.ui" line="380"/> <source>Show anchor</source> <translation>Pokaż kotwicę</translation> 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 @@ <context> <name>AddUrlDialog</name> <message> - <location filename="../addurldialog.cpp" line="117"/> + <location filename="../addurldialog.cpp" line="125"/> <source>Error</source> <translation type="unfinished"></translation> </message> @@ -1235,6 +1235,16 @@ Andrey Adreev <andreev00@gmail.com></source> <translation type="unfinished"></translation> </message> <message> + <location filename="../forms/skinnedsettings.ui" line="468"/> + <source>URL Dialog</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../forms/skinnedsettings.ui" line="474"/> + <source>Auto-paste URL from clipboard</source> + <translation type="unfinished"></translation> + </message> + <message> <location filename="../forms/skinnedsettings.ui" line="380"/> <source>Show anchor</source> <translation type="unfinished"></translation> 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 @@ <context> <name>AddUrlDialog</name> <message> - <location filename="../addurldialog.cpp" line="117"/> + <location filename="../addurldialog.cpp" line="125"/> <source>Error</source> <translation>Ошибка</translation> </message> @@ -1238,6 +1238,16 @@ Andrey Adreev <andreev00@gmail.com></source> <translation>Разделитель списков:</translation> </message> <message> + <location filename="../forms/skinnedsettings.ui" line="468"/> + <source>URL Dialog</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../forms/skinnedsettings.ui" line="474"/> + <source>Auto-paste URL from clipboard</source> + <translation type="unfinished"></translation> + </message> + <message> <location filename="../forms/skinnedsettings.ui" line="380"/> <source>Show anchor</source> <translation>Показывать "якорь"</translation> 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 @@ <translation>Pridať URL</translation> </message> <message> - <location filename="../addurldialog.cpp" line="117"/> + <location filename="../addurldialog.cpp" line="125"/> <source>Error</source> <translation>Chyba</translation> </message> @@ -1235,6 +1235,16 @@ Andrey Adreev <andreev00@gmail.com></source> <translation type="unfinished"></translation> </message> <message> + <location filename="../forms/skinnedsettings.ui" line="468"/> + <source>URL Dialog</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../forms/skinnedsettings.ui" line="474"/> + <source>Auto-paste URL from clipboard</source> + <translation type="unfinished"></translation> + </message> + <message> <location filename="../forms/skinnedsettings.ui" line="380"/> <source>Show anchor</source> <translation type="unfinished">Zobrazovať ukotvenie</translation> 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 @@ <context> <name>AddUrlDialog</name> <message> - <location filename="../addurldialog.cpp" line="117"/> + <location filename="../addurldialog.cpp" line="125"/> <source>Error</source> <translation>Hata</translation> </message> @@ -1235,6 +1235,16 @@ Andrey Adreev <andreev00@gmail.com></source> <translation type="unfinished"></translation> </message> <message> + <location filename="../forms/skinnedsettings.ui" line="468"/> + <source>URL Dialog</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../forms/skinnedsettings.ui" line="474"/> + <source>Auto-paste URL from clipboard</source> + <translation type="unfinished"></translation> + </message> + <message> <location filename="../forms/skinnedsettings.ui" line="380"/> <source>Show anchor</source> <translation type="unfinished"></translation> 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 @@ <context> <name>AddUrlDialog</name> <message> - <location filename="../addurldialog.cpp" line="117"/> + <location filename="../addurldialog.cpp" line="125"/> <source>Error</source> <translation>Помилка</translation> </message> @@ -1238,6 +1238,16 @@ Andrey Adreev <andreev00@gmail.com></source> <translation>Розділювач списків:</translation> </message> <message> + <location filename="../forms/skinnedsettings.ui" line="468"/> + <source>URL Dialog</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../forms/skinnedsettings.ui" line="474"/> + <source>Auto-paste URL from clipboard</source> + <translation type="unfinished"></translation> + </message> + <message> <location filename="../forms/skinnedsettings.ui" line="380"/> <source>Show anchor</source> <translation>Показувати "якір"</translation> 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 @@ <context> <name>AddUrlDialog</name> <message> - <location filename="../addurldialog.cpp" line="117"/> + <location filename="../addurldialog.cpp" line="125"/> <source>Error</source> <translation>错误</translation> </message> @@ -1235,6 +1235,16 @@ Andrey Adreev <andreev00@gmail.com></source> <translation type="unfinished"></translation> </message> <message> + <location filename="../forms/skinnedsettings.ui" line="468"/> + <source>URL Dialog</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../forms/skinnedsettings.ui" line="474"/> + <source>Auto-paste URL from clipboard</source> + <translation type="unfinished"></translation> + </message> + <message> <location filename="../forms/skinnedsettings.ui" line="380"/> <source>Show anchor</source> <translation type="unfinished"></translation> 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 @@ <context> <name>AddUrlDialog</name> <message> - <location filename="../addurldialog.cpp" line="117"/> + <location filename="../addurldialog.cpp" line="125"/> <source>Error</source> <translation>錯誤</translation> </message> @@ -1235,6 +1235,16 @@ Andrey Adreev <andreev00@gmail.com></source> <translation type="unfinished"></translation> </message> <message> + <location filename="../forms/skinnedsettings.ui" line="468"/> + <source>URL Dialog</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../forms/skinnedsettings.ui" line="474"/> + <source>Auto-paste URL from clipboard</source> + <translation type="unfinished"></translation> + </message> + <message> <location filename="../forms/skinnedsettings.ui" line="380"/> <source>Show anchor</source> <translation type="unfinished"></translation> |