aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authortrialuser02 <trialuser02@90c681e8-e032-0410-971d-27865f9a5e38>2011-07-01 19:34:48 +0000
committertrialuser02 <trialuser02@90c681e8-e032-0410-971d-27865f9a5e38>2011-07-01 19:34:48 +0000
commit3ce26ad80c1abb283576b9f654df75372eda0cc3 (patch)
treeecf7f123116405adea60e1ce614808f6ea515c82
parentb8b7804fcc229e9c34e18dc3ec6dfafd2e3485b0 (diff)
downloadqmmp-3ce26ad80c1abb283576b9f654df75372eda0cc3.tar.gz
qmmp-3ce26ad80c1abb283576b9f654df75372eda0cc3.tar.bz2
qmmp-3ce26ad80c1abb283576b9f654df75372eda0cc3.zip
renamed application directory
git-svn-id: http://svn.code.sf.net/p/qmmp-dev/code/trunk/qmmp@2253 90c681e8-e032-0410-971d-27865f9a5e38
-rw-r--r--qmmp.pro6
-rw-r--r--src/app/CMakeLists.txt (renamed from src/ui/CMakeLists.txt)0
-rw-r--r--src/app/app.pro (renamed from src/ui/ui.pro)0
-rw-r--r--src/app/builtincommandlineoption.cpp (renamed from src/ui/builtincommandlineoption.cpp)0
-rw-r--r--src/app/builtincommandlineoption.h (renamed from src/ui/builtincommandlineoption.h)0
-rw-r--r--src/app/images/16x16/qmmp.png (renamed from src/ui/images/16x16/qmmp.png)bin520 -> 520 bytes
-rw-r--r--src/app/images/32x32/qmmp.png (renamed from src/ui/images/32x32/qmmp.png)bin1297 -> 1297 bytes
-rw-r--r--src/app/images/48x48/qmmp.png (renamed from src/ui/images/48x48/qmmp.png)bin2268 -> 2268 bytes
-rw-r--r--src/app/images/56x56/qmmp.png (renamed from src/ui/images/56x56/qmmp.png)bin2805 -> 2805 bytes
-rw-r--r--src/app/images/advanced.png (renamed from src/ui/images/advanced.png)bin1054 -> 1054 bytes
-rw-r--r--src/app/images/images.qrc (renamed from src/ui/images/images.qrc)0
-rw-r--r--src/app/images/interface.png (renamed from src/ui/images/interface.png)bin1418 -> 1418 bytes
-rw-r--r--src/app/images/logo-qmmp.png (renamed from src/ui/images/logo-qmmp.png)bin22844 -> 22844 bytes
-rw-r--r--src/app/images/network.png (renamed from src/ui/images/network.png)bin1465 -> 1465 bytes
-rw-r--r--src/app/images/playlist.png (renamed from src/ui/images/playlist.png)bin743 -> 743 bytes
-rw-r--r--src/app/images/plugins.png (renamed from src/ui/images/plugins.png)bin1378 -> 1378 bytes
-rw-r--r--src/app/images/replaygain.png (renamed from src/ui/images/replaygain.png)bin624 -> 624 bytes
-rw-r--r--src/app/images/scalable/qmmp-simple.svgz (renamed from src/ui/images/scalable/qmmp-simple.svgz)bin4639 -> 4639 bytes
-rw-r--r--src/app/images/scalable/qmmp.svgz (renamed from src/ui/images/scalable/qmmp.svgz)bin4892 -> 4892 bytes
-rw-r--r--src/app/images/shortcuts.png (renamed from src/ui/images/shortcuts.png)bin603 -> 603 bytes
-rw-r--r--src/app/images/ui_no_cover.png (renamed from src/ui/images/ui_no_cover.png)bin4170 -> 4170 bytes
-rw-r--r--src/app/lxdesupport.cpp (renamed from src/ui/lxdesupport.cpp)0
-rw-r--r--src/app/lxdesupport.h (renamed from src/ui/lxdesupport.h)0
-rw-r--r--src/app/main.cpp (renamed from src/ui/main.cpp)0
-rw-r--r--src/app/qmmp.desktop (renamed from src/ui/qmmp.desktop)0
-rw-r--r--src/app/qmmp_enqueue.desktop (renamed from src/ui/qmmp_enqueue.desktop)0
-rw-r--r--src/app/qmmpstarter.cpp (renamed from src/ui/qmmpstarter.cpp)0
-rw-r--r--src/app/qmmpstarter.h (renamed from src/ui/qmmpstarter.h)0
-rw-r--r--src/app/translations/qmmp_cs.ts (renamed from src/ui/translations/qmmp_cs.ts)0
-rw-r--r--src/app/translations/qmmp_de.ts (renamed from src/ui/translations/qmmp_de.ts)0
-rw-r--r--src/app/translations/qmmp_es.ts (renamed from src/ui/translations/qmmp_es.ts)0
-rw-r--r--src/app/translations/qmmp_fr.ts (renamed from src/ui/translations/qmmp_fr.ts)0
-rw-r--r--src/app/translations/qmmp_hu.ts (renamed from src/ui/translations/qmmp_hu.ts)0
-rw-r--r--src/app/translations/qmmp_it.ts (renamed from src/ui/translations/qmmp_it.ts)0
-rw-r--r--src/app/translations/qmmp_ja.ts (renamed from src/ui/translations/qmmp_ja.ts)0
-rw-r--r--src/app/translations/qmmp_kk.ts (renamed from src/ui/translations/qmmp_kk.ts)0
-rw-r--r--src/app/translations/qmmp_locales.qrc (renamed from src/ui/translations/qmmp_locales.qrc)0
-rw-r--r--src/app/translations/qmmp_lt.ts (renamed from src/ui/translations/qmmp_lt.ts)0
-rw-r--r--src/app/translations/qmmp_nl.ts (renamed from src/ui/translations/qmmp_nl.ts)0
-rw-r--r--src/app/translations/qmmp_pl_PL.ts (renamed from src/ui/translations/qmmp_pl_PL.ts)0
-rw-r--r--src/app/translations/qmmp_pt_BR.ts (renamed from src/ui/translations/qmmp_pt_BR.ts)0
-rw-r--r--src/app/translations/qmmp_ru.ts (renamed from src/ui/translations/qmmp_ru.ts)0
-rw-r--r--src/app/translations/qmmp_sk.ts (renamed from src/ui/translations/qmmp_sk.ts)0
-rw-r--r--src/app/translations/qmmp_tr.ts (renamed from src/ui/translations/qmmp_tr.ts)0
-rw-r--r--src/app/translations/qmmp_uk_UA.ts (renamed from src/ui/translations/qmmp_uk_UA.ts)0
-rw-r--r--src/app/translations/qmmp_zh_CN.ts (renamed from src/ui/translations/qmmp_zh_CN.ts)0
-rw-r--r--src/app/translations/qmmp_zh_TW.ts (renamed from src/ui/translations/qmmp_zh_TW.ts)0
-rw-r--r--src/app/txt/authors_cs.txt (renamed from src/ui/txt/authors_cs.txt)0
-rw-r--r--src/app/txt/authors_de.txt (renamed from src/ui/txt/authors_de.txt)0
-rw-r--r--src/app/txt/authors_en.txt (renamed from src/ui/txt/authors_en.txt)0
-rw-r--r--src/app/txt/authors_es.txt (renamed from src/ui/txt/authors_es.txt)0
-rw-r--r--src/app/txt/authors_it.txt (renamed from src/ui/txt/authors_it.txt)0
-rw-r--r--src/app/txt/authors_ja.txt (renamed from src/ui/txt/authors_ja.txt)0
-rw-r--r--src/app/txt/authors_lt.txt (renamed from src/ui/txt/authors_lt.txt)0
-rw-r--r--src/app/txt/authors_nl.txt (renamed from src/ui/txt/authors_nl.txt)0
-rw-r--r--src/app/txt/authors_pl.txt (renamed from src/ui/txt/authors_pl.txt)0
-rw-r--r--src/app/txt/authors_ru.txt (renamed from src/ui/txt/authors_ru.txt)0
-rw-r--r--src/app/txt/authors_tr.txt (renamed from src/ui/txt/authors_tr.txt)0
-rw-r--r--src/app/txt/authors_uk_UA.txt (renamed from src/ui/txt/authors_uk_UA.txt)0
-rw-r--r--src/app/txt/authors_zh_CN.txt (renamed from src/ui/txt/authors_zh_CN.txt)0
-rw-r--r--src/app/txt/authors_zh_TW.txt (renamed from src/ui/txt/authors_zh_TW.txt)0
-rw-r--r--src/app/txt/description_cs.txt (renamed from src/ui/txt/description_cs.txt)0
-rw-r--r--src/app/txt/description_de.txt (renamed from src/ui/txt/description_de.txt)0
-rw-r--r--src/app/txt/description_en.txt (renamed from src/ui/txt/description_en.txt)0
-rw-r--r--src/app/txt/description_es.txt (renamed from src/ui/txt/description_es.txt)0
-rw-r--r--src/app/txt/description_it.txt (renamed from src/ui/txt/description_it.txt)0
-rw-r--r--src/app/txt/description_ja.txt (renamed from src/ui/txt/description_ja.txt)0
-rw-r--r--src/app/txt/description_lt.txt (renamed from src/ui/txt/description_lt.txt)0
-rw-r--r--src/app/txt/description_nl.txt (renamed from src/ui/txt/description_nl.txt)0
-rw-r--r--src/app/txt/description_pl.txt (renamed from src/ui/txt/description_pl.txt)0
-rw-r--r--src/app/txt/description_ru.txt (renamed from src/ui/txt/description_ru.txt)0
-rw-r--r--src/app/txt/description_tr.txt (renamed from src/ui/txt/description_tr.txt)0
-rw-r--r--src/app/txt/description_uk_UA.txt (renamed from src/ui/txt/description_uk_UA.txt)0
-rw-r--r--src/app/txt/description_zh_CN.txt (renamed from src/ui/txt/description_zh_CN.txt)0
-rw-r--r--src/app/txt/description_zh_TW.txt (renamed from src/ui/txt/description_zh_TW.txt)0
-rw-r--r--src/app/txt/thanks_cs.txt (renamed from src/ui/txt/thanks_cs.txt)0
-rw-r--r--src/app/txt/thanks_de.txt (renamed from src/ui/txt/thanks_de.txt)0
-rw-r--r--src/app/txt/thanks_en.txt (renamed from src/ui/txt/thanks_en.txt)0
-rw-r--r--src/app/txt/thanks_es.txt (renamed from src/ui/txt/thanks_es.txt)0
-rw-r--r--src/app/txt/thanks_it.txt (renamed from src/ui/txt/thanks_it.txt)0
-rw-r--r--src/app/txt/thanks_ja.txt (renamed from src/ui/txt/thanks_ja.txt)0
-rw-r--r--src/app/txt/thanks_lt.txt (renamed from src/ui/txt/thanks_lt.txt)0
-rw-r--r--src/app/txt/thanks_nl.txt (renamed from src/ui/txt/thanks_nl.txt)0
-rw-r--r--src/app/txt/thanks_pl.txt (renamed from src/ui/txt/thanks_pl.txt)0
-rw-r--r--src/app/txt/thanks_ru.txt (renamed from src/ui/txt/thanks_ru.txt)0
-rw-r--r--src/app/txt/thanks_tr.txt (renamed from src/ui/txt/thanks_tr.txt)0
-rw-r--r--src/app/txt/thanks_uk_UA.txt (renamed from src/ui/txt/thanks_uk_UA.txt)0
-rw-r--r--src/app/txt/thanks_zh_CN.txt (renamed from src/ui/txt/thanks_zh_CN.txt)0
-rw-r--r--src/app/txt/thanks_zh_TW.txt (renamed from src/ui/txt/thanks_zh_TW.txt)0
-rw-r--r--src/app/txt/translators_cs.txt (renamed from src/ui/txt/translators_cs.txt)0
-rw-r--r--src/app/txt/translators_de.txt (renamed from src/ui/txt/translators_de.txt)0
-rw-r--r--src/app/txt/translators_en.txt (renamed from src/ui/txt/translators_en.txt)0
-rw-r--r--src/app/txt/translators_es.txt (renamed from src/ui/txt/translators_es.txt)0
-rw-r--r--src/app/txt/translators_it.txt (renamed from src/ui/txt/translators_it.txt)0
-rw-r--r--src/app/txt/translators_ja.txt (renamed from src/ui/txt/translators_ja.txt)0
-rw-r--r--src/app/txt/translators_lt.txt (renamed from src/ui/txt/translators_lt.txt)0
-rw-r--r--src/app/txt/translators_nl.txt (renamed from src/ui/txt/translators_nl.txt)0
-rw-r--r--src/app/txt/translators_pl.txt (renamed from src/ui/txt/translators_pl.txt)0
-rw-r--r--src/app/txt/translators_ru.txt (renamed from src/ui/txt/translators_ru.txt)0
-rw-r--r--src/app/txt/translators_tr.txt (renamed from src/ui/txt/translators_tr.txt)0
-rw-r--r--src/app/txt/translators_uk_UA.txt (renamed from src/ui/txt/translators_uk_UA.txt)0
-rw-r--r--src/app/txt/translators_zh_CN.txt (renamed from src/ui/txt/translators_zh_CN.txt)0
-rw-r--r--src/app/txt/translators_zh_TW.txt (renamed from src/ui/txt/translators_zh_TW.txt)0
-rw-r--r--src/plugins/Ui/Ui.pro4
-rw-r--r--src/qmmpui/uifactory.h43
105 files changed, 33 insertions, 20 deletions
diff --git a/qmmp.pro b/qmmp.pro
index 8865921b4..ea58070f0 100644
--- a/qmmp.pro
+++ b/qmmp.pro
@@ -3,10 +3,8 @@ CONFIG += ordered
include (qmmp.pri)
TEMPLATE = subdirs
-SUBDIRS = src/qmmp src/qmmpui src/plugins
-contains(CONFIG, WITH_SKINNED){
-SUBDIRS += src/ui
-}
+SUBDIRS = src/qmmp src/qmmpui src/plugins src/app
+
unix:exists($$[QT_INSTALL_BINS]/lrelease){
LRELEASE_EXECUTABLE = $$[QT_INSTALL_BINS]/lrelease
diff --git a/src/ui/CMakeLists.txt b/src/app/CMakeLists.txt
index 471e26443..471e26443 100644
--- a/src/ui/CMakeLists.txt
+++ b/src/app/CMakeLists.txt
diff --git a/src/ui/ui.pro b/src/app/app.pro
index 1f5b8f619..1f5b8f619 100644
--- a/src/ui/ui.pro
+++ b/src/app/app.pro
diff --git a/src/ui/builtincommandlineoption.cpp b/src/app/builtincommandlineoption.cpp
index 29c2a50f5..29c2a50f5 100644
--- a/src/ui/builtincommandlineoption.cpp
+++ b/src/app/builtincommandlineoption.cpp
diff --git a/src/ui/builtincommandlineoption.h b/src/app/builtincommandlineoption.h
index 08d8e2df3..08d8e2df3 100644
--- a/src/ui/builtincommandlineoption.h
+++ b/src/app/builtincommandlineoption.h
diff --git a/src/ui/images/16x16/qmmp.png b/src/app/images/16x16/qmmp.png
index d6bca13fd..d6bca13fd 100644
--- a/src/ui/images/16x16/qmmp.png
+++ b/src/app/images/16x16/qmmp.png
Binary files differ
diff --git a/src/ui/images/32x32/qmmp.png b/src/app/images/32x32/qmmp.png
index 32126f83b..32126f83b 100644
--- a/src/ui/images/32x32/qmmp.png
+++ b/src/app/images/32x32/qmmp.png
Binary files differ
diff --git a/src/ui/images/48x48/qmmp.png b/src/app/images/48x48/qmmp.png
index 3f8a8f3a0..3f8a8f3a0 100644
--- a/src/ui/images/48x48/qmmp.png
+++ b/src/app/images/48x48/qmmp.png
Binary files differ
diff --git a/src/ui/images/56x56/qmmp.png b/src/app/images/56x56/qmmp.png
index 4a3b7903a..4a3b7903a 100644
--- a/src/ui/images/56x56/qmmp.png
+++ b/src/app/images/56x56/qmmp.png
Binary files differ
diff --git a/src/ui/images/advanced.png b/src/app/images/advanced.png
index 862464242..862464242 100644
--- a/src/ui/images/advanced.png
+++ b/src/app/images/advanced.png
Binary files differ
diff --git a/src/ui/images/images.qrc b/src/app/images/images.qrc
index 45909a993..45909a993 100644
--- a/src/ui/images/images.qrc
+++ b/src/app/images/images.qrc
diff --git a/src/ui/images/interface.png b/src/app/images/interface.png
index ebedddde2..ebedddde2 100644
--- a/src/ui/images/interface.png
+++ b/src/app/images/interface.png
Binary files differ
diff --git a/src/ui/images/logo-qmmp.png b/src/app/images/logo-qmmp.png
index d6c7e9bd8..d6c7e9bd8 100644
--- a/src/ui/images/logo-qmmp.png
+++ b/src/app/images/logo-qmmp.png
Binary files differ
diff --git a/src/ui/images/network.png b/src/app/images/network.png
index 3a52c1130..3a52c1130 100644
--- a/src/ui/images/network.png
+++ b/src/app/images/network.png
Binary files differ
diff --git a/src/ui/images/playlist.png b/src/app/images/playlist.png
index 7b750db0a..7b750db0a 100644
--- a/src/ui/images/playlist.png
+++ b/src/app/images/playlist.png
Binary files differ
diff --git a/src/ui/images/plugins.png b/src/app/images/plugins.png
index 931d4d1da..931d4d1da 100644
--- a/src/ui/images/plugins.png
+++ b/src/app/images/plugins.png
Binary files differ
diff --git a/src/ui/images/replaygain.png b/src/app/images/replaygain.png
index d2f78947b..d2f78947b 100644
--- a/src/ui/images/replaygain.png
+++ b/src/app/images/replaygain.png
Binary files differ
diff --git a/src/ui/images/scalable/qmmp-simple.svgz b/src/app/images/scalable/qmmp-simple.svgz
index 8ac48346b..8ac48346b 100644
--- a/src/ui/images/scalable/qmmp-simple.svgz
+++ b/src/app/images/scalable/qmmp-simple.svgz
Binary files differ
diff --git a/src/ui/images/scalable/qmmp.svgz b/src/app/images/scalable/qmmp.svgz
index 7050b41c9..7050b41c9 100644
--- a/src/ui/images/scalable/qmmp.svgz
+++ b/src/app/images/scalable/qmmp.svgz
Binary files differ
diff --git a/src/ui/images/shortcuts.png b/src/app/images/shortcuts.png
index 45d917220..45d917220 100644
--- a/src/ui/images/shortcuts.png
+++ b/src/app/images/shortcuts.png
Binary files differ
diff --git a/src/ui/images/ui_no_cover.png b/src/app/images/ui_no_cover.png
index ac8c587e3..ac8c587e3 100644
--- a/src/ui/images/ui_no_cover.png
+++ b/src/app/images/ui_no_cover.png
Binary files differ
diff --git a/src/ui/lxdesupport.cpp b/src/app/lxdesupport.cpp
index 827cbd60c..827cbd60c 100644
--- a/src/ui/lxdesupport.cpp
+++ b/src/app/lxdesupport.cpp
diff --git a/src/ui/lxdesupport.h b/src/app/lxdesupport.h
index 99f0aac62..99f0aac62 100644
--- a/src/ui/lxdesupport.h
+++ b/src/app/lxdesupport.h
diff --git a/src/ui/main.cpp b/src/app/main.cpp
index 86df24ee8..86df24ee8 100644
--- a/src/ui/main.cpp
+++ b/src/app/main.cpp
diff --git a/src/ui/qmmp.desktop b/src/app/qmmp.desktop
index d1602a19b..d1602a19b 100644
--- a/src/ui/qmmp.desktop
+++ b/src/app/qmmp.desktop
diff --git a/src/ui/qmmp_enqueue.desktop b/src/app/qmmp_enqueue.desktop
index b42e2b18b..b42e2b18b 100644
--- a/src/ui/qmmp_enqueue.desktop
+++ b/src/app/qmmp_enqueue.desktop
diff --git a/src/ui/qmmpstarter.cpp b/src/app/qmmpstarter.cpp
index c24bd5789..c24bd5789 100644
--- a/src/ui/qmmpstarter.cpp
+++ b/src/app/qmmpstarter.cpp
diff --git a/src/ui/qmmpstarter.h b/src/app/qmmpstarter.h
index 95596ea49..95596ea49 100644
--- a/src/ui/qmmpstarter.h
+++ b/src/app/qmmpstarter.h
diff --git a/src/ui/translations/qmmp_cs.ts b/src/app/translations/qmmp_cs.ts
index 750283b44..750283b44 100644
--- a/src/ui/translations/qmmp_cs.ts
+++ b/src/app/translations/qmmp_cs.ts
diff --git a/src/ui/translations/qmmp_de.ts b/src/app/translations/qmmp_de.ts
index 9c5968ee3..9c5968ee3 100644
--- a/src/ui/translations/qmmp_de.ts
+++ b/src/app/translations/qmmp_de.ts
diff --git a/src/ui/translations/qmmp_es.ts b/src/app/translations/qmmp_es.ts
index b83b3fc59..b83b3fc59 100644
--- a/src/ui/translations/qmmp_es.ts
+++ b/src/app/translations/qmmp_es.ts
diff --git a/src/ui/translations/qmmp_fr.ts b/src/app/translations/qmmp_fr.ts
index 2541e7a62..2541e7a62 100644
--- a/src/ui/translations/qmmp_fr.ts
+++ b/src/app/translations/qmmp_fr.ts
diff --git a/src/ui/translations/qmmp_hu.ts b/src/app/translations/qmmp_hu.ts
index 33b2d5afc..33b2d5afc 100644
--- a/src/ui/translations/qmmp_hu.ts
+++ b/src/app/translations/qmmp_hu.ts
diff --git a/src/ui/translations/qmmp_it.ts b/src/app/translations/qmmp_it.ts
index a94b67cc7..a94b67cc7 100644
--- a/src/ui/translations/qmmp_it.ts
+++ b/src/app/translations/qmmp_it.ts
diff --git a/src/ui/translations/qmmp_ja.ts b/src/app/translations/qmmp_ja.ts
index 1c434d85b..1c434d85b 100644
--- a/src/ui/translations/qmmp_ja.ts
+++ b/src/app/translations/qmmp_ja.ts
diff --git a/src/ui/translations/qmmp_kk.ts b/src/app/translations/qmmp_kk.ts
index 9e338e2fc..9e338e2fc 100644
--- a/src/ui/translations/qmmp_kk.ts
+++ b/src/app/translations/qmmp_kk.ts
diff --git a/src/ui/translations/qmmp_locales.qrc b/src/app/translations/qmmp_locales.qrc
index 2442f6dc1..2442f6dc1 100644
--- a/src/ui/translations/qmmp_locales.qrc
+++ b/src/app/translations/qmmp_locales.qrc
diff --git a/src/ui/translations/qmmp_lt.ts b/src/app/translations/qmmp_lt.ts
index 87ad73c4a..87ad73c4a 100644
--- a/src/ui/translations/qmmp_lt.ts
+++ b/src/app/translations/qmmp_lt.ts
diff --git a/src/ui/translations/qmmp_nl.ts b/src/app/translations/qmmp_nl.ts
index 3036c8504..3036c8504 100644
--- a/src/ui/translations/qmmp_nl.ts
+++ b/src/app/translations/qmmp_nl.ts
diff --git a/src/ui/translations/qmmp_pl_PL.ts b/src/app/translations/qmmp_pl_PL.ts
index adcf47709..adcf47709 100644
--- a/src/ui/translations/qmmp_pl_PL.ts
+++ b/src/app/translations/qmmp_pl_PL.ts
diff --git a/src/ui/translations/qmmp_pt_BR.ts b/src/app/translations/qmmp_pt_BR.ts
index 548b20727..548b20727 100644
--- a/src/ui/translations/qmmp_pt_BR.ts
+++ b/src/app/translations/qmmp_pt_BR.ts
diff --git a/src/ui/translations/qmmp_ru.ts b/src/app/translations/qmmp_ru.ts
index 52b8a5b2d..52b8a5b2d 100644
--- a/src/ui/translations/qmmp_ru.ts
+++ b/src/app/translations/qmmp_ru.ts
diff --git a/src/ui/translations/qmmp_sk.ts b/src/app/translations/qmmp_sk.ts
index 9351796c9..9351796c9 100644
--- a/src/ui/translations/qmmp_sk.ts
+++ b/src/app/translations/qmmp_sk.ts
diff --git a/src/ui/translations/qmmp_tr.ts b/src/app/translations/qmmp_tr.ts
index 95b5b6d3e..95b5b6d3e 100644
--- a/src/ui/translations/qmmp_tr.ts
+++ b/src/app/translations/qmmp_tr.ts
diff --git a/src/ui/translations/qmmp_uk_UA.ts b/src/app/translations/qmmp_uk_UA.ts
index dd627de1b..dd627de1b 100644
--- a/src/ui/translations/qmmp_uk_UA.ts
+++ b/src/app/translations/qmmp_uk_UA.ts
diff --git a/src/ui/translations/qmmp_zh_CN.ts b/src/app/translations/qmmp_zh_CN.ts
index b8b52ed6f..b8b52ed6f 100644
--- a/src/ui/translations/qmmp_zh_CN.ts
+++ b/src/app/translations/qmmp_zh_CN.ts
diff --git a/src/ui/translations/qmmp_zh_TW.ts b/src/app/translations/qmmp_zh_TW.ts
index 835ab58fe..835ab58fe 100644
--- a/src/ui/translations/qmmp_zh_TW.ts
+++ b/src/app/translations/qmmp_zh_TW.ts
diff --git a/src/ui/txt/authors_cs.txt b/src/app/txt/authors_cs.txt
index 191228144..191228144 100644
--- a/src/ui/txt/authors_cs.txt
+++ b/src/app/txt/authors_cs.txt
diff --git a/src/ui/txt/authors_de.txt b/src/app/txt/authors_de.txt
index 331a0c8d6..331a0c8d6 100644
--- a/src/ui/txt/authors_de.txt
+++ b/src/app/txt/authors_de.txt
diff --git a/src/ui/txt/authors_en.txt b/src/app/txt/authors_en.txt
index 87231af8c..87231af8c 100644
--- a/src/ui/txt/authors_en.txt
+++ b/src/app/txt/authors_en.txt
diff --git a/src/ui/txt/authors_es.txt b/src/app/txt/authors_es.txt
index 3acfbaf71..3acfbaf71 100644
--- a/src/ui/txt/authors_es.txt
+++ b/src/app/txt/authors_es.txt
diff --git a/src/ui/txt/authors_it.txt b/src/app/txt/authors_it.txt
index 2d205cb32..2d205cb32 100644
--- a/src/ui/txt/authors_it.txt
+++ b/src/app/txt/authors_it.txt
diff --git a/src/ui/txt/authors_ja.txt b/src/app/txt/authors_ja.txt
index e5c460acf..e5c460acf 100644
--- a/src/ui/txt/authors_ja.txt
+++ b/src/app/txt/authors_ja.txt
diff --git a/src/ui/txt/authors_lt.txt b/src/app/txt/authors_lt.txt
index b778cefc2..b778cefc2 100644
--- a/src/ui/txt/authors_lt.txt
+++ b/src/app/txt/authors_lt.txt
diff --git a/src/ui/txt/authors_nl.txt b/src/app/txt/authors_nl.txt
index 4fe8fac4b..4fe8fac4b 100644
--- a/src/ui/txt/authors_nl.txt
+++ b/src/app/txt/authors_nl.txt
diff --git a/src/ui/txt/authors_pl.txt b/src/app/txt/authors_pl.txt
index e37d88ee4..e37d88ee4 100644
--- a/src/ui/txt/authors_pl.txt
+++ b/src/app/txt/authors_pl.txt
diff --git a/src/ui/txt/authors_ru.txt b/src/app/txt/authors_ru.txt
index 9b6336d80..9b6336d80 100644
--- a/src/ui/txt/authors_ru.txt
+++ b/src/app/txt/authors_ru.txt
diff --git a/src/ui/txt/authors_tr.txt b/src/app/txt/authors_tr.txt
index 292b222d7..292b222d7 100644
--- a/src/ui/txt/authors_tr.txt
+++ b/src/app/txt/authors_tr.txt
diff --git a/src/ui/txt/authors_uk_UA.txt b/src/app/txt/authors_uk_UA.txt
index 9dd59194d..9dd59194d 100644
--- a/src/ui/txt/authors_uk_UA.txt
+++ b/src/app/txt/authors_uk_UA.txt
diff --git a/src/ui/txt/authors_zh_CN.txt b/src/app/txt/authors_zh_CN.txt
index f554ce7e9..f554ce7e9 100644
--- a/src/ui/txt/authors_zh_CN.txt
+++ b/src/app/txt/authors_zh_CN.txt
diff --git a/src/ui/txt/authors_zh_TW.txt b/src/app/txt/authors_zh_TW.txt
index fa9f8482d..fa9f8482d 100644
--- a/src/ui/txt/authors_zh_TW.txt
+++ b/src/app/txt/authors_zh_TW.txt
diff --git a/src/ui/txt/description_cs.txt b/src/app/txt/description_cs.txt
index d262da180..d262da180 100644
--- a/src/ui/txt/description_cs.txt
+++ b/src/app/txt/description_cs.txt
diff --git a/src/ui/txt/description_de.txt b/src/app/txt/description_de.txt
index d9087c5dd..d9087c5dd 100644
--- a/src/ui/txt/description_de.txt
+++ b/src/app/txt/description_de.txt
diff --git a/src/ui/txt/description_en.txt b/src/app/txt/description_en.txt
index 23f6dd619..23f6dd619 100644
--- a/src/ui/txt/description_en.txt
+++ b/src/app/txt/description_en.txt
diff --git a/src/ui/txt/description_es.txt b/src/app/txt/description_es.txt
index 6bf33e46b..6bf33e46b 100644
--- a/src/ui/txt/description_es.txt
+++ b/src/app/txt/description_es.txt
diff --git a/src/ui/txt/description_it.txt b/src/app/txt/description_it.txt
index fc6cf7ae5..fc6cf7ae5 100644
--- a/src/ui/txt/description_it.txt
+++ b/src/app/txt/description_it.txt
diff --git a/src/ui/txt/description_ja.txt b/src/app/txt/description_ja.txt
index 3eabd97c5..3eabd97c5 100644
--- a/src/ui/txt/description_ja.txt
+++ b/src/app/txt/description_ja.txt
diff --git a/src/ui/txt/description_lt.txt b/src/app/txt/description_lt.txt
index f8116e9d3..f8116e9d3 100644
--- a/src/ui/txt/description_lt.txt
+++ b/src/app/txt/description_lt.txt
diff --git a/src/ui/txt/description_nl.txt b/src/app/txt/description_nl.txt
index aa3e93337..aa3e93337 100644
--- a/src/ui/txt/description_nl.txt
+++ b/src/app/txt/description_nl.txt
diff --git a/src/ui/txt/description_pl.txt b/src/app/txt/description_pl.txt
index 4481835a4..4481835a4 100644
--- a/src/ui/txt/description_pl.txt
+++ b/src/app/txt/description_pl.txt
diff --git a/src/ui/txt/description_ru.txt b/src/app/txt/description_ru.txt
index 18d772ab3..18d772ab3 100644
--- a/src/ui/txt/description_ru.txt
+++ b/src/app/txt/description_ru.txt
diff --git a/src/ui/txt/description_tr.txt b/src/app/txt/description_tr.txt
index 135d0f010..135d0f010 100644
--- a/src/ui/txt/description_tr.txt
+++ b/src/app/txt/description_tr.txt
diff --git a/src/ui/txt/description_uk_UA.txt b/src/app/txt/description_uk_UA.txt
index 9e5d45b60..9e5d45b60 100644
--- a/src/ui/txt/description_uk_UA.txt
+++ b/src/app/txt/description_uk_UA.txt
diff --git a/src/ui/txt/description_zh_CN.txt b/src/app/txt/description_zh_CN.txt
index 9d672c6d1..9d672c6d1 100644
--- a/src/ui/txt/description_zh_CN.txt
+++ b/src/app/txt/description_zh_CN.txt
diff --git a/src/ui/txt/description_zh_TW.txt b/src/app/txt/description_zh_TW.txt
index a1da82850..a1da82850 100644
--- a/src/ui/txt/description_zh_TW.txt
+++ b/src/app/txt/description_zh_TW.txt
diff --git a/src/ui/txt/thanks_cs.txt b/src/app/txt/thanks_cs.txt
index 9bc0388da..9bc0388da 100644
--- a/src/ui/txt/thanks_cs.txt
+++ b/src/app/txt/thanks_cs.txt
diff --git a/src/ui/txt/thanks_de.txt b/src/app/txt/thanks_de.txt
index 3392e9f19..3392e9f19 100644
--- a/src/ui/txt/thanks_de.txt
+++ b/src/app/txt/thanks_de.txt
diff --git a/src/ui/txt/thanks_en.txt b/src/app/txt/thanks_en.txt
index 2e52ed482..2e52ed482 100644
--- a/src/ui/txt/thanks_en.txt
+++ b/src/app/txt/thanks_en.txt
diff --git a/src/ui/txt/thanks_es.txt b/src/app/txt/thanks_es.txt
index dec15461f..dec15461f 100644
--- a/src/ui/txt/thanks_es.txt
+++ b/src/app/txt/thanks_es.txt
diff --git a/src/ui/txt/thanks_it.txt b/src/app/txt/thanks_it.txt
index 46b6987db..46b6987db 100644
--- a/src/ui/txt/thanks_it.txt
+++ b/src/app/txt/thanks_it.txt
diff --git a/src/ui/txt/thanks_ja.txt b/src/app/txt/thanks_ja.txt
index a7b7b820e..a7b7b820e 100644
--- a/src/ui/txt/thanks_ja.txt
+++ b/src/app/txt/thanks_ja.txt
diff --git a/src/ui/txt/thanks_lt.txt b/src/app/txt/thanks_lt.txt
index fbfa16ac0..fbfa16ac0 100644
--- a/src/ui/txt/thanks_lt.txt
+++ b/src/app/txt/thanks_lt.txt
diff --git a/src/ui/txt/thanks_nl.txt b/src/app/txt/thanks_nl.txt
index 145d2f4bb..145d2f4bb 100644
--- a/src/ui/txt/thanks_nl.txt
+++ b/src/app/txt/thanks_nl.txt
diff --git a/src/ui/txt/thanks_pl.txt b/src/app/txt/thanks_pl.txt
index fa839dbf3..fa839dbf3 100644
--- a/src/ui/txt/thanks_pl.txt
+++ b/src/app/txt/thanks_pl.txt
diff --git a/src/ui/txt/thanks_ru.txt b/src/app/txt/thanks_ru.txt
index c6edb7110..c6edb7110 100644
--- a/src/ui/txt/thanks_ru.txt
+++ b/src/app/txt/thanks_ru.txt
diff --git a/src/ui/txt/thanks_tr.txt b/src/app/txt/thanks_tr.txt
index 9bdf21ef0..9bdf21ef0 100644
--- a/src/ui/txt/thanks_tr.txt
+++ b/src/app/txt/thanks_tr.txt
diff --git a/src/ui/txt/thanks_uk_UA.txt b/src/app/txt/thanks_uk_UA.txt
index 31803ec40..31803ec40 100644
--- a/src/ui/txt/thanks_uk_UA.txt
+++ b/src/app/txt/thanks_uk_UA.txt
diff --git a/src/ui/txt/thanks_zh_CN.txt b/src/app/txt/thanks_zh_CN.txt
index 6f9ba0a1d..6f9ba0a1d 100644
--- a/src/ui/txt/thanks_zh_CN.txt
+++ b/src/app/txt/thanks_zh_CN.txt
diff --git a/src/ui/txt/thanks_zh_TW.txt b/src/app/txt/thanks_zh_TW.txt
index d1b898fef..d1b898fef 100644
--- a/src/ui/txt/thanks_zh_TW.txt
+++ b/src/app/txt/thanks_zh_TW.txt
diff --git a/src/ui/txt/translators_cs.txt b/src/app/txt/translators_cs.txt
index 545c16425..545c16425 100644
--- a/src/ui/txt/translators_cs.txt
+++ b/src/app/txt/translators_cs.txt
diff --git a/src/ui/txt/translators_de.txt b/src/app/txt/translators_de.txt
index eae2ab01b..eae2ab01b 100644
--- a/src/ui/txt/translators_de.txt
+++ b/src/app/txt/translators_de.txt
diff --git a/src/ui/txt/translators_en.txt b/src/app/txt/translators_en.txt
index 9d13b3ac3..9d13b3ac3 100644
--- a/src/ui/txt/translators_en.txt
+++ b/src/app/txt/translators_en.txt
diff --git a/src/ui/txt/translators_es.txt b/src/app/txt/translators_es.txt
index 3d5570dd2..3d5570dd2 100644
--- a/src/ui/txt/translators_es.txt
+++ b/src/app/txt/translators_es.txt
diff --git a/src/ui/txt/translators_it.txt b/src/app/txt/translators_it.txt
index 8a238be38..8a238be38 100644
--- a/src/ui/txt/translators_it.txt
+++ b/src/app/txt/translators_it.txt
diff --git a/src/ui/txt/translators_ja.txt b/src/app/txt/translators_ja.txt
index 11c5537d7..11c5537d7 100644
--- a/src/ui/txt/translators_ja.txt
+++ b/src/app/txt/translators_ja.txt
diff --git a/src/ui/txt/translators_lt.txt b/src/app/txt/translators_lt.txt
index 7cc6d8bbd..7cc6d8bbd 100644
--- a/src/ui/txt/translators_lt.txt
+++ b/src/app/txt/translators_lt.txt
diff --git a/src/ui/txt/translators_nl.txt b/src/app/txt/translators_nl.txt
index 88211a6ae..88211a6ae 100644
--- a/src/ui/txt/translators_nl.txt
+++ b/src/app/txt/translators_nl.txt
diff --git a/src/ui/txt/translators_pl.txt b/src/app/txt/translators_pl.txt
index a5ea9d78e..a5ea9d78e 100644
--- a/src/ui/txt/translators_pl.txt
+++ b/src/app/txt/translators_pl.txt
diff --git a/src/ui/txt/translators_ru.txt b/src/app/txt/translators_ru.txt
index 18152ee20..18152ee20 100644
--- a/src/ui/txt/translators_ru.txt
+++ b/src/app/txt/translators_ru.txt
diff --git a/src/ui/txt/translators_tr.txt b/src/app/txt/translators_tr.txt
index 1a8df1494..1a8df1494 100644
--- a/src/ui/txt/translators_tr.txt
+++ b/src/app/txt/translators_tr.txt
diff --git a/src/ui/txt/translators_uk_UA.txt b/src/app/txt/translators_uk_UA.txt
index 120369499..120369499 100644
--- a/src/ui/txt/translators_uk_UA.txt
+++ b/src/app/txt/translators_uk_UA.txt
diff --git a/src/ui/txt/translators_zh_CN.txt b/src/app/txt/translators_zh_CN.txt
index e24bb5a29..e24bb5a29 100644
--- a/src/ui/txt/translators_zh_CN.txt
+++ b/src/app/txt/translators_zh_CN.txt
diff --git a/src/ui/txt/translators_zh_TW.txt b/src/app/txt/translators_zh_TW.txt
index 2ed3da7ac..2ed3da7ac 100644
--- a/src/ui/txt/translators_zh_TW.txt
+++ b/src/app/txt/translators_zh_TW.txt
diff --git a/src/plugins/Ui/Ui.pro b/src/plugins/Ui/Ui.pro
index b6c44ce0d..c5ca47523 100644
--- a/src/plugins/Ui/Ui.pro
+++ b/src/plugins/Ui/Ui.pro
@@ -1,4 +1,8 @@
include(../../../qmmp.pri)
TEMPLATE = subdirs
+
+contains(CINFIG, WITH_SKINNED){
SUBDIRS += skinned
+}
+
diff --git a/src/qmmpui/uifactory.h b/src/qmmpui/uifactory.h
index bccb632aa..feb2e05b4 100644
--- a/src/qmmpui/uifactory.h
+++ b/src/qmmpui/uifactory.h
@@ -1,5 +1,5 @@
/***************************************************************************
- * Copyright (C) 2011 by Ilya Kotov *
+ * Copyright (C) 2008-2009 by Ilya Kotov *
* forkotov02@hotmail.ru *
* *
* This program is free software; you can redistribute it and/or modify *
@@ -17,8 +17,8 @@
* Free Software Foundation, Inc., *
* 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. *
***************************************************************************/
-#ifndef UIFACTORY_H
-#define UIFACTORY_H
+#ifndef GENERALFACTORY_H
+#define GENERALFACTORY_H
class QObject;
class QTranslator;
@@ -28,23 +28,28 @@ class QWidget;
class Control;
class General;
-/*! @brief Helper class to store user interface plugin properies.
+/*! @brief Helper class to store general plugin properies.
*/
-class UiProperties
+class GeneralProperties
{
public:
/*!
* Constructor
*/
- UiProperties()
+ GeneralProperties()
{
hasAbout = false;
+ hasSettings = false;
+ visibilityControl = false;
}
- QString name; /*!< File dialog plugin full name */
- QString shortName; /*!< File dialog short name for internal usage */
- bool hasAbout; /*!< Should be \b true if plugin has about dialog, otherwise returns \b false */
+ QString name; /*!< File dialog plugin full name */
+ QString shortName; /*!< File dialog short name for internal usage */
+ bool hasAbout; /*!< Should be \b true if plugin has about dialog, otherwise returns \b false */
+ bool hasSettings; /*!< Should be \b true if plugin has settings dialog, otherwise returns \b false */
+ bool visibilityControl; /*!< Should be \b true if plugin can show/hide main window of the player,
+ * otherwise returns \b false */
};
-/*! @brief User interface plugin interface.
+/*! @brief %General plugin interface.
* @author Ilya Kotov <forkotov02@hotmail.ru>
*/
class UiFactory
@@ -53,15 +58,21 @@ public:
/*!
* Object destructor.
*/
- virtual ~UiFactory() {}
+ virtual ~GeneralFactory() {}
/*!
- * Returns user interface plugin properties.
+ * Returns general plugin properties.
*/
- virtual const UiProperties properties() const = 0;
+ virtual const GeneralProperties properties() const = 0;
/*!
- * Creates user interface instance.
+ * Creates object of the General class.
*/
- virtual QObject *create() = 0;
+ virtual General *create(QObject *parent) = 0;
+ /*!
+ * Creates configuration dialog.
+ * @param parent Parent widget.
+ * @return Configuration dialog pointer.
+ */
+ virtual QDialog *createConfigDialog(QWidget *parent) = 0;
/*!
* Shows about dialog.
* @param parent Parent widget.
@@ -74,5 +85,5 @@ public:
virtual QTranslator *createTranslator(QObject *parent) = 0;
};
-Q_DECLARE_INTERFACE(UiFactory, "UiFactory/1.0")
+Q_DECLARE_INTERFACE(GeneralFactory, "GeneralFactory/1.0");
#endif