From 120cc255157da0fa806125ebfe8026ae64664a62 Mon Sep 17 00:00:00 2001 From: trialuser02 Date: Tue, 16 Aug 2011 17:54:02 +0000 Subject: added 'playlist separator' setting git-svn-id: http://svn.code.sf.net/p/qmmp-dev/code/trunk/qmmp@2306 90c681e8-e032-0410-971d-27865f9a5e38 --- src/plugins/Ui/skinned/forms/skinnedsettings.ui | 137 +++++++++++++++------ src/plugins/Ui/skinned/playlistselector.cpp | 10 +- src/plugins/Ui/skinned/playlistselector.h | 1 + src/plugins/Ui/skinned/skinnedsettings.cpp | 2 + .../Ui/skinned/translations/skinned_plugin_cs.ts | 15 ++- .../Ui/skinned/translations/skinned_plugin_de.ts | 15 ++- .../Ui/skinned/translations/skinned_plugin_es.ts | 15 ++- .../Ui/skinned/translations/skinned_plugin_hu.ts | 15 ++- .../Ui/skinned/translations/skinned_plugin_it.ts | 15 ++- .../Ui/skinned/translations/skinned_plugin_ja.ts | 15 ++- .../Ui/skinned/translations/skinned_plugin_lt.ts | 15 ++- .../Ui/skinned/translations/skinned_plugin_nl.ts | 15 ++- .../skinned/translations/skinned_plugin_pl_PL.ts | 15 ++- .../skinned/translations/skinned_plugin_pt_BR.ts | 15 ++- .../Ui/skinned/translations/skinned_plugin_ru.ts | 15 ++- .../Ui/skinned/translations/skinned_plugin_sk.ts | 15 ++- .../Ui/skinned/translations/skinned_plugin_tr.ts | 15 ++- .../skinned/translations/skinned_plugin_uk_UA.ts | 15 ++- .../skinned/translations/skinned_plugin_zh_CN.ts | 15 ++- .../skinned/translations/skinned_plugin_zh_TW.ts | 15 ++- 20 files changed, 267 insertions(+), 123 deletions(-) (limited to 'src/plugins') diff --git a/src/plugins/Ui/skinned/forms/skinnedsettings.ui b/src/plugins/Ui/skinned/forms/skinnedsettings.ui index 80a725dd3..476d6188f 100644 --- a/src/plugins/Ui/skinned/forms/skinnedsettings.ui +++ b/src/plugins/Ui/skinned/forms/skinnedsettings.ui @@ -350,21 +350,21 @@ Song Display - + Show protocol - + Show song numbers - + false @@ -374,21 +374,21 @@ - - + + - Show playlists + Show anchor - - + + - Show anchor + Show playlists - + Show popup information @@ -396,27 +396,68 @@ - - - false - - - Edit template - - + + + + + false + + + Edit template + + + + + + + Qt::Horizontal + + + + 40 + 20 + + + + + - - - - Qt::Horizontal - - - - 291 - 20 - - - + + + + + + Playlist separator: + + + + + + + false + + + + 0 + 0 + + + + + + + + Qt::Horizontal + + + + 40 + 20 + + + + + @@ -449,8 +490,8 @@ setNum(int) - 366 - 287 + 385 + 284 393 @@ -465,12 +506,12 @@ setNum(int) - 377 - 312 + 385 + 310 - 393 - 311 + 416 + 310 @@ -497,12 +538,12 @@ setEnabled(bool) - 130 - 198 + 151 + 189 - 210 - 200 + 117 + 221 @@ -522,5 +563,21 @@ + + playlistsCheckBox + toggled(bool) + plSeplineEdit + setEnabled(bool) + + + 201 + 161 + + + 197 + 243 + + + diff --git a/src/plugins/Ui/skinned/playlistselector.cpp b/src/plugins/Ui/skinned/playlistselector.cpp index 4a153ecce..3f99c4a1b 100644 --- a/src/plugins/Ui/skinned/playlistselector.cpp +++ b/src/plugins/Ui/skinned/playlistselector.cpp @@ -73,7 +73,9 @@ void PlayListSelector::readSettings() m_update = true; } m_metrics = new QFontMetrics(m_font); - + m_pl_separator = settings.value("Skinned/pl_separator", "::").toString(); + m_pl_separator.append(" "); + m_pl_separator.prepend(" "); resize(width(), m_metrics->height () +1); drawButtons(); } @@ -87,7 +89,7 @@ void PlayListSelector::updateTabs() if(m_rects.isEmpty()) rect.setX(9); else - rect.setX(m_rects.last().right() + m_metrics->width(" | ")); + rect.setX(m_rects.last().right() + m_metrics->width(m_pl_separator)); rect.setY(0); rect.setWidth(m_metrics->width(text)); rect.setHeight(m_metrics->ascent ()); @@ -139,7 +141,8 @@ void PlayListSelector::paintEvent(QPaintEvent *) if(i < m_rects.size() - 1) { painter.setPen(m_normal); - painter.drawText(m_rects[i].x() + m_rects[i].width() - m_offset, m_metrics->ascent(), " | "); + painter.drawText(m_rects[i].x() + m_rects[i].width() - m_offset, m_metrics->ascent(), + m_pl_separator); } } if(m_scrollable) @@ -249,6 +252,7 @@ void PlayListSelector::drawButtons() m_pixmap = QPixmap(40, height()); m_pixmap.fill(m_normal_bg); QPainter painter(&m_pixmap); + painter.setRenderHint(QPainter::Antialiasing, true); painter.setPen(m_left_pressed ? m_current : m_normal); painter.setBrush(QBrush(m_left_pressed ? m_current : m_normal)); QPoint points[3] = { diff --git a/src/plugins/Ui/skinned/playlistselector.h b/src/plugins/Ui/skinned/playlistselector.h index 67e281f75..ddb03ce89 100644 --- a/src/plugins/Ui/skinned/playlistselector.h +++ b/src/plugins/Ui/skinned/playlistselector.h @@ -74,6 +74,7 @@ private: bool m_showButtons; int m_offset, m_offset_max; bool m_left_pressed, m_right_pressed; + QString m_pl_separator; }; #endif // PLAYLISTSELECTOR_H diff --git a/src/plugins/Ui/skinned/skinnedsettings.cpp b/src/plugins/Ui/skinned/skinnedsettings.cpp index 533913af3..3cc0e4fa6 100644 --- a/src/plugins/Ui/skinned/skinnedsettings.cpp +++ b/src/plugins/Ui/skinned/skinnedsettings.cpp @@ -197,6 +197,7 @@ void SkinnedSettings::readSettings() ui.anchorCheckBox->setChecked(settings.value("pl_show_anchor", false).toBool()); ui.playlistsCheckBox->setChecked(settings.value("pl_show_plalists", false).toBool()); ui.popupCheckBox->setChecked(settings.value("pl_show_popup", false).toBool()); + ui.plSeplineEdit->setText(settings.value("pl_separator", "::").toString()); //transparency ui.mwTransparencySlider->setValue(100 - settings.value("mw_opacity", 1.0).toDouble()*100); ui.eqTransparencySlider->setValue(100 - settings.value("eq_opacity", 1.0).toDouble()*100); @@ -219,6 +220,7 @@ void SkinnedSettings::writeSettings() settings.setValue ("pl_show_anchor", ui.anchorCheckBox->isChecked()); settings.setValue ("pl_show_plalists", ui.playlistsCheckBox->isChecked()); settings.setValue ("pl_show_popup", ui.popupCheckBox->isChecked()); + settings.setValue ("pl_separator", ui.plSeplineEdit->text()); settings.setValue ("mw_opacity", 1.0 - (double)ui.mwTransparencySlider->value()/100); settings.setValue ("eq_opacity", 1.0 - (double)ui.eqTransparencySlider->value()/100); settings.setValue ("pl_opacity", 1.0 - (double)ui.plTransparencySlider->value()/100); diff --git a/src/plugins/Ui/skinned/translations/skinned_plugin_cs.ts b/src/plugins/Ui/skinned/translations/skinned_plugin_cs.ts index 07542f3c6..bd7f3aed8 100644 --- a/src/plugins/Ui/skinned/translations/skinned_plugin_cs.ts +++ b/src/plugins/Ui/skinned/translations/skinned_plugin_cs.ts @@ -891,12 +891,12 @@ O&dstranit - + Rename Playlist Přejmenovat seznam skladeb - + Playlist name: Název seznamu skladeb: @@ -1219,7 +1219,7 @@ Andrey Adreev <andreev00@gmail.com> Zobrazit čísla skladeb - + Show playlists Zobrazit seznam skladeb @@ -1229,12 +1229,17 @@ Andrey Adreev <andreev00@gmail.com> Zobrazit informace ve vyskakovacím okně - + Edit template - + + Playlist separator: + + + + 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 1b12349d6..d7321f4ce 100644 --- a/src/plugins/Ui/skinned/translations/skinned_plugin_de.ts +++ b/src/plugins/Ui/skinned/translations/skinned_plugin_de.ts @@ -891,12 +891,12 @@ L&öschen - + Rename Playlist Wiedergabeliste umbenennen - + Playlist name: Name der Wiedergabeliste: @@ -1219,7 +1219,7 @@ Andrey Adreev <andreev00@gmail.com> Titelnummern anzeigen - + Show playlists Wiedergabelisten anzeigen @@ -1229,12 +1229,17 @@ Andrey Adreev <andreev00@gmail.com> Informationen in einem Aufklapp-Fenster anzeigen - + Edit template Vorlage bearbeiten - + + Playlist separator: + + + + 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 8f7ebcf84..b67488012 100644 --- a/src/plugins/Ui/skinned/translations/skinned_plugin_es.ts +++ b/src/plugins/Ui/skinned/translations/skinned_plugin_es.ts @@ -891,12 +891,12 @@ &Borrar - + Rename Playlist Renombrar lista - + Playlist name: Nombre de la lista: @@ -1219,7 +1219,7 @@ Andrey Adreev <andreev00@gmail.com> Mostrar los números de canción - + Show playlists Mostrar la lista de reproducción @@ -1229,12 +1229,17 @@ Andrey Adreev <andreev00@gmail.com> Mostrar información emergente - + Edit template Editar la plantilla - + + Playlist separator: + + + + Show anchor Mostrar ancla diff --git a/src/plugins/Ui/skinned/translations/skinned_plugin_hu.ts b/src/plugins/Ui/skinned/translations/skinned_plugin_hu.ts index 0773d032c..9c5ee9676 100644 --- a/src/plugins/Ui/skinned/translations/skinned_plugin_hu.ts +++ b/src/plugins/Ui/skinned/translations/skinned_plugin_hu.ts @@ -891,12 +891,12 @@ &Törlés - + Rename Playlist Lista átnevezése - + Playlist name: Lista neve: @@ -1219,7 +1219,7 @@ Andrey Adreev <andreev00@gmail.com> Zene sorszámának mutatása - + Show playlists Lejátszási lista mutatása @@ -1229,12 +1229,17 @@ Andrey Adreev <andreev00@gmail.com> Felugró információk mutatása - + Edit template - + + Playlist separator: + + + + 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 407efcd53..9ca8adb01 100644 --- a/src/plugins/Ui/skinned/translations/skinned_plugin_it.ts +++ b/src/plugins/Ui/skinned/translations/skinned_plugin_it.ts @@ -891,12 +891,12 @@ &Elimina - + Rename Playlist Rinomina lista brani - + Playlist name: Nome della lista brani: @@ -1219,7 +1219,7 @@ Andrey Adreev <andreev00@gmail.com> Mostra numero brani - + Show playlists Mostra lista esecuzione brani @@ -1229,12 +1229,17 @@ Andrey Adreev <andreev00@gmail.com> Mostra informazioni popup - + Edit template - + + Playlist separator: + + + + 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 6955c5612..14a746c5f 100644 --- a/src/plugins/Ui/skinned/translations/skinned_plugin_ja.ts +++ b/src/plugins/Ui/skinned/translations/skinned_plugin_ja.ts @@ -891,12 +891,12 @@ 削除(&D) - + Rename Playlist プレイリスト名を変更 - + Playlist name: プレイリスト名: @@ -1219,7 +1219,7 @@ Andrey Adreev <andreev00@gmail.com> 曲番号つきで表示 - + Show playlists プレイリストを表示 @@ -1229,12 +1229,17 @@ Andrey Adreev <andreev00@gmail.com> 情報吹き出しを表示 - + Edit template ひな型を編集 - + + Playlist separator: + + + + 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 09269611b..23bc7218c 100644 --- a/src/plugins/Ui/skinned/translations/skinned_plugin_lt.ts +++ b/src/plugins/Ui/skinned/translations/skinned_plugin_lt.ts @@ -892,12 +892,12 @@ &Ištrinti - + Rename Playlist Pervadinti grojaraštį - + Playlist name: Grojaraščio pavadinimas @@ -1220,7 +1220,7 @@ Andrey Adreev <andreev00@gmail.com> Rodyti takelių numerius - + Show playlists Rodyti grojaraščius @@ -1230,12 +1230,17 @@ Andrey Adreev <andreev00@gmail.com> Rodyti iššokančią informaciją - + Edit template Taisyti šabloną - + + Playlist separator: + + + + 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 e3d07ec84..b3d8b364c 100644 --- a/src/plugins/Ui/skinned/translations/skinned_plugin_nl.ts +++ b/src/plugins/Ui/skinned/translations/skinned_plugin_nl.ts @@ -891,12 +891,12 @@ &Verwijder - + Rename Playlist Hernoem Afspeellijst - + Playlist name: Afspeellijst: @@ -1219,7 +1219,7 @@ Andrey Adreev <andreev00@gmail.com> Toon liednummers - + Show playlists Toon afspeellijst @@ -1229,12 +1229,17 @@ Andrey Adreev <andreev00@gmail.com> Toon popup informatie - + Edit template - + + Playlist separator: + + + + 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 309108936..95370d6b1 100644 --- a/src/plugins/Ui/skinned/translations/skinned_plugin_pl_PL.ts +++ b/src/plugins/Ui/skinned/translations/skinned_plugin_pl_PL.ts @@ -891,12 +891,12 @@ Usuń - + Rename Playlist Zmień nazwę listy - + Playlist name: Nazwa listy odtwarzania: @@ -1222,7 +1222,7 @@ Andrey Adreev <andreev00@gmail.com> Wyświetl numery utworów na liście odtwarzania - + Show playlists Pokaż listy odtwarzania @@ -1232,12 +1232,17 @@ Andrey Adreev <andreev00@gmail.com> Pokaż informację popup - + Edit template Edytuj szablon - + + Playlist separator: + + + + Show anchor Pokaż kotwicę 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 b61aaa66d..0876fb4bb 100644 --- a/src/plugins/Ui/skinned/translations/skinned_plugin_pt_BR.ts +++ b/src/plugins/Ui/skinned/translations/skinned_plugin_pt_BR.ts @@ -891,12 +891,12 @@ - + Rename Playlist - + Playlist name: @@ -1219,7 +1219,7 @@ Andrey Adreev <andreev00@gmail.com> - + Show playlists @@ -1229,12 +1229,17 @@ Andrey Adreev <andreev00@gmail.com> - + Edit template - + + Playlist separator: + + + + 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 f43fe4d0b..114453e80 100644 --- a/src/plugins/Ui/skinned/translations/skinned_plugin_ru.ts +++ b/src/plugins/Ui/skinned/translations/skinned_plugin_ru.ts @@ -891,12 +891,12 @@ &Удалить - + Rename Playlist Переименовать список - + Playlist name: Имя списка: @@ -1222,7 +1222,7 @@ Andrey Adreev <andreev00@gmail.com> Показывать номера песен - + Show playlists Показывать списки воспроизведения @@ -1232,12 +1232,17 @@ Andrey Adreev <andreev00@gmail.com> Показывать всплывающее окно с информацией - + Edit template Редактировать шаблон - + + Playlist separator: + Разделитель списков: + + + 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 27ea60a7a..05c8d1f24 100644 --- a/src/plugins/Ui/skinned/translations/skinned_plugin_sk.ts +++ b/src/plugins/Ui/skinned/translations/skinned_plugin_sk.ts @@ -891,12 +891,12 @@ &Vymazať - + Rename Playlist Premenovať playlist - + Playlist name: Název playlistu: @@ -1219,7 +1219,7 @@ Andrey Adreev <andreev00@gmail.com> Zobrazovať čísla piesní - + Show playlists Zobrazovať playlisty @@ -1229,12 +1229,17 @@ Andrey Adreev <andreev00@gmail.com> Zobrazovať upozornenia s informáciami - + Edit template Upraviť šablónu - + + Playlist separator: + + + + Show anchor Zobrazovať ukotvenie diff --git a/src/plugins/Ui/skinned/translations/skinned_plugin_tr.ts b/src/plugins/Ui/skinned/translations/skinned_plugin_tr.ts index 86582cf0f..3d0b58c15 100644 --- a/src/plugins/Ui/skinned/translations/skinned_plugin_tr.ts +++ b/src/plugins/Ui/skinned/translations/skinned_plugin_tr.ts @@ -891,12 +891,12 @@ - + Rename Playlist - + Playlist name: @@ -1219,7 +1219,7 @@ Andrey Adreev <andreev00@gmail.com> Şarkı numaralarını göster - + Show playlists @@ -1229,12 +1229,17 @@ Andrey Adreev <andreev00@gmail.com> - + Edit template - + + Playlist separator: + + + + 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 615ba6c7d..3e67a99ad 100644 --- a/src/plugins/Ui/skinned/translations/skinned_plugin_uk_UA.ts +++ b/src/plugins/Ui/skinned/translations/skinned_plugin_uk_UA.ts @@ -891,12 +891,12 @@ &Видалити - + Rename Playlist Переіменувати список - + Playlist name: Ім'я списка: @@ -1222,7 +1222,7 @@ Andrey Adreev <andreev00@gmail.com> Відображати номера пісень - + Show playlists Показати списки @@ -1232,12 +1232,17 @@ Andrey Adreev <andreev00@gmail.com> Показувати спливаюче вікно з інформацією - + Edit template Редагувати шаблон - + + Playlist separator: + + + + 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 e8a512e05..b0c1e14cf 100644 --- a/src/plugins/Ui/skinned/translations/skinned_plugin_zh_CN.ts +++ b/src/plugins/Ui/skinned/translations/skinned_plugin_zh_CN.ts @@ -891,12 +891,12 @@ - + Rename Playlist - + Playlist name: @@ -1219,7 +1219,7 @@ Andrey Adreev <andreev00@gmail.com> 显示曲目编号 - + Show playlists @@ -1229,12 +1229,17 @@ Andrey Adreev <andreev00@gmail.com> - + Edit template - + + Playlist separator: + + + + 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 a16da9e20..5a4de9870 100644 --- a/src/plugins/Ui/skinned/translations/skinned_plugin_zh_TW.ts +++ b/src/plugins/Ui/skinned/translations/skinned_plugin_zh_TW.ts @@ -891,12 +891,12 @@ - + Rename Playlist - + Playlist name: @@ -1219,7 +1219,7 @@ Andrey Adreev <andreev00@gmail.com> 顯示曲目編號 - + Show playlists @@ -1229,12 +1229,17 @@ Andrey Adreev <andreev00@gmail.com> - + Edit template - + + Playlist separator: + + + + Show anchor -- cgit v1.2.3-13-gbd6f