aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJ-P Nurmi <jpnurmi@qt.io>2017-03-13 09:24:55 +0100
committerJ-P Nurmi <jpnurmi@qt.io>2017-03-13 09:31:56 +0000
commitc99397d75120095e7c91bd674e10c760eba64ad4 (patch)
treec533dcfefd4d33caa7b285f5613e679f9fb292ea
parent97b282732a23a8e088b90a3650dd7e81ae99649d (diff)
Wearable: rename the pages
Even the code and the documentation talks about "pages", so call the types pages too. Change-Id: Ie0151be1b2344af6f7122ed22da6cc3b1ea634e4 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
-rw-r--r--examples/quickcontrols2/wearable/qml/Alarms/AlarmsPage.qml (renamed from examples/quickcontrols2/wearable/qml/Alarms/AlarmsMain.qml)0
-rw-r--r--examples/quickcontrols2/wearable/qml/Fitness/FitnessPage.qml (renamed from examples/quickcontrols2/wearable/qml/Fitness/FitnessMain.qml)0
-rw-r--r--examples/quickcontrols2/wearable/qml/LauncherPage.qml (renamed from examples/quickcontrols2/wearable/qml/LauncherMain.qml)14
-rw-r--r--examples/quickcontrols2/wearable/qml/Navigation/NavigationPage.qml (renamed from examples/quickcontrols2/wearable/qml/Navigation/NavigationMain.qml)0
-rw-r--r--examples/quickcontrols2/wearable/qml/Notifications/NotificationsPage.qml (renamed from examples/quickcontrols2/wearable/qml/Notifications/NotificationsMain.qml)0
-rw-r--r--examples/quickcontrols2/wearable/qml/Settings/SettingsPage.qml (renamed from examples/quickcontrols2/wearable/qml/Settings/SettingsMain.qml)0
-rw-r--r--examples/quickcontrols2/wearable/qml/WatchFace/WatchFacePage.qml (renamed from examples/quickcontrols2/wearable/qml/WatchFace/WatchFaceMain.qml)0
-rw-r--r--examples/quickcontrols2/wearable/qml/Weather/WeatherPage.qml (renamed from examples/quickcontrols2/wearable/qml/Weather/WeatherMain.qml)0
-rw-r--r--examples/quickcontrols2/wearable/wearable.qml2
-rw-r--r--examples/quickcontrols2/wearable/wearable.qrc16
10 files changed, 16 insertions, 16 deletions
diff --git a/examples/quickcontrols2/wearable/qml/Alarms/AlarmsMain.qml b/examples/quickcontrols2/wearable/qml/Alarms/AlarmsPage.qml
index bac1ca87..bac1ca87 100644
--- a/examples/quickcontrols2/wearable/qml/Alarms/AlarmsMain.qml
+++ b/examples/quickcontrols2/wearable/qml/Alarms/AlarmsPage.qml
diff --git a/examples/quickcontrols2/wearable/qml/Fitness/FitnessMain.qml b/examples/quickcontrols2/wearable/qml/Fitness/FitnessPage.qml
index 59ac0925..59ac0925 100644
--- a/examples/quickcontrols2/wearable/qml/Fitness/FitnessMain.qml
+++ b/examples/quickcontrols2/wearable/qml/Fitness/FitnessPage.qml
diff --git a/examples/quickcontrols2/wearable/qml/LauncherMain.qml b/examples/quickcontrols2/wearable/qml/LauncherPage.qml
index f1fd02d1..e867d63d 100644
--- a/examples/quickcontrols2/wearable/qml/LauncherMain.qml
+++ b/examples/quickcontrols2/wearable/qml/LauncherPage.qml
@@ -67,37 +67,37 @@ Item {
ListElement { // 0
title: qsTr("World Clock")
icon: "../images/watchface/watch.png"
- page: "WatchFace/WatchFaceMain.qml"
+ page: "WatchFace/WatchFacePage.qml"
}
ListElement { // 1
title: qsTr("Navigation")
icon: "../images/navigation/route.png"
- page: "Navigation/NavigationMain.qml"
+ page: "Navigation/NavigationPage.qml"
}
ListElement { // 2
title: qsTr("Weather")
icon: "../images/weather/weather.png"
- page: "Weather/WeatherMain.qml"
+ page: "Weather/WeatherPage.qml"
}
ListElement { // 3
title: qsTr("Fitness")
icon: "../images/fitness/fitness.png"
- page: "Fitness/FitnessMain.qml"
+ page: "Fitness/FitnessPage.qml"
}
ListElement { // 4
title: qsTr("Notifications")
icon: "../images/notifications/notifications.png"
- page: "Notifications/NotificationsMain.qml"
+ page: "Notifications/NotificationsPage.qml"
}
ListElement { // 5
title: qsTr("Alarm")
icon: "../images/alarms/alarms.png"
- page: "Alarms/AlarmsMain.qml"
+ page: "Alarms/AlarmsPage.qml"
}
ListElement { // 6
title: qsTr("Settings")
icon: "../images/settings/settings.png"
- page: "Settings/SettingsMain.qml"
+ page: "Settings/SettingsPage.qml"
}
}
diff --git a/examples/quickcontrols2/wearable/qml/Navigation/NavigationMain.qml b/examples/quickcontrols2/wearable/qml/Navigation/NavigationPage.qml
index c8e81315..c8e81315 100644
--- a/examples/quickcontrols2/wearable/qml/Navigation/NavigationMain.qml
+++ b/examples/quickcontrols2/wearable/qml/Navigation/NavigationPage.qml
diff --git a/examples/quickcontrols2/wearable/qml/Notifications/NotificationsMain.qml b/examples/quickcontrols2/wearable/qml/Notifications/NotificationsPage.qml
index da829707..da829707 100644
--- a/examples/quickcontrols2/wearable/qml/Notifications/NotificationsMain.qml
+++ b/examples/quickcontrols2/wearable/qml/Notifications/NotificationsPage.qml
diff --git a/examples/quickcontrols2/wearable/qml/Settings/SettingsMain.qml b/examples/quickcontrols2/wearable/qml/Settings/SettingsPage.qml
index 45a050c9..45a050c9 100644
--- a/examples/quickcontrols2/wearable/qml/Settings/SettingsMain.qml
+++ b/examples/quickcontrols2/wearable/qml/Settings/SettingsPage.qml
diff --git a/examples/quickcontrols2/wearable/qml/WatchFace/WatchFaceMain.qml b/examples/quickcontrols2/wearable/qml/WatchFace/WatchFacePage.qml
index 33e6dcfb..33e6dcfb 100644
--- a/examples/quickcontrols2/wearable/qml/WatchFace/WatchFaceMain.qml
+++ b/examples/quickcontrols2/wearable/qml/WatchFace/WatchFacePage.qml
diff --git a/examples/quickcontrols2/wearable/qml/Weather/WeatherMain.qml b/examples/quickcontrols2/wearable/qml/Weather/WeatherPage.qml
index b66a149b..b66a149b 100644
--- a/examples/quickcontrols2/wearable/qml/Weather/WeatherMain.qml
+++ b/examples/quickcontrols2/wearable/qml/Weather/WeatherPage.qml
diff --git a/examples/quickcontrols2/wearable/wearable.qml b/examples/quickcontrols2/wearable/wearable.qml
index 15c75494..2603392c 100644
--- a/examples/quickcontrols2/wearable/wearable.qml
+++ b/examples/quickcontrols2/wearable/wearable.qml
@@ -93,6 +93,6 @@ QQC2.ApplicationWindow {
focus: true
anchors.fill: parent
- initialItem: LauncherMain { }
+ initialItem: LauncherPage { }
}
}
diff --git a/examples/quickcontrols2/wearable/wearable.qrc b/examples/quickcontrols2/wearable/wearable.qrc
index f89f2494..a1099673 100644
--- a/examples/quickcontrols2/wearable/wearable.qrc
+++ b/examples/quickcontrols2/wearable/wearable.qrc
@@ -2,28 +2,28 @@
<qresource prefix="/">
<file>wearable.qml</file>
<file>qml/Alarms/alarms.js</file>
- <file>qml/Alarms/AlarmsMain.qml</file>
+ <file>qml/Alarms/AlarmsPage.qml</file>
<file>qml/Fitness/fitness.js</file>
- <file>qml/Fitness/FitnessMain.qml</file>
- <file>qml/LauncherMain.qml</file>
+ <file>qml/Fitness/FitnessPage.qml</file>
+ <file>qml/LauncherPage.qml</file>
<file>qml/NaviButton.qml</file>
<file>qml/Navigation/navigation.js</file>
- <file>qml/Navigation/NavigationMain.qml</file>
+ <file>qml/Navigation/NavigationPage.qml</file>
<file>qml/Navigation/RouteElement.qml</file>
<file>qml/Navigation/walk_route.json</file>
<file>qml/Notifications/notifications.js</file>
- <file>qml/Notifications/NotificationsMain.qml</file>
+ <file>qml/Notifications/NotificationsPage.qml</file>
<file>qml/Settings/SettingsData.qml</file>
- <file>qml/Settings/SettingsMain.qml</file>
+ <file>qml/Settings/SettingsPage.qml</file>
<file>qml/Style/qmldir</file>
<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/WatchFaceMain.qml</file>
+ <file>qml/WatchFace/WatchFacePage.qml</file>
<file>qml/Weather/weather.js</file>
<file>qml/Weather/weather.json</file>
- <file>qml/Weather/WeatherMain.qml</file>
+ <file>qml/Weather/WeatherPage.qml</file>
<file>images/alarms/alarms.png</file>
<file>images/background/HomeBackground.png</file>
<file>images/back.png</file>