From 04c907b60b7da6175f81fb1b5f61cc4ce3f71e1e Mon Sep 17 00:00:00 2001 From: Holger Hans Peter Freyther Date: Thu, 14 Sep 2017 11:12:58 +0200 Subject: democompositor: Move images and apps to resources/ folder The apps were hard to be discovered inside apps/files and other projects here seem to use a resources/ folder. Move the apps and the images in it. Change-Id: If2e9127ea6e941e1a97465b2de5e9f9af3660ea3 Reviewed-by: Paul Olav Tvete --- wayland/democompositor/apps/files/clock.app | 8 -------- wayland/democompositor/apps/files/maps.app | 8 -------- wayland/democompositor/apps/files/rss.app | 8 -------- wayland/democompositor/apps/files/stocqt.app | 8 -------- wayland/democompositor/democompositor.pro | 2 +- wayland/democompositor/democompositor.qrc | 20 ++++++++++---------- wayland/democompositor/images/Icon_Clocks.png | Bin 1870 -> 0 bytes wayland/democompositor/images/Icon_Maps.png | Bin 1529 -> 0 bytes wayland/democompositor/images/Icon_RSS.png | Bin 1769 -> 0 bytes wayland/democompositor/images/Icon_StocQt.png | Bin 1639 -> 0 bytes wayland/democompositor/images/graydot.png | Bin 211 -> 0 bytes wayland/democompositor/images/graydots.png | Bin 247 -> 0 bytes wayland/democompositor/images/greendot.png | Bin 212 -> 0 bytes wayland/democompositor/images/greendots.png | Bin 240 -> 0 bytes wayland/democompositor/images/icon1.png | Bin 1700 -> 0 bytes wayland/democompositor/images/icon2.png | Bin 1761 -> 0 bytes wayland/democompositor/images/icon3.png | Bin 1719 -> 0 bytes wayland/democompositor/images/icon4.png | Bin 1505 -> 0 bytes wayland/democompositor/images/quit.png | Bin 782 -> 0 bytes wayland/democompositor/images/reddot.png | Bin 219 -> 0 bytes wayland/democompositor/resources/apps/clock.app | 8 ++++++++ wayland/democompositor/resources/apps/maps.app | 8 ++++++++ wayland/democompositor/resources/apps/rss.app | 8 ++++++++ wayland/democompositor/resources/apps/stocqt.app | 8 ++++++++ .../democompositor/resources/images/Icon_Clocks.png | Bin 0 -> 1870 bytes .../democompositor/resources/images/Icon_Maps.png | Bin 0 -> 1529 bytes .../democompositor/resources/images/Icon_RSS.png | Bin 0 -> 1769 bytes .../democompositor/resources/images/Icon_StocQt.png | Bin 0 -> 1639 bytes wayland/democompositor/resources/images/graydot.png | Bin 0 -> 211 bytes .../democompositor/resources/images/graydots.png | Bin 0 -> 247 bytes .../democompositor/resources/images/greendot.png | Bin 0 -> 212 bytes .../democompositor/resources/images/greendots.png | Bin 0 -> 240 bytes wayland/democompositor/resources/images/icon1.png | Bin 0 -> 1700 bytes wayland/democompositor/resources/images/icon2.png | Bin 0 -> 1761 bytes wayland/democompositor/resources/images/icon3.png | Bin 0 -> 1719 bytes wayland/democompositor/resources/images/icon4.png | Bin 0 -> 1505 bytes wayland/democompositor/resources/images/quit.png | Bin 0 -> 782 bytes wayland/democompositor/resources/images/reddot.png | Bin 0 -> 219 bytes wayland/democompositor/tests/applist/applist.qrc | 4 ++-- wayland/democompositor/tests/apps/apps.qrc | 2 +- 40 files changed, 46 insertions(+), 46 deletions(-) delete mode 100644 wayland/democompositor/apps/files/clock.app delete mode 100644 wayland/democompositor/apps/files/maps.app delete mode 100644 wayland/democompositor/apps/files/rss.app delete mode 100644 wayland/democompositor/apps/files/stocqt.app delete mode 100644 wayland/democompositor/images/Icon_Clocks.png delete mode 100644 wayland/democompositor/images/Icon_Maps.png delete mode 100644 wayland/democompositor/images/Icon_RSS.png delete mode 100644 wayland/democompositor/images/Icon_StocQt.png delete mode 100644 wayland/democompositor/images/graydot.png delete mode 100644 wayland/democompositor/images/graydots.png delete mode 100644 wayland/democompositor/images/greendot.png delete mode 100644 wayland/democompositor/images/greendots.png delete mode 100644 wayland/democompositor/images/icon1.png delete mode 100644 wayland/democompositor/images/icon2.png delete mode 100644 wayland/democompositor/images/icon3.png delete mode 100644 wayland/democompositor/images/icon4.png delete mode 100644 wayland/democompositor/images/quit.png delete mode 100644 wayland/democompositor/images/reddot.png create mode 100644 wayland/democompositor/resources/apps/clock.app create mode 100644 wayland/democompositor/resources/apps/maps.app create mode 100644 wayland/democompositor/resources/apps/rss.app create mode 100644 wayland/democompositor/resources/apps/stocqt.app create mode 100644 wayland/democompositor/resources/images/Icon_Clocks.png create mode 100644 wayland/democompositor/resources/images/Icon_Maps.png create mode 100644 wayland/democompositor/resources/images/Icon_RSS.png create mode 100644 wayland/democompositor/resources/images/Icon_StocQt.png create mode 100644 wayland/democompositor/resources/images/graydot.png create mode 100644 wayland/democompositor/resources/images/graydots.png create mode 100644 wayland/democompositor/resources/images/greendot.png create mode 100644 wayland/democompositor/resources/images/greendots.png create mode 100644 wayland/democompositor/resources/images/icon1.png create mode 100644 wayland/democompositor/resources/images/icon2.png create mode 100644 wayland/democompositor/resources/images/icon3.png create mode 100644 wayland/democompositor/resources/images/icon4.png create mode 100644 wayland/democompositor/resources/images/quit.png create mode 100644 wayland/democompositor/resources/images/reddot.png (limited to 'wayland') diff --git a/wayland/democompositor/apps/files/clock.app b/wayland/democompositor/apps/files/clock.app deleted file mode 100644 index d6f5f56..0000000 --- a/wayland/democompositor/apps/files/clock.app +++ /dev/null @@ -1,8 +0,0 @@ -{ - "Type": "Application", - "Version": 1, - "Icon": "qrc:/images/Icon_Clocks.png", - "Name": "Clocks", - "Exec": "clocks", - "Path": "./" -} diff --git a/wayland/democompositor/apps/files/maps.app b/wayland/democompositor/apps/files/maps.app deleted file mode 100644 index e88899a..0000000 --- a/wayland/democompositor/apps/files/maps.app +++ /dev/null @@ -1,8 +0,0 @@ -{ - "Type": "Application", - "Version": 1, - "Icon": "qrc:/images/Icon_Maps.png", - "Name": "Maps", - "Exec": "qml_location_mapviewer", - "Path": "./" -} diff --git a/wayland/democompositor/apps/files/rss.app b/wayland/democompositor/apps/files/rss.app deleted file mode 100644 index 13ffbca..0000000 --- a/wayland/democompositor/apps/files/rss.app +++ /dev/null @@ -1,8 +0,0 @@ -{ - "Type": "Application", - "Version": 1, - "Icon": "qrc:/images/Icon_RSS.png", - "Name": "RSS News", - "Exec": "rssnews", - "Path": "./" -} diff --git a/wayland/democompositor/apps/files/stocqt.app b/wayland/democompositor/apps/files/stocqt.app deleted file mode 100644 index 9317359..0000000 --- a/wayland/democompositor/apps/files/stocqt.app +++ /dev/null @@ -1,8 +0,0 @@ -{ - "Type": "Application", - "Version": 1, - "Icon": "qrc:/images/Icon_StocQt.png", - "Name": "StoQt", - "Exec": "stocqt", - "Path": "./" -} diff --git a/wayland/democompositor/democompositor.pro b/wayland/democompositor/democompositor.pro index ff9f2b4..22b7d98 100644 --- a/wayland/democompositor/democompositor.pro +++ b/wayland/democompositor/democompositor.pro @@ -25,4 +25,4 @@ target.path = /data/user/$$TARGET # TODO. How does /data/user/$$TARGET map to QStandardPaths apps.path = /data/user/$$TARGET/apps/ -apps.files = apps/files/*.app +apps.files = resources/apps/*.app diff --git a/wayland/democompositor/democompositor.qrc b/wayland/democompositor/democompositor.qrc index 940f04e..6e8bd54 100644 --- a/wayland/democompositor/democompositor.qrc +++ b/wayland/democompositor/democompositor.qrc @@ -6,15 +6,15 @@ qml/MyButton.qml qml/LaunchButton.qml qml/TimedButton.qml - images/quit.png - images/greendot.png - images/reddot.png - images/graydot.png - images/graydots.png - images/greendots.png - images/Icon_Clocks.png - images/Icon_Maps.png - images/Icon_RSS.png - images/Icon_StocQt.png + resources/images/quit.png + resources/images/greendot.png + resources/images/reddot.png + resources/images/graydot.png + resources/images/graydots.png + resources/images/greendots.png + resources/images/Icon_Clocks.png + resources/images/Icon_Maps.png + resources/images/Icon_RSS.png + resources/images/Icon_StocQt.png diff --git a/wayland/democompositor/images/Icon_Clocks.png b/wayland/democompositor/images/Icon_Clocks.png deleted file mode 100644 index 0ca1955..0000000 Binary files a/wayland/democompositor/images/Icon_Clocks.png and /dev/null differ diff --git a/wayland/democompositor/images/Icon_Maps.png b/wayland/democompositor/images/Icon_Maps.png deleted file mode 100644 index fac0dc9..0000000 Binary files a/wayland/democompositor/images/Icon_Maps.png and /dev/null differ diff --git a/wayland/democompositor/images/Icon_RSS.png b/wayland/democompositor/images/Icon_RSS.png deleted file mode 100644 index 54ada4f..0000000 Binary files a/wayland/democompositor/images/Icon_RSS.png and /dev/null differ diff --git a/wayland/democompositor/images/Icon_StocQt.png b/wayland/democompositor/images/Icon_StocQt.png deleted file mode 100644 index d12aec1..0000000 Binary files a/wayland/democompositor/images/Icon_StocQt.png and /dev/null differ diff --git a/wayland/democompositor/images/graydot.png b/wayland/democompositor/images/graydot.png deleted file mode 100644 index 99606e3..0000000 Binary files a/wayland/democompositor/images/graydot.png and /dev/null differ diff --git a/wayland/democompositor/images/graydots.png b/wayland/democompositor/images/graydots.png deleted file mode 100644 index 0f90f12..0000000 Binary files a/wayland/democompositor/images/graydots.png and /dev/null differ diff --git a/wayland/democompositor/images/greendot.png b/wayland/democompositor/images/greendot.png deleted file mode 100644 index 0afb08f..0000000 Binary files a/wayland/democompositor/images/greendot.png and /dev/null differ diff --git a/wayland/democompositor/images/greendots.png b/wayland/democompositor/images/greendots.png deleted file mode 100644 index ab1e220..0000000 Binary files a/wayland/democompositor/images/greendots.png and /dev/null differ diff --git a/wayland/democompositor/images/icon1.png b/wayland/democompositor/images/icon1.png deleted file mode 100644 index 08f1c0c..0000000 Binary files a/wayland/democompositor/images/icon1.png and /dev/null differ diff --git a/wayland/democompositor/images/icon2.png b/wayland/democompositor/images/icon2.png deleted file mode 100644 index e02dda8..0000000 Binary files a/wayland/democompositor/images/icon2.png and /dev/null differ diff --git a/wayland/democompositor/images/icon3.png b/wayland/democompositor/images/icon3.png deleted file mode 100644 index 9872b89..0000000 Binary files a/wayland/democompositor/images/icon3.png and /dev/null differ diff --git a/wayland/democompositor/images/icon4.png b/wayland/democompositor/images/icon4.png deleted file mode 100644 index 3f64825..0000000 Binary files a/wayland/democompositor/images/icon4.png and /dev/null differ diff --git a/wayland/democompositor/images/quit.png b/wayland/democompositor/images/quit.png deleted file mode 100644 index 7366d77..0000000 Binary files a/wayland/democompositor/images/quit.png and /dev/null differ diff --git a/wayland/democompositor/images/reddot.png b/wayland/democompositor/images/reddot.png deleted file mode 100644 index 06451be..0000000 Binary files a/wayland/democompositor/images/reddot.png and /dev/null differ diff --git a/wayland/democompositor/resources/apps/clock.app b/wayland/democompositor/resources/apps/clock.app new file mode 100644 index 0000000..d6f5f56 --- /dev/null +++ b/wayland/democompositor/resources/apps/clock.app @@ -0,0 +1,8 @@ +{ + "Type": "Application", + "Version": 1, + "Icon": "qrc:/images/Icon_Clocks.png", + "Name": "Clocks", + "Exec": "clocks", + "Path": "./" +} diff --git a/wayland/democompositor/resources/apps/maps.app b/wayland/democompositor/resources/apps/maps.app new file mode 100644 index 0000000..e88899a --- /dev/null +++ b/wayland/democompositor/resources/apps/maps.app @@ -0,0 +1,8 @@ +{ + "Type": "Application", + "Version": 1, + "Icon": "qrc:/images/Icon_Maps.png", + "Name": "Maps", + "Exec": "qml_location_mapviewer", + "Path": "./" +} diff --git a/wayland/democompositor/resources/apps/rss.app b/wayland/democompositor/resources/apps/rss.app new file mode 100644 index 0000000..13ffbca --- /dev/null +++ b/wayland/democompositor/resources/apps/rss.app @@ -0,0 +1,8 @@ +{ + "Type": "Application", + "Version": 1, + "Icon": "qrc:/images/Icon_RSS.png", + "Name": "RSS News", + "Exec": "rssnews", + "Path": "./" +} diff --git a/wayland/democompositor/resources/apps/stocqt.app b/wayland/democompositor/resources/apps/stocqt.app new file mode 100644 index 0000000..9317359 --- /dev/null +++ b/wayland/democompositor/resources/apps/stocqt.app @@ -0,0 +1,8 @@ +{ + "Type": "Application", + "Version": 1, + "Icon": "qrc:/images/Icon_StocQt.png", + "Name": "StoQt", + "Exec": "stocqt", + "Path": "./" +} diff --git a/wayland/democompositor/resources/images/Icon_Clocks.png b/wayland/democompositor/resources/images/Icon_Clocks.png new file mode 100644 index 0000000..0ca1955 Binary files /dev/null and b/wayland/democompositor/resources/images/Icon_Clocks.png differ diff --git a/wayland/democompositor/resources/images/Icon_Maps.png b/wayland/democompositor/resources/images/Icon_Maps.png new file mode 100644 index 0000000..fac0dc9 Binary files /dev/null and b/wayland/democompositor/resources/images/Icon_Maps.png differ diff --git a/wayland/democompositor/resources/images/Icon_RSS.png b/wayland/democompositor/resources/images/Icon_RSS.png new file mode 100644 index 0000000..54ada4f Binary files /dev/null and b/wayland/democompositor/resources/images/Icon_RSS.png differ diff --git a/wayland/democompositor/resources/images/Icon_StocQt.png b/wayland/democompositor/resources/images/Icon_StocQt.png new file mode 100644 index 0000000..d12aec1 Binary files /dev/null and b/wayland/democompositor/resources/images/Icon_StocQt.png differ diff --git a/wayland/democompositor/resources/images/graydot.png b/wayland/democompositor/resources/images/graydot.png new file mode 100644 index 0000000..99606e3 Binary files /dev/null and b/wayland/democompositor/resources/images/graydot.png differ diff --git a/wayland/democompositor/resources/images/graydots.png b/wayland/democompositor/resources/images/graydots.png new file mode 100644 index 0000000..0f90f12 Binary files /dev/null and b/wayland/democompositor/resources/images/graydots.png differ diff --git a/wayland/democompositor/resources/images/greendot.png b/wayland/democompositor/resources/images/greendot.png new file mode 100644 index 0000000..0afb08f Binary files /dev/null and b/wayland/democompositor/resources/images/greendot.png differ diff --git a/wayland/democompositor/resources/images/greendots.png b/wayland/democompositor/resources/images/greendots.png new file mode 100644 index 0000000..ab1e220 Binary files /dev/null and b/wayland/democompositor/resources/images/greendots.png differ diff --git a/wayland/democompositor/resources/images/icon1.png b/wayland/democompositor/resources/images/icon1.png new file mode 100644 index 0000000..08f1c0c Binary files /dev/null and b/wayland/democompositor/resources/images/icon1.png differ diff --git a/wayland/democompositor/resources/images/icon2.png b/wayland/democompositor/resources/images/icon2.png new file mode 100644 index 0000000..e02dda8 Binary files /dev/null and b/wayland/democompositor/resources/images/icon2.png differ diff --git a/wayland/democompositor/resources/images/icon3.png b/wayland/democompositor/resources/images/icon3.png new file mode 100644 index 0000000..9872b89 Binary files /dev/null and b/wayland/democompositor/resources/images/icon3.png differ diff --git a/wayland/democompositor/resources/images/icon4.png b/wayland/democompositor/resources/images/icon4.png new file mode 100644 index 0000000..3f64825 Binary files /dev/null and b/wayland/democompositor/resources/images/icon4.png differ diff --git a/wayland/democompositor/resources/images/quit.png b/wayland/democompositor/resources/images/quit.png new file mode 100644 index 0000000..7366d77 Binary files /dev/null and b/wayland/democompositor/resources/images/quit.png differ diff --git a/wayland/democompositor/resources/images/reddot.png b/wayland/democompositor/resources/images/reddot.png new file mode 100644 index 0000000..06451be Binary files /dev/null and b/wayland/democompositor/resources/images/reddot.png differ diff --git a/wayland/democompositor/tests/applist/applist.qrc b/wayland/democompositor/tests/applist/applist.qrc index 04db642..eb4d8da 100644 --- a/wayland/democompositor/tests/applist/applist.qrc +++ b/wayland/democompositor/tests/applist/applist.qrc @@ -1,6 +1,6 @@ - ../../apps/files/clock.app - ../../apps/files/maps.app + ../../resources/apps/clock.app + ../../resources/apps/maps.app diff --git a/wayland/democompositor/tests/apps/apps.qrc b/wayland/democompositor/tests/apps/apps.qrc index 07e0afe..a8a834b 100644 --- a/wayland/democompositor/tests/apps/apps.qrc +++ b/wayland/democompositor/tests/apps/apps.qrc @@ -1,5 +1,5 @@ - ../../apps/files/clock.app + ../../resources/apps/clock.app -- cgit v1.2.3