aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJ-P Nurmi <jpnurmi@qt.io>2017-03-13 10:03:37 +0100
committerJ-P Nurmi <jpnurmi@qt.io>2017-03-13 10:19:25 +0000
commit2f8e91e37d327c8dacd5c137e4198f274898f72a (patch)
treeeccf489ba2a99711a8ed685d85c71fcac856d8ea
parent809df2c258914c7490c005fb192a0861eaace658 (diff)
Wearable: rename WatchFace to WorldClock
To be consistent how the pages/apps are called in the UI vs. code. Change-Id: I721d3ebb8631aa97a1ab43e6924cd0e4d0f39d24 Reviewed-by: J-P Nurmi <jpnurmi@qt.io>
-rw-r--r--examples/quickcontrols2/wearable/images/worldclock/center.png (renamed from examples/quickcontrols2/wearable/images/watchface/center.png)bin765 -> 765 bytes
-rw-r--r--examples/quickcontrols2/wearable/images/worldclock/clock-night.png (renamed from examples/quickcontrols2/wearable/images/watchface/clock-night.png)bin25619 -> 25619 bytes
-rw-r--r--examples/quickcontrols2/wearable/images/worldclock/clock.png (renamed from examples/quickcontrols2/wearable/images/watchface/clock.png)bin15616 -> 15616 bytes
-rw-r--r--examples/quickcontrols2/wearable/images/worldclock/second.png (renamed from examples/quickcontrols2/wearable/images/watchface/second.png)bin1015 -> 1015 bytes
-rw-r--r--examples/quickcontrols2/wearable/images/worldclock/swissdaydial.png (renamed from examples/quickcontrols2/wearable/images/watchface/swissdaydial.png)bin7999 -> 7999 bytes
-rw-r--r--examples/quickcontrols2/wearable/images/worldclock/swissdayhour.png (renamed from examples/quickcontrols2/wearable/images/watchface/swissdayhour.png)bin1088 -> 1088 bytes
-rw-r--r--examples/quickcontrols2/wearable/images/worldclock/swissdayminute.png (renamed from examples/quickcontrols2/wearable/images/watchface/swissdayminute.png)bin1109 -> 1109 bytes
-rw-r--r--examples/quickcontrols2/wearable/images/worldclock/swissnightdial.png (renamed from examples/quickcontrols2/wearable/images/watchface/swissnightdial.png)bin8899 -> 8899 bytes
-rw-r--r--examples/quickcontrols2/wearable/images/worldclock/swissnighthour.png (renamed from examples/quickcontrols2/wearable/images/watchface/swissnighthour.png)bin1117 -> 1117 bytes
-rw-r--r--examples/quickcontrols2/wearable/images/worldclock/swissnightminute.png (renamed from examples/quickcontrols2/wearable/images/watchface/swissnightminute.png)bin1063 -> 1063 bytes
-rw-r--r--examples/quickcontrols2/wearable/images/worldclock/swissseconds.png (renamed from examples/quickcontrols2/wearable/images/watchface/swissseconds.png)bin2752 -> 2752 bytes
-rw-r--r--examples/quickcontrols2/wearable/images/worldclock/watch.png (renamed from examples/quickcontrols2/wearable/images/watchface/watch.png)bin19015 -> 19015 bytes
-rw-r--r--examples/quickcontrols2/wearable/qml/LauncherPage.qml4
-rw-r--r--examples/quickcontrols2/wearable/qml/WorldClock/Clock.qml (renamed from examples/quickcontrols2/wearable/qml/WatchFace/Clock.qml)2
-rw-r--r--examples/quickcontrols2/wearable/qml/WorldClock/WorldClockPage.qml (renamed from examples/quickcontrols2/wearable/qml/WatchFace/WatchFacePage.qml)0
-rw-r--r--examples/quickcontrols2/wearable/wearable.qrc22
16 files changed, 14 insertions, 14 deletions
diff --git a/examples/quickcontrols2/wearable/images/watchface/center.png b/examples/quickcontrols2/wearable/images/worldclock/center.png
index 7fbd802a..7fbd802a 100644
--- a/examples/quickcontrols2/wearable/images/watchface/center.png
+++ b/examples/quickcontrols2/wearable/images/worldclock/center.png
Binary files differ
diff --git a/examples/quickcontrols2/wearable/images/watchface/clock-night.png b/examples/quickcontrols2/wearable/images/worldclock/clock-night.png
index 698f57a5..698f57a5 100644
--- a/examples/quickcontrols2/wearable/images/watchface/clock-night.png
+++ b/examples/quickcontrols2/wearable/images/worldclock/clock-night.png
Binary files differ
diff --git a/examples/quickcontrols2/wearable/images/watchface/clock.png b/examples/quickcontrols2/wearable/images/worldclock/clock.png
index 6e1c6eed..6e1c6eed 100644
--- a/examples/quickcontrols2/wearable/images/watchface/clock.png
+++ b/examples/quickcontrols2/wearable/images/worldclock/clock.png
Binary files differ
diff --git a/examples/quickcontrols2/wearable/images/watchface/second.png b/examples/quickcontrols2/wearable/images/worldclock/second.png
index eee07efb..eee07efb 100644
--- a/examples/quickcontrols2/wearable/images/watchface/second.png
+++ b/examples/quickcontrols2/wearable/images/worldclock/second.png
Binary files differ
diff --git a/examples/quickcontrols2/wearable/images/watchface/swissdaydial.png b/examples/quickcontrols2/wearable/images/worldclock/swissdaydial.png
index 64136618..64136618 100644
--- a/examples/quickcontrols2/wearable/images/watchface/swissdaydial.png
+++ b/examples/quickcontrols2/wearable/images/worldclock/swissdaydial.png
Binary files differ
diff --git a/examples/quickcontrols2/wearable/images/watchface/swissdayhour.png b/examples/quickcontrols2/wearable/images/worldclock/swissdayhour.png
index 255985d2..255985d2 100644
--- a/examples/quickcontrols2/wearable/images/watchface/swissdayhour.png
+++ b/examples/quickcontrols2/wearable/images/worldclock/swissdayhour.png
Binary files differ
diff --git a/examples/quickcontrols2/wearable/images/watchface/swissdayminute.png b/examples/quickcontrols2/wearable/images/worldclock/swissdayminute.png
index bc6992f8..bc6992f8 100644
--- a/examples/quickcontrols2/wearable/images/watchface/swissdayminute.png
+++ b/examples/quickcontrols2/wearable/images/worldclock/swissdayminute.png
Binary files differ
diff --git a/examples/quickcontrols2/wearable/images/watchface/swissnightdial.png b/examples/quickcontrols2/wearable/images/worldclock/swissnightdial.png
index e2590af4..e2590af4 100644
--- a/examples/quickcontrols2/wearable/images/watchface/swissnightdial.png
+++ b/examples/quickcontrols2/wearable/images/worldclock/swissnightdial.png
Binary files differ
diff --git a/examples/quickcontrols2/wearable/images/watchface/swissnighthour.png b/examples/quickcontrols2/wearable/images/worldclock/swissnighthour.png
index 1c6a6131..1c6a6131 100644
--- a/examples/quickcontrols2/wearable/images/watchface/swissnighthour.png
+++ b/examples/quickcontrols2/wearable/images/worldclock/swissnighthour.png
Binary files differ
diff --git a/examples/quickcontrols2/wearable/images/watchface/swissnightminute.png b/examples/quickcontrols2/wearable/images/worldclock/swissnightminute.png
index 3353ba2c..3353ba2c 100644
--- a/examples/quickcontrols2/wearable/images/watchface/swissnightminute.png
+++ b/examples/quickcontrols2/wearable/images/worldclock/swissnightminute.png
Binary files differ
diff --git a/examples/quickcontrols2/wearable/images/watchface/swissseconds.png b/examples/quickcontrols2/wearable/images/worldclock/swissseconds.png
index 66b4f3fa..66b4f3fa 100644
--- a/examples/quickcontrols2/wearable/images/watchface/swissseconds.png
+++ b/examples/quickcontrols2/wearable/images/worldclock/swissseconds.png
Binary files differ
diff --git a/examples/quickcontrols2/wearable/images/watchface/watch.png b/examples/quickcontrols2/wearable/images/worldclock/watch.png
index 299858b7..299858b7 100644
--- a/examples/quickcontrols2/wearable/images/watchface/watch.png
+++ b/examples/quickcontrols2/wearable/images/worldclock/watch.png
Binary files differ
diff --git a/examples/quickcontrols2/wearable/qml/LauncherPage.qml b/examples/quickcontrols2/wearable/qml/LauncherPage.qml
index b1f642ee..9c82393f 100644
--- a/examples/quickcontrols2/wearable/qml/LauncherPage.qml
+++ b/examples/quickcontrols2/wearable/qml/LauncherPage.qml
@@ -69,8 +69,8 @@ PathView {
model: ListModel {
ListElement {
title: qsTr("World Clock")
- icon: "../images/watchface/watch.png"
- page: "WatchFace/WatchFacePage.qml"
+ icon: "../images/worldclock/watch.png"
+ page: "WorldClock/WorldClockPage.qml"
}
ListElement {
title: qsTr("Navigation")
diff --git a/examples/quickcontrols2/wearable/qml/WatchFace/Clock.qml b/examples/quickcontrols2/wearable/qml/WorldClock/Clock.qml
index 545c1b6e..7e30a371 100644
--- a/examples/quickcontrols2/wearable/qml/WatchFace/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/watchface/" + imageName
+ return "../../images/worldclock/" + imageName
}
function timeChanged() {
diff --git a/examples/quickcontrols2/wearable/qml/WatchFace/WatchFacePage.qml b/examples/quickcontrols2/wearable/qml/WorldClock/WorldClockPage.qml
index 33e6dcfb..33e6dcfb 100644
--- a/examples/quickcontrols2/wearable/qml/WatchFace/WatchFacePage.qml
+++ b/examples/quickcontrols2/wearable/qml/WorldClock/WorldClockPage.qml
diff --git a/examples/quickcontrols2/wearable/wearable.qrc b/examples/quickcontrols2/wearable/wearable.qrc
index a1099673..4469aea2 100644
--- a/examples/quickcontrols2/wearable/wearable.qrc
+++ b/examples/quickcontrols2/wearable/wearable.qrc
@@ -19,11 +19,11 @@
<file>qml/Style/UIStyle.qml</file>
<file>qml/Style/Slider.qml</file>
<file>qml/Style/Switch.qml</file>
- <file>qml/WatchFace/Clock.qml</file>
- <file>qml/WatchFace/WatchFacePage.qml</file>
<file>qml/Weather/weather.js</file>
<file>qml/Weather/weather.json</file>
<file>qml/Weather/WeatherPage.qml</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>
@@ -48,15 +48,6 @@
<file>images/settings/contrast.png</file>
<file>images/settings/settings.png</file>
<file>images/settings/wifi.png</file>
- <file>images/watchface/center.png</file>
- <file>images/watchface/second.png</file>
- <file>images/watchface/swissdaydial.png</file>
- <file>images/watchface/swissdayhour.png</file>
- <file>images/watchface/swissdayminute.png</file>
- <file>images/watchface/swissnightdial.png</file>
- <file>images/watchface/swissnighthour.png</file>
- <file>images/watchface/swissnightminute.png</file>
- <file>images/watchface/watch.png</file>
<file>images/weather/humidity.png</file>
<file>images/weather/pressure.png</file>
<file>images/weather/sunrise.png</file>
@@ -64,5 +55,14 @@
<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>
</qresource>
</RCC>