From 767999392d86d467e577ee14b0242f0f5dc21c28 Mon Sep 17 00:00:00 2001 From: trialuser02 Date: Tue, 12 Jul 2011 19:13:22 +0000 Subject: fixed some regressions git-svn-id: http://svn.code.sf.net/p/qmmp-dev/code/trunk/qmmp@2275 90c681e8-e032-0410-971d-27865f9a5e38 --- src/plugins/Ui/skinned/forms/skinnedsettings.ui | 72 ++++++++++------------ src/plugins/Ui/skinned/hotkeyeditor.cpp | 1 + src/plugins/Ui/skinned/skinnedsettings.cpp | 4 ++ .../Ui/skinned/translations/skinned_plugin_cs.ts | 26 ++++---- .../Ui/skinned/translations/skinned_plugin_de.ts | 28 ++++----- .../Ui/skinned/translations/skinned_plugin_es.ts | 26 ++++---- .../Ui/skinned/translations/skinned_plugin_hu.ts | 30 ++++----- .../Ui/skinned/translations/skinned_plugin_it.ts | 34 +++++----- .../Ui/skinned/translations/skinned_plugin_ja.ts | 26 ++++---- .../Ui/skinned/translations/skinned_plugin_lt.ts | 28 ++++----- .../Ui/skinned/translations/skinned_plugin_nl.ts | 26 ++++---- .../skinned/translations/skinned_plugin_pl_PL.ts | 26 ++++---- .../skinned/translations/skinned_plugin_pt_BR.ts | 26 ++++---- .../Ui/skinned/translations/skinned_plugin_ru.ts | 26 ++++---- .../Ui/skinned/translations/skinned_plugin_sk.ts | 30 ++++----- .../Ui/skinned/translations/skinned_plugin_tr.ts | 26 ++++---- .../skinned/translations/skinned_plugin_uk_UA.ts | 26 ++++---- .../skinned/translations/skinned_plugin_zh_CN.ts | 26 ++++---- .../skinned/translations/skinned_plugin_zh_TW.ts | 26 ++++---- 19 files changed, 257 insertions(+), 256 deletions(-) (limited to 'src/plugins') diff --git a/src/plugins/Ui/skinned/forms/skinnedsettings.ui b/src/plugins/Ui/skinned/forms/skinnedsettings.ui index 4554c017b..80a725dd3 100644 --- a/src/plugins/Ui/skinned/forms/skinnedsettings.ui +++ b/src/plugins/Ui/skinned/forms/skinnedsettings.ui @@ -343,7 +343,7 @@ Miscellaneous - + @@ -364,6 +364,16 @@ + + + + false + + + Align song numbers + + + @@ -371,40 +381,6 @@ - - - - - - Show popup information - - - - - - - false - - - Edit template - - - - - - - Qt::Horizontal - - - - 40 - 20 - - - - - - @@ -412,16 +388,36 @@ - - + + + + Show popup information + + + + + false - Align song numbers + Edit template + + + + Qt::Horizontal + + + + 291 + 20 + + + + diff --git a/src/plugins/Ui/skinned/hotkeyeditor.cpp b/src/plugins/Ui/skinned/hotkeyeditor.cpp index 9c687a1d7..d57527f1e 100644 --- a/src/plugins/Ui/skinned/hotkeyeditor.cpp +++ b/src/plugins/Ui/skinned/hotkeyeditor.cpp @@ -28,6 +28,7 @@ HotkeyEditor::HotkeyEditor(QWidget *parent) : QWidget(parent), m_ui(new Ui::Hotk { m_ui->setupUi(this); loadShortcuts(); + m_ui->changeShortcutButton->setIcon(QIcon::fromTheme("configure")); } HotkeyEditor::~HotkeyEditor() diff --git a/src/plugins/Ui/skinned/skinnedsettings.cpp b/src/plugins/Ui/skinned/skinnedsettings.cpp index 95fb2a055..533913af3 100644 --- a/src/plugins/Ui/skinned/skinnedsettings.cpp +++ b/src/plugins/Ui/skinned/skinnedsettings.cpp @@ -38,6 +38,10 @@ SkinnedSettings::SkinnedSettings(QWidget *parent) : QWidget(parent) readSettings(); loadSkins(); loadFonts(); + //setup icons + ui.skinInstallButton->setIcon(QIcon::fromTheme("list-add")); + ui.skinReloadButton->setIcon(QIcon::fromTheme("view-refresh")); + ui.popupTemplateButton->setIcon(QIcon::fromTheme("configure")); } SkinnedSettings::~SkinnedSettings() diff --git a/src/plugins/Ui/skinned/translations/skinned_plugin_cs.ts b/src/plugins/Ui/skinned/translations/skinned_plugin_cs.ts index aa9bce1b7..26df12bba 100644 --- a/src/plugins/Ui/skinned/translations/skinned_plugin_cs.ts +++ b/src/plugins/Ui/skinned/translations/skinned_plugin_cs.ts @@ -562,22 +562,22 @@ - + Playback Přehrávání - + View Zobrazení - + Playlist Seznam skladeb - + Misc @@ -1271,47 +1271,47 @@ Zobrazit čísla skladeb - + Show playlists Zobrazit seznam skladeb - + Show popup information Zobrazit informace ve vyskakovacím okně - + Edit template - + Show anchor - + Align song numbers - + Select Skin Files Vybrat soubory s tématy - + Skin files Soubory s tématy - + Unarchived skin Rozbalené téma - + Archived skin Sbalené téma diff --git a/src/plugins/Ui/skinned/translations/skinned_plugin_de.ts b/src/plugins/Ui/skinned/translations/skinned_plugin_de.ts index 94db8becd..aafe46d88 100644 --- a/src/plugins/Ui/skinned/translations/skinned_plugin_de.ts +++ b/src/plugins/Ui/skinned/translations/skinned_plugin_de.ts @@ -562,22 +562,22 @@ Kurzbefehl ändern ... - + Playback Wiedergabe - + View Ansicht - + Playlist Wiedergabeliste - + Misc Verschiedenes @@ -1211,7 +1211,7 @@ ... - + @@ -1271,47 +1271,47 @@ Titelnummern anzeigen - + Show playlists Wiedergabelisten anzeigen - + Show popup information Informationen in einem Aufklapp-Fenster anzeigen - + Edit template Vorlage bearbeiten - + Show anchor - + Align song numbers Stücknummern ausrichten - + Select Skin Files Design-Dateien auswählen - + Skin files Design-Dateien - + Unarchived skin Nicht archiviertes Design - + Archived skin Archiviertes Design diff --git a/src/plugins/Ui/skinned/translations/skinned_plugin_es.ts b/src/plugins/Ui/skinned/translations/skinned_plugin_es.ts index 015e8e0c3..f0825be22 100644 --- a/src/plugins/Ui/skinned/translations/skinned_plugin_es.ts +++ b/src/plugins/Ui/skinned/translations/skinned_plugin_es.ts @@ -562,22 +562,22 @@ Cambiar atajo... - + Playback Reproducción - + View Ver - + Playlist Lista de reproducción - + Misc Varios @@ -1271,47 +1271,47 @@ Mostrar los números de canción - + Show playlists Mostrar la lista de reproducción - + Show popup information Mostrar información emergente - + Edit template Editar la plantilla - + Show anchor Mostrar ancla - + Align song numbers Alinear los números de canción - + Select Skin Files Seleccionar archivos de pieles - + Skin files Archivos de pieles - + Unarchived skin Piel no archivada - + Archived skin Piel archivada diff --git a/src/plugins/Ui/skinned/translations/skinned_plugin_hu.ts b/src/plugins/Ui/skinned/translations/skinned_plugin_hu.ts index 00aadf988..bad6f0c00 100644 --- a/src/plugins/Ui/skinned/translations/skinned_plugin_hu.ts +++ b/src/plugins/Ui/skinned/translations/skinned_plugin_hu.ts @@ -490,7 +490,7 @@ Equalizer - + Hangszínszabályzó @@ -562,22 +562,22 @@ - + Playback Lejátszás - + View Megnéz - + Playlist Lejátszási lista - + Misc @@ -1243,7 +1243,7 @@ Equalizer - + Hangszínszabályzó @@ -1271,47 +1271,47 @@ Zene sorszámának mutatása - + Show playlists Lejátszási lista mutatása - + Show popup information Felugró információk mutatása - + Edit template - + Show anchor - + Align song numbers - + Select Skin Files Skin fájl kiválasztása - + Skin files Skin fájlok - + Unarchived skin Tömörítettlen skin - + Archived skin Tömörített skin diff --git a/src/plugins/Ui/skinned/translations/skinned_plugin_it.ts b/src/plugins/Ui/skinned/translations/skinned_plugin_it.ts index 0a9fb3d18..54a77fbd3 100644 --- a/src/plugins/Ui/skinned/translations/skinned_plugin_it.ts +++ b/src/plugins/Ui/skinned/translations/skinned_plugin_it.ts @@ -562,22 +562,22 @@ - + Playback Riproduzione - + View - + Playlist - + Lista brani - + Misc @@ -833,7 +833,7 @@ Playlist - + Lista brani @@ -918,7 +918,7 @@ Playlist - + Lista brani @@ -1248,7 +1248,7 @@ Playlist - + Lista brani @@ -1271,47 +1271,47 @@ Mostra numero brani - + Show playlists Mostra lista esecuzione brani - + Show popup information Mostra informazioni popup - + Edit template - + Show anchor - + Align song numbers - + Select Skin Files Seleziona aspetto - + Skin files Aspetto - + Unarchived skin Tema non archiviato - + Archived skin Tema archiviato diff --git a/src/plugins/Ui/skinned/translations/skinned_plugin_ja.ts b/src/plugins/Ui/skinned/translations/skinned_plugin_ja.ts index a3a57b7d0..a0d4cd041 100644 --- a/src/plugins/Ui/skinned/translations/skinned_plugin_ja.ts +++ b/src/plugins/Ui/skinned/translations/skinned_plugin_ja.ts @@ -562,22 +562,22 @@ 変更 - + Playback 再生 - + View 観容 - + Playlist プレイリスト - + Misc いろいろ @@ -1271,47 +1271,47 @@ 曲番号つきで表示 - + Show playlists プレイリストを表示 - + Show popup information 情報吹き出しを表示 - + Edit template ひな型を編集 - + Show anchor アンカーを表示 - + Align song numbers 曲番号のみを表示 - + Select Skin Files スキンファイルを選択 - + Skin files スキンファイル - + Unarchived skin 非書庫化スキン - + Archived skin 書庫化スキン diff --git a/src/plugins/Ui/skinned/translations/skinned_plugin_lt.ts b/src/plugins/Ui/skinned/translations/skinned_plugin_lt.ts index def91c8c4..856549058 100644 --- a/src/plugins/Ui/skinned/translations/skinned_plugin_lt.ts +++ b/src/plugins/Ui/skinned/translations/skinned_plugin_lt.ts @@ -563,22 +563,22 @@ Keisti trumpinį... - + Playback Grojimas - + View Rodyti - + Playlist Grojaraštis - + Misc Įvairūs @@ -1244,7 +1244,7 @@ Equalizer - + Glotintuvas @@ -1272,47 +1272,47 @@ Rodyti takelių numerius - + Show playlists Rodyti grojaraščius - + Show popup information Rodyti iššokančią informaciją - + Edit template Taisyti šabloną - + Show anchor - + Align song numbers Lygiuoti dainų numerius - + Select Skin Files Pasirinkti temų bylas - + Skin files Temų bylos - + Unarchived skin Išskleista tema - + Archived skin Suspausta tema diff --git a/src/plugins/Ui/skinned/translations/skinned_plugin_nl.ts b/src/plugins/Ui/skinned/translations/skinned_plugin_nl.ts index 185dc01a2..3dbbf653b 100644 --- a/src/plugins/Ui/skinned/translations/skinned_plugin_nl.ts +++ b/src/plugins/Ui/skinned/translations/skinned_plugin_nl.ts @@ -562,22 +562,22 @@ - + Playback Afspelen - + View Weergave - + Playlist Afspeellijst - + Misc @@ -1271,47 +1271,47 @@ Toon liednummers - + Show playlists Toon afspeellijst - + Show popup information Toon popup informatie - + Edit template - + Show anchor - + Align song numbers - + Select Skin Files Selecteer themabestanden - + Skin files Thema bestanden - + Unarchived skin Niet gearchiveerd thema - + Archived skin Gearchiveerd thema 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 a70eb8fa0..f2829939f 100644 --- a/src/plugins/Ui/skinned/translations/skinned_plugin_pl_PL.ts +++ b/src/plugins/Ui/skinned/translations/skinned_plugin_pl_PL.ts @@ -562,22 +562,22 @@ Zmień skrót... - + Playback Odtwarzanie - + View Wygląd - + Playlist Lista odtwarzania - + Misc Inne @@ -1271,47 +1271,47 @@ Wyświetl numery utworów na liście odtwarzania - + Show playlists Pokaż listy odtwarzania - + Show popup information Pokaż informację popup - + Edit template Edytuj szablon - + Show anchor Pokaż kotwicę - + Align song numbers Wyrównaj w pionie numery utworów - + Select Skin Files Wybierz skórę - + Skin files Pliki skór - + Unarchived skin Niekompresowana skórka - + Archived skin Skompresowana skórka 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 fd64c7a94..f67f91c6b 100644 --- a/src/plugins/Ui/skinned/translations/skinned_plugin_pt_BR.ts +++ b/src/plugins/Ui/skinned/translations/skinned_plugin_pt_BR.ts @@ -562,22 +562,22 @@ - + Playback - + View - + Playlist Lista de músicas - + Misc @@ -1271,47 +1271,47 @@ - + Show playlists - + Show popup information - + Edit template - + Show anchor - + Align song numbers - + Select Skin Files - + Skin files - + Unarchived skin - + Archived skin diff --git a/src/plugins/Ui/skinned/translations/skinned_plugin_ru.ts b/src/plugins/Ui/skinned/translations/skinned_plugin_ru.ts index 389fb27d4..0b9052b23 100644 --- a/src/plugins/Ui/skinned/translations/skinned_plugin_ru.ts +++ b/src/plugins/Ui/skinned/translations/skinned_plugin_ru.ts @@ -562,22 +562,22 @@ Изменить сочетание клавиш... - + Playback Воспроизведение - + View Вид - + Playlist Список - + Misc Другие @@ -1271,47 +1271,47 @@ Показывать номера песен - + Show playlists Показывать списки воспроизведения - + Show popup information Показывать всплывающее окно с информацией - + Edit template Редактировать шаблон - + Show anchor Показывать "якорь" - + Align song numbers Выравнивать номера фрагментов - + Select Skin Files Выберите файлы обложек - + Skin files Файлы обложек - + Unarchived skin Распакованная тема - + Archived skin Упакованная тема diff --git a/src/plugins/Ui/skinned/translations/skinned_plugin_sk.ts b/src/plugins/Ui/skinned/translations/skinned_plugin_sk.ts index 816781cba..d21841d95 100644 --- a/src/plugins/Ui/skinned/translations/skinned_plugin_sk.ts +++ b/src/plugins/Ui/skinned/translations/skinned_plugin_sk.ts @@ -562,22 +562,22 @@ Zmeniť skratku... - + Playback Prehrávanie - + View - + Zobraziť - + Playlist Playlist - + Misc Rôzn. @@ -1174,7 +1174,7 @@ View - + Zobraziť @@ -1271,47 +1271,47 @@ Zobrazovať čísla piesní - + Show playlists Zobrazovať playlisty - + Show popup information Zobrazovať upozornenia s informáciami - + Edit template Upraviť šablónu - + Show anchor Zobrazovať ukotvenie - + Align song numbers Zarovnať čísla piesní - + Select Skin Files Vybrať súbory skinov - + Skin files Súbory skinov - + Unarchived skin Nearchivovaný skin - + Archived skin Archivovaný skin diff --git a/src/plugins/Ui/skinned/translations/skinned_plugin_tr.ts b/src/plugins/Ui/skinned/translations/skinned_plugin_tr.ts index eca3b91ea..e639d3f8c 100644 --- a/src/plugins/Ui/skinned/translations/skinned_plugin_tr.ts +++ b/src/plugins/Ui/skinned/translations/skinned_plugin_tr.ts @@ -562,22 +562,22 @@ - + Playback - + View - + Playlist Çalma Listesi - + Misc @@ -1271,47 +1271,47 @@ Şarkı numaralarını göster - + Show playlists - + Show popup information - + Edit template - + Show anchor - + Align song numbers - + Select Skin Files Kabuk Dosyası Seç - + Skin files Kabuk dosyaları - + Unarchived skin Arşivlenmemiş kabuk - + Archived skin Arşivlenmiş kabuk 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 282dfa105..634cf8fe3 100644 --- a/src/plugins/Ui/skinned/translations/skinned_plugin_uk_UA.ts +++ b/src/plugins/Ui/skinned/translations/skinned_plugin_uk_UA.ts @@ -562,22 +562,22 @@ Змінити комбінації клавіш... - + Playback Відтворення - + View Вигляд - + Playlist Список - + Misc Інші @@ -1271,47 +1271,47 @@ Відображати номера пісень - + Show playlists Показати списки - + Show popup information Показувати спливаюче вікно з інформацією - + Edit template Редагувати шаблон - + Show anchor Показувати "якір" - + Align song numbers Вирівнювати номери фрагментів - + Select Skin Files Вибрати файли скінів - + Skin files Файли скінів - + Unarchived skin Розпакована тема - + Archived skin Упакована тема 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 c5d95bcfd..ce17243e4 100644 --- a/src/plugins/Ui/skinned/translations/skinned_plugin_zh_CN.ts +++ b/src/plugins/Ui/skinned/translations/skinned_plugin_zh_CN.ts @@ -562,22 +562,22 @@ - + Playback - + View - + Playlist 播放列表 - + Misc @@ -1271,47 +1271,47 @@ 显示曲目编号 - + Show playlists - + Show popup information - + Edit template - + Show anchor - + Align song numbers - + Select Skin Files 选择皮肤文件 - + Skin files 皮肤文件 - + Unarchived skin 未压缩皮肤 - + Archived skin 压缩皮肤 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 4ca79981c..35c0673bc 100644 --- a/src/plugins/Ui/skinned/translations/skinned_plugin_zh_TW.ts +++ b/src/plugins/Ui/skinned/translations/skinned_plugin_zh_TW.ts @@ -562,22 +562,22 @@ - + Playback - + View - + Playlist 播放清單 - + Misc @@ -1271,47 +1271,47 @@ 顯示曲目編號 - + Show playlists - + Show popup information - + Edit template - + Show anchor - + Align song numbers - + Select Skin Files 選取皮膚檔案 - + Skin files 皮膚檔案 - + Unarchived skin 未封包皮膚 - + Archived skin 封包皮膚 -- cgit v1.2.3-13-gbd6f