aboutsummaryrefslogtreecommitdiffstats
path: root/examples/quickcontrols2
diff options
context:
space:
mode:
authorJ-P Nurmi <jpnurmi@qt.io>2017-03-13 11:55:43 +0100
committerJ-P Nurmi <jpnurmi@qt.io>2017-03-13 14:47:16 +0000
commitd1ac6e3dc8b6919bcba4278a4cef8cbfa83f30a1 (patch)
tree32099ee6e42e6c0993612b306776dd8e42e6e3ae /examples/quickcontrols2
parent7e382538fad487204885025f43409e265d58788c (diff)
Wearable: move app-specific images into each app's own folder
Change-Id: Ie378f19a1ccfd962528f47263d03cac6bf7dc03f Reviewed-by: J-P Nurmi <jpnurmi@qt.io>
Diffstat (limited to 'examples/quickcontrols2')
-rw-r--r--examples/quickcontrols2/wearable/images/background.png (renamed from examples/quickcontrols2/wearable/images/background/HomeBackground.png)bin400411 -> 400411 bytes
-rw-r--r--examples/quickcontrols2/wearable/qml/Alarms/images/alarms.png (renamed from examples/quickcontrols2/wearable/images/alarms/alarms.png)bin19340 -> 19340 bytes
-rw-r--r--examples/quickcontrols2/wearable/qml/Fitness/FitnessPage.qml4
-rw-r--r--examples/quickcontrols2/wearable/qml/Fitness/images/fitness.png (renamed from examples/quickcontrols2/wearable/images/fitness/fitness.png)bin19110 -> 19110 bytes
-rw-r--r--examples/quickcontrols2/wearable/qml/Fitness/images/man-running.png (renamed from examples/quickcontrols2/wearable/images/fitness/man-running.png)bin16047 -> 16047 bytes
-rw-r--r--examples/quickcontrols2/wearable/qml/Fitness/images/man-walking.png (renamed from examples/quickcontrols2/wearable/images/fitness/man-walking.png)bin16062 -> 16062 bytes
-rw-r--r--examples/quickcontrols2/wearable/qml/LauncherPage.qml14
-rw-r--r--examples/quickcontrols2/wearable/qml/Navigation/NavigationPage.qml2
-rw-r--r--examples/quickcontrols2/wearable/qml/Navigation/RouteElement.qml2
-rw-r--r--examples/quickcontrols2/wearable/qml/Navigation/images/end.png (renamed from examples/quickcontrols2/wearable/images/navigation/end.png)bin16408 -> 16408 bytes
-rw-r--r--examples/quickcontrols2/wearable/qml/Navigation/images/leftturn.png (renamed from examples/quickcontrols2/wearable/images/navigation/leftturn.png)bin16111 -> 16111 bytes
-rw-r--r--examples/quickcontrols2/wearable/qml/Navigation/images/marker.png (renamed from examples/quickcontrols2/wearable/images/navigation/marker.png)bin16408 -> 16408 bytes
-rw-r--r--examples/quickcontrols2/wearable/qml/Navigation/images/rightturn.png (renamed from examples/quickcontrols2/wearable/images/navigation/rightturn.png)bin16077 -> 16077 bytes
-rw-r--r--examples/quickcontrols2/wearable/qml/Navigation/images/route.png (renamed from examples/quickcontrols2/wearable/images/navigation/route.png)bin19411 -> 19411 bytes
-rw-r--r--examples/quickcontrols2/wearable/qml/Navigation/images/start.png (renamed from examples/quickcontrols2/wearable/images/navigation/start.png)bin16411 -> 16411 bytes
-rw-r--r--examples/quickcontrols2/wearable/qml/Navigation/images/straight.png (renamed from examples/quickcontrols2/wearable/images/navigation/straight.png)bin15727 -> 15727 bytes
-rw-r--r--examples/quickcontrols2/wearable/qml/Navigation/images/uturn.png (renamed from examples/quickcontrols2/wearable/images/navigation/uturn.png)bin3254 -> 3254 bytes
-rw-r--r--examples/quickcontrols2/wearable/qml/Notifications/NotificationsPage.qml6
-rw-r--r--examples/quickcontrols2/wearable/qml/Notifications/images/avatarf.png (renamed from examples/quickcontrols2/wearable/images/notifications/avatarf.png)bin16396 -> 16396 bytes
-rw-r--r--examples/quickcontrols2/wearable/qml/Notifications/images/avatarm.png (renamed from examples/quickcontrols2/wearable/images/notifications/avatarm.png)bin16198 -> 16198 bytes
-rw-r--r--examples/quickcontrols2/wearable/qml/Notifications/images/missedcall.png (renamed from examples/quickcontrols2/wearable/images/notifications/missedcall.png)bin2833 -> 2833 bytes
-rw-r--r--examples/quickcontrols2/wearable/qml/Notifications/images/notifications.png (renamed from examples/quickcontrols2/wearable/images/notifications/notifications.png)bin19625 -> 19625 bytes
-rw-r--r--examples/quickcontrols2/wearable/qml/Settings/SettingsPage.qml8
-rw-r--r--examples/quickcontrols2/wearable/qml/Settings/images/bluetooth.png (renamed from examples/quickcontrols2/wearable/images/settings/bluetooth.png)bin2770 -> 2770 bytes
-rw-r--r--examples/quickcontrols2/wearable/qml/Settings/images/brightness.png (renamed from examples/quickcontrols2/wearable/images/settings/brightness.png)bin2692 -> 2692 bytes
-rw-r--r--examples/quickcontrols2/wearable/qml/Settings/images/contrast.png (renamed from examples/quickcontrols2/wearable/images/settings/contrast.png)bin2347 -> 2347 bytes
-rw-r--r--examples/quickcontrols2/wearable/qml/Settings/images/settings.png (renamed from examples/quickcontrols2/wearable/images/settings/settings.png)bin19715 -> 19715 bytes
-rw-r--r--examples/quickcontrols2/wearable/qml/Settings/images/wifi.png (renamed from examples/quickcontrols2/wearable/images/settings/wifi.png)bin16308 -> 16308 bytes
-rw-r--r--examples/quickcontrols2/wearable/qml/Weather/WeatherPage.qml12
-rw-r--r--examples/quickcontrols2/wearable/qml/Weather/images/humidity.png (renamed from examples/quickcontrols2/wearable/images/weather/humidity.png)bin16450 -> 16450 bytes
-rw-r--r--examples/quickcontrols2/wearable/qml/Weather/images/pressure.png (renamed from examples/quickcontrols2/wearable/images/weather/pressure.png)bin16902 -> 16902 bytes
-rw-r--r--examples/quickcontrols2/wearable/qml/Weather/images/sunrise.png (renamed from examples/quickcontrols2/wearable/images/weather/sunrise.png)bin16534 -> 16534 bytes
-rw-r--r--examples/quickcontrols2/wearable/qml/Weather/images/sunset.png (renamed from examples/quickcontrols2/wearable/images/weather/sunset.png)bin16586 -> 16586 bytes
-rw-r--r--examples/quickcontrols2/wearable/qml/Weather/images/temperature.png (renamed from examples/quickcontrols2/wearable/images/weather/temperature.png)bin2004 -> 2004 bytes
-rw-r--r--examples/quickcontrols2/wearable/qml/Weather/images/weather.png (renamed from examples/quickcontrols2/wearable/images/weather/weather.png)bin19281 -> 19281 bytes
-rw-r--r--examples/quickcontrols2/wearable/qml/Weather/images/wind.png (renamed from examples/quickcontrols2/wearable/images/weather/wind.png)bin16440 -> 16440 bytes
-rw-r--r--examples/quickcontrols2/wearable/qml/WorldClock/Clock.qml2
-rw-r--r--examples/quickcontrols2/wearable/qml/WorldClock/images/center.png (renamed from examples/quickcontrols2/wearable/images/worldclock/center.png)bin765 -> 765 bytes
-rw-r--r--examples/quickcontrols2/wearable/qml/WorldClock/images/clock-night.png (renamed from examples/quickcontrols2/wearable/images/worldclock/clock-night.png)bin25619 -> 25619 bytes
-rw-r--r--examples/quickcontrols2/wearable/qml/WorldClock/images/clock.png (renamed from examples/quickcontrols2/wearable/images/worldclock/clock.png)bin15616 -> 15616 bytes
-rw-r--r--examples/quickcontrols2/wearable/qml/WorldClock/images/second.png (renamed from examples/quickcontrols2/wearable/images/worldclock/second.png)bin1015 -> 1015 bytes
-rw-r--r--examples/quickcontrols2/wearable/qml/WorldClock/images/swissdaydial.png (renamed from examples/quickcontrols2/wearable/images/worldclock/swissdaydial.png)bin7999 -> 7999 bytes
-rw-r--r--examples/quickcontrols2/wearable/qml/WorldClock/images/swissdayhour.png (renamed from examples/quickcontrols2/wearable/images/worldclock/swissdayhour.png)bin1088 -> 1088 bytes
-rw-r--r--examples/quickcontrols2/wearable/qml/WorldClock/images/swissdayminute.png (renamed from examples/quickcontrols2/wearable/images/worldclock/swissdayminute.png)bin1109 -> 1109 bytes
-rw-r--r--examples/quickcontrols2/wearable/qml/WorldClock/images/swissnightdial.png (renamed from examples/quickcontrols2/wearable/images/worldclock/swissnightdial.png)bin8899 -> 8899 bytes
-rw-r--r--examples/quickcontrols2/wearable/qml/WorldClock/images/swissnighthour.png (renamed from examples/quickcontrols2/wearable/images/worldclock/swissnighthour.png)bin1117 -> 1117 bytes
-rw-r--r--examples/quickcontrols2/wearable/qml/WorldClock/images/swissnightminute.png (renamed from examples/quickcontrols2/wearable/images/worldclock/swissnightminute.png)bin1063 -> 1063 bytes
-rw-r--r--examples/quickcontrols2/wearable/qml/WorldClock/images/swissseconds.png (renamed from examples/quickcontrols2/wearable/images/worldclock/swissseconds.png)bin2752 -> 2752 bytes
-rw-r--r--examples/quickcontrols2/wearable/qml/WorldClock/images/watch.png (renamed from examples/quickcontrols2/wearable/images/worldclock/watch.png)bin19015 -> 19015 bytes
-rw-r--r--examples/quickcontrols2/wearable/wearable.qml2
-rw-r--r--examples/quickcontrols2/wearable/wearable.qrc84
51 files changed, 68 insertions, 68 deletions
diff --git a/examples/quickcontrols2/wearable/images/background/HomeBackground.png b/examples/quickcontrols2/wearable/images/background.png
index 1c6920e6..1c6920e6 100644
--- a/examples/quickcontrols2/wearable/images/background/HomeBackground.png
+++ b/examples/quickcontrols2/wearable/images/background.png
Binary files differ
diff --git a/examples/quickcontrols2/wearable/images/alarms/alarms.png b/examples/quickcontrols2/wearable/qml/Alarms/images/alarms.png
index 00ec663e..00ec663e 100644
--- a/examples/quickcontrols2/wearable/images/alarms/alarms.png
+++ b/examples/quickcontrols2/wearable/qml/Alarms/images/alarms.png
Binary files differ
diff --git a/examples/quickcontrols2/wearable/qml/Fitness/FitnessPage.qml b/examples/quickcontrols2/wearable/qml/Fitness/FitnessPage.qml
index e2a9c21d..920f2594 100644
--- a/examples/quickcontrols2/wearable/qml/Fitness/FitnessPage.qml
+++ b/examples/quickcontrols2/wearable/qml/Fitness/FitnessPage.qml
@@ -86,7 +86,7 @@ Item {
anchors.horizontalCenter: parent.horizontalCenter
height: 64
width: 64
- source: "../../images/fitness/man-walking.png"
+ source: "images/man-walking.png"
}
Text {
anchors.horizontalCenter: parent.horizontalCenter
@@ -118,7 +118,7 @@ Item {
anchors.horizontalCenter: parent.horizontalCenter
height: 64
width: 64
- source: "../../images/fitness/man-running.png"
+ source: "images/man-running.png"
}
Text {
anchors.horizontalCenter: parent.horizontalCenter
diff --git a/examples/quickcontrols2/wearable/images/fitness/fitness.png b/examples/quickcontrols2/wearable/qml/Fitness/images/fitness.png
index a8789a61..a8789a61 100644
--- a/examples/quickcontrols2/wearable/images/fitness/fitness.png
+++ b/examples/quickcontrols2/wearable/qml/Fitness/images/fitness.png
Binary files differ
diff --git a/examples/quickcontrols2/wearable/images/fitness/man-running.png b/examples/quickcontrols2/wearable/qml/Fitness/images/man-running.png
index 5efab6e2..5efab6e2 100644
--- a/examples/quickcontrols2/wearable/images/fitness/man-running.png
+++ b/examples/quickcontrols2/wearable/qml/Fitness/images/man-running.png
Binary files differ
diff --git a/examples/quickcontrols2/wearable/images/fitness/man-walking.png b/examples/quickcontrols2/wearable/qml/Fitness/images/man-walking.png
index 01add534..01add534 100644
--- a/examples/quickcontrols2/wearable/images/fitness/man-walking.png
+++ b/examples/quickcontrols2/wearable/qml/Fitness/images/man-walking.png
Binary files differ
diff --git a/examples/quickcontrols2/wearable/qml/LauncherPage.qml b/examples/quickcontrols2/wearable/qml/LauncherPage.qml
index 9c82393f..e6c1b534 100644
--- a/examples/quickcontrols2/wearable/qml/LauncherPage.qml
+++ b/examples/quickcontrols2/wearable/qml/LauncherPage.qml
@@ -69,37 +69,37 @@ PathView {
model: ListModel {
ListElement {
title: qsTr("World Clock")
- icon: "../images/worldclock/watch.png"
+ icon: "WorldClock/images/watch.png"
page: "WorldClock/WorldClockPage.qml"
}
ListElement {
title: qsTr("Navigation")
- icon: "../images/navigation/route.png"
+ icon: "Navigation/images/route.png"
page: "Navigation/NavigationPage.qml"
}
ListElement {
title: qsTr("Weather")
- icon: "../images/weather/weather.png"
+ icon: "Weather/images/weather.png"
page: "Weather/WeatherPage.qml"
}
ListElement {
title: qsTr("Fitness")
- icon: "../images/fitness/fitness.png"
+ icon: "Fitness/images/fitness.png"
page: "Fitness/FitnessPage.qml"
}
ListElement {
title: qsTr("Notifications")
- icon: "../images/notifications/notifications.png"
+ icon: "Notifications/images/notifications.png"
page: "Notifications/NotificationsPage.qml"
}
ListElement {
title: qsTr("Alarm")
- icon: "../images/alarms/alarms.png"
+ icon: "Alarms/images/alarms.png"
page: "Alarms/AlarmsPage.qml"
}
ListElement {
title: qsTr("Settings")
- icon: "../images/settings/settings.png"
+ icon: "Settings/images/settings.png"
page: "Settings/SettingsPage.qml"
}
}
diff --git a/examples/quickcontrols2/wearable/qml/Navigation/NavigationPage.qml b/examples/quickcontrols2/wearable/qml/Navigation/NavigationPage.qml
index c8e81315..95df2676 100644
--- a/examples/quickcontrols2/wearable/qml/Navigation/NavigationPage.qml
+++ b/examples/quickcontrols2/wearable/qml/Navigation/NavigationPage.qml
@@ -80,7 +80,7 @@ Item {
anchors.verticalCenter: parent.verticalCenter
height: 64
width: 64
- source: "../../images/navigation/route.png"
+ source: "images/route.png"
fillMode: Image.PreserveAspectCrop
}
Text {
diff --git a/examples/quickcontrols2/wearable/qml/Navigation/RouteElement.qml b/examples/quickcontrols2/wearable/qml/Navigation/RouteElement.qml
index 80e6898a..f9a2f26b 100644
--- a/examples/quickcontrols2/wearable/qml/Navigation/RouteElement.qml
+++ b/examples/quickcontrols2/wearable/qml/Navigation/RouteElement.qml
@@ -69,7 +69,7 @@ Rectangle {
anchors.verticalCenter: parent.verticalCenter
height: 64
width: 64
- source: "../../images/navigation/" + navImage
+ source: "images/" + navImage
fillMode: Image.PreserveAspectFit
}
diff --git a/examples/quickcontrols2/wearable/images/navigation/end.png b/examples/quickcontrols2/wearable/qml/Navigation/images/end.png
index 3006c0f3..3006c0f3 100644
--- a/examples/quickcontrols2/wearable/images/navigation/end.png
+++ b/examples/quickcontrols2/wearable/qml/Navigation/images/end.png
Binary files differ
diff --git a/examples/quickcontrols2/wearable/images/navigation/leftturn.png b/examples/quickcontrols2/wearable/qml/Navigation/images/leftturn.png
index 3c416304..3c416304 100644
--- a/examples/quickcontrols2/wearable/images/navigation/leftturn.png
+++ b/examples/quickcontrols2/wearable/qml/Navigation/images/leftturn.png
Binary files differ
diff --git a/examples/quickcontrols2/wearable/images/navigation/marker.png b/examples/quickcontrols2/wearable/qml/Navigation/images/marker.png
index 3006c0f3..3006c0f3 100644
--- a/examples/quickcontrols2/wearable/images/navigation/marker.png
+++ b/examples/quickcontrols2/wearable/qml/Navigation/images/marker.png
Binary files differ
diff --git a/examples/quickcontrols2/wearable/images/navigation/rightturn.png b/examples/quickcontrols2/wearable/qml/Navigation/images/rightturn.png
index a29ec694..a29ec694 100644
--- a/examples/quickcontrols2/wearable/images/navigation/rightturn.png
+++ b/examples/quickcontrols2/wearable/qml/Navigation/images/rightturn.png
Binary files differ
diff --git a/examples/quickcontrols2/wearable/images/navigation/route.png b/examples/quickcontrols2/wearable/qml/Navigation/images/route.png
index b8ac9d7e..b8ac9d7e 100644
--- a/examples/quickcontrols2/wearable/images/navigation/route.png
+++ b/examples/quickcontrols2/wearable/qml/Navigation/images/route.png
Binary files differ
diff --git a/examples/quickcontrols2/wearable/images/navigation/start.png b/examples/quickcontrols2/wearable/qml/Navigation/images/start.png
index 1adf0ac8..1adf0ac8 100644
--- a/examples/quickcontrols2/wearable/images/navigation/start.png
+++ b/examples/quickcontrols2/wearable/qml/Navigation/images/start.png
Binary files differ
diff --git a/examples/quickcontrols2/wearable/images/navigation/straight.png b/examples/quickcontrols2/wearable/qml/Navigation/images/straight.png
index e3c5bb5c..e3c5bb5c 100644
--- a/examples/quickcontrols2/wearable/images/navigation/straight.png
+++ b/examples/quickcontrols2/wearable/qml/Navigation/images/straight.png
Binary files differ
diff --git a/examples/quickcontrols2/wearable/images/navigation/uturn.png b/examples/quickcontrols2/wearable/qml/Navigation/images/uturn.png
index b6917f67..b6917f67 100644
--- a/examples/quickcontrols2/wearable/images/navigation/uturn.png
+++ b/examples/quickcontrols2/wearable/qml/Navigation/images/uturn.png
Binary files differ
diff --git a/examples/quickcontrols2/wearable/qml/Notifications/NotificationsPage.qml b/examples/quickcontrols2/wearable/qml/Notifications/NotificationsPage.qml
index 6be065e5..f1dc6259 100644
--- a/examples/quickcontrols2/wearable/qml/Notifications/NotificationsPage.qml
+++ b/examples/quickcontrols2/wearable/qml/Notifications/NotificationsPage.qml
@@ -85,7 +85,7 @@ Item {
anchors.verticalCenter: parent.verticalCenter
height: 64
width: 64
- source: "../../images/notifications/missedcall.png"
+ source: "images/missedcall.png"
}
ListView {
@@ -113,8 +113,8 @@ Item {
height: 64
width: 64
source: (gender == "m") ?
- "../../images/notifications/avatarm.png"
- :"../../images/notifications/avatarf.png"
+ "images/avatarm.png"
+ :"images/avatarf.png"
}
Text {
diff --git a/examples/quickcontrols2/wearable/images/notifications/avatarf.png b/examples/quickcontrols2/wearable/qml/Notifications/images/avatarf.png
index c88edc60..c88edc60 100644
--- a/examples/quickcontrols2/wearable/images/notifications/avatarf.png
+++ b/examples/quickcontrols2/wearable/qml/Notifications/images/avatarf.png
Binary files differ
diff --git a/examples/quickcontrols2/wearable/images/notifications/avatarm.png b/examples/quickcontrols2/wearable/qml/Notifications/images/avatarm.png
index f7abb4c9..f7abb4c9 100644
--- a/examples/quickcontrols2/wearable/images/notifications/avatarm.png
+++ b/examples/quickcontrols2/wearable/qml/Notifications/images/avatarm.png
Binary files differ
diff --git a/examples/quickcontrols2/wearable/images/notifications/missedcall.png b/examples/quickcontrols2/wearable/qml/Notifications/images/missedcall.png
index d05f17b3..d05f17b3 100644
--- a/examples/quickcontrols2/wearable/images/notifications/missedcall.png
+++ b/examples/quickcontrols2/wearable/qml/Notifications/images/missedcall.png
Binary files differ
diff --git a/examples/quickcontrols2/wearable/images/notifications/notifications.png b/examples/quickcontrols2/wearable/qml/Notifications/images/notifications.png
index c5c3ffb2..c5c3ffb2 100644
--- a/examples/quickcontrols2/wearable/images/notifications/notifications.png
+++ b/examples/quickcontrols2/wearable/qml/Notifications/images/notifications.png
Binary files differ
diff --git a/examples/quickcontrols2/wearable/qml/Settings/SettingsPage.qml b/examples/quickcontrols2/wearable/qml/Settings/SettingsPage.qml
index fa04f38f..69797f3a 100644
--- a/examples/quickcontrols2/wearable/qml/Settings/SettingsPage.qml
+++ b/examples/quickcontrols2/wearable/qml/Settings/SettingsPage.qml
@@ -81,7 +81,7 @@ Item {
spacing: 50
Image {
anchors.verticalCenter: parent.verticalCenter
- source: "../../images/settings/bluetooth.png"
+ source: "images/bluetooth.png"
}
QQC2.Switch {
id: bluetoothSwitch
@@ -93,7 +93,7 @@ Item {
spacing: 50
Image {
anchors.verticalCenter: parent.verticalCenter
- source: "../../images/settings/wifi.png"
+ source: "images/wifi.png"
}
QQC2.Switch {
id: wirelessSwitch
@@ -114,7 +114,7 @@ Item {
Column {
Image {
anchors.horizontalCenter: parent.horizontalCenter
- source: "../../images/settings/brightness.png"
+ source: "images/brightness.png"
}
QQC2.Slider {
id: brightnessSlider
@@ -129,7 +129,7 @@ Item {
spacing: 2
Image {
anchors.horizontalCenter: parent.horizontalCenter
- source: "../../images/settings/contrast.png"
+ source: "images/contrast.png"
}
QQC2.Slider {
id: contrastSlider
diff --git a/examples/quickcontrols2/wearable/images/settings/bluetooth.png b/examples/quickcontrols2/wearable/qml/Settings/images/bluetooth.png
index 2b2d0e7e..2b2d0e7e 100644
--- a/examples/quickcontrols2/wearable/images/settings/bluetooth.png
+++ b/examples/quickcontrols2/wearable/qml/Settings/images/bluetooth.png
Binary files differ
diff --git a/examples/quickcontrols2/wearable/images/settings/brightness.png b/examples/quickcontrols2/wearable/qml/Settings/images/brightness.png
index 846a896c..846a896c 100644
--- a/examples/quickcontrols2/wearable/images/settings/brightness.png
+++ b/examples/quickcontrols2/wearable/qml/Settings/images/brightness.png
Binary files differ
diff --git a/examples/quickcontrols2/wearable/images/settings/contrast.png b/examples/quickcontrols2/wearable/qml/Settings/images/contrast.png
index eb528eb8..eb528eb8 100644
--- a/examples/quickcontrols2/wearable/images/settings/contrast.png
+++ b/examples/quickcontrols2/wearable/qml/Settings/images/contrast.png
Binary files differ
diff --git a/examples/quickcontrols2/wearable/images/settings/settings.png b/examples/quickcontrols2/wearable/qml/Settings/images/settings.png
index c42f7dc6..c42f7dc6 100644
--- a/examples/quickcontrols2/wearable/images/settings/settings.png
+++ b/examples/quickcontrols2/wearable/qml/Settings/images/settings.png
Binary files differ
diff --git a/examples/quickcontrols2/wearable/images/settings/wifi.png b/examples/quickcontrols2/wearable/qml/Settings/images/wifi.png
index 42c92516..42c92516 100644
--- a/examples/quickcontrols2/wearable/images/settings/wifi.png
+++ b/examples/quickcontrols2/wearable/qml/Settings/images/wifi.png
Binary files differ
diff --git a/examples/quickcontrols2/wearable/qml/Weather/WeatherPage.qml b/examples/quickcontrols2/wearable/qml/Weather/WeatherPage.qml
index 7b9cb916..4bb944cb 100644
--- a/examples/quickcontrols2/wearable/qml/Weather/WeatherPage.qml
+++ b/examples/quickcontrols2/wearable/qml/Weather/WeatherPage.qml
@@ -81,7 +81,7 @@ Item {
anchors.verticalCenter: parent.verticalCenter
height: 64
width: 64
- source: "../../images/weather/temperature.png"
+ source: "images/temperature.png"
}
Column {
@@ -146,7 +146,7 @@ Item {
anchors.verticalCenter: parent.verticalCenter
height: 64
width: 64
- source: "../../images/weather/wind.png"
+ source: "images/wind.png"
}
Text {
@@ -174,7 +174,7 @@ Item {
anchors.verticalCenter: parent.verticalCenter
height: 64
width: 64
- source: "../../images/weather/humidity.png"
+ source: "images/humidity.png"
}
Text {
anchors.left: hImg.right
@@ -206,7 +206,7 @@ Item {
anchors.verticalCenter: parent.verticalCenter
height: 64
width: 64
- source: "../../images/weather/pressure.png"
+ source: "images/pressure.png"
}
Column {
@@ -271,7 +271,7 @@ Item {
anchors.verticalCenter: parent.verticalCenter
height: 64
width: 64
- source: "../../images/weather/sunrise.png"
+ source: "images/sunrise.png"
}
Text {
@@ -300,7 +300,7 @@ Item {
anchors.verticalCenter: parent.verticalCenter
height: 64
width: 64
- source: "../../images/weather/sunset.png"
+ source: "images/sunset.png"
}
Text {
diff --git a/examples/quickcontrols2/wearable/images/weather/humidity.png b/examples/quickcontrols2/wearable/qml/Weather/images/humidity.png
index ef9ed9de..ef9ed9de 100644
--- a/examples/quickcontrols2/wearable/images/weather/humidity.png
+++ b/examples/quickcontrols2/wearable/qml/Weather/images/humidity.png
Binary files differ
diff --git a/examples/quickcontrols2/wearable/images/weather/pressure.png b/examples/quickcontrols2/wearable/qml/Weather/images/pressure.png
index 7850609e..7850609e 100644
--- a/examples/quickcontrols2/wearable/images/weather/pressure.png
+++ b/examples/quickcontrols2/wearable/qml/Weather/images/pressure.png
Binary files differ
diff --git a/examples/quickcontrols2/wearable/images/weather/sunrise.png b/examples/quickcontrols2/wearable/qml/Weather/images/sunrise.png
index 70a9a969..70a9a969 100644
--- a/examples/quickcontrols2/wearable/images/weather/sunrise.png
+++ b/examples/quickcontrols2/wearable/qml/Weather/images/sunrise.png
Binary files differ
diff --git a/examples/quickcontrols2/wearable/images/weather/sunset.png b/examples/quickcontrols2/wearable/qml/Weather/images/sunset.png
index 01bb9ec8..01bb9ec8 100644
--- a/examples/quickcontrols2/wearable/images/weather/sunset.png
+++ b/examples/quickcontrols2/wearable/qml/Weather/images/sunset.png
Binary files differ
diff --git a/examples/quickcontrols2/wearable/images/weather/temperature.png b/examples/quickcontrols2/wearable/qml/Weather/images/temperature.png
index 5d7faa99..5d7faa99 100644
--- a/examples/quickcontrols2/wearable/images/weather/temperature.png
+++ b/examples/quickcontrols2/wearable/qml/Weather/images/temperature.png
Binary files differ
diff --git a/examples/quickcontrols2/wearable/images/weather/weather.png b/examples/quickcontrols2/wearable/qml/Weather/images/weather.png
index 0530d47b..0530d47b 100644
--- a/examples/quickcontrols2/wearable/images/weather/weather.png
+++ b/examples/quickcontrols2/wearable/qml/Weather/images/weather.png
Binary files differ
diff --git a/examples/quickcontrols2/wearable/images/weather/wind.png b/examples/quickcontrols2/wearable/qml/Weather/images/wind.png
index c728fcc0..c728fcc0 100644
--- a/examples/quickcontrols2/wearable/images/weather/wind.png
+++ b/examples/quickcontrols2/wearable/qml/Weather/images/wind.png
Binary files differ
diff --git a/examples/quickcontrols2/wearable/qml/WorldClock/Clock.qml b/examples/quickcontrols2/wearable/qml/WorldClock/Clock.qml
index 7e30a371..64f92f60 100644
--- a/examples/quickcontrols2/wearable/qml/WorldClock/Clock.qml
+++ b/examples/quickcontrols2/wearable/qml/WorldClock/Clock.qml
@@ -65,7 +65,7 @@ Item {
property bool internationalTime: true //Unset for local time
function getWatchFaceImage(imageName) {
- return "../../images/worldclock/" + imageName
+ return "images/" + imageName
}
function timeChanged() {
diff --git a/examples/quickcontrols2/wearable/images/worldclock/center.png b/examples/quickcontrols2/wearable/qml/WorldClock/images/center.png
index 7fbd802a..7fbd802a 100644
--- a/examples/quickcontrols2/wearable/images/worldclock/center.png
+++ b/examples/quickcontrols2/wearable/qml/WorldClock/images/center.png
Binary files differ
diff --git a/examples/quickcontrols2/wearable/images/worldclock/clock-night.png b/examples/quickcontrols2/wearable/qml/WorldClock/images/clock-night.png
index 698f57a5..698f57a5 100644
--- a/examples/quickcontrols2/wearable/images/worldclock/clock-night.png
+++ b/examples/quickcontrols2/wearable/qml/WorldClock/images/clock-night.png
Binary files differ
diff --git a/examples/quickcontrols2/wearable/images/worldclock/clock.png b/examples/quickcontrols2/wearable/qml/WorldClock/images/clock.png
index 6e1c6eed..6e1c6eed 100644
--- a/examples/quickcontrols2/wearable/images/worldclock/clock.png
+++ b/examples/quickcontrols2/wearable/qml/WorldClock/images/clock.png
Binary files differ
diff --git a/examples/quickcontrols2/wearable/images/worldclock/second.png b/examples/quickcontrols2/wearable/qml/WorldClock/images/second.png
index eee07efb..eee07efb 100644
--- a/examples/quickcontrols2/wearable/images/worldclock/second.png
+++ b/examples/quickcontrols2/wearable/qml/WorldClock/images/second.png
Binary files differ
diff --git a/examples/quickcontrols2/wearable/images/worldclock/swissdaydial.png b/examples/quickcontrols2/wearable/qml/WorldClock/images/swissdaydial.png
index 64136618..64136618 100644
--- a/examples/quickcontrols2/wearable/images/worldclock/swissdaydial.png
+++ b/examples/quickcontrols2/wearable/qml/WorldClock/images/swissdaydial.png
Binary files differ
diff --git a/examples/quickcontrols2/wearable/images/worldclock/swissdayhour.png b/examples/quickcontrols2/wearable/qml/WorldClock/images/swissdayhour.png
index 255985d2..255985d2 100644
--- a/examples/quickcontrols2/wearable/images/worldclock/swissdayhour.png
+++ b/examples/quickcontrols2/wearable/qml/WorldClock/images/swissdayhour.png
Binary files differ
diff --git a/examples/quickcontrols2/wearable/images/worldclock/swissdayminute.png b/examples/quickcontrols2/wearable/qml/WorldClock/images/swissdayminute.png
index bc6992f8..bc6992f8 100644
--- a/examples/quickcontrols2/wearable/images/worldclock/swissdayminute.png
+++ b/examples/quickcontrols2/wearable/qml/WorldClock/images/swissdayminute.png
Binary files differ
diff --git a/examples/quickcontrols2/wearable/images/worldclock/swissnightdial.png b/examples/quickcontrols2/wearable/qml/WorldClock/images/swissnightdial.png
index e2590af4..e2590af4 100644
--- a/examples/quickcontrols2/wearable/images/worldclock/swissnightdial.png
+++ b/examples/quickcontrols2/wearable/qml/WorldClock/images/swissnightdial.png
Binary files differ
diff --git a/examples/quickcontrols2/wearable/images/worldclock/swissnighthour.png b/examples/quickcontrols2/wearable/qml/WorldClock/images/swissnighthour.png
index 1c6a6131..1c6a6131 100644
--- a/examples/quickcontrols2/wearable/images/worldclock/swissnighthour.png
+++ b/examples/quickcontrols2/wearable/qml/WorldClock/images/swissnighthour.png
Binary files differ
diff --git a/examples/quickcontrols2/wearable/images/worldclock/swissnightminute.png b/examples/quickcontrols2/wearable/qml/WorldClock/images/swissnightminute.png
index 3353ba2c..3353ba2c 100644
--- a/examples/quickcontrols2/wearable/images/worldclock/swissnightminute.png
+++ b/examples/quickcontrols2/wearable/qml/WorldClock/images/swissnightminute.png
Binary files differ
diff --git a/examples/quickcontrols2/wearable/images/worldclock/swissseconds.png b/examples/quickcontrols2/wearable/qml/WorldClock/images/swissseconds.png
index 66b4f3fa..66b4f3fa 100644
--- a/examples/quickcontrols2/wearable/images/worldclock/swissseconds.png
+++ b/examples/quickcontrols2/wearable/qml/WorldClock/images/swissseconds.png
Binary files differ
diff --git a/examples/quickcontrols2/wearable/images/worldclock/watch.png b/examples/quickcontrols2/wearable/qml/WorldClock/images/watch.png
index 299858b7..299858b7 100644
--- a/examples/quickcontrols2/wearable/images/worldclock/watch.png
+++ b/examples/quickcontrols2/wearable/qml/WorldClock/images/watch.png
Binary files differ
diff --git a/examples/quickcontrols2/wearable/wearable.qml b/examples/quickcontrols2/wearable/wearable.qml
index 425c2e93..a1420c61 100644
--- a/examples/quickcontrols2/wearable/wearable.qml
+++ b/examples/quickcontrols2/wearable/wearable.qml
@@ -64,7 +64,7 @@ QQC2.ApplicationWindow {
title: qsTr("Wearable")
background: Image {
- source: "images/background/HomeBackground.png"
+ source: "images/background.png"
}
header: NaviButton {
diff --git a/examples/quickcontrols2/wearable/wearable.qrc b/examples/quickcontrols2/wearable/wearable.qrc
index 6d605fd0..b512fbd7 100644
--- a/examples/quickcontrols2/wearable/wearable.qrc
+++ b/examples/quickcontrols2/wearable/wearable.qrc
@@ -1,19 +1,43 @@
<RCC>
<qresource prefix="/">
<file>wearable.qml</file>
+ <file>qml/LauncherPage.qml</file>
+ <file>qml/NaviButton.qml</file>
+ <file>images/background.png</file>
+ <file>images/back.png</file>
+ <file>images/home.png</file>
<file>qml/Alarms/alarms.js</file>
<file>qml/Alarms/AlarmsPage.qml</file>
+ <file>qml/Alarms/images/alarms.png</file>
<file>qml/Fitness/fitness.js</file>
<file>qml/Fitness/FitnessPage.qml</file>
- <file>qml/LauncherPage.qml</file>
- <file>qml/NaviButton.qml</file>
+ <file>qml/Fitness/images/fitness.png</file>
+ <file>qml/Fitness/images/man-running.png</file>
+ <file>qml/Fitness/images/man-walking.png</file>
<file>qml/Navigation/navigation.js</file>
<file>qml/Navigation/NavigationPage.qml</file>
<file>qml/Navigation/RouteElement.qml</file>
<file>qml/Navigation/walk_route.json</file>
+ <file>qml/Navigation/images/end.png</file>
+ <file>qml/Navigation/images/leftturn.png</file>
+ <file>qml/Navigation/images/marker.png</file>
+ <file>qml/Navigation/images/rightturn.png</file>
+ <file>qml/Navigation/images/route.png</file>
+ <file>qml/Navigation/images/start.png</file>
+ <file>qml/Navigation/images/straight.png</file>
+ <file>qml/Navigation/images/uturn.png</file>
<file>qml/Notifications/notifications.js</file>
<file>qml/Notifications/NotificationsPage.qml</file>
+ <file>qml/Notifications/images/avatarf.png</file>
+ <file>qml/Notifications/images/avatarm.png</file>
+ <file>qml/Notifications/images/missedcall.png</file>
+ <file>qml/Notifications/images/notifications.png</file>
<file>qml/Settings/SettingsPage.qml</file>
+ <file>qml/Settings/images/bluetooth.png</file>
+ <file>qml/Settings/images/brightness.png</file>
+ <file>qml/Settings/images/contrast.png</file>
+ <file>qml/Settings/images/settings.png</file>
+ <file>qml/Settings/images/wifi.png</file>
<file>qml/Style/qmldir</file>
<file>qml/Style/PageIndicator.qml</file>
<file>qml/Style/Slider.qml</file>
@@ -22,47 +46,23 @@
<file>qml/Weather/weather.js</file>
<file>qml/Weather/weather.json</file>
<file>qml/Weather/WeatherPage.qml</file>
+ <file>qml/Weather/images/humidity.png</file>
+ <file>qml/Weather/images/pressure.png</file>
+ <file>qml/Weather/images/sunrise.png</file>
+ <file>qml/Weather/images/sunset.png</file>
+ <file>qml/Weather/images/temperature.png</file>
+ <file>qml/Weather/images/weather.png</file>
+ <file>qml/Weather/images/wind.png</file>
<file>qml/WorldClock/Clock.qml</file>
<file>qml/WorldClock/WorldClockPage.qml</file>
- <file>images/alarms/alarms.png</file>
- <file>images/background/HomeBackground.png</file>
- <file>images/back.png</file>
- <file>images/fitness/fitness.png</file>
- <file>images/fitness/man-running.png</file>
- <file>images/fitness/man-walking.png</file>
- <file>images/home.png</file>
- <file>images/navigation/end.png</file>
- <file>images/navigation/leftturn.png</file>
- <file>images/navigation/marker.png</file>
- <file>images/navigation/rightturn.png</file>
- <file>images/navigation/route.png</file>
- <file>images/navigation/start.png</file>
- <file>images/navigation/straight.png</file>
- <file>images/navigation/uturn.png</file>
- <file>images/notifications/avatarf.png</file>
- <file>images/notifications/avatarm.png</file>
- <file>images/notifications/missedcall.png</file>
- <file>images/notifications/notifications.png</file>
- <file>images/settings/bluetooth.png</file>
- <file>images/settings/brightness.png</file>
- <file>images/settings/contrast.png</file>
- <file>images/settings/settings.png</file>
- <file>images/settings/wifi.png</file>
- <file>images/weather/humidity.png</file>
- <file>images/weather/pressure.png</file>
- <file>images/weather/sunrise.png</file>
- <file>images/weather/sunset.png</file>
- <file>images/weather/temperature.png</file>
- <file>images/weather/weather.png</file>
- <file>images/weather/wind.png</file>
- <file>images/worldclock/center.png</file>
- <file>images/worldclock/second.png</file>
- <file>images/worldclock/swissdaydial.png</file>
- <file>images/worldclock/swissdayhour.png</file>
- <file>images/worldclock/swissdayminute.png</file>
- <file>images/worldclock/swissnightdial.png</file>
- <file>images/worldclock/swissnighthour.png</file>
- <file>images/worldclock/swissnightminute.png</file>
- <file>images/worldclock/watch.png</file>
+ <file>qml/WorldClock/images/center.png</file>
+ <file>qml/WorldClock/images/second.png</file>
+ <file>qml/WorldClock/images/swissdaydial.png</file>
+ <file>qml/WorldClock/images/swissdayhour.png</file>
+ <file>qml/WorldClock/images/swissdayminute.png</file>
+ <file>qml/WorldClock/images/swissnightdial.png</file>
+ <file>qml/WorldClock/images/swissnighthour.png</file>
+ <file>qml/WorldClock/images/swissnightminute.png</file>
+ <file>qml/WorldClock/images/watch.png</file>
</qresource>
</RCC>