diff options
| -rw-r--r-- | examples/quickcontrols/wearable/CMakeLists.txt | 183 | ||||
| -rw-r--r-- | examples/quickcontrols/wearable/Wearable/AlarmsPage.qml (renamed from examples/quickcontrols/wearable/qml/Alarms/AlarmsPage.qml) | 4 | ||||
| -rw-r--r-- | examples/quickcontrols/wearable/Wearable/AppSettings.qml | 14 | ||||
| -rw-r--r-- | examples/quickcontrols/wearable/Wearable/CMakeLists.txt | 188 | ||||
| -rw-r--r-- | examples/quickcontrols/wearable/Wearable/Clock.qml (renamed from examples/quickcontrols/wearable/qml/WorldClock/Clock.qml) | 32 | ||||
| -rw-r--r-- | examples/quickcontrols/wearable/Wearable/DemoMode.qml (renamed from examples/quickcontrols/wearable/qml/DemoMode.qml) | 21 | ||||
| -rw-r--r-- | examples/quickcontrols/wearable/Wearable/DemoModeIndicator.qml (renamed from examples/quickcontrols/wearable/qml/DemoModeIndicator.qml) | 4 | ||||
| -rw-r--r-- | examples/quickcontrols/wearable/Wearable/FitnessPage.qml (renamed from examples/quickcontrols/wearable/qml/Fitness/FitnessPage.qml) | 8 | ||||
| -rw-r--r-- | examples/quickcontrols/wearable/Wearable/LauncherPage.qml (renamed from examples/quickcontrols/wearable/qml/LauncherPage.qml) | 16 | ||||
| -rw-r--r-- | examples/quickcontrols/wearable/Wearable/Main.qml (renamed from examples/quickcontrols/wearable/wearable.qml) | 41 | ||||
| -rw-r--r-- | examples/quickcontrols/wearable/Wearable/NaviButton.qml (renamed from examples/quickcontrols/wearable/qml/NaviButton.qml) | 2 | ||||
| -rw-r--r-- | examples/quickcontrols/wearable/Wearable/NavigationPage.qml (renamed from examples/quickcontrols/wearable/qml/Navigation/NavigationPage.qml) | 16 | ||||
| -rw-r--r-- | examples/quickcontrols/wearable/Wearable/NotificationsPage.qml (renamed from examples/quickcontrols/wearable/qml/Notifications/NotificationsPage.qml) | 6 | ||||
| -rw-r--r-- | examples/quickcontrols/wearable/Wearable/RouteElement.qml (renamed from examples/quickcontrols/wearable/qml/Navigation/RouteElement.qml) | 2 | ||||
| -rw-r--r-- | examples/quickcontrols/wearable/Wearable/SettingsPage.qml (renamed from examples/quickcontrols/wearable/qml/Settings/SettingsPage.qml) | 34 | ||||
| -rw-r--r-- | examples/quickcontrols/wearable/Wearable/SwipeViewPage.qml (renamed from examples/quickcontrols/wearable/qml/SwipeViewPage.qml) | 0 | ||||
| -rw-r--r-- | examples/quickcontrols/wearable/Wearable/WeatherPage.qml (renamed from examples/quickcontrols/wearable/qml/Weather/WeatherPage.qml) | 16 | ||||
| -rw-r--r-- | examples/quickcontrols/wearable/Wearable/WorldClockPage.qml (renamed from examples/quickcontrols/wearable/qml/WorldClock/WorldClockPage.qml) | 2 | ||||
| -rw-r--r-- | examples/quickcontrols/wearable/Wearable/fitness.js (renamed from examples/quickcontrols/wearable/qml/Fitness/fitness.js) | 0 | ||||
| -rw-r--r-- | examples/quickcontrols/wearable/Wearable/icons/wearable/36x36/alarms.png (renamed from examples/quickcontrols/wearable/icons/wearable/36x36/alarms.png) | bin | 510 -> 510 bytes | |||
| -rw-r--r-- | examples/quickcontrols/wearable/Wearable/icons/wearable/36x36/fitness.png (renamed from examples/quickcontrols/wearable/icons/wearable/36x36/fitness.png) | bin | 443 -> 443 bytes | |||
| -rw-r--r-- | examples/quickcontrols/wearable/Wearable/icons/wearable/36x36/navigation.png (renamed from examples/quickcontrols/wearable/icons/wearable/36x36/navigation.png) | bin | 474 -> 474 bytes | |||
| -rw-r--r-- | examples/quickcontrols/wearable/Wearable/icons/wearable/36x36/notifications.png (renamed from examples/quickcontrols/wearable/icons/wearable/36x36/notifications.png) | bin | 559 -> 559 bytes | |||
| -rw-r--r-- | examples/quickcontrols/wearable/Wearable/icons/wearable/36x36/settings.png (renamed from examples/quickcontrols/wearable/icons/wearable/36x36/settings.png) | bin | 544 -> 544 bytes | |||
| -rw-r--r-- | examples/quickcontrols/wearable/Wearable/icons/wearable/36x36/weather.png (renamed from examples/quickcontrols/wearable/icons/wearable/36x36/weather.png) | bin | 427 -> 427 bytes | |||
| -rw-r--r-- | examples/quickcontrols/wearable/Wearable/icons/wearable/36x36/worldclock.png (renamed from examples/quickcontrols/wearable/icons/wearable/36x36/worldclock.png) | bin | 470 -> 470 bytes | |||
| -rw-r--r-- | examples/quickcontrols/wearable/Wearable/icons/wearable/36x36@2/alarms.png (renamed from examples/quickcontrols/wearable/icons/wearable/36x36@2/alarms.png) | bin | 871 -> 871 bytes | |||
| -rw-r--r-- | examples/quickcontrols/wearable/Wearable/icons/wearable/36x36@2/fitness.png (renamed from examples/quickcontrols/wearable/icons/wearable/36x36@2/fitness.png) | bin | 743 -> 743 bytes | |||
| -rw-r--r-- | examples/quickcontrols/wearable/Wearable/icons/wearable/36x36@2/navigation.png (renamed from examples/quickcontrols/wearable/icons/wearable/36x36@2/navigation.png) | bin | 803 -> 803 bytes | |||
| -rw-r--r-- | examples/quickcontrols/wearable/Wearable/icons/wearable/36x36@2/notifications.png (renamed from examples/quickcontrols/wearable/icons/wearable/36x36@2/notifications.png) | bin | 1016 -> 1016 bytes | |||
| -rw-r--r-- | examples/quickcontrols/wearable/Wearable/icons/wearable/36x36@2/settings.png (renamed from examples/quickcontrols/wearable/icons/wearable/36x36@2/settings.png) | bin | 802 -> 802 bytes | |||
| -rw-r--r-- | examples/quickcontrols/wearable/Wearable/icons/wearable/36x36@2/weather.png (renamed from examples/quickcontrols/wearable/icons/wearable/36x36@2/weather.png) | bin | 747 -> 747 bytes | |||
| -rw-r--r-- | examples/quickcontrols/wearable/Wearable/icons/wearable/36x36@2/worldclock.png (renamed from examples/quickcontrols/wearable/icons/wearable/36x36@2/worldclock.png) | bin | 817 -> 817 bytes | |||
| -rw-r--r-- | examples/quickcontrols/wearable/Wearable/icons/wearable/index.theme (renamed from examples/quickcontrols/wearable/icons/wearable/index.theme) | 0 | ||||
| -rw-r--r-- | examples/quickcontrols/wearable/Wearable/images/back.png (renamed from examples/quickcontrols/wearable/images/back.png) | bin | 834 -> 834 bytes | |||
| -rw-r--r-- | examples/quickcontrols/wearable/Wearable/images/back@2x.png (renamed from examples/quickcontrols/wearable/images/back@2x.png) | bin | 528 -> 528 bytes | |||
| -rw-r--r-- | examples/quickcontrols/wearable/Wearable/images/back@3x.png (renamed from examples/quickcontrols/wearable/images/back@3x.png) | bin | 788 -> 788 bytes | |||
| -rw-r--r-- | examples/quickcontrols/wearable/Wearable/images/back@4x.png (renamed from examples/quickcontrols/wearable/images/back@4x.png) | bin | 1002 -> 1002 bytes | |||
| -rw-r--r-- | examples/quickcontrols/wearable/Wearable/images/background-dark.png (renamed from examples/quickcontrols/wearable/images/background-dark.png) | bin | 28157 -> 28157 bytes | |||
| -rw-r--r-- | examples/quickcontrols/wearable/Wearable/images/background-light.png (renamed from examples/quickcontrols/wearable/images/background-light.png) | bin | 343879 -> 343879 bytes | |||
| -rw-r--r-- | examples/quickcontrols/wearable/Wearable/images/fitness-man-running-dark.png (renamed from examples/quickcontrols/wearable/qml/Fitness/images/man-running-dark.png) | bin | 1400 -> 1400 bytes | |||
| -rw-r--r-- | examples/quickcontrols/wearable/Wearable/images/fitness-man-running-dark@2x.png (renamed from examples/quickcontrols/wearable/qml/Fitness/images/man-running-dark@2x.png) | bin | 2260 -> 2260 bytes | |||
| -rw-r--r-- | examples/quickcontrols/wearable/Wearable/images/fitness-man-running-light.png (renamed from examples/quickcontrols/wearable/qml/Fitness/images/man-running-light.png) | bin | 1216 -> 1216 bytes | |||
| -rw-r--r-- | examples/quickcontrols/wearable/Wearable/images/fitness-man-running-light@2x.png (renamed from examples/quickcontrols/wearable/qml/Fitness/images/man-running-light@2x.png) | bin | 2473 -> 2473 bytes | |||
| -rw-r--r-- | examples/quickcontrols/wearable/Wearable/images/fitness-man-walking-dark.png (renamed from examples/quickcontrols/wearable/qml/Fitness/images/man-walking-dark.png) | bin | 1408 -> 1408 bytes | |||
| -rw-r--r-- | examples/quickcontrols/wearable/Wearable/images/fitness-man-walking-dark@2x.png (renamed from examples/quickcontrols/wearable/qml/Fitness/images/man-walking-dark@2x.png) | bin | 2215 -> 2215 bytes | |||
| -rw-r--r-- | examples/quickcontrols/wearable/Wearable/images/fitness-man-walking-light.png (renamed from examples/quickcontrols/wearable/qml/Fitness/images/man-walking-light.png) | bin | 1231 -> 1231 bytes | |||
| -rw-r--r-- | examples/quickcontrols/wearable/Wearable/images/fitness-man-walking-light@2x.png (renamed from examples/quickcontrols/wearable/qml/Fitness/images/man-walking-light@2x.png) | bin | 2308 -> 2308 bytes | |||
| -rw-r--r-- | examples/quickcontrols/wearable/Wearable/images/home.png (renamed from examples/quickcontrols/wearable/images/home.png) | bin | 856 -> 856 bytes | |||
| -rw-r--r-- | examples/quickcontrols/wearable/Wearable/images/home@2x.png (renamed from examples/quickcontrols/wearable/images/home@2x.png) | bin | 653 -> 653 bytes | |||
| -rw-r--r-- | examples/quickcontrols/wearable/Wearable/images/home@3x.png (renamed from examples/quickcontrols/wearable/images/home@3x.png) | bin | 909 -> 909 bytes | |||
| -rw-r--r-- | examples/quickcontrols/wearable/Wearable/images/home@4x.png (renamed from examples/quickcontrols/wearable/images/home@4x.png) | bin | 1167 -> 1167 bytes | |||
| -rw-r--r-- | examples/quickcontrols/wearable/Wearable/images/navigation-dark.png (renamed from examples/quickcontrols/wearable/qml/Navigation/images/navigation-dark.png) | bin | 474 -> 474 bytes | |||
| -rw-r--r-- | examples/quickcontrols/wearable/Wearable/images/navigation-dark@2x.png (renamed from examples/quickcontrols/wearable/qml/Navigation/images/navigation-dark@2x.png) | bin | 802 -> 802 bytes | |||
| -rw-r--r-- | examples/quickcontrols/wearable/Wearable/images/navigation-end.png (renamed from examples/quickcontrols/wearable/qml/Navigation/images/end.png) | bin | 1515 -> 1515 bytes | |||
| -rw-r--r-- | examples/quickcontrols/wearable/Wearable/images/navigation-end@2x.png (renamed from examples/quickcontrols/wearable/qml/Navigation/images/end@2x.png) | bin | 1383 -> 1383 bytes | |||
| -rw-r--r-- | examples/quickcontrols/wearable/Wearable/images/navigation-leftturn-dark.png (renamed from examples/quickcontrols/wearable/qml/Navigation/images/leftturn-dark.png) | bin | 1670 -> 1670 bytes | |||
| -rw-r--r-- | examples/quickcontrols/wearable/Wearable/images/navigation-leftturn-dark@2x.png (renamed from examples/quickcontrols/wearable/qml/Navigation/images/leftturn-dark@2x.png) | bin | 1191 -> 1191 bytes | |||
| -rw-r--r-- | examples/quickcontrols/wearable/Wearable/images/navigation-leftturn-light.png (renamed from examples/quickcontrols/wearable/qml/Navigation/images/leftturn-light.png) | bin | 1280 -> 1280 bytes | |||
| -rw-r--r-- | examples/quickcontrols/wearable/Wearable/images/navigation-leftturn-light@2x.png (renamed from examples/quickcontrols/wearable/qml/Navigation/images/leftturn-light@2x.png) | bin | 1191 -> 1191 bytes | |||
| -rw-r--r-- | examples/quickcontrols/wearable/Wearable/images/navigation-light.png (renamed from examples/quickcontrols/wearable/qml/Navigation/images/navigation-light.png) | bin | 474 -> 474 bytes | |||
| -rw-r--r-- | examples/quickcontrols/wearable/Wearable/images/navigation-light@2x.png (renamed from examples/quickcontrols/wearable/qml/Navigation/images/navigation-light@2x.png) | bin | 803 -> 803 bytes | |||
| -rw-r--r-- | examples/quickcontrols/wearable/Wearable/images/navigation-marker.png (renamed from examples/quickcontrols/wearable/qml/Navigation/images/marker.png) | bin | 1515 -> 1515 bytes | |||
| -rw-r--r-- | examples/quickcontrols/wearable/Wearable/images/navigation-rightturn-dark.png (renamed from examples/quickcontrols/wearable/qml/Navigation/images/rightturn-dark.png) | bin | 1670 -> 1670 bytes | |||
| -rw-r--r-- | examples/quickcontrols/wearable/Wearable/images/navigation-rightturn-dark@2x.png (renamed from examples/quickcontrols/wearable/qml/Navigation/images/rightturn-dark@2x.png) | bin | 1176 -> 1176 bytes | |||
| -rw-r--r-- | examples/quickcontrols/wearable/Wearable/images/navigation-rightturn-light.png (renamed from examples/quickcontrols/wearable/qml/Navigation/images/rightturn-light.png) | bin | 1246 -> 1246 bytes | |||
| -rw-r--r-- | examples/quickcontrols/wearable/Wearable/images/navigation-rightturn-light@2x.png (renamed from examples/quickcontrols/wearable/qml/Navigation/images/rightturn-light@2x.png) | bin | 1176 -> 1176 bytes | |||
| -rw-r--r-- | examples/quickcontrols/wearable/Wearable/images/navigation-start.png (renamed from examples/quickcontrols/wearable/qml/Navigation/images/start.png) | bin | 1515 -> 1515 bytes | |||
| -rw-r--r-- | examples/quickcontrols/wearable/Wearable/images/navigation-start@2x.png (renamed from examples/quickcontrols/wearable/qml/Navigation/images/start@2x.png) | bin | 1364 -> 1364 bytes | |||
| -rw-r--r-- | examples/quickcontrols/wearable/Wearable/images/navigation-straight-dark.png (renamed from examples/quickcontrols/wearable/qml/Navigation/images/straight-dark.png) | bin | 1112 -> 1112 bytes | |||
| -rw-r--r-- | examples/quickcontrols/wearable/Wearable/images/navigation-straight-dark@2x.png (renamed from examples/quickcontrols/wearable/qml/Navigation/images/straight-dark@2x.png) | bin | 654 -> 654 bytes | |||
| -rw-r--r-- | examples/quickcontrols/wearable/Wearable/images/navigation-straight-light.png (renamed from examples/quickcontrols/wearable/qml/Navigation/images/straight-light.png) | bin | 896 -> 896 bytes | |||
| -rw-r--r-- | examples/quickcontrols/wearable/Wearable/images/navigation-straight-light@2x.png (renamed from examples/quickcontrols/wearable/qml/Navigation/images/straight-light@2x.png) | bin | 654 -> 654 bytes | |||
| -rw-r--r-- | examples/quickcontrols/wearable/Wearable/images/navigation-uturn.png (renamed from examples/quickcontrols/wearable/qml/Navigation/images/uturn.png) | bin | 1833 -> 1833 bytes | |||
| -rw-r--r-- | examples/quickcontrols/wearable/Wearable/images/navigation-uturn@2x.png (renamed from examples/quickcontrols/wearable/qml/Navigation/images/uturn@2x.png) | bin | 4780 -> 4780 bytes | |||
| -rw-r--r-- | examples/quickcontrols/wearable/Wearable/images/notifications-avatarf-dark.png (renamed from examples/quickcontrols/wearable/qml/Notifications/images/avatarf-dark.png) | bin | 1848 -> 1848 bytes | |||
| -rw-r--r-- | examples/quickcontrols/wearable/Wearable/images/notifications-avatarf-dark@2x.png (renamed from examples/quickcontrols/wearable/qml/Notifications/images/avatarf-dark@2x.png) | bin | 1540 -> 1540 bytes | |||
| -rw-r--r-- | examples/quickcontrols/wearable/Wearable/images/notifications-avatarf-light.png (renamed from examples/quickcontrols/wearable/qml/Notifications/images/avatarf-light.png) | bin | 1565 -> 1565 bytes | |||
| -rw-r--r-- | examples/quickcontrols/wearable/Wearable/images/notifications-avatarf-light@2x.png (renamed from examples/quickcontrols/wearable/qml/Notifications/images/avatarf-light@2x.png) | bin | 1540 -> 1540 bytes | |||
| -rw-r--r-- | examples/quickcontrols/wearable/Wearable/images/notifications-avatarm-dark.png (renamed from examples/quickcontrols/wearable/qml/Notifications/images/avatarm-dark.png) | bin | 1622 -> 1622 bytes | |||
| -rw-r--r-- | examples/quickcontrols/wearable/Wearable/images/notifications-avatarm-dark@2x.png (renamed from examples/quickcontrols/wearable/qml/Notifications/images/avatarm-dark@2x.png) | bin | 1367 -> 1367 bytes | |||
| -rw-r--r-- | examples/quickcontrols/wearable/Wearable/images/notifications-avatarm-light.png (renamed from examples/quickcontrols/wearable/qml/Notifications/images/avatarm-light.png) | bin | 1367 -> 1367 bytes | |||
| -rw-r--r-- | examples/quickcontrols/wearable/Wearable/images/notifications-avatarm-light@2x.png (renamed from examples/quickcontrols/wearable/qml/Notifications/images/avatarm-light@2x.png) | bin | 1367 -> 1367 bytes | |||
| -rw-r--r-- | examples/quickcontrols/wearable/Wearable/images/notifications-missedcall-dark.png (renamed from examples/quickcontrols/wearable/qml/Notifications/images/missedcall-dark.png) | bin | 1994 -> 1994 bytes | |||
| -rw-r--r-- | examples/quickcontrols/wearable/Wearable/images/notifications-missedcall-dark@2x.png (renamed from examples/quickcontrols/wearable/qml/Notifications/images/missedcall-dark@2x.png) | bin | 1374 -> 1374 bytes | |||
| -rw-r--r-- | examples/quickcontrols/wearable/Wearable/images/notifications-missedcall-light.png (renamed from examples/quickcontrols/wearable/qml/Notifications/images/missedcall-light.png) | bin | 1976 -> 1976 bytes | |||
| -rw-r--r-- | examples/quickcontrols/wearable/Wearable/images/notifications-missedcall-light@2x.png (renamed from examples/quickcontrols/wearable/qml/Notifications/images/missedcall-light@2x.png) | bin | 1374 -> 1374 bytes | |||
| -rw-r--r-- | examples/quickcontrols/wearable/Wearable/images/settings-bluetooth-dark.png (renamed from examples/quickcontrols/wearable/qml/Settings/images/bluetooth-dark.png) | bin | 793 -> 793 bytes | |||
| -rw-r--r-- | examples/quickcontrols/wearable/Wearable/images/settings-bluetooth-dark@2x.png (renamed from examples/quickcontrols/wearable/qml/Settings/images/bluetooth-dark@2x.png) | bin | 2668 -> 2668 bytes | |||
| -rw-r--r-- | examples/quickcontrols/wearable/Wearable/images/settings-bluetooth-light.png (renamed from examples/quickcontrols/wearable/qml/Settings/images/bluetooth-light.png) | bin | 1678 -> 1678 bytes | |||
| -rw-r--r-- | examples/quickcontrols/wearable/Wearable/images/settings-bluetooth-light@2x.png (renamed from examples/quickcontrols/wearable/qml/Settings/images/bluetooth-light@2x.png) | bin | 2718 -> 2718 bytes | |||
| -rw-r--r-- | examples/quickcontrols/wearable/Wearable/images/settings-brightness-dark.png (renamed from examples/quickcontrols/wearable/qml/Settings/images/brightness-dark.png) | bin | 1276 -> 1276 bytes | |||
| -rw-r--r-- | examples/quickcontrols/wearable/Wearable/images/settings-brightness-dark@2x.png (renamed from examples/quickcontrols/wearable/qml/Settings/images/brightness-dark@2x.png) | bin | 1127 -> 1127 bytes | |||
| -rw-r--r-- | examples/quickcontrols/wearable/Wearable/images/settings-brightness-light.png (renamed from examples/quickcontrols/wearable/qml/Settings/images/brightness-light.png) | bin | 1277 -> 1277 bytes | |||
| -rw-r--r-- | examples/quickcontrols/wearable/Wearable/images/settings-brightness-light@2x.png (renamed from examples/quickcontrols/wearable/qml/Settings/images/brightness-light@2x.png) | bin | 1127 -> 1127 bytes | |||
| -rw-r--r-- | examples/quickcontrols/wearable/Wearable/images/settings-demo-mode-dark.png (renamed from examples/quickcontrols/wearable/qml/Settings/images/demo-mode-dark.png) | bin | 797 -> 797 bytes | |||
| -rw-r--r-- | examples/quickcontrols/wearable/Wearable/images/settings-demo-mode-dark@2x.png (renamed from examples/quickcontrols/wearable/qml/Settings/images/demo-mode-dark@2x.png) | bin | 1154 -> 1154 bytes | |||
| -rw-r--r-- | examples/quickcontrols/wearable/Wearable/images/settings-demo-mode-light.png (renamed from examples/quickcontrols/wearable/qml/Settings/images/demo-mode-light.png) | bin | 797 -> 797 bytes | |||
| -rw-r--r-- | examples/quickcontrols/wearable/Wearable/images/settings-demo-mode-light@2x.png (renamed from examples/quickcontrols/wearable/qml/Settings/images/demo-mode-light@2x.png) | bin | 1150 -> 1150 bytes | |||
| -rw-r--r-- | examples/quickcontrols/wearable/Wearable/images/settings-demo-mode-white.png (renamed from examples/quickcontrols/wearable/qml/Settings/images/demo-mode-white.png) | bin | 576 -> 576 bytes | |||
| -rw-r--r-- | examples/quickcontrols/wearable/Wearable/images/settings-demo-mode-white@2x.png (renamed from examples/quickcontrols/wearable/qml/Settings/images/demo-mode-white@2x.png) | bin | 1069 -> 1069 bytes | |||
| -rw-r--r-- | examples/quickcontrols/wearable/Wearable/images/settings-demo-mode.svg (renamed from examples/quickcontrols/wearable/qml/Settings/images/demo-mode.svg) | 0 | ||||
| -rw-r--r-- | examples/quickcontrols/wearable/Wearable/images/settings-theme-dark.png (renamed from examples/quickcontrols/wearable/qml/Settings/images/theme-dark.png) | bin | 1129 -> 1129 bytes | |||
| -rw-r--r-- | examples/quickcontrols/wearable/Wearable/images/settings-theme-dark@2x.png (renamed from examples/quickcontrols/wearable/qml/Settings/images/theme-dark@2x.png) | bin | 2002 -> 2002 bytes | |||
| -rw-r--r-- | examples/quickcontrols/wearable/Wearable/images/settings-theme-light.png (renamed from examples/quickcontrols/wearable/qml/Settings/images/theme-light.png) | bin | 1138 -> 1138 bytes | |||
| -rw-r--r-- | examples/quickcontrols/wearable/Wearable/images/settings-theme-light@2x.png (renamed from examples/quickcontrols/wearable/qml/Settings/images/theme-light@2x.png) | bin | 2004 -> 2004 bytes | |||
| -rw-r--r-- | examples/quickcontrols/wearable/Wearable/images/settings-theme.svg (renamed from examples/quickcontrols/wearable/qml/Settings/images/theme.svg) | 0 | ||||
| -rw-r--r-- | examples/quickcontrols/wearable/Wearable/images/settings-wifi-dark.png (renamed from examples/quickcontrols/wearable/qml/Settings/images/wifi-dark.png) | bin | 1476 -> 1476 bytes | |||
| -rw-r--r-- | examples/quickcontrols/wearable/Wearable/images/settings-wifi-dark@2x.png (renamed from examples/quickcontrols/wearable/qml/Settings/images/wifi-dark@2x.png) | bin | 1072 -> 1072 bytes | |||
| -rw-r--r-- | examples/quickcontrols/wearable/Wearable/images/settings-wifi-light.png (renamed from examples/quickcontrols/wearable/qml/Settings/images/wifi-light.png) | bin | 1477 -> 1477 bytes | |||
| -rw-r--r-- | examples/quickcontrols/wearable/Wearable/images/settings-wifi-light@2x.png (renamed from examples/quickcontrols/wearable/qml/Settings/images/wifi-light@2x.png) | bin | 1072 -> 1072 bytes | |||
| -rw-r--r-- | examples/quickcontrols/wearable/Wearable/images/weather-humidity-dark.png (renamed from examples/quickcontrols/wearable/qml/Weather/images/humidity-dark.png) | bin | 1673 -> 1673 bytes | |||
| -rw-r--r-- | examples/quickcontrols/wearable/Wearable/images/weather-humidity-dark@2x.png (renamed from examples/quickcontrols/wearable/qml/Weather/images/humidity-dark@2x.png) | bin | 1440 -> 1440 bytes | |||
| -rw-r--r-- | examples/quickcontrols/wearable/Wearable/images/weather-humidity-light.png (renamed from examples/quickcontrols/wearable/qml/Weather/images/humidity-light.png) | bin | 1619 -> 1619 bytes | |||
| -rw-r--r-- | examples/quickcontrols/wearable/Wearable/images/weather-humidity-light@2x.png (renamed from examples/quickcontrols/wearable/qml/Weather/images/humidity-light@2x.png) | bin | 1440 -> 1440 bytes | |||
| -rw-r--r-- | examples/quickcontrols/wearable/Wearable/images/weather-pressure-dark.png (renamed from examples/quickcontrols/wearable/qml/Weather/images/pressure-dark.png) | bin | 1506 -> 1506 bytes | |||
| -rw-r--r-- | examples/quickcontrols/wearable/Wearable/images/weather-pressure-dark@2x.png (renamed from examples/quickcontrols/wearable/qml/Weather/images/pressure-dark@2x.png) | bin | 1542 -> 1542 bytes | |||
| -rw-r--r-- | examples/quickcontrols/wearable/Wearable/images/weather-pressure-light.png (renamed from examples/quickcontrols/wearable/qml/Weather/images/pressure-light.png) | bin | 1508 -> 1508 bytes | |||
| -rw-r--r-- | examples/quickcontrols/wearable/Wearable/images/weather-pressure-light@2x.png (renamed from examples/quickcontrols/wearable/qml/Weather/images/pressure-light@2x.png) | bin | 1543 -> 1543 bytes | |||
| -rw-r--r-- | examples/quickcontrols/wearable/Wearable/images/weather-sunrise-dark.png (renamed from examples/quickcontrols/wearable/qml/Weather/images/sunrise-dark.png) | bin | 1813 -> 1813 bytes | |||
| -rw-r--r-- | examples/quickcontrols/wearable/Wearable/images/weather-sunrise-dark@2x.png (renamed from examples/quickcontrols/wearable/qml/Weather/images/sunrise-dark@2x.png) | bin | 1235 -> 1235 bytes | |||
| -rw-r--r-- | examples/quickcontrols/wearable/Wearable/images/weather-sunrise-light.png (renamed from examples/quickcontrols/wearable/qml/Weather/images/sunrise-light.png) | bin | 1703 -> 1703 bytes | |||
| -rw-r--r-- | examples/quickcontrols/wearable/Wearable/images/weather-sunrise-light@2x.png (renamed from examples/quickcontrols/wearable/qml/Weather/images/sunrise-light@2x.png) | bin | 1235 -> 1235 bytes | |||
| -rw-r--r-- | examples/quickcontrols/wearable/Wearable/images/weather-sunset-dark.png (renamed from examples/quickcontrols/wearable/qml/Weather/images/sunset-dark.png) | bin | 1809 -> 1809 bytes | |||
| -rw-r--r-- | examples/quickcontrols/wearable/Wearable/images/weather-sunset-dark@2x.png (renamed from examples/quickcontrols/wearable/qml/Weather/images/sunset-dark@2x.png) | bin | 1267 -> 1267 bytes | |||
| -rw-r--r-- | examples/quickcontrols/wearable/Wearable/images/weather-sunset-light.png (renamed from examples/quickcontrols/wearable/qml/Weather/images/sunset-light.png) | bin | 1755 -> 1755 bytes | |||
| -rw-r--r-- | examples/quickcontrols/wearable/Wearable/images/weather-sunset-light@2x.png (renamed from examples/quickcontrols/wearable/qml/Weather/images/sunset-light@2x.png) | bin | 1267 -> 1267 bytes | |||
| -rw-r--r-- | examples/quickcontrols/wearable/Wearable/images/weather-temperature-dark.png (renamed from examples/quickcontrols/wearable/qml/Weather/images/temperature-dark.png) | bin | 1232 -> 1232 bytes | |||
| -rw-r--r-- | examples/quickcontrols/wearable/Wearable/images/weather-temperature-dark@2x.png (renamed from examples/quickcontrols/wearable/qml/Weather/images/temperature-dark@2x.png) | bin | 939 -> 939 bytes | |||
| -rw-r--r-- | examples/quickcontrols/wearable/Wearable/images/weather-temperature-light.png (renamed from examples/quickcontrols/wearable/qml/Weather/images/temperature-light.png) | bin | 1147 -> 1147 bytes | |||
| -rw-r--r-- | examples/quickcontrols/wearable/Wearable/images/weather-temperature-light@2x.png (renamed from examples/quickcontrols/wearable/qml/Weather/images/temperature-light@2x.png) | bin | 939 -> 939 bytes | |||
| -rw-r--r-- | examples/quickcontrols/wearable/Wearable/images/weather-wind-dark.png (renamed from examples/quickcontrols/wearable/qml/Weather/images/wind-dark.png) | bin | 1715 -> 1715 bytes | |||
| -rw-r--r-- | examples/quickcontrols/wearable/Wearable/images/weather-wind-dark@2x.png (renamed from examples/quickcontrols/wearable/qml/Weather/images/wind-dark@2x.png) | bin | 1106 -> 1106 bytes | |||
| -rw-r--r-- | examples/quickcontrols/wearable/Wearable/images/weather-wind-light.png (renamed from examples/quickcontrols/wearable/qml/Weather/images/wind-light.png) | bin | 1609 -> 1609 bytes | |||
| -rw-r--r-- | examples/quickcontrols/wearable/Wearable/images/weather-wind-light@2x.png (renamed from examples/quickcontrols/wearable/qml/Weather/images/wind-light@2x.png) | bin | 1106 -> 1106 bytes | |||
| -rw-r--r-- | examples/quickcontrols/wearable/Wearable/images/world-clock-center.png (renamed from examples/quickcontrols/wearable/qml/WorldClock/images/center.png) | bin | 691 -> 691 bytes | |||
| -rw-r--r-- | examples/quickcontrols/wearable/Wearable/images/world-clock-center@2x.png (renamed from examples/quickcontrols/wearable/qml/WorldClock/images/center@2x.png) | bin | 1796 -> 1796 bytes | |||
| -rw-r--r-- | examples/quickcontrols/wearable/Wearable/images/world-clock-clock-night.png (renamed from examples/quickcontrols/wearable/qml/WorldClock/images/clock-night.png) | bin | 24236 -> 24236 bytes | |||
| -rw-r--r-- | examples/quickcontrols/wearable/Wearable/images/world-clock-clock-night@2x.png (renamed from examples/quickcontrols/wearable/qml/WorldClock/images/clock-night@2x.png) | bin | 64764 -> 64764 bytes | |||
| -rw-r--r-- | examples/quickcontrols/wearable/Wearable/images/world-clock-clock.png (renamed from examples/quickcontrols/wearable/qml/WorldClock/images/clock.png) | bin | 11173 -> 11173 bytes | |||
| -rw-r--r-- | examples/quickcontrols/wearable/Wearable/images/world-clock-second.png (renamed from examples/quickcontrols/wearable/qml/WorldClock/images/second.png) | bin | 158 -> 158 bytes | |||
| -rw-r--r-- | examples/quickcontrols/wearable/Wearable/images/world-clock-second@2x.png (renamed from examples/quickcontrols/wearable/qml/WorldClock/images/second@2x.png) | bin | 115 -> 115 bytes | |||
| -rw-r--r-- | examples/quickcontrols/wearable/Wearable/images/world-clock-swissdaydial.png (renamed from examples/quickcontrols/wearable/qml/WorldClock/images/swissdaydial.png) | bin | 5078 -> 5078 bytes | |||
| -rw-r--r-- | examples/quickcontrols/wearable/Wearable/images/world-clock-swissdaydial@2x.png (renamed from examples/quickcontrols/wearable/qml/WorldClock/images/swissdaydial@2x.png) | bin | 10146 -> 10146 bytes | |||
| -rw-r--r-- | examples/quickcontrols/wearable/Wearable/images/world-clock-swissdayhour.png (renamed from examples/quickcontrols/wearable/qml/WorldClock/images/swissdayhour.png) | bin | 181 -> 181 bytes | |||
| -rw-r--r-- | examples/quickcontrols/wearable/Wearable/images/world-clock-swissdayhour@2x.png (renamed from examples/quickcontrols/wearable/qml/WorldClock/images/swissdayhour@2x.png) | bin | 269 -> 269 bytes | |||
| -rw-r--r-- | examples/quickcontrols/wearable/Wearable/images/world-clock-swissdayminute.png (renamed from examples/quickcontrols/wearable/qml/WorldClock/images/swissdayminute.png) | bin | 187 -> 187 bytes | |||
| -rw-r--r-- | examples/quickcontrols/wearable/Wearable/images/world-clock-swissdayminute@2x.png (renamed from examples/quickcontrols/wearable/qml/WorldClock/images/swissdayminute@2x.png) | bin | 371 -> 371 bytes | |||
| -rw-r--r-- | examples/quickcontrols/wearable/Wearable/images/world-clock-swissnightdial.png (renamed from examples/quickcontrols/wearable/qml/WorldClock/images/swissnightdial.png) | bin | 4970 -> 4970 bytes | |||
| -rw-r--r-- | examples/quickcontrols/wearable/Wearable/images/world-clock-swissnightdial@2x.png (renamed from examples/quickcontrols/wearable/qml/WorldClock/images/swissnightdial@2x.png) | bin | 13594 -> 13594 bytes | |||
| -rw-r--r-- | examples/quickcontrols/wearable/Wearable/images/world-clock-swissnighthour.png (renamed from examples/quickcontrols/wearable/qml/WorldClock/images/swissnighthour.png) | bin | 260 -> 260 bytes | |||
| -rw-r--r-- | examples/quickcontrols/wearable/Wearable/images/world-clock-swissnighthour@2x.png (renamed from examples/quickcontrols/wearable/qml/WorldClock/images/swissnighthour@2x.png) | bin | 492 -> 492 bytes | |||
| -rw-r--r-- | examples/quickcontrols/wearable/Wearable/images/world-clock-swissnightminute.png (renamed from examples/quickcontrols/wearable/qml/WorldClock/images/swissnightminute.png) | bin | 187 -> 187 bytes | |||
| -rw-r--r-- | examples/quickcontrols/wearable/Wearable/images/world-clock-swissnightminute@2x.png (renamed from examples/quickcontrols/wearable/qml/WorldClock/images/swissnightminute@2x.png) | bin | 365 -> 365 bytes | |||
| -rw-r--r-- | examples/quickcontrols/wearable/Wearable/images/world-clock-swissseconds.png (renamed from examples/quickcontrols/wearable/qml/WorldClock/images/swissseconds.png) | bin | 1120 -> 1120 bytes | |||
| -rw-r--r-- | examples/quickcontrols/wearable/Wearable/navigation.js (renamed from examples/quickcontrols/wearable/qml/Navigation/navigation.js) | 0 | ||||
| -rw-r--r-- | examples/quickcontrols/wearable/Wearable/notifications.js (renamed from examples/quickcontrols/wearable/qml/Notifications/notifications.js) | 0 | ||||
| -rw-r--r-- | examples/quickcontrols/wearable/Wearable/qmldir | 19 | ||||
| -rw-r--r-- | examples/quickcontrols/wearable/Wearable/walk_route.json (renamed from examples/quickcontrols/wearable/qml/Navigation/walk_route.json) | 0 | ||||
| -rw-r--r-- | examples/quickcontrols/wearable/Wearable/weather.js (renamed from examples/quickcontrols/wearable/qml/Weather/weather.js) | 0 | ||||
| -rw-r--r-- | examples/quickcontrols/wearable/Wearable/weather.json (renamed from examples/quickcontrols/wearable/qml/Weather/weather.json) | 0 | ||||
| -rw-r--r-- | examples/quickcontrols/wearable/WearableSettings/CMakeLists.txt | 47 | ||||
| -rw-r--r-- | examples/quickcontrols/wearable/WearableSettings/WearableSettings.qml | 14 | ||||
| -rw-r--r-- | examples/quickcontrols/wearable/WearableSettings/qmldir | 5 | ||||
| -rw-r--r-- | examples/quickcontrols/wearable/WearableStyle/CMakeLists.txt | 50 | ||||
| -rw-r--r-- | examples/quickcontrols/wearable/WearableStyle/PageIndicator.qml (renamed from examples/quickcontrols/wearable/qml/Style/PageIndicator.qml) | 1 | ||||
| -rw-r--r-- | examples/quickcontrols/wearable/WearableStyle/Slider.qml (renamed from examples/quickcontrols/wearable/qml/Style/Slider.qml) | 1 | ||||
| -rw-r--r-- | examples/quickcontrols/wearable/WearableStyle/Switch.qml (renamed from examples/quickcontrols/wearable/qml/Style/Switch.qml) | 1 | ||||
| -rw-r--r-- | examples/quickcontrols/wearable/WearableStyle/UIStyle.qml (renamed from examples/quickcontrols/wearable/qml/Style/UIStyle.qml) | 33 | ||||
| -rw-r--r-- | examples/quickcontrols/wearable/WearableStyle/qmldir | 8 | ||||
| -rw-r--r-- | examples/quickcontrols/wearable/doc/src/qtquickcontrols-wearable.qdoc | 22 | ||||
| -rw-r--r-- | examples/quickcontrols/wearable/qml/Style/qmldir | 1 | ||||
| -rw-r--r-- | examples/quickcontrols/wearable/wearable.cpp | 8 | ||||
| -rw-r--r-- | examples/quickcontrols/wearable/wearable.qrc | 308 |
174 files changed, 634 insertions, 473 deletions
diff --git a/examples/quickcontrols/wearable/CMakeLists.txt b/examples/quickcontrols/wearable/CMakeLists.txt index 8b264ef1c4..7b337ee61d 100644 --- a/examples/quickcontrols/wearable/CMakeLists.txt +++ b/examples/quickcontrols/wearable/CMakeLists.txt @@ -2,7 +2,7 @@ # SPDX-License-Identifier: BSD-3-Clause cmake_minimum_required(VERSION 3.16) -project(wearable LANGUAGES CXX) +project(wearableexample LANGUAGES CXX) set(CMAKE_AUTOMOC ON) @@ -12,18 +12,19 @@ endif() set(INSTALL_EXAMPLEDIR "${INSTALL_EXAMPLESDIR}/quickcontrols/wearable") +add_subdirectory(Wearable) +add_subdirectory(WearableSettings) +add_subdirectory(WearableStyle) + find_package(Qt6 REQUIRED COMPONENTS Core Gui Quick QuickControls2) -qt_add_executable(wearable - wearable.cpp -) +qt_standard_project_setup() -set_target_properties(wearable PROPERTIES - WIN32_EXECUTABLE TRUE - MACOSX_BUNDLE TRUE +qt_add_executable(wearableexample WIN32 MACOSX_BUNDLE + wearable.cpp ) -target_link_libraries(wearable PUBLIC +target_link_libraries(wearableexample PUBLIC Qt6::Core Qt6::Gui Qt6::Quick @@ -34,172 +35,10 @@ if(UNIX AND NOT APPLE AND CMAKE_CROSSCOMPILING) find_package(Qt6 REQUIRED COMPONENTS QuickTemplates2) # Work around QTBUG-86533 - target_link_libraries(wearable PRIVATE Qt6::QuickTemplates2) + target_link_libraries(wearableexample PRIVATE Qt6::QuickTemplates2) endif() -# Resources: -set(wearable_resource_files - "icons/wearable/36x36/alarms.png" - "icons/wearable/36x36/fitness.png" - "icons/wearable/36x36/navigation.png" - "icons/wearable/36x36/notifications.png" - "icons/wearable/36x36/settings.png" - "icons/wearable/36x36/weather.png" - "icons/wearable/36x36/worldclock.png" - "icons/wearable/36x36@2/alarms.png" - "icons/wearable/36x36@2/fitness.png" - "icons/wearable/36x36@2/navigation.png" - "icons/wearable/36x36@2/notifications.png" - "icons/wearable/36x36@2/settings.png" - "icons/wearable/36x36@2/weather.png" - "icons/wearable/36x36@2/worldclock.png" - "icons/wearable/index.theme" - "images/back.png" - "images/back@2x.png" - "images/background-dark.png" - "images/background-light.png" - "images/home.png" - "images/home@2x.png" - "qml/Alarms/AlarmsPage.qml" - "qml/DemoMode.qml" - "qml/DemoModeIndicator.qml" - "qml/Fitness/FitnessPage.qml" - "qml/Fitness/fitness.js" - "qml/Fitness/images/man-running-dark.png" - "qml/Fitness/images/man-running-dark@2x.png" - "qml/Fitness/images/man-running-light.png" - "qml/Fitness/images/man-running-light@2x.png" - "qml/Fitness/images/man-walking-dark.png" - "qml/Fitness/images/man-walking-dark@2x.png" - "qml/Fitness/images/man-walking-light.png" - "qml/Fitness/images/man-walking-light@2x.png" - "qml/LauncherPage.qml" - "qml/NaviButton.qml" - "qml/Navigation/NavigationPage.qml" - "qml/Navigation/RouteElement.qml" - "qml/Navigation/images/end.png" - "qml/Navigation/images/end@2x.png" - "qml/Navigation/images/leftturn-dark.png" - "qml/Navigation/images/leftturn-dark@2x.png" - "qml/Navigation/images/leftturn-light.png" - "qml/Navigation/images/leftturn-light@2x.png" - "qml/Navigation/images/navigation-dark.png" - "qml/Navigation/images/navigation-dark@2x.png" - "qml/Navigation/images/navigation-light.png" - "qml/Navigation/images/navigation-light@2x.png" - "qml/Navigation/images/rightturn-dark.png" - "qml/Navigation/images/rightturn-dark@2x.png" - "qml/Navigation/images/rightturn-light.png" - "qml/Navigation/images/rightturn-light@2x.png" - "qml/Navigation/images/start.png" - "qml/Navigation/images/start@2x.png" - "qml/Navigation/images/straight-dark.png" - "qml/Navigation/images/straight-dark@2x.png" - "qml/Navigation/images/straight-light.png" - "qml/Navigation/images/straight-light@2x.png" - "qml/Navigation/images/uturn.png" - "qml/Navigation/images/uturn@2x.png" - "qml/Navigation/navigation.js" - "qml/Navigation/walk_route.json" - "qml/Notifications/NotificationsPage.qml" - "qml/Notifications/images/avatarf-dark.png" - "qml/Notifications/images/avatarf-dark@2x.png" - "qml/Notifications/images/avatarf-light.png" - "qml/Notifications/images/avatarf-light@2x.png" - "qml/Notifications/images/avatarm-dark.png" - "qml/Notifications/images/avatarm-dark@2x.png" - "qml/Notifications/images/avatarm-light.png" - "qml/Notifications/images/avatarm-light@2x.png" - "qml/Notifications/images/missedcall-dark.png" - "qml/Notifications/images/missedcall-dark@2x.png" - "qml/Notifications/images/missedcall-light.png" - "qml/Notifications/images/missedcall-light@2x.png" - "qml/Notifications/notifications.js" - "qml/Settings/SettingsPage.qml" - "qml/Settings/images/bluetooth-dark.png" - "qml/Settings/images/bluetooth-dark@2x.png" - "qml/Settings/images/bluetooth-light.png" - "qml/Settings/images/bluetooth-light@2x.png" - "qml/Settings/images/brightness-dark.png" - "qml/Settings/images/brightness-dark@2x.png" - "qml/Settings/images/brightness-light.png" - "qml/Settings/images/brightness-light@2x.png" - "qml/Settings/images/demo-mode-dark.png" - "qml/Settings/images/demo-mode-dark@2x.png" - "qml/Settings/images/demo-mode-light.png" - "qml/Settings/images/demo-mode-light@2x.png" - "qml/Settings/images/demo-mode-white.png" - "qml/Settings/images/demo-mode-white@2x.png" - "qml/Settings/images/theme-dark.png" - "qml/Settings/images/theme-dark@2x.png" - "qml/Settings/images/theme-light.png" - "qml/Settings/images/theme-light@2x.png" - "qml/Settings/images/wifi-dark.png" - "qml/Settings/images/wifi-dark@2x.png" - "qml/Settings/images/wifi-light.png" - "qml/Settings/images/wifi-light@2x.png" - "qml/Style/PageIndicator.qml" - "qml/Style/Slider.qml" - "qml/Style/Switch.qml" - "qml/Style/UIStyle.qml" - "qml/Style/qmldir" - "qml/SwipeViewPage.qml" - "qml/Weather/WeatherPage.qml" - "qml/Weather/images/humidity-dark.png" - "qml/Weather/images/humidity-dark@2x.png" - "qml/Weather/images/humidity-light.png" - "qml/Weather/images/humidity-light@2x.png" - "qml/Weather/images/pressure-dark.png" - "qml/Weather/images/pressure-dark@2x.png" - "qml/Weather/images/pressure-light.png" - "qml/Weather/images/pressure-light@2x.png" - "qml/Weather/images/sunrise-dark.png" - "qml/Weather/images/sunrise-dark@2x.png" - "qml/Weather/images/sunrise-light.png" - "qml/Weather/images/sunrise-light@2x.png" - "qml/Weather/images/sunset-dark.png" - "qml/Weather/images/sunset-dark@2x.png" - "qml/Weather/images/sunset-light.png" - "qml/Weather/images/sunset-light@2x.png" - "qml/Weather/images/temperature-dark.png" - "qml/Weather/images/temperature-dark@2x.png" - "qml/Weather/images/temperature-light.png" - "qml/Weather/images/temperature-light@2x.png" - "qml/Weather/images/wind-dark.png" - "qml/Weather/images/wind-dark@2x.png" - "qml/Weather/images/wind-light.png" - "qml/Weather/images/wind-light@2x.png" - "qml/Weather/weather.js" - "qml/Weather/weather.json" - "qml/WorldClock/Clock.qml" - "qml/WorldClock/WorldClockPage.qml" - "qml/WorldClock/images/center.png" - "qml/WorldClock/images/center@2x.png" - "qml/WorldClock/images/second.png" - "qml/WorldClock/images/second@2x.png" - "qml/WorldClock/images/swissdaydial.png" - "qml/WorldClock/images/swissdaydial@2x.png" - "qml/WorldClock/images/swissdayhour.png" - "qml/WorldClock/images/swissdayhour@2x.png" - "qml/WorldClock/images/swissdayminute.png" - "qml/WorldClock/images/swissdayminute@2x.png" - "qml/WorldClock/images/swissnightdial.png" - "qml/WorldClock/images/swissnightdial@2x.png" - "qml/WorldClock/images/swissnighthour.png" - "qml/WorldClock/images/swissnighthour@2x.png" - "qml/WorldClock/images/swissnightminute.png" - "qml/WorldClock/images/swissnightminute@2x.png" - "wearable.qml" -) - -qt6_add_resources(wearable "wearable" - PREFIX - "/" - FILES - ${wearable_resource_files} -) - -install(TARGETS wearable +install(TARGETS wearableexample RUNTIME DESTINATION "${INSTALL_EXAMPLEDIR}" BUNDLE DESTINATION "${INSTALL_EXAMPLEDIR}" LIBRARY DESTINATION "${INSTALL_EXAMPLEDIR}" diff --git a/examples/quickcontrols/wearable/qml/Alarms/AlarmsPage.qml b/examples/quickcontrols/wearable/Wearable/AlarmsPage.qml index 65b34b83cb..3fb4208564 100644 --- a/examples/quickcontrols/wearable/qml/Alarms/AlarmsPage.qml +++ b/examples/quickcontrols/wearable/Wearable/AlarmsPage.qml @@ -3,8 +3,8 @@ import QtQuick import QtQuick.Controls as QQC2 -import ".." -import "../Style" +import Wearable +import WearableStyle Item { QQC2.SwipeView { diff --git a/examples/quickcontrols/wearable/Wearable/AppSettings.qml b/examples/quickcontrols/wearable/Wearable/AppSettings.qml new file mode 100644 index 0000000000..bf47b3b6c8 --- /dev/null +++ b/examples/quickcontrols/wearable/Wearable/AppSettings.qml @@ -0,0 +1,14 @@ +// Copyright (C) 2023 The Qt Company Ltd. +// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR LGPL-3.0-only OR GPL-2.0-only OR GPL-3.0-only + +pragma Singleton + +import QtCore + +Settings { + property bool wireless + property bool bluetooth + property int brightness + property bool darkTheme + property bool demoMode +} diff --git a/examples/quickcontrols/wearable/Wearable/CMakeLists.txt b/examples/quickcontrols/wearable/Wearable/CMakeLists.txt new file mode 100644 index 0000000000..2f319f707c --- /dev/null +++ b/examples/quickcontrols/wearable/Wearable/CMakeLists.txt @@ -0,0 +1,188 @@ +# Copyright (C) 2023 The Qt Company Ltd. +# SPDX-License-Identifier: BSD-3-Clause + +cmake_minimum_required(VERSION 3.16) +project(wearable LANGUAGES CXX) + +set(CMAKE_AUTOMOC ON) + +if(NOT DEFINED INSTALL_EXAMPLESDIR) + set(INSTALL_EXAMPLESDIR "examples") +endif() + +set(INSTALL_EXAMPLEDIR "${INSTALL_EXAMPLESDIR}/quickcontrols/wearable/Wearable") + +find_package(Qt6 REQUIRED COMPONENTS Core Gui Quick QuickControls2) + +qt_policy(SET QTP0001 NEW) +qt_add_qml_module(wearable + URI Wearable + QML_FILES + AlarmsPage.qml + Clock.qml + DemoMode.qml + DemoModeIndicator.qml + FitnessPage.qml + LauncherPage.qml + Main.qml + NaviButton.qml + NavigationPage.qml + NotificationsPage.qml + RouteElement.qml + SettingsPage.qml + SwipeViewPage.qml + WeatherPage.qml + WorldClockPage.qml + fitness.js + navigation.js + notifications.js + weather.js + RESOURCES + icons/wearable/36x36/alarms.png + icons/wearable/36x36/fitness.png + icons/wearable/36x36/navigation.png + icons/wearable/36x36/notifications.png + icons/wearable/36x36/settings.png + icons/wearable/36x36/weather.png + icons/wearable/36x36/worldclock.png + icons/wearable/36x36@2/alarms.png + icons/wearable/36x36@2/fitness.png + icons/wearable/36x36@2/navigation.png + icons/wearable/36x36@2/notifications.png + icons/wearable/36x36@2/settings.png + icons/wearable/36x36@2/weather.png + icons/wearable/36x36@2/worldclock.png + icons/wearable/index.theme + images/back.png + images/back@2x.png + images/background-dark.png + images/background-light.png + images/fitness-man-running-dark.png + images/fitness-man-running-dark@2x.png + images/fitness-man-running-light.png + images/fitness-man-running-light@2x.png + images/fitness-man-walking-dark.png + images/fitness-man-walking-dark@2x.png + images/fitness-man-walking-light.png + images/fitness-man-walking-light@2x.png + images/home.png + images/home@2x.png + images/navigation-dark.png + images/navigation-dark@2x.png + images/navigation-end.png + images/navigation-end@2x.png + images/navigation-leftturn-dark.png + images/navigation-leftturn-dark@2x.png + images/navigation-leftturn-light.png + images/navigation-leftturn-light@2x.png + images/navigation-light.png + images/navigation-light@2x.png + images/navigation-rightturn-dark.png + images/navigation-rightturn-dark@2x.png + images/navigation-rightturn-light.png + images/navigation-rightturn-light@2x.png + images/navigation-start.png + images/navigation-start@2x.png + images/navigation-straight-dark.png + images/navigation-straight-dark@2x.png + images/navigation-straight-light.png + images/navigation-straight-light@2x.png + images/navigation-uturn.png + images/navigation-uturn@2x.png + images/notifications-avatarf-dark.png + images/notifications-avatarf-dark@2x.png + images/notifications-avatarf-light.png + images/notifications-avatarf-light@2x.png + images/notifications-avatarm-dark.png + images/notifications-avatarm-dark@2x.png + images/notifications-avatarm-light.png + images/notifications-avatarm-light@2x.png + images/notifications-missedcall-dark.png + images/notifications-missedcall-dark@2x.png + images/notifications-missedcall-light.png + images/notifications-missedcall-light@2x.png + images/settings-bluetooth-dark.png + images/settings-bluetooth-dark@2x.png + images/settings-bluetooth-light.png + images/settings-bluetooth-light@2x.png + images/settings-brightness-dark.png + images/settings-brightness-dark@2x.png + images/settings-brightness-light.png + images/settings-brightness-light@2x.png + images/settings-demo-mode-dark.png + images/settings-demo-mode-dark@2x.png + images/settings-demo-mode-light.png + images/settings-demo-mode-light@2x.png + images/settings-demo-mode-white.png + images/settings-demo-mode-white@2x.png + images/settings-theme-dark.png + images/settings-theme-dark@2x.png + images/settings-theme-light.png + images/settings-theme-light@2x.png + images/settings-wifi-dark.png + images/settings-wifi-dark@2x.png + images/settings-wifi-light.png + images/settings-wifi-light@2x.png + images/weather-humidity-dark.png + images/weather-humidity-dark@2x.png + images/weather-humidity-light.png + images/weather-humidity-light@2x.png + images/weather-pressure-dark.png + images/weather-pressure-dark@2x.png + images/weather-pressure-light.png + images/weather-pressure-light@2x.png + images/weather-sunrise-dark.png + images/weather-sunrise-dark@2x.png + images/weather-sunrise-light.png + images/weather-sunrise-light@2x.png + images/weather-sunset-dark.png + images/weather-sunset-dark@2x.png + images/weather-sunset-light.png + images/weather-sunset-light@2x.png + images/weather-temperature-dark.png + images/weather-temperature-dark@2x.png + images/weather-temperature-light.png + images/weather-temperature-light@2x.png + images/weather-wind-dark.png + images/weather-wind-dark@2x.png + images/weather-wind-light.png + images/weather-wind-light@2x.png + images/world-clock-center.png + images/world-clock-center@2x.png + images/world-clock-second.png + images/world-clock-second@2x.png + images/world-clock-swissdaydial.png + images/world-clock-swissdaydial@2x.png + images/world-clock-swissdayhour.png + images/world-clock-swissdayhour@2x.png + images/world-clock-swissdayminute.png + images/world-clock-swissdayminute@2x.png + images/world-clock-swissnightdial.png + images/world-clock-swissnightdial@2x.png + images/world-clock-swissnighthour.png + images/world-clock-swissnighthour@2x.png + images/world-clock-swissnightminute.png + images/world-clock-swissnightminute@2x.png + walk_route.json + weather.json +) + +target_link_libraries(wearable PUBLIC + Qt6::Core + Qt6::Gui + Qt6::Quick + Qt6::QuickControls2 +) + +if(UNIX AND NOT APPLE AND CMAKE_CROSSCOMPILING) + find_package(Qt6 REQUIRED COMPONENTS QuickTemplates2) + + # Work around QTBUG-86533 + target_link_libraries(wearable PRIVATE Qt6::QuickTemplates2) +endif() + +install(TARGETS wearable + RUNTIME DESTINATION "${INSTALL_EXAMPLEDIR}" + BUNDLE DESTINATION "${INSTALL_EXAMPLEDIR}" + LIBRARY DESTINATION "${INSTALL_EXAMPLEDIR}" +) diff --git a/examples/quickcontrols/wearable/qml/WorldClock/Clock.qml b/examples/quickcontrols/wearable/Wearable/Clock.qml index e89489b045..88960507f1 100644 --- a/examples/quickcontrols/wearable/qml/WorldClock/Clock.qml +++ b/examples/quickcontrols/wearable/Wearable/Clock.qml @@ -3,8 +3,8 @@ import QtQuick import QtQuick.Controls as QQC2 -import ".." -import "../Style" +import Wearable +import WearableStyle SwipeViewPage { id: clock @@ -16,17 +16,11 @@ SwipeViewPage { property bool night: false property bool internationalTime: true //Unset for local time - function getWatchFaceImage(imageName) { - return "images/" + imageName - } - function timeChanged() { - var date = new Date - hours = internationalTime ? date.getUTCHours() + Math.floor( - clock.shift) : date.getHours() + const date = new Date + hours = internationalTime ? date.getUTCHours() + Math.floor(clock.shift) : date.getHours() night = (hours < 7 || hours > 19) - minutes = internationalTime ? - date.getUTCMinutes() + ((clock.shift % 1) * 60) : date.getMinutes() + minutes = internationalTime ? date.getUTCMinutes() + ((clock.shift % 1) * 60) : date.getMinutes() seconds = date.getUTCSeconds() } @@ -52,20 +46,18 @@ SwipeViewPage { Image { id: background - source: getWatchFaceImage("swissdaydial.png") + source: UIStyle.imagePath("world-clock-swissdaydial") visible: clock.night == false } Image { - source: getWatchFaceImage("swissnightdial.png") + source: UIStyle.imagePath("world-clock-swissnightdial") visible: clock.night == true } Image { x: 92.5 y: 27 - source: getWatchFaceImage(clock.night ? - "swissnighthour.png" - : "swissdayhour.png") + source: UIStyle.imagePath(`world-clock-swiss${clock.night ? "night" : "day"}hour`) transform: Rotation { id: hourRotation origin.x: 7.5 @@ -84,9 +76,7 @@ SwipeViewPage { Image { x: 93.5 y: 17 - source: getWatchFaceImage(clock.night ? - "swissnightminute.png" - : "swissdayminute.png") + source: UIStyle.imagePath(`world-clock-swiss${clock.night ? "night" : "day"}minute`) transform: Rotation { id: minuteRotation origin.x: 6.5 @@ -105,7 +95,7 @@ SwipeViewPage { Image { x: 97.5 y: 20 - source: getWatchFaceImage("second.png") + source: UIStyle.imagePath("world-clock-second") transform: Rotation { id: secondRotation origin.x: 2.5 @@ -123,7 +113,7 @@ SwipeViewPage { Image { anchors.centerIn: background - source: getWatchFaceImage("center.png") + source: UIStyle.imagePath("world-clock-center") } Text { diff --git a/examples/quickcontrols/wearable/qml/DemoMode.qml b/examples/quickcontrols/wearable/Wearable/DemoMode.qml index d7d4b6e61f..7a35ba682c 100644 --- a/examples/quickcontrols/wearable/qml/DemoMode.qml +++ b/examples/quickcontrols/wearable/Wearable/DemoMode.qml @@ -4,17 +4,18 @@ import QtQuick import QtQuick.Controls -import "Style" +import WearableSettings +import WearableStyle Item { property StackView stackView SequentialAnimation { id: demoModeAnimation - running: settings.demoMode + running: WearableSettings.demoMode // Set brightness back to normal. - ScriptAction { script: settings.brightness = 0 } + ScriptAction { script: WearableSettings.brightness = 0 } // Go back to the launcher page. PauseAnimation { duration: 1000 } @@ -22,7 +23,7 @@ Item { PauseAnimation { duration: 2000 } // Open the world clock page. - ScriptAction { script: stackView.currentItem.launched(Qt.resolvedUrl("WorldClock/WorldClockPage.qml")) } + ScriptAction { script: stackView.currentItem.launched("WorldClockPage.qml") } PauseAnimation { duration: 2000 } // Swipe across a few times. @@ -41,7 +42,7 @@ Item { // Open the navigation page. ScriptAction { script: stackView.currentItem.incrementCurrentIndex() } PauseAnimation { duration: 1000 } - ScriptAction { script: stackView.currentItem.launched(Qt.resolvedUrl("Navigation/NavigationPage.qml")) } + ScriptAction { script: stackView.currentItem.launched("NavigationPage.qml") } PauseAnimation { duration: 2000 } // Flick down a few times. @@ -60,7 +61,7 @@ Item { // Open the weather page. ScriptAction { script: stackView.currentItem.incrementCurrentIndex() } PauseAnimation { duration: 1000 } - ScriptAction { script: stackView.currentItem.launched(Qt.resolvedUrl("Weather/WeatherPage.qml")) } + ScriptAction { script: stackView.currentItem.launched("WeatherPage.qml") } PauseAnimation { duration: 2000 } // Swipe across a few times. @@ -79,7 +80,7 @@ Item { // Open the fitness page. ScriptAction { script: stackView.currentItem.incrementCurrentIndex() } PauseAnimation { duration: 1000 } - ScriptAction { script: stackView.currentItem.launched(Qt.resolvedUrl("Fitness/FitnessPage.qml")) } + ScriptAction { script: stackView.currentItem.launched("FitnessPage.qml") } PauseAnimation { duration: 2000 } // Swipe across a few times. @@ -98,7 +99,7 @@ Item { // Open the notifications page. ScriptAction { script: stackView.currentItem.incrementCurrentIndex() } PauseAnimation { duration: 1000 } - ScriptAction { script: stackView.currentItem.launched(Qt.resolvedUrl("Notifications/NotificationsPage.qml")) } + ScriptAction { script: stackView.currentItem.launched("NotificationsPage.qml") } // Flick down a few times. SequentialAnimation { @@ -116,7 +117,7 @@ Item { // Open the alarms page. ScriptAction { script: stackView.currentItem.incrementCurrentIndex() } PauseAnimation { duration: 1000 } - ScriptAction { script: stackView.currentItem.launched(Qt.resolvedUrl("Alarms/AlarmsPage.qml")) } + ScriptAction { script: stackView.currentItem.launched("AlarmsPage.qml") } PauseAnimation { duration: 2000 } // Toggle the switch. @@ -139,7 +140,7 @@ Item { // Open the settings page. ScriptAction { script: stackView.currentItem.incrementCurrentIndex() } PauseAnimation { duration: 1000 } - ScriptAction { script: stackView.currentItem.launched(Qt.resolvedUrl("Settings/SettingsPage.qml")) } + ScriptAction { script: stackView.currentItem.launched("SettingsPage.qml") } PauseAnimation { duration: 3000 } // Toggle the switches. diff --git a/examples/quickcontrols/wearable/qml/DemoModeIndicator.qml b/examples/quickcontrols/wearable/Wearable/DemoModeIndicator.qml index 977c600653..921ae32e57 100644 --- a/examples/quickcontrols/wearable/qml/DemoModeIndicator.qml +++ b/examples/quickcontrols/wearable/Wearable/DemoModeIndicator.qml @@ -3,7 +3,7 @@ import QtQuick import QtQuick.Controls as QQC2 -import "Style" +import WearableStyle Item { id: root @@ -32,7 +32,7 @@ Item { anchors.rightMargin: margins Image { - source: "Settings/images/demo-mode-white.png" + source: UIStyle.imagePath("settings-demo-mode-white") width: height height: instructionLabel.height * 2 anchors.verticalCenter: parent.verticalCenter diff --git a/examples/quickcontrols/wearable/qml/Fitness/FitnessPage.qml b/examples/quickcontrols/wearable/Wearable/FitnessPage.qml index c1047de9aa..4fd18d0ddb 100644 --- a/examples/quickcontrols/wearable/qml/Fitness/FitnessPage.qml +++ b/examples/quickcontrols/wearable/Wearable/FitnessPage.qml @@ -3,8 +3,8 @@ import QtQuick import QtQuick.Controls as QQC2 -import ".." -import "../Style" +import Wearable +import WearableStyle import "fitness.js" as FitnessData Item { @@ -29,7 +29,7 @@ Item { } Image { anchors.horizontalCenter: parent.horizontalCenter - source: UIStyle.themeImagePath("images/man-walking") + source: UIStyle.themeImagePath("fitness-man-walking") } Text { anchors.horizontalCenter: parent.horizontalCenter @@ -59,7 +59,7 @@ Item { } Image { anchors.horizontalCenter: parent.horizontalCenter - source: UIStyle.themeImagePath("images/man-running") + source: UIStyle.themeImagePath("fitness-man-running") } Text { anchors.horizontalCenter: parent.horizontalCenter diff --git a/examples/quickcontrols/wearable/qml/LauncherPage.qml b/examples/quickcontrols/wearable/Wearable/LauncherPage.qml index 4017a81c57..7cd4c707b2 100644 --- a/examples/quickcontrols/wearable/qml/LauncherPage.qml +++ b/examples/quickcontrols/wearable/Wearable/LauncherPage.qml @@ -3,7 +3,7 @@ import QtQuick import QtQuick.Controls as QQC2 -import "Style" +import WearableStyle PathView { id: circularView @@ -22,37 +22,37 @@ PathView { ListElement { title: qsTr("World Clock") icon: "worldclock" - page: "WorldClock/WorldClockPage.qml" + page: "WorldClockPage.qml" } ListElement { title: qsTr("Navigation") icon: "navigation" - page: "Navigation/NavigationPage.qml" + page: "NavigationPage.qml" } ListElement { title: qsTr("Weather") icon: "weather" - page: "Weather/WeatherPage.qml" + page: "WeatherPage.qml" } ListElement { title: qsTr("Fitness") icon: "fitness" - page: "Fitness/FitnessPage.qml" + page: "FitnessPage.qml" } ListElement { title: qsTr("Notifications") icon: "notifications" - page: "Notifications/NotificationsPage.qml" + page: "NotificationsPage.qml" } ListElement { title: qsTr("Alarm") icon: "alarms" - page: "Alarms/AlarmsPage.qml" + page: "AlarmsPage.qml" } ListElement { title: qsTr("Settings") icon: "settings" - page: "Settings/SettingsPage.qml" + page: "SettingsPage.qml" } } diff --git a/examples/quickcontrols/wearable/wearable.qml b/examples/quickcontrols/wearable/Wearable/Main.qml index 27887354dc..bc6e36112f 100644 --- a/examples/quickcontrols/wearable/wearable.qml +++ b/examples/quickcontrols/wearable/Wearable/Main.qml @@ -4,8 +4,9 @@ import QtCore import QtQuick import QtQuick.Controls as QQC2 -import "qml" -import "qml/Style" + +import WearableSettings +import WearableStyle QQC2.ApplicationWindow { id: window @@ -14,46 +15,24 @@ QQC2.ApplicationWindow { height: 320 title: qsTr("Wearable") - Settings { - id: settings - property bool wireless - property bool bluetooth - property int brightness - property bool darkTheme - property bool demoMode - } - - Binding { - target: UIStyle - property: "darkTheme" - value: settings.darkTheme - } - - // We need the settings object both here and in SettingsPage, - // so for convenience, we declare it as a property of the root object so that - // it will be available to all of the QML files that we load. - property alias settings: settings - background: Image { - source: "images/background-" + (settings.darkTheme ? "dark" : "light") + ".png" + source: UIStyle.themeImagePath("background") } header: NaviButton { id: homeButton - edge: Qt.TopEdge enabled: stackView.depth > 1 - imageSource: "images/home.png" + imageSource: UIStyle.imagePath("home") onClicked: stackView.pop(null) } footer: NaviButton { id: backButton - edge: Qt.BottomEdge enabled: stackView.depth > 1 - imageSource: "images/back.png" + imageSource: UIStyle.imagePath("back") onClicked: stackView.pop() } @@ -65,7 +44,7 @@ QQC2.ApplicationWindow { anchors.fill: parent initialItem: LauncherPage { - onLaunched: stackView.push(page) + onLaunched: (page) => stackView.push(page) } } @@ -75,18 +54,18 @@ QQC2.ApplicationWindow { DemoModeIndicator { id: demoModeIndicator - y: settings.demoMode ? -height : -height * 2 + y: WearableSettings.demoMode ? -height : -height * 2 anchors.horizontalCenter: parent.horizontalCenter height: header.height z: window.header.z + 1 } MouseArea { - enabled: settings.demoMode + enabled: WearableSettings.demoMode anchors.fill: parent onClicked: { // Stop demo mode and return to the launcher page. - settings.demoMode = false + WearableSettings.demoMode = false stackView.pop(null) } } diff --git a/examples/quickcontrols/wearable/qml/NaviButton.qml b/examples/quickcontrols/wearable/Wearable/NaviButton.qml index 3c1c30fb7f..112a1332b4 100644 --- a/examples/quickcontrols/wearable/qml/NaviButton.qml +++ b/examples/quickcontrols/wearable/Wearable/NaviButton.qml @@ -3,7 +3,7 @@ import QtQuick import QtQuick.Controls as QQC2 -import "Style" +import WearableStyle QQC2.AbstractButton { id: button diff --git a/examples/quickcontrols/wearable/qml/Navigation/NavigationPage.qml b/examples/quickcontrols/wearable/Wearable/NavigationPage.qml index f9fdd61b47..d707a8ecdc 100644 --- a/examples/quickcontrols/wearable/qml/Navigation/NavigationPage.qml +++ b/examples/quickcontrols/wearable/Wearable/NavigationPage.qml @@ -2,7 +2,7 @@ // SPDX-License-Identifier: LicenseRef-Qt-Commercial OR BSD-3-Clause import QtQuick -import "../Style" +import WearableStyle import "navigation.js" as NavigationData Item { @@ -27,7 +27,7 @@ Item { Image { anchors.verticalCenter: parent.verticalCenter - source: UIStyle.themeImagePath("images/navigation") + source: UIStyle.themeImagePath("navigation") fillMode: Image.PreserveAspectCrop } Text { @@ -49,12 +49,12 @@ Item { width: parent.width height: parent.height - titleRow.height - parent.spacing - property var imageList: [UIStyle.themeImagePath("images/straight"), - UIStyle.themeImagePath("images/leftturn"), - UIStyle.themeImagePath("images/rightturn"), - "images/uturn.png", - "images/start.png", - "images/end.png"] + property var imageList: [UIStyle.themeImagePath("navigation-straight"), + UIStyle.themeImagePath("navigation-leftturn"), + UIStyle.themeImagePath("navigation-rightturn"), + UIStyle.imagePath("navigation-uturn"), + UIStyle.imagePath("navigation-start"), + UIStyle.imagePath("navigation-end")] clip: true focus: true diff --git a/examples/quickcontrols/wearable/qml/Notifications/NotificationsPage.qml b/examples/quickcontrols/wearable/Wearable/NotificationsPage.qml index 6cbf2d92cf..fcc1ceb916 100644 --- a/examples/quickcontrols/wearable/qml/Notifications/NotificationsPage.qml +++ b/examples/quickcontrols/wearable/Wearable/NotificationsPage.qml @@ -3,7 +3,7 @@ import QtQuick import QtQuick.Controls as QQC2 -import "../Style" +import WearableStyle import "notifications.js" as NotificationData ListView { @@ -23,7 +23,7 @@ ListView { width: parent.width / 2 anchors.right: parent.horizontalCenter anchors.verticalCenter: parent.verticalCenter - source: UIStyle.themeImagePath("images/missedcall") + source: UIStyle.themeImagePath("notifications-missedcall") fillMode: Image.Pad } @@ -38,7 +38,7 @@ ListView { Image { anchors.horizontalCenter: parent.horizontalCenter - source: qsTr("images/avatar%1-%2.png").arg(model.gender).arg(UIStyle.darkTheme ? "dark" : "light") + source: UIStyle.themeImagePath(`notifications-avatar${model.gender}`) } Text { diff --git a/examples/quickcontrols/wearable/qml/Navigation/RouteElement.qml b/examples/quickcontrols/wearable/Wearable/RouteElement.qml index dd4aebbb2f..b4fdea2010 100644 --- a/examples/quickcontrols/wearable/qml/Navigation/RouteElement.qml +++ b/examples/quickcontrols/wearable/Wearable/RouteElement.qml @@ -2,7 +2,7 @@ // SPDX-License-Identifier: LicenseRef-Qt-Commercial OR BSD-3-Clause import QtQuick -import "../Style" +import WearableStyle Rectangle { color: UIStyle.themeColorQtGray8 diff --git a/examples/quickcontrols/wearable/qml/Settings/SettingsPage.qml b/examples/quickcontrols/wearable/Wearable/SettingsPage.qml index 68fb17990d..968f5edb36 100644 --- a/examples/quickcontrols/wearable/qml/Settings/SettingsPage.qml +++ b/examples/quickcontrols/wearable/Wearable/SettingsPage.qml @@ -3,8 +3,8 @@ import QtQuick import QtQuick.Controls as QQC2 -import ".." -import "../Style" +import WearableStyle +import WearableSettings Item { @@ -27,26 +27,26 @@ Item { spacing: 50 Image { anchors.verticalCenter: parent.verticalCenter - source: UIStyle.themeImagePath("images/bluetooth") + source: UIStyle.themeImagePath("settings-bluetooth") } QQC2.Switch { id: bluetoothSwitch anchors.verticalCenter: parent.verticalCenter - checked: settings.bluetooth - onToggled: settings.bluetooth = checked + checked: WearableSettings.bluetooth + onToggled: WearableSettings.bluetooth = checked } } Row { spacing: 50 Image { anchors.verticalCenter: parent.verticalCenter - source: UIStyle.themeImagePath("images/wifi") + source: UIStyle.themeImagePath("settings-wifi") } QQC2.Switch { id: wirelessSwitch anchors.verticalCenter: parent.verticalCenter - checked: settings.wireless - onToggled: settings.wireless = checked + checked: WearableSettings.wireless + onToggled: WearableSettings.wireless = checked } } } @@ -65,7 +65,7 @@ Item { Column { Image { anchors.horizontalCenter: parent.horizontalCenter - source: UIStyle.themeImagePath("images/brightness") + source: UIStyle.themeImagePath("settings-brightness") } QQC2.Slider { id: brightnessSlider @@ -73,8 +73,8 @@ Item { from: 0 to: 5 stepSize: 1 - value: settings.brightness - onMoved: settings.brightness = value + value: WearableSettings.brightness + onMoved: WearableSettings.brightness = value } } Column { @@ -82,13 +82,13 @@ Item { Image { anchors.horizontalCenter: parent.horizontalCenter - source: UIStyle.themeImagePath("images/theme") + source: UIStyle.themeImagePath("settings-theme") } QQC2.Switch { id: darkThemeSwitch anchors.horizontalCenter: parent.horizontalCenter - checked: settings.darkTheme - onToggled: settings.darkTheme = checked + checked: WearableSettings.darkTheme + onToggled: WearableSettings.darkTheme = checked } } } @@ -106,13 +106,13 @@ Item { Image { anchors.horizontalCenter: parent.horizontalCenter - source: UIStyle.themeImagePath("images/demo-mode") + source: UIStyle.themeImagePath("settings-demo-mode") } QQC2.Switch { id: demoModeSwitch anchors.horizontalCenter: parent.horizontalCenter - checked: settings.demoMode - onToggled: settings.demoMode = checked + checked: WearableSettings.demoMode + onToggled: WearableSettings.demoMode = checked } } } diff --git a/examples/quickcontrols/wearable/qml/SwipeViewPage.qml b/examples/quickcontrols/wearable/Wearable/SwipeViewPage.qml index 1f005363dc..1f005363dc 100644 --- a/examples/quickcontrols/wearable/qml/SwipeViewPage.qml +++ b/examples/quickcontrols/wearable/Wearable/SwipeViewPage.qml diff --git a/examples/quickcontrols/wearable/qml/Weather/WeatherPage.qml b/examples/quickcontrols/wearable/Wearable/WeatherPage.qml index d110fabdf9..de0d5d8097 100644 --- a/examples/quickcontrols/wearable/qml/Weather/WeatherPage.qml +++ b/examples/quickcontrols/wearable/Wearable/WeatherPage.qml @@ -3,8 +3,8 @@ import QtQuick import QtQuick.Controls as QQC2 -import ".." -import "../Style" +import Wearable +import WearableStyle import "weather.js" as WeatherData Item { @@ -22,7 +22,7 @@ Item { Image { anchors.verticalCenter: parent.verticalCenter - source: UIStyle.themeImagePath("images/temperature") + source: UIStyle.themeImagePath("weather-temperature") } Column { @@ -82,7 +82,7 @@ Item { Image { id: wImg anchors.verticalCenter: parent.verticalCenter - source: UIStyle.themeImagePath("images/wind") + source: UIStyle.themeImagePath("weather-wind") } Text { @@ -105,7 +105,7 @@ Item { Image { id: hImg anchors.verticalCenter: parent.verticalCenter - source: UIStyle.themeImagePath("images/humidity") + source: UIStyle.themeImagePath("weather-humidity") } Text { @@ -132,7 +132,7 @@ Item { Image { anchors.verticalCenter: parent.verticalCenter - source: UIStyle.themeImagePath("images/pressure") + source: UIStyle.themeImagePath("weather-pressure") } Column { @@ -191,7 +191,7 @@ Item { Image { anchors.verticalCenter: parent.verticalCenter - source: UIStyle.themeImagePath("images/sunrise") + source: UIStyle.themeImagePath("weather-sunrise") } Text { @@ -213,7 +213,7 @@ Item { Image { anchors.verticalCenter: parent.verticalCenter - source: UIStyle.themeImagePath("images/sunset") + source: UIStyle.themeImagePath("weather-sunset") } Text { diff --git a/examples/quickcontrols/wearable/qml/WorldClock/WorldClockPage.qml b/examples/quickcontrols/wearable/Wearable/WorldClockPage.qml index 34a51da5cf..2d22da83b0 100644 --- a/examples/quickcontrols/wearable/qml/WorldClock/WorldClockPage.qml +++ b/examples/quickcontrols/wearable/Wearable/WorldClockPage.qml @@ -3,7 +3,7 @@ import QtQuick import QtQuick.Controls as QQC2 -import "../Style" +import WearableStyle Item { QQC2.SwipeView { diff --git a/examples/quickcontrols/wearable/qml/Fitness/fitness.js b/examples/quickcontrols/wearable/Wearable/fitness.js index 95ce06cdc1..95ce06cdc1 100644 --- a/examples/quickcontrols/wearable/qml/Fitness/fitness.js +++ b/examples/quickcontrols/wearable/Wearable/fitness.js diff --git a/examples/quickcontrols/wearable/icons/wearable/36x36/alarms.png b/examples/quickcontrols/wearable/Wearable/icons/wearable/36x36/alarms.png Binary files differindex 252dcf938f..252dcf938f 100644 --- a/examples/quickcontrols/wearable/icons/wearable/36x36/alarms.png +++ b/examples/quickcontrols/wearable/Wearable/icons/wearable/36x36/alarms.png diff --git a/examples/quickcontrols/wearable/icons/wearable/36x36/fitness.png b/examples/quickcontrols/wearable/Wearable/icons/wearable/36x36/fitness.png Binary files differindex 4b0679e271..4b0679e271 100644 --- a/examples/quickcontrols/wearable/icons/wearable/36x36/fitness.png +++ b/examples/quickcontrols/wearable/Wearable/icons/wearable/36x36/fitness.png diff --git a/examples/quickcontrols/wearable/icons/wearable/36x36/navigation.png b/examples/quickcontrols/wearable/Wearable/icons/wearable/36x36/navigation.png Binary files differindex 08e73005fd..08e73005fd 100644 --- a/examples/quickcontrols/wearable/icons/wearable/36x36/navigation.png +++ b/examples/quickcontrols/wearable/Wearable/icons/wearable/36x36/navigation.png diff --git a/examples/quickcontrols/wearable/icons/wearable/36x36/notifications.png b/examples/quickcontrols/wearable/Wearable/icons/wearable/36x36/notifications.png Binary files differindex 6309312122..6309312122 100644 --- a/examples/quickcontrols/wearable/icons/wearable/36x36/notifications.png +++ b/examples/quickcontrols/wearable/Wearable/icons/wearable/36x36/notifications.png diff --git a/examples/quickcontrols/wearable/icons/wearable/36x36/settings.png b/examples/quickcontrols/wearable/Wearable/icons/wearable/36x36/settings.png Binary files differindex c1552fb360..c1552fb360 100644 --- a/examples/quickcontrols/wearable/icons/wearable/36x36/settings.png +++ b/examples/quickcontrols/wearable/Wearable/icons/wearable/36x36/settings.png diff --git a/examples/quickcontrols/wearable/icons/wearable/36x36/weather.png b/examples/quickcontrols/wearable/Wearable/icons/wearable/36x36/weather.png Binary files differindex 61be79a24f..61be79a24f 100644 --- a/examples/quickcontrols/wearable/icons/wearable/36x36/weather.png +++ b/examples/quickcontrols/wearable/Wearable/icons/wearable/36x36/weather.png diff --git a/examples/quickcontrols/wearable/icons/wearable/36x36/worldclock.png b/examples/quickcontrols/wearable/Wearable/icons/wearable/36x36/worldclock.png Binary files differindex d23e32e512..d23e32e512 100644 --- a/examples/quickcontrols/wearable/icons/wearable/36x36/worldclock.png +++ b/examples/quickcontrols/wearable/Wearable/icons/wearable/36x36/worldclock.png diff --git a/examples/quickcontrols/wearable/icons/wearable/36x36@2/alarms.png b/examples/quickcontrols/wearable/Wearable/icons/wearable/36x36@2/alarms.png Binary files differindex 6047e231fc..6047e231fc 100644 --- a/examples/quickcontrols/wearable/icons/wearable/36x36@2/alarms.png +++ b/examples/quickcontrols/wearable/Wearable/icons/wearable/36x36@2/alarms.png diff --git a/examples/quickcontrols/wearable/icons/wearable/36x36@2/fitness.png b/examples/quickcontrols/wearable/Wearable/icons/wearable/36x36@2/fitness.png Binary files differindex 1d2caa3385..1d2caa3385 100644 --- a/examples/quickcontrols/wearable/icons/wearable/36x36@2/fitness.png +++ b/examples/quickcontrols/wearable/Wearable/icons/wearable/36x36@2/fitness.png diff --git a/examples/quickcontrols/wearable/icons/wearable/36x36@2/navigation.png b/examples/quickcontrols/wearable/Wearable/icons/wearable/36x36@2/navigation.png Binary files differindex 7d4a62b9e1..7d4a62b9e1 100644 --- a/examples/quickcontrols/wearable/icons/wearable/36x36@2/navigation.png +++ b/examples/quickcontrols/wearable/Wearable/icons/wearable/36x36@2/navigation.png diff --git a/examples/quickcontrols/wearable/icons/wearable/36x36@2/notifications.png b/examples/quickcontrols/wearable/Wearable/icons/wearable/36x36@2/notifications.png Binary files differindex 8d3b333350..8d3b333350 100644 --- a/examples/quickcontrols/wearable/icons/wearable/36x36@2/notifications.png +++ b/examples/quickcontrols/wearable/Wearable/icons/wearable/36x36@2/notifications.png diff --git a/examples/quickcontrols/wearable/icons/wearable/36x36@2/settings.png b/examples/quickcontrols/wearable/Wearable/icons/wearable/36x36@2/settings.png Binary files differindex e89188743d..e89188743d 100644 --- a/examples/quickcontrols/wearable/icons/wearable/36x36@2/settings.png +++ b/examples/quickcontrols/wearable/Wearable/icons/wearable/36x36@2/settings.png diff --git a/examples/quickcontrols/wearable/icons/wearable/36x36@2/weather.png b/examples/quickcontrols/wearable/Wearable/icons/wearable/36x36@2/weather.png Binary files differindex 0a2ae7d54e..0a2ae7d54e 100644 --- a/examples/quickcontrols/wearable/icons/wearable/36x36@2/weather.png +++ b/examples/quickcontrols/wearable/Wearable/icons/wearable/36x36@2/weather.png diff --git a/examples/quickcontrols/wearable/icons/wearable/36x36@2/worldclock.png b/examples/quickcontrols/wearable/Wearable/icons/wearable/36x36@2/worldclock.png Binary files differindex ca6eb879e1..ca6eb879e1 100644 --- a/examples/quickcontrols/wearable/icons/wearable/36x36@2/worldclock.png +++ b/examples/quickcontrols/wearable/Wearable/icons/wearable/36x36@2/worldclock.png diff --git a/examples/quickcontrols/wearable/icons/wearable/index.theme b/examples/quickcontrols/wearable/Wearable/icons/wearable/index.theme index da702d4a92..da702d4a92 100644 --- a/examples/quickcontrols/wearable/icons/wearable/index.theme +++ b/examples/quickcontrols/wearable/Wearable/icons/wearable/index.theme diff --git a/examples/quickcontrols/wearable/images/back.png b/examples/quickcontrols/wearable/Wearable/images/back.png Binary files differindex cf80aa65f5..cf80aa65f5 100644 --- a/examples/quickcontrols/wearable/images/back.png +++ b/examples/quickcontrols/wearable/Wearable/images/back.png diff --git a/examples/quickcontrols/wearable/images/back@2x.png b/examples/quickcontrols/wearable/Wearable/images/back@2x.png Binary files differindex 02f27981e0..02f27981e0 100644 --- a/examples/quickcontrols/wearable/images/back@2x.png +++ b/examples/quickcontrols/wearable/Wearable/images/back@2x.png diff --git a/examples/quickcontrols/wearable/images/back@3x.png b/examples/quickcontrols/wearable/Wearable/images/back@3x.png Binary files differindex 6d2d6cf120..6d2d6cf120 100644 --- a/examples/quickcontrols/wearable/images/back@3x.png +++ b/examples/quickcontrols/wearable/Wearable/images/back@3x.png diff --git a/examples/quickcontrols/wearable/images/back@4x.png b/examples/quickcontrols/wearable/Wearable/images/back@4x.png Binary files differindex 03193681b1..03193681b1 100644 --- a/examples/quickcontrols/wearable/images/back@4x.png +++ b/examples/quickcontrols/wearable/Wearable/images/back@4x.png diff --git a/examples/quickcontrols/wearable/images/background-dark.png b/examples/quickcontrols/wearable/Wearable/images/background-dark.png Binary files differindex 6a8c0761aa..6a8c0761aa 100644 --- a/examples/quickcontrols/wearable/images/background-dark.png +++ b/examples/quickcontrols/wearable/Wearable/images/background-dark.png diff --git a/examples/quickcontrols/wearable/images/background-light.png b/examples/quickcontrols/wearable/Wearable/images/background-light.png Binary files differindex 913befab82..913befab82 100644 --- a/examples/quickcontrols/wearable/images/background-light.png +++ b/examples/quickcontrols/wearable/Wearable/images/background-light.png diff --git a/examples/quickcontrols/wearable/qml/Fitness/images/man-running-dark.png b/examples/quickcontrols/wearable/Wearable/images/fitness-man-running-dark.png Binary files differindex 6c791d6170..6c791d6170 100644 --- a/examples/quickcontrols/wearable/qml/Fitness/images/man-running-dark.png +++ b/examples/quickcontrols/wearable/Wearable/images/fitness-man-running-dark.png diff --git a/examples/quickcontrols/wearable/qml/Fitness/images/man-running-dark@2x.png b/examples/quickcontrols/wearable/Wearable/images/fitness-man-running-dark@2x.png Binary files differindex e9abae9de4..e9abae9de4 100644 --- a/examples/quickcontrols/wearable/qml/Fitness/images/man-running-dark@2x.png +++ b/examples/quickcontrols/wearable/Wearable/images/fitness-man-running-dark@2x.png diff --git a/examples/quickcontrols/wearable/qml/Fitness/images/man-running-light.png b/examples/quickcontrols/wearable/Wearable/images/fitness-man-running-light.png Binary files differindex e7eef12cb3..e7eef12cb3 100644 --- a/examples/quickcontrols/wearable/qml/Fitness/images/man-running-light.png +++ b/examples/quickcontrols/wearable/Wearable/images/fitness-man-running-light.png diff --git a/examples/quickcontrols/wearable/qml/Fitness/images/man-running-light@2x.png b/examples/quickcontrols/wearable/Wearable/images/fitness-man-running-light@2x.png Binary files differindex 79861f5718..79861f5718 100644 --- a/examples/quickcontrols/wearable/qml/Fitness/images/man-running-light@2x.png +++ b/examples/quickcontrols/wearable/Wearable/images/fitness-man-running-light@2x.png diff --git a/examples/quickcontrols/wearable/qml/Fitness/images/man-walking-dark.png b/examples/quickcontrols/wearable/Wearable/images/fitness-man-walking-dark.png Binary files differindex 6d455b4925..6d455b4925 100644 --- a/examples/quickcontrols/wearable/qml/Fitness/images/man-walking-dark.png +++ b/examples/quickcontrols/wearable/Wearable/images/fitness-man-walking-dark.png diff --git a/examples/quickcontrols/wearable/qml/Fitness/images/man-walking-dark@2x.png b/examples/quickcontrols/wearable/Wearable/images/fitness-man-walking-dark@2x.png Binary files differindex a3ac08baf3..a3ac08baf3 100644 --- a/examples/quickcontrols/wearable/qml/Fitness/images/man-walking-dark@2x.png +++ b/examples/quickcontrols/wearable/Wearable/images/fitness-man-walking-dark@2x.png diff --git a/examples/quickcontrols/wearable/qml/Fitness/images/man-walking-light.png b/examples/quickcontrols/wearable/Wearable/images/fitness-man-walking-light.png Binary files differindex f963f8897b..f963f8897b 100644 --- a/examples/quickcontrols/wearable/qml/Fitness/images/man-walking-light.png +++ b/examples/quickcontrols/wearable/Wearable/images/fitness-man-walking-light.png diff --git a/examples/quickcontrols/wearable/qml/Fitness/images/man-walking-light@2x.png b/examples/quickcontrols/wearable/Wearable/images/fitness-man-walking-light@2x.png Binary files differindex 1b4d7592d6..1b4d7592d6 100644 --- a/examples/quickcontrols/wearable/qml/Fitness/images/man-walking-light@2x.png +++ b/examples/quickcontrols/wearable/Wearable/images/fitness-man-walking-light@2x.png diff --git a/examples/quickcontrols/wearable/images/home.png b/examples/quickcontrols/wearable/Wearable/images/home.png Binary files differindex b6ee1459f7..b6ee1459f7 100644 --- a/examples/quickcontrols/wearable/images/home.png +++ b/examples/quickcontrols/wearable/Wearable/images/home.png diff --git a/examples/quickcontrols/wearable/images/home@2x.png b/examples/quickcontrols/wearable/Wearable/images/home@2x.png Binary files differindex d5595b2378..d5595b2378 100644 --- a/examples/quickcontrols/wearable/images/home@2x.png +++ b/examples/quickcontrols/wearable/Wearable/images/home@2x.png diff --git a/examples/quickcontrols/wearable/images/home@3x.png b/examples/quickcontrols/wearable/Wearable/images/home@3x.png Binary files differindex 9a5188d22b..9a5188d22b 100644 --- a/examples/quickcontrols/wearable/images/home@3x.png +++ b/examples/quickcontrols/wearable/Wearable/images/home@3x.png diff --git a/examples/quickcontrols/wearable/images/home@4x.png b/examples/quickcontrols/wearable/Wearable/images/home@4x.png Binary files differindex c4d2eb515a..c4d2eb515a 100644 --- a/examples/quickcontrols/wearable/images/home@4x.png +++ b/examples/quickcontrols/wearable/Wearable/images/home@4x.png diff --git a/examples/quickcontrols/wearable/qml/Navigation/images/navigation-dark.png b/examples/quickcontrols/wearable/Wearable/images/navigation-dark.png Binary files differindex b80b7b610f..b80b7b610f 100644 --- a/examples/quickcontrols/wearable/qml/Navigation/images/navigation-dark.png +++ b/examples/quickcontrols/wearable/Wearable/images/navigation-dark.png diff --git a/examples/quickcontrols/wearable/qml/Navigation/images/navigation-dark@2x.png b/examples/quickcontrols/wearable/Wearable/images/navigation-dark@2x.png Binary files differindex b198aa3d9a..b198aa3d9a 100644 --- a/examples/quickcontrols/wearable/qml/Navigation/images/navigation-dark@2x.png +++ b/examples/quickcontrols/wearable/Wearable/images/navigation-dark@2x.png diff --git a/examples/quickcontrols/wearable/qml/Navigation/images/end.png b/examples/quickcontrols/wearable/Wearable/images/navigation-end.png Binary files differindex 4805ad8207..4805ad8207 100644 --- a/examples/quickcontrols/wearable/qml/Navigation/images/end.png +++ b/examples/quickcontrols/wearable/Wearable/images/navigation-end.png diff --git a/examples/quickcontrols/wearable/qml/Navigation/images/end@2x.png b/examples/quickcontrols/wearable/Wearable/images/navigation-end@2x.png Binary files differindex e91d537465..e91d537465 100644 --- a/examples/quickcontrols/wearable/qml/Navigation/images/end@2x.png +++ b/examples/quickcontrols/wearable/Wearable/images/navigation-end@2x.png diff --git a/examples/quickcontrols/wearable/qml/Navigation/images/leftturn-dark.png b/examples/quickcontrols/wearable/Wearable/images/navigation-leftturn-dark.png Binary files differindex 66d258f5ac..66d258f5ac 100644 --- a/examples/quickcontrols/wearable/qml/Navigation/images/leftturn-dark.png +++ b/examples/quickcontrols/wearable/Wearable/images/navigation-leftturn-dark.png diff --git a/examples/quickcontrols/wearable/qml/Navigation/images/leftturn-dark@2x.png b/examples/quickcontrols/wearable/Wearable/images/navigation-leftturn-dark@2x.png Binary files differindex 639deb81cf..639deb81cf 100644 --- a/examples/quickcontrols/wearable/qml/Navigation/images/leftturn-dark@2x.png +++ b/examples/quickcontrols/wearable/Wearable/images/navigation-leftturn-dark@2x.png diff --git a/examples/quickcontrols/wearable/qml/Navigation/images/leftturn-light.png b/examples/quickcontrols/wearable/Wearable/images/navigation-leftturn-light.png Binary files differindex 1346e8eaff..1346e8eaff 100644 --- a/examples/quickcontrols/wearable/qml/Navigation/images/leftturn-light.png +++ b/examples/quickcontrols/wearable/Wearable/images/navigation-leftturn-light.png diff --git a/examples/quickcontrols/wearable/qml/Navigation/images/leftturn-light@2x.png b/examples/quickcontrols/wearable/Wearable/images/navigation-leftturn-light@2x.png Binary files differindex 268a6283f9..268a6283f9 100644 --- a/examples/quickcontrols/wearable/qml/Navigation/images/leftturn-light@2x.png +++ b/examples/quickcontrols/wearable/Wearable/images/navigation-leftturn-light@2x.png diff --git a/examples/quickcontrols/wearable/qml/Navigation/images/navigation-light.png b/examples/quickcontrols/wearable/Wearable/images/navigation-light.png Binary files differindex 08e73005fd..08e73005fd 100644 --- a/examples/quickcontrols/wearable/qml/Navigation/images/navigation-light.png +++ b/examples/quickcontrols/wearable/Wearable/images/navigation-light.png diff --git a/examples/quickcontrols/wearable/qml/Navigation/images/navigation-light@2x.png b/examples/quickcontrols/wearable/Wearable/images/navigation-light@2x.png Binary files differindex 7d4a62b9e1..7d4a62b9e1 100644 --- a/examples/quickcontrols/wearable/qml/Navigation/images/navigation-light@2x.png +++ b/examples/quickcontrols/wearable/Wearable/images/navigation-light@2x.png diff --git a/examples/quickcontrols/wearable/qml/Navigation/images/marker.png b/examples/quickcontrols/wearable/Wearable/images/navigation-marker.png Binary files differindex 4805ad8207..4805ad8207 100644 --- a/examples/quickcontrols/wearable/qml/Navigation/images/marker.png +++ b/examples/quickcontrols/wearable/Wearable/images/navigation-marker.png diff --git a/examples/quickcontrols/wearable/qml/Navigation/images/rightturn-dark.png b/examples/quickcontrols/wearable/Wearable/images/navigation-rightturn-dark.png Binary files differindex 6a779dadc4..6a779dadc4 100644 --- a/examples/quickcontrols/wearable/qml/Navigation/images/rightturn-dark.png +++ b/examples/quickcontrols/wearable/Wearable/images/navigation-rightturn-dark.png diff --git a/examples/quickcontrols/wearable/qml/Navigation/images/rightturn-dark@2x.png b/examples/quickcontrols/wearable/Wearable/images/navigation-rightturn-dark@2x.png Binary files differindex 13143c2e2c..13143c2e2c 100644 --- a/examples/quickcontrols/wearable/qml/Navigation/images/rightturn-dark@2x.png +++ b/examples/quickcontrols/wearable/Wearable/images/navigation-rightturn-dark@2x.png diff --git a/examples/quickcontrols/wearable/qml/Navigation/images/rightturn-light.png b/examples/quickcontrols/wearable/Wearable/images/navigation-rightturn-light.png Binary files differindex a6be08c1a1..a6be08c1a1 100644 --- a/examples/quickcontrols/wearable/qml/Navigation/images/rightturn-light.png +++ b/examples/quickcontrols/wearable/Wearable/images/navigation-rightturn-light.png diff --git a/examples/quickcontrols/wearable/qml/Navigation/images/rightturn-light@2x.png b/examples/quickcontrols/wearable/Wearable/images/navigation-rightturn-light@2x.png Binary files differindex 58f04b5052..58f04b5052 100644 --- a/examples/quickcontrols/wearable/qml/Navigation/images/rightturn-light@2x.png +++ b/examples/quickcontrols/wearable/Wearable/images/navigation-rightturn-light@2x.png diff --git a/examples/quickcontrols/wearable/qml/Navigation/images/start.png b/examples/quickcontrols/wearable/Wearable/images/navigation-start.png Binary files differindex 41de60e60c..41de60e60c 100644 --- a/examples/quickcontrols/wearable/qml/Navigation/images/start.png +++ b/examples/quickcontrols/wearable/Wearable/images/navigation-start.png diff --git a/examples/quickcontrols/wearable/qml/Navigation/images/start@2x.png b/examples/quickcontrols/wearable/Wearable/images/navigation-start@2x.png Binary files differindex 6fe3ba9dbd..6fe3ba9dbd 100644 --- a/examples/quickcontrols/wearable/qml/Navigation/images/start@2x.png +++ b/examples/quickcontrols/wearable/Wearable/images/navigation-start@2x.png diff --git a/examples/quickcontrols/wearable/qml/Navigation/images/straight-dark.png b/examples/quickcontrols/wearable/Wearable/images/navigation-straight-dark.png Binary files differindex 3f4ab66430..3f4ab66430 100644 --- a/examples/quickcontrols/wearable/qml/Navigation/images/straight-dark.png +++ b/examples/quickcontrols/wearable/Wearable/images/navigation-straight-dark.png diff --git a/examples/quickcontrols/wearable/qml/Navigation/images/straight-dark@2x.png b/examples/quickcontrols/wearable/Wearable/images/navigation-straight-dark@2x.png Binary files differindex f5baa6da42..f5baa6da42 100644 --- a/examples/quickcontrols/wearable/qml/Navigation/images/straight-dark@2x.png +++ b/examples/quickcontrols/wearable/Wearable/images/navigation-straight-dark@2x.png diff --git a/examples/quickcontrols/wearable/qml/Navigation/images/straight-light.png b/examples/quickcontrols/wearable/Wearable/images/navigation-straight-light.png Binary files differindex 1321b97aa5..1321b97aa5 100644 --- a/examples/quickcontrols/wearable/qml/Navigation/images/straight-light.png +++ b/examples/quickcontrols/wearable/Wearable/images/navigation-straight-light.png diff --git a/examples/quickcontrols/wearable/qml/Navigation/images/straight-light@2x.png b/examples/quickcontrols/wearable/Wearable/images/navigation-straight-light@2x.png Binary files differindex a2d3c4c2ab..a2d3c4c2ab 100644 --- a/examples/quickcontrols/wearable/qml/Navigation/images/straight-light@2x.png +++ b/examples/quickcontrols/wearable/Wearable/images/navigation-straight-light@2x.png diff --git a/examples/quickcontrols/wearable/qml/Navigation/images/uturn.png b/examples/quickcontrols/wearable/Wearable/images/navigation-uturn.png Binary files differindex 596046ca9a..596046ca9a 100644 --- a/examples/quickcontrols/wearable/qml/Navigation/images/uturn.png +++ b/examples/quickcontrols/wearable/Wearable/images/navigation-uturn.png diff --git a/examples/quickcontrols/wearable/qml/Navigation/images/uturn@2x.png b/examples/quickcontrols/wearable/Wearable/images/navigation-uturn@2x.png Binary files differindex 659f103573..659f103573 100644 --- a/examples/quickcontrols/wearable/qml/Navigation/images/uturn@2x.png +++ b/examples/quickcontrols/wearable/Wearable/images/navigation-uturn@2x.png diff --git a/examples/quickcontrols/wearable/qml/Notifications/images/avatarf-dark.png b/examples/quickcontrols/wearable/Wearable/images/notifications-avatarf-dark.png Binary files differindex 37bc1f291b..37bc1f291b 100644 --- a/examples/quickcontrols/wearable/qml/Notifications/images/avatarf-dark.png +++ b/examples/quickcontrols/wearable/Wearable/images/notifications-avatarf-dark.png diff --git a/examples/quickcontrols/wearable/qml/Notifications/images/avatarf-dark@2x.png b/examples/quickcontrols/wearable/Wearable/images/notifications-avatarf-dark@2x.png Binary files differindex efcd7cba74..efcd7cba74 100644 --- a/examples/quickcontrols/wearable/qml/Notifications/images/avatarf-dark@2x.png +++ b/examples/quickcontrols/wearable/Wearable/images/notifications-avatarf-dark@2x.png diff --git a/examples/quickcontrols/wearable/qml/Notifications/images/avatarf-light.png b/examples/quickcontrols/wearable/Wearable/images/notifications-avatarf-light.png Binary files differindex e38b260724..e38b260724 100644 --- a/examples/quickcontrols/wearable/qml/Notifications/images/avatarf-light.png +++ b/examples/quickcontrols/wearable/Wearable/images/notifications-avatarf-light.png diff --git a/examples/quickcontrols/wearable/qml/Notifications/images/avatarf-light@2x.png b/examples/quickcontrols/wearable/Wearable/images/notifications-avatarf-light@2x.png Binary files differindex 1f28beac6c..1f28beac6c 100644 --- a/examples/quickcontrols/wearable/qml/Notifications/images/avatarf-light@2x.png +++ b/examples/quickcontrols/wearable/Wearable/images/notifications-avatarf-light@2x.png diff --git a/examples/quickcontrols/wearable/qml/Notifications/images/avatarm-dark.png b/examples/quickcontrols/wearable/Wearable/images/notifications-avatarm-dark.png Binary files differindex 5a2a394d8c..5a2a394d8c 100644 --- a/examples/quickcontrols/wearable/qml/Notifications/images/avatarm-dark.png +++ b/examples/quickcontrols/wearable/Wearable/images/notifications-avatarm-dark.png diff --git a/examples/quickcontrols/wearable/qml/Notifications/images/avatarm-dark@2x.png b/examples/quickcontrols/wearable/Wearable/images/notifications-avatarm-dark@2x.png Binary files differindex 1a19b0fc8e..1a19b0fc8e 100644 --- a/examples/quickcontrols/wearable/qml/Notifications/images/avatarm-dark@2x.png +++ b/examples/quickcontrols/wearable/Wearable/images/notifications-avatarm-dark@2x.png diff --git a/examples/quickcontrols/wearable/qml/Notifications/images/avatarm-light.png b/examples/quickcontrols/wearable/Wearable/images/notifications-avatarm-light.png Binary files differindex f0fc7a9606..f0fc7a9606 100644 --- a/examples/quickcontrols/wearable/qml/Notifications/images/avatarm-light.png +++ b/examples/quickcontrols/wearable/Wearable/images/notifications-avatarm-light.png diff --git a/examples/quickcontrols/wearable/qml/Notifications/images/avatarm-light@2x.png b/examples/quickcontrols/wearable/Wearable/images/notifications-avatarm-light@2x.png Binary files differindex 64a0f1f9ac..64a0f1f9ac 100644 --- a/examples/quickcontrols/wearable/qml/Notifications/images/avatarm-light@2x.png +++ b/examples/quickcontrols/wearable/Wearable/images/notifications-avatarm-light@2x.png diff --git a/examples/quickcontrols/wearable/qml/Notifications/images/missedcall-dark.png b/examples/quickcontrols/wearable/Wearable/images/notifications-missedcall-dark.png Binary files differindex 26bcf98ad3..26bcf98ad3 100644 --- a/examples/quickcontrols/wearable/qml/Notifications/images/missedcall-dark.png +++ b/examples/quickcontrols/wearable/Wearable/images/notifications-missedcall-dark.png diff --git a/examples/quickcontrols/wearable/qml/Notifications/images/missedcall-dark@2x.png b/examples/quickcontrols/wearable/Wearable/images/notifications-missedcall-dark@2x.png Binary files differindex 5eb54ce809..5eb54ce809 100644 --- a/examples/quickcontrols/wearable/qml/Notifications/images/missedcall-dark@2x.png +++ b/examples/quickcontrols/wearable/Wearable/images/notifications-missedcall-dark@2x.png diff --git a/examples/quickcontrols/wearable/qml/Notifications/images/missedcall-light.png b/examples/quickcontrols/wearable/Wearable/images/notifications-missedcall-light.png Binary files differindex 641e1f0c43..641e1f0c43 100644 --- a/examples/quickcontrols/wearable/qml/Notifications/images/missedcall-light.png +++ b/examples/quickcontrols/wearable/Wearable/images/notifications-missedcall-light.png diff --git a/examples/quickcontrols/wearable/qml/Notifications/images/missedcall-light@2x.png b/examples/quickcontrols/wearable/Wearable/images/notifications-missedcall-light@2x.png Binary files differindex e8d2d81c9a..e8d2d81c9a 100644 --- a/examples/quickcontrols/wearable/qml/Notifications/images/missedcall-light@2x.png +++ b/examples/quickcontrols/wearable/Wearable/images/notifications-missedcall-light@2x.png diff --git a/examples/quickcontrols/wearable/qml/Settings/images/bluetooth-dark.png b/examples/quickcontrols/wearable/Wearable/images/settings-bluetooth-dark.png Binary files differindex 0f1f4d0a54..0f1f4d0a54 100644 --- a/examples/quickcontrols/wearable/qml/Settings/images/bluetooth-dark.png +++ b/examples/quickcontrols/wearable/Wearable/images/settings-bluetooth-dark.png diff --git a/examples/quickcontrols/wearable/qml/Settings/images/bluetooth-dark@2x.png b/examples/quickcontrols/wearable/Wearable/images/settings-bluetooth-dark@2x.png Binary files differindex 7496fc5685..7496fc5685 100644 --- a/examples/quickcontrols/wearable/qml/Settings/images/bluetooth-dark@2x.png +++ b/examples/quickcontrols/wearable/Wearable/images/settings-bluetooth-dark@2x.png diff --git a/examples/quickcontrols/wearable/qml/Settings/images/bluetooth-light.png b/examples/quickcontrols/wearable/Wearable/images/settings-bluetooth-light.png Binary files differindex 6e297cfab3..6e297cfab3 100644 --- a/examples/quickcontrols/wearable/qml/Settings/images/bluetooth-light.png +++ b/examples/quickcontrols/wearable/Wearable/images/settings-bluetooth-light.png diff --git a/examples/quickcontrols/wearable/qml/Settings/images/bluetooth-light@2x.png b/examples/quickcontrols/wearable/Wearable/images/settings-bluetooth-light@2x.png Binary files differindex 62d084032f..62d084032f 100644 --- a/examples/quickcontrols/wearable/qml/Settings/images/bluetooth-light@2x.png +++ b/examples/quickcontrols/wearable/Wearable/images/settings-bluetooth-light@2x.png diff --git a/examples/quickcontrols/wearable/qml/Settings/images/brightness-dark.png b/examples/quickcontrols/wearable/Wearable/images/settings-brightness-dark.png Binary files differindex f9eb07b583..f9eb07b583 100644 --- a/examples/quickcontrols/wearable/qml/Settings/images/brightness-dark.png +++ b/examples/quickcontrols/wearable/Wearable/images/settings-brightness-dark.png diff --git a/examples/quickcontrols/wearable/qml/Settings/images/brightness-dark@2x.png b/examples/quickcontrols/wearable/Wearable/images/settings-brightness-dark@2x.png Binary files differindex 3efc5a6c4b..3efc5a6c4b 100644 --- a/examples/quickcontrols/wearable/qml/Settings/images/brightness-dark@2x.png +++ b/examples/quickcontrols/wearable/Wearable/images/settings-brightness-dark@2x.png diff --git a/examples/quickcontrols/wearable/qml/Settings/images/brightness-light.png b/examples/quickcontrols/wearable/Wearable/images/settings-brightness-light.png Binary files differindex ce3023b565..ce3023b565 100644 --- a/examples/quickcontrols/wearable/qml/Settings/images/brightness-light.png +++ b/examples/quickcontrols/wearable/Wearable/images/settings-brightness-light.png diff --git a/examples/quickcontrols/wearable/qml/Settings/images/brightness-light@2x.png b/examples/quickcontrols/wearable/Wearable/images/settings-brightness-light@2x.png Binary files differindex dc01aae1fd..dc01aae1fd 100644 --- a/examples/quickcontrols/wearable/qml/Settings/images/brightness-light@2x.png +++ b/examples/quickcontrols/wearable/Wearable/images/settings-brightness-light@2x.png diff --git a/examples/quickcontrols/wearable/qml/Settings/images/demo-mode-dark.png b/examples/quickcontrols/wearable/Wearable/images/settings-demo-mode-dark.png Binary files differindex e93c417d79..e93c417d79 100644 --- a/examples/quickcontrols/wearable/qml/Settings/images/demo-mode-dark.png +++ b/examples/quickcontrols/wearable/Wearable/images/settings-demo-mode-dark.png diff --git a/examples/quickcontrols/wearable/qml/Settings/images/demo-mode-dark@2x.png b/examples/quickcontrols/wearable/Wearable/images/settings-demo-mode-dark@2x.png Binary files differindex faa1bf6d11..faa1bf6d11 100644 --- a/examples/quickcontrols/wearable/qml/Settings/images/demo-mode-dark@2x.png +++ b/examples/quickcontrols/wearable/Wearable/images/settings-demo-mode-dark@2x.png diff --git a/examples/quickcontrols/wearable/qml/Settings/images/demo-mode-light.png b/examples/quickcontrols/wearable/Wearable/images/settings-demo-mode-light.png Binary files differindex c38d146d37..c38d146d37 100644 --- a/examples/quickcontrols/wearable/qml/Settings/images/demo-mode-light.png +++ b/examples/quickcontrols/wearable/Wearable/images/settings-demo-mode-light.png diff --git a/examples/quickcontrols/wearable/qml/Settings/images/demo-mode-light@2x.png b/examples/quickcontrols/wearable/Wearable/images/settings-demo-mode-light@2x.png Binary files differindex b9d6409cbc..b9d6409cbc 100644 --- a/examples/quickcontrols/wearable/qml/Settings/images/demo-mode-light@2x.png +++ b/examples/quickcontrols/wearable/Wearable/images/settings-demo-mode-light@2x.png diff --git a/examples/quickcontrols/wearable/qml/Settings/images/demo-mode-white.png b/examples/quickcontrols/wearable/Wearable/images/settings-demo-mode-white.png Binary files differindex aac8ef3f6c..aac8ef3f6c 100644 --- a/examples/quickcontrols/wearable/qml/Settings/images/demo-mode-white.png +++ b/examples/quickcontrols/wearable/Wearable/images/settings-demo-mode-white.png diff --git a/examples/quickcontrols/wearable/qml/Settings/images/demo-mode-white@2x.png b/examples/quickcontrols/wearable/Wearable/images/settings-demo-mode-white@2x.png Binary files differindex b4d8954f5d..b4d8954f5d 100644 --- a/examples/quickcontrols/wearable/qml/Settings/images/demo-mode-white@2x.png +++ b/examples/quickcontrols/wearable/Wearable/images/settings-demo-mode-white@2x.png diff --git a/examples/quickcontrols/wearable/qml/Settings/images/demo-mode.svg b/examples/quickcontrols/wearable/Wearable/images/settings-demo-mode.svg index ad1ce44873..ad1ce44873 100644 --- a/examples/quickcontrols/wearable/qml/Settings/images/demo-mode.svg +++ b/examples/quickcontrols/wearable/Wearable/images/settings-demo-mode.svg diff --git a/examples/quickcontrols/wearable/qml/Settings/images/theme-dark.png b/examples/quickcontrols/wearable/Wearable/images/settings-theme-dark.png Binary files differindex d4c4a8c094..d4c4a8c094 100644 --- a/examples/quickcontrols/wearable/qml/Settings/images/theme-dark.png +++ b/examples/quickcontrols/wearable/Wearable/images/settings-theme-dark.png diff --git a/examples/quickcontrols/wearable/qml/Settings/images/theme-dark@2x.png b/examples/quickcontrols/wearable/Wearable/images/settings-theme-dark@2x.png Binary files differindex 30d8c6de28..30d8c6de28 100644 --- a/examples/quickcontrols/wearable/qml/Settings/images/theme-dark@2x.png +++ b/examples/quickcontrols/wearable/Wearable/images/settings-theme-dark@2x.png diff --git a/examples/quickcontrols/wearable/qml/Settings/images/theme-light.png b/examples/quickcontrols/wearable/Wearable/images/settings-theme-light.png Binary files differindex e7a0771b94..e7a0771b94 100644 --- a/examples/quickcontrols/wearable/qml/Settings/images/theme-light.png +++ b/examples/quickcontrols/wearable/Wearable/images/settings-theme-light.png diff --git a/examples/quickcontrols/wearable/qml/Settings/images/theme-light@2x.png b/examples/quickcontrols/wearable/Wearable/images/settings-theme-light@2x.png Binary files differindex 83bc878b03..83bc878b03 100644 --- a/examples/quickcontrols/wearable/qml/Settings/images/theme-light@2x.png +++ b/examples/quickcontrols/wearable/Wearable/images/settings-theme-light@2x.png diff --git a/examples/quickcontrols/wearable/qml/Settings/images/theme.svg b/examples/quickcontrols/wearable/Wearable/images/settings-theme.svg index bf3f1e57d7..bf3f1e57d7 100644 --- a/examples/quickcontrols/wearable/qml/Settings/images/theme.svg +++ b/examples/quickcontrols/wearable/Wearable/images/settings-theme.svg diff --git a/examples/quickcontrols/wearable/qml/Settings/images/wifi-dark.png b/examples/quickcontrols/wearable/Wearable/images/settings-wifi-dark.png Binary files differindex 14bfe8f5c8..14bfe8f5c8 100644 --- a/examples/quickcontrols/wearable/qml/Settings/images/wifi-dark.png +++ b/examples/quickcontrols/wearable/Wearable/images/settings-wifi-dark.png diff --git a/examples/quickcontrols/wearable/qml/Settings/images/wifi-dark@2x.png b/examples/quickcontrols/wearable/Wearable/images/settings-wifi-dark@2x.png Binary files differindex b70d04290b..b70d04290b 100644 --- a/examples/quickcontrols/wearable/qml/Settings/images/wifi-dark@2x.png +++ b/examples/quickcontrols/wearable/Wearable/images/settings-wifi-dark@2x.png diff --git a/examples/quickcontrols/wearable/qml/Settings/images/wifi-light.png b/examples/quickcontrols/wearable/Wearable/images/settings-wifi-light.png Binary files differindex 2de34118a7..2de34118a7 100644 --- a/examples/quickcontrols/wearable/qml/Settings/images/wifi-light.png +++ b/examples/quickcontrols/wearable/Wearable/images/settings-wifi-light.png diff --git a/examples/quickcontrols/wearable/qml/Settings/images/wifi-light@2x.png b/examples/quickcontrols/wearable/Wearable/images/settings-wifi-light@2x.png Binary files differindex 64b5f1725c..64b5f1725c 100644 --- a/examples/quickcontrols/wearable/qml/Settings/images/wifi-light@2x.png +++ b/examples/quickcontrols/wearable/Wearable/images/settings-wifi-light@2x.png diff --git a/examples/quickcontrols/wearable/qml/Weather/images/humidity-dark.png b/examples/quickcontrols/wearable/Wearable/images/weather-humidity-dark.png Binary files differindex 5d82238cdb..5d82238cdb 100644 --- a/examples/quickcontrols/wearable/qml/Weather/images/humidity-dark.png +++ b/examples/quickcontrols/wearable/Wearable/images/weather-humidity-dark.png diff --git a/examples/quickcontrols/wearable/qml/Weather/images/humidity-dark@2x.png b/examples/quickcontrols/wearable/Wearable/images/weather-humidity-dark@2x.png Binary files differindex d83bb4f00c..d83bb4f00c 100644 --- a/examples/quickcontrols/wearable/qml/Weather/images/humidity-dark@2x.png +++ b/examples/quickcontrols/wearable/Wearable/images/weather-humidity-dark@2x.png diff --git a/examples/quickcontrols/wearable/qml/Weather/images/humidity-light.png b/examples/quickcontrols/wearable/Wearable/images/weather-humidity-light.png Binary files differindex 5f3bf714e6..5f3bf714e6 100644 --- a/examples/quickcontrols/wearable/qml/Weather/images/humidity-light.png +++ b/examples/quickcontrols/wearable/Wearable/images/weather-humidity-light.png diff --git a/examples/quickcontrols/wearable/qml/Weather/images/humidity-light@2x.png b/examples/quickcontrols/wearable/Wearable/images/weather-humidity-light@2x.png Binary files differindex a23364c52c..a23364c52c 100644 --- a/examples/quickcontrols/wearable/qml/Weather/images/humidity-light@2x.png +++ b/examples/quickcontrols/wearable/Wearable/images/weather-humidity-light@2x.png diff --git a/examples/quickcontrols/wearable/qml/Weather/images/pressure-dark.png b/examples/quickcontrols/wearable/Wearable/images/weather-pressure-dark.png Binary files differindex b2870a55a6..b2870a55a6 100644 --- a/examples/quickcontrols/wearable/qml/Weather/images/pressure-dark.png +++ b/examples/quickcontrols/wearable/Wearable/images/weather-pressure-dark.png diff --git a/examples/quickcontrols/wearable/qml/Weather/images/pressure-dark@2x.png b/examples/quickcontrols/wearable/Wearable/images/weather-pressure-dark@2x.png Binary files differindex 061f9b8266..061f9b8266 100644 --- a/examples/quickcontrols/wearable/qml/Weather/images/pressure-dark@2x.png +++ b/examples/quickcontrols/wearable/Wearable/images/weather-pressure-dark@2x.png diff --git a/examples/quickcontrols/wearable/qml/Weather/images/pressure-light.png b/examples/quickcontrols/wearable/Wearable/images/weather-pressure-light.png Binary files differindex 7b1b158734..7b1b158734 100644 --- a/examples/quickcontrols/wearable/qml/Weather/images/pressure-light.png +++ b/examples/quickcontrols/wearable/Wearable/images/weather-pressure-light.png diff --git a/examples/quickcontrols/wearable/qml/Weather/images/pressure-light@2x.png b/examples/quickcontrols/wearable/Wearable/images/weather-pressure-light@2x.png Binary files differindex 1a40c6422a..1a40c6422a 100644 --- a/examples/quickcontrols/wearable/qml/Weather/images/pressure-light@2x.png +++ b/examples/quickcontrols/wearable/Wearable/images/weather-pressure-light@2x.png diff --git a/examples/quickcontrols/wearable/qml/Weather/images/sunrise-dark.png b/examples/quickcontrols/wearable/Wearable/images/weather-sunrise-dark.png Binary files differindex 9cac22e1e1..9cac22e1e1 100644 --- a/examples/quickcontrols/wearable/qml/Weather/images/sunrise-dark.png +++ b/examples/quickcontrols/wearable/Wearable/images/weather-sunrise-dark.png diff --git a/examples/quickcontrols/wearable/qml/Weather/images/sunrise-dark@2x.png b/examples/quickcontrols/wearable/Wearable/images/weather-sunrise-dark@2x.png Binary files differindex fe32682386b..fe32682386b 100644 --- a/examples/quickcontrols/wearable/qml/Weather/images/sunrise-dark@2x.png +++ b/examples/quickcontrols/wearable/Wearable/images/weather-sunrise-dark@2x.png diff --git a/examples/quickcontrols/wearable/qml/Weather/images/sunrise-light.png b/examples/quickcontrols/wearable/Wearable/images/weather-sunrise-light.png Binary files differindex f67a5dff34..f67a5dff34 100644 --- a/examples/quickcontrols/wearable/qml/Weather/images/sunrise-light.png +++ b/examples/quickcontrols/wearable/Wearable/images/weather-sunrise-light.png diff --git a/examples/quickcontrols/wearable/qml/Weather/images/sunrise-light@2x.png b/examples/quickcontrols/wearable/Wearable/images/weather-sunrise-light@2x.png Binary files differindex 86f5483761..86f5483761 100644 --- a/examples/quickcontrols/wearable/qml/Weather/images/sunrise-light@2x.png +++ b/examples/quickcontrols/wearable/Wearable/images/weather-sunrise-light@2x.png diff --git a/examples/quickcontrols/wearable/qml/Weather/images/sunset-dark.png b/examples/quickcontrols/wearable/Wearable/images/weather-sunset-dark.png Binary files differindex 0068d30539..0068d30539 100644 --- a/examples/quickcontrols/wearable/qml/Weather/images/sunset-dark.png +++ b/examples/quickcontrols/wearable/Wearable/images/weather-sunset-dark.png diff --git a/examples/quickcontrols/wearable/qml/Weather/images/sunset-dark@2x.png b/examples/quickcontrols/wearable/Wearable/images/weather-sunset-dark@2x.png Binary files differindex e515bcc37c..e515bcc37c 100644 --- a/examples/quickcontrols/wearable/qml/Weather/images/sunset-dark@2x.png +++ b/examples/quickcontrols/wearable/Wearable/images/weather-sunset-dark@2x.png diff --git a/examples/quickcontrols/wearable/qml/Weather/images/sunset-light.png b/examples/quickcontrols/wearable/Wearable/images/weather-sunset-light.png Binary files differindex 495f78a786..495f78a786 100644 --- a/examples/quickcontrols/wearable/qml/Weather/images/sunset-light.png +++ b/examples/quickcontrols/wearable/Wearable/images/weather-sunset-light.png diff --git a/examples/quickcontrols/wearable/qml/Weather/images/sunset-light@2x.png b/examples/quickcontrols/wearable/Wearable/images/weather-sunset-light@2x.png Binary files differindex d220e829d1..d220e829d1 100644 --- a/examples/quickcontrols/wearable/qml/Weather/images/sunset-light@2x.png +++ b/examples/quickcontrols/wearable/Wearable/images/weather-sunset-light@2x.png diff --git a/examples/quickcontrols/wearable/qml/Weather/images/temperature-dark.png b/examples/quickcontrols/wearable/Wearable/images/weather-temperature-dark.png Binary files differindex a207d9440d..a207d9440d 100644 --- a/examples/quickcontrols/wearable/qml/Weather/images/temperature-dark.png +++ b/examples/quickcontrols/wearable/Wearable/images/weather-temperature-dark.png diff --git a/examples/quickcontrols/wearable/qml/Weather/images/temperature-dark@2x.png b/examples/quickcontrols/wearable/Wearable/images/weather-temperature-dark@2x.png Binary files differindex c0e4ef39bf..c0e4ef39bf 100644 --- a/examples/quickcontrols/wearable/qml/Weather/images/temperature-dark@2x.png +++ b/examples/quickcontrols/wearable/Wearable/images/weather-temperature-dark@2x.png diff --git a/examples/quickcontrols/wearable/qml/Weather/images/temperature-light.png b/examples/quickcontrols/wearable/Wearable/images/weather-temperature-light.png Binary files differindex c4f7b61c2e..c4f7b61c2e 100644 --- a/examples/quickcontrols/wearable/qml/Weather/images/temperature-light.png +++ b/examples/quickcontrols/wearable/Wearable/images/weather-temperature-light.png diff --git a/examples/quickcontrols/wearable/qml/Weather/images/temperature-light@2x.png b/examples/quickcontrols/wearable/Wearable/images/weather-temperature-light@2x.png Binary files differindex 50d4f4c43c..50d4f4c43c 100644 --- a/examples/quickcontrols/wearable/qml/Weather/images/temperature-light@2x.png +++ b/examples/quickcontrols/wearable/Wearable/images/weather-temperature-light@2x.png diff --git a/examples/quickcontrols/wearable/qml/Weather/images/wind-dark.png b/examples/quickcontrols/wearable/Wearable/images/weather-wind-dark.png Binary files differindex 6a530491af..6a530491af 100644 --- a/examples/quickcontrols/wearable/qml/Weather/images/wind-dark.png +++ b/examples/quickcontrols/wearable/Wearable/images/weather-wind-dark.png diff --git a/examples/quickcontrols/wearable/qml/Weather/images/wind-dark@2x.png b/examples/quickcontrols/wearable/Wearable/images/weather-wind-dark@2x.png Binary files differindex 487e3e78a3..487e3e78a3 100644 --- a/examples/quickcontrols/wearable/qml/Weather/images/wind-dark@2x.png +++ b/examples/quickcontrols/wearable/Wearable/images/weather-wind-dark@2x.png diff --git a/examples/quickcontrols/wearable/qml/Weather/images/wind-light.png b/examples/quickcontrols/wearable/Wearable/images/weather-wind-light.png Binary files differindex 97824bee8f..97824bee8f 100644 --- a/examples/quickcontrols/wearable/qml/Weather/images/wind-light.png +++ b/examples/quickcontrols/wearable/Wearable/images/weather-wind-light.png diff --git a/examples/quickcontrols/wearable/qml/Weather/images/wind-light@2x.png b/examples/quickcontrols/wearable/Wearable/images/weather-wind-light@2x.png Binary files differindex 7f94bd8542..7f94bd8542 100644 --- a/examples/quickcontrols/wearable/qml/Weather/images/wind-light@2x.png +++ b/examples/quickcontrols/wearable/Wearable/images/weather-wind-light@2x.png diff --git a/examples/quickcontrols/wearable/qml/WorldClock/images/center.png b/examples/quickcontrols/wearable/Wearable/images/world-clock-center.png Binary files differindex 0dec43a0aa..0dec43a0aa 100644 --- a/examples/quickcontrols/wearable/qml/WorldClock/images/center.png +++ b/examples/quickcontrols/wearable/Wearable/images/world-clock-center.png diff --git a/examples/quickcontrols/wearable/qml/WorldClock/images/center@2x.png b/examples/quickcontrols/wearable/Wearable/images/world-clock-center@2x.png Binary files differindex dffc5d60e4..dffc5d60e4 100644 --- a/examples/quickcontrols/wearable/qml/WorldClock/images/center@2x.png +++ b/examples/quickcontrols/wearable/Wearable/images/world-clock-center@2x.png diff --git a/examples/quickcontrols/wearable/qml/WorldClock/images/clock-night.png b/examples/quickcontrols/wearable/Wearable/images/world-clock-clock-night.png Binary files differindex 2de330243a..2de330243a 100644 --- a/examples/quickcontrols/wearable/qml/WorldClock/images/clock-night.png +++ b/examples/quickcontrols/wearable/Wearable/images/world-clock-clock-night.png diff --git a/examples/quickcontrols/wearable/qml/WorldClock/images/clock-night@2x.png b/examples/quickcontrols/wearable/Wearable/images/world-clock-clock-night@2x.png Binary files differindex f675acea69..f675acea69 100644 --- a/examples/quickcontrols/wearable/qml/WorldClock/images/clock-night@2x.png +++ b/examples/quickcontrols/wearable/Wearable/images/world-clock-clock-night@2x.png diff --git a/examples/quickcontrols/wearable/qml/WorldClock/images/clock.png b/examples/quickcontrols/wearable/Wearable/images/world-clock-clock.png Binary files differindex 686fb8c2f7..686fb8c2f7 100644 --- a/examples/quickcontrols/wearable/qml/WorldClock/images/clock.png +++ b/examples/quickcontrols/wearable/Wearable/images/world-clock-clock.png diff --git a/examples/quickcontrols/wearable/qml/WorldClock/images/second.png b/examples/quickcontrols/wearable/Wearable/images/world-clock-second.png Binary files differindex 1e64f357df..1e64f357df 100644 --- a/examples/quickcontrols/wearable/qml/WorldClock/images/second.png +++ b/examples/quickcontrols/wearable/Wearable/images/world-clock-second.png diff --git a/examples/quickcontrols/wearable/qml/WorldClock/images/second@2x.png b/examples/quickcontrols/wearable/Wearable/images/world-clock-second@2x.png Binary files differindex cebc1deb06..cebc1deb06 100644 --- a/examples/quickcontrols/wearable/qml/WorldClock/images/second@2x.png +++ b/examples/quickcontrols/wearable/Wearable/images/world-clock-second@2x.png diff --git a/examples/quickcontrols/wearable/qml/WorldClock/images/swissdaydial.png b/examples/quickcontrols/wearable/Wearable/images/world-clock-swissdaydial.png Binary files differindex 0e6321537a..0e6321537a 100644 --- a/examples/quickcontrols/wearable/qml/WorldClock/images/swissdaydial.png +++ b/examples/quickcontrols/wearable/Wearable/images/world-clock-swissdaydial.png diff --git a/examples/quickcontrols/wearable/qml/WorldClock/images/swissdaydial@2x.png b/examples/quickcontrols/wearable/Wearable/images/world-clock-swissdaydial@2x.png Binary files differindex ed5de8c646..ed5de8c646 100644 --- a/examples/quickcontrols/wearable/qml/WorldClock/images/swissdaydial@2x.png +++ b/examples/quickcontrols/wearable/Wearable/images/world-clock-swissdaydial@2x.png diff --git a/examples/quickcontrols/wearable/qml/WorldClock/images/swissdayhour.png b/examples/quickcontrols/wearable/Wearable/images/world-clock-swissdayhour.png Binary files differindex 4a835ac3f0..4a835ac3f0 100644 --- a/examples/quickcontrols/wearable/qml/WorldClock/images/swissdayhour.png +++ b/examples/quickcontrols/wearable/Wearable/images/world-clock-swissdayhour.png diff --git a/examples/quickcontrols/wearable/qml/WorldClock/images/swissdayhour@2x.png b/examples/quickcontrols/wearable/Wearable/images/world-clock-swissdayhour@2x.png Binary files differindex 70f3fa0eee..70f3fa0eee 100644 --- a/examples/quickcontrols/wearable/qml/WorldClock/images/swissdayhour@2x.png +++ b/examples/quickcontrols/wearable/Wearable/images/world-clock-swissdayhour@2x.png diff --git a/examples/quickcontrols/wearable/qml/WorldClock/images/swissdayminute.png b/examples/quickcontrols/wearable/Wearable/images/world-clock-swissdayminute.png Binary files differindex 048acc7b3f..048acc7b3f 100644 --- a/examples/quickcontrols/wearable/qml/WorldClock/images/swissdayminute.png +++ b/examples/quickcontrols/wearable/Wearable/images/world-clock-swissdayminute.png diff --git a/examples/quickcontrols/wearable/qml/WorldClock/images/swissdayminute@2x.png b/examples/quickcontrols/wearable/Wearable/images/world-clock-swissdayminute@2x.png Binary files differindex 4cc6ce64b4..4cc6ce64b4 100644 --- a/examples/quickcontrols/wearable/qml/WorldClock/images/swissdayminute@2x.png +++ b/examples/quickcontrols/wearable/Wearable/images/world-clock-swissdayminute@2x.png diff --git a/examples/quickcontrols/wearable/qml/WorldClock/images/swissnightdial.png b/examples/quickcontrols/wearable/Wearable/images/world-clock-swissnightdial.png Binary files differindex ee5a15bb9b..ee5a15bb9b 100644 --- a/examples/quickcontrols/wearable/qml/WorldClock/images/swissnightdial.png +++ b/examples/quickcontrols/wearable/Wearable/images/world-clock-swissnightdial.png diff --git a/examples/quickcontrols/wearable/qml/WorldClock/images/swissnightdial@2x.png b/examples/quickcontrols/wearable/Wearable/images/world-clock-swissnightdial@2x.png Binary files differindex ec7e5c77dc..ec7e5c77dc 100644 --- a/examples/quickcontrols/wearable/qml/WorldClock/images/swissnightdial@2x.png +++ b/examples/quickcontrols/wearable/Wearable/images/world-clock-swissnightdial@2x.png diff --git a/examples/quickcontrols/wearable/qml/WorldClock/images/swissnighthour.png b/examples/quickcontrols/wearable/Wearable/images/world-clock-swissnighthour.png Binary files differindex c5b41cb043..c5b41cb043 100644 --- a/examples/quickcontrols/wearable/qml/WorldClock/images/swissnighthour.png +++ b/examples/quickcontrols/wearable/Wearable/images/world-clock-swissnighthour.png diff --git a/examples/quickcontrols/wearable/qml/WorldClock/images/swissnighthour@2x.png b/examples/quickcontrols/wearable/Wearable/images/world-clock-swissnighthour@2x.png Binary files differindex bbbc36f1d7..bbbc36f1d7 100644 --- a/examples/quickcontrols/wearable/qml/WorldClock/images/swissnighthour@2x.png +++ b/examples/quickcontrols/wearable/Wearable/images/world-clock-swissnighthour@2x.png diff --git a/examples/quickcontrols/wearable/qml/WorldClock/images/swissnightminute.png b/examples/quickcontrols/wearable/Wearable/images/world-clock-swissnightminute.png Binary files differindex 026c742446..026c742446 100644 --- a/examples/quickcontrols/wearable/qml/WorldClock/images/swissnightminute.png +++ b/examples/quickcontrols/wearable/Wearable/images/world-clock-swissnightminute.png diff --git a/examples/quickcontrols/wearable/qml/WorldClock/images/swissnightminute@2x.png b/examples/quickcontrols/wearable/Wearable/images/world-clock-swissnightminute@2x.png Binary files differindex 8ad69047a4..8ad69047a4 100644 --- a/examples/quickcontrols/wearable/qml/WorldClock/images/swissnightminute@2x.png +++ b/examples/quickcontrols/wearable/Wearable/images/world-clock-swissnightminute@2x.png diff --git a/examples/quickcontrols/wearable/qml/WorldClock/images/swissseconds.png b/examples/quickcontrols/wearable/Wearable/images/world-clock-swissseconds.png Binary files differindex 06446ac0fe..06446ac0fe 100644 --- a/examples/quickcontrols/wearable/qml/WorldClock/images/swissseconds.png +++ b/examples/quickcontrols/wearable/Wearable/images/world-clock-swissseconds.png diff --git a/examples/quickcontrols/wearable/qml/Navigation/navigation.js b/examples/quickcontrols/wearable/Wearable/navigation.js index e82cccbea5..e82cccbea5 100644 --- a/examples/quickcontrols/wearable/qml/Navigation/navigation.js +++ b/examples/quickcontrols/wearable/Wearable/navigation.js diff --git a/examples/quickcontrols/wearable/qml/Notifications/notifications.js b/examples/quickcontrols/wearable/Wearable/notifications.js index 62f46e0a0b..62f46e0a0b 100644 --- a/examples/quickcontrols/wearable/qml/Notifications/notifications.js +++ b/examples/quickcontrols/wearable/Wearable/notifications.js diff --git a/examples/quickcontrols/wearable/Wearable/qmldir b/examples/quickcontrols/wearable/Wearable/qmldir new file mode 100644 index 0000000000..1ce636ab6b --- /dev/null +++ b/examples/quickcontrols/wearable/Wearable/qmldir @@ -0,0 +1,19 @@ +# This file only exists for qmake. + +module Wearable +prefer :/qt/qml/Wearable/ +AlarmsPage 254.0 AlarmsPage.qml +Clock 254.0 Clock.qml +DemoMode 254.0 DemoMode.qml +DemoModeIndicator 254.0 DemoModeIndicator.qml +FitnessPage 254.0 FitnessPage.qml +LauncherPage 254.0 LauncherPage.qml +Main 254.0 Main.qml +NaviButton 254.0 NaviButton.qml +NavigationPage 254.0 NavigationPage.qml +NotificationsPage 254.0 NotificationsPage.qml +RouteElement 254.0 RouteElement.qml +SettingsPage 254.0 SettingsPage.qml +SwipeViewPage 254.0 SwipeViewPage.qml +WeatherPage 254.0 WeatherPage.qml +WorldClockPage 254.0 WorldClockPage.qml diff --git a/examples/quickcontrols/wearable/qml/Navigation/walk_route.json b/examples/quickcontrols/wearable/Wearable/walk_route.json index e69b5cc187..e69b5cc187 100644 --- a/examples/quickcontrols/wearable/qml/Navigation/walk_route.json +++ b/examples/quickcontrols/wearable/Wearable/walk_route.json diff --git a/examples/quickcontrols/wearable/qml/Weather/weather.js b/examples/quickcontrols/wearable/Wearable/weather.js index c08fd96e9e..c08fd96e9e 100644 --- a/examples/quickcontrols/wearable/qml/Weather/weather.js +++ b/examples/quickcontrols/wearable/Wearable/weather.js diff --git a/examples/quickcontrols/wearable/qml/Weather/weather.json b/examples/quickcontrols/wearable/Wearable/weather.json index 2cce95c60b..2cce95c60b 100644 --- a/examples/quickcontrols/wearable/qml/Weather/weather.json +++ b/examples/quickcontrols/wearable/Wearable/weather.json diff --git a/examples/quickcontrols/wearable/WearableSettings/CMakeLists.txt b/examples/quickcontrols/wearable/WearableSettings/CMakeLists.txt new file mode 100644 index 0000000000..ee5c7b4a38 --- /dev/null +++ b/examples/quickcontrols/wearable/WearableSettings/CMakeLists.txt @@ -0,0 +1,47 @@ +# Copyright (C) 2023 The Qt Company Ltd. +# SPDX-License-Identifier: BSD-3-Clause + +cmake_minimum_required(VERSION 3.16) +project(wearablesettings LANGUAGES CXX) + +set(CMAKE_AUTOMOC ON) + +if(NOT DEFINED INSTALL_EXAMPLESDIR) + set(INSTALL_EXAMPLESDIR "examples") +endif() + +set(INSTALL_EXAMPLEDIR "${INSTALL_EXAMPLESDIR}/quickcontrols/wearable/WearableSettings") + +find_package(Qt6 REQUIRED COMPONENTS Core Gui Quick QuickControls2) + +set_source_files_properties(WearableSettings.qml + PROPERTIES + QT_QML_SINGLETON_TYPE TRUE +) + +qt_policy(SET QTP0001 NEW) +qt_add_qml_module(wearablesettings + URI WearableSettings + QML_FILES + WearableSettings.qml +) + +target_link_libraries(wearablesettings PUBLIC + Qt6::Core + Qt6::Gui + Qt6::Quick + Qt6::QuickControls2 +) + +if(UNIX AND NOT APPLE AND CMAKE_CROSSCOMPILING) + find_package(Qt6 REQUIRED COMPONENTS QuickTemplates2) + + # Work around QTBUG-86533 + target_link_libraries(wearablesettings PRIVATE Qt6::QuickTemplates2) +endif() + +install(TARGETS wearablesettings + RUNTIME DESTINATION "${INSTALL_EXAMPLEDIR}" + BUNDLE DESTINATION "${INSTALL_EXAMPLEDIR}" + LIBRARY DESTINATION "${INSTALL_EXAMPLEDIR}" +) diff --git a/examples/quickcontrols/wearable/WearableSettings/WearableSettings.qml b/examples/quickcontrols/wearable/WearableSettings/WearableSettings.qml new file mode 100644 index 0000000000..bf47b3b6c8 --- /dev/null +++ b/examples/quickcontrols/wearable/WearableSettings/WearableSettings.qml @@ -0,0 +1,14 @@ +// Copyright (C) 2023 The Qt Company Ltd. +// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR LGPL-3.0-only OR GPL-2.0-only OR GPL-3.0-only + +pragma Singleton + +import QtCore + +Settings { + property bool wireless + property bool bluetooth + property int brightness + property bool darkTheme + property bool demoMode +} diff --git a/examples/quickcontrols/wearable/WearableSettings/qmldir b/examples/quickcontrols/wearable/WearableSettings/qmldir new file mode 100644 index 0000000000..b11b06ab0b --- /dev/null +++ b/examples/quickcontrols/wearable/WearableSettings/qmldir @@ -0,0 +1,5 @@ +# This file only exists for qmake. + +module WearableSettings +prefer :/qt/qml/WearableSettings/ +singleton WearableSettings 254.0 WearableSettings.qml diff --git a/examples/quickcontrols/wearable/WearableStyle/CMakeLists.txt b/examples/quickcontrols/wearable/WearableStyle/CMakeLists.txt new file mode 100644 index 0000000000..3479c67c4b --- /dev/null +++ b/examples/quickcontrols/wearable/WearableStyle/CMakeLists.txt @@ -0,0 +1,50 @@ +# Copyright (C) 2023 The Qt Company Ltd. +# SPDX-License-Identifier: BSD-3-Clause + +cmake_minimum_required(VERSION 3.16) +project(wearablestyle LANGUAGES CXX) + +set(CMAKE_AUTOMOC ON) + +if(NOT DEFINED INSTALL_EXAMPLESDIR) + set(INSTALL_EXAMPLESDIR "examples") +endif() + +set(INSTALL_EXAMPLEDIR "${INSTALL_EXAMPLESDIR}/quickcontrols/wearable/WearableStyle") + +find_package(Qt6 REQUIRED COMPONENTS Core Gui Quick QuickControls2) + +set_source_files_properties(UIStyle.qml + PROPERTIES + QT_QML_SINGLETON_TYPE TRUE +) + +qt_policy(SET QTP0001 NEW) +qt_add_qml_module(wearablestyle + URI WearableStyle + QML_FILES + PageIndicator.qml + Slider.qml + Switch.qml + UIStyle.qml +) + +target_link_libraries(wearablestyle PUBLIC + Qt6::Core + Qt6::Gui + Qt6::Quick + Qt6::QuickControls2 +) + +if(UNIX AND NOT APPLE AND CMAKE_CROSSCOMPILING) + find_package(Qt6 REQUIRED COMPONENTS QuickTemplates2) + + # Work around QTBUG-86533 + target_link_libraries(wearablestyle PRIVATE Qt6::QuickTemplates2) +endif() + +install(TARGETS wearablestyle + RUNTIME DESTINATION "${INSTALL_EXAMPLEDIR}" + BUNDLE DESTINATION "${INSTALL_EXAMPLEDIR}" + LIBRARY DESTINATION "${INSTALL_EXAMPLEDIR}" +) diff --git a/examples/quickcontrols/wearable/qml/Style/PageIndicator.qml b/examples/quickcontrols/wearable/WearableStyle/PageIndicator.qml index 593b50afb5..3a6eef8f96 100644 --- a/examples/quickcontrols/wearable/qml/Style/PageIndicator.qml +++ b/examples/quickcontrols/wearable/WearableStyle/PageIndicator.qml @@ -3,7 +3,6 @@ import QtQuick import QtQuick.Templates as T -import "." T.PageIndicator { id: control diff --git a/examples/quickcontrols/wearable/qml/Style/Slider.qml b/examples/quickcontrols/wearable/WearableStyle/Slider.qml index 79c664280f..526c4a537a 100644 --- a/examples/quickcontrols/wearable/qml/Style/Slider.qml +++ b/examples/quickcontrols/wearable/WearableStyle/Slider.qml @@ -3,7 +3,6 @@ import QtQuick import QtQuick.Templates as T -import "." T.Slider { id: control diff --git a/examples/quickcontrols/wearable/qml/Style/Switch.qml b/examples/quickcontrols/wearable/WearableStyle/Switch.qml index 6219bf231e..e27992436d 100644 --- a/examples/quickcontrols/wearable/qml/Style/Switch.qml +++ b/examples/quickcontrols/wearable/WearableStyle/Switch.qml @@ -3,7 +3,6 @@ import QtQuick import QtQuick.Templates as T -import "." T.Switch { id: control diff --git a/examples/quickcontrols/wearable/qml/Style/UIStyle.qml b/examples/quickcontrols/wearable/WearableStyle/UIStyle.qml index 524b8394f5..ff06bcaff4 100644 --- a/examples/quickcontrols/wearable/qml/Style/UIStyle.qml +++ b/examples/quickcontrols/wearable/WearableStyle/UIStyle.qml @@ -1,10 +1,11 @@ // Copyright (C) 2017 The Qt Company Ltd. // SPDX-License-Identifier: LicenseRef-Qt-Commercial OR BSD-3-Clause -import QtQuick - pragma Singleton +import QtQuick +import WearableSettings + QtObject { id: uiStyle @@ -41,20 +42,22 @@ QtObject { // Light/dark versions of the colors above. // Some UI elements always use a specific color regardless of theme, // which is why we have both sets: so that those elements don't need to hard-code the hex string. - readonly property color themeColorQtGray1: darkTheme ? colorQtGray10 : colorQtGray1 - readonly property color themeColorQtGray2: darkTheme ? colorQtGray9 : colorQtGray2 - readonly property color themeColorQtGray3: darkTheme ? colorQtGray8 : colorQtGray3 - readonly property color themeColorQtGray4: darkTheme ? colorQtGray7 : colorQtGray4 - readonly property color themeColorQtGray5: darkTheme ? colorQtGray6 : colorQtGray5 - readonly property color themeColorQtGray6: darkTheme ? colorQtGray5 : colorQtGray6 - readonly property color themeColorQtGray7: darkTheme ? colorQtGray4 : colorQtGray7 - readonly property color themeColorQtGray8: darkTheme ? colorQtGray3 : colorQtGray8 - readonly property color themeColorQtGray9: darkTheme ? colorQtGray2 : colorQtGray9 - readonly property color themeColorQtGray10: darkTheme ? colorQtGray1 : colorQtGray10 - - property bool darkTheme: false + readonly property color themeColorQtGray1: WearableSettings.darkTheme ? colorQtGray10 : colorQtGray1 + readonly property color themeColorQtGray2: WearableSettings.darkTheme ? colorQtGray9 : colorQtGray2 + readonly property color themeColorQtGray3: WearableSettings.darkTheme ? colorQtGray8 : colorQtGray3 + readonly property color themeColorQtGray4: WearableSettings.darkTheme ? colorQtGray7 : colorQtGray4 + readonly property color themeColorQtGray5: WearableSettings.darkTheme ? colorQtGray6 : colorQtGray5 + readonly property color themeColorQtGray6: WearableSettings.darkTheme ? colorQtGray5 : colorQtGray6 + readonly property color themeColorQtGray7: WearableSettings.darkTheme ? colorQtGray4 : colorQtGray7 + readonly property color themeColorQtGray8: WearableSettings.darkTheme ? colorQtGray3 : colorQtGray8 + readonly property color themeColorQtGray9: WearableSettings.darkTheme ? colorQtGray2 : colorQtGray9 + readonly property color themeColorQtGray10: WearableSettings.darkTheme ? colorQtGray1 : colorQtGray10 + + function imagePath(baseImagePath) { + return `qrc:/qt/qml/Wearable/images/${baseImagePath}.png` + } function themeImagePath(baseImagePath) { - return baseImagePath + (darkTheme ? "-dark" : "-light") + ".png" + return `qrc:/qt/qml/Wearable/images/${baseImagePath}${(WearableSettings.darkTheme ? "-dark" : "-light")}.png` } } diff --git a/examples/quickcontrols/wearable/WearableStyle/qmldir b/examples/quickcontrols/wearable/WearableStyle/qmldir new file mode 100644 index 0000000000..d29b115ba0 --- /dev/null +++ b/examples/quickcontrols/wearable/WearableStyle/qmldir @@ -0,0 +1,8 @@ +# This file only exists for qmake. + +module WearableStyle +prefer :/qt/qml/WearableStyle/ +PageIndicator 254.0 PageIndicator.qml +Slider 254.0 Slider.qml +Switch 254.0 Switch.qml +singleton UIStyle 254.0 UIStyle.qml diff --git a/examples/quickcontrols/wearable/doc/src/qtquickcontrols-wearable.qdoc b/examples/quickcontrols/wearable/doc/src/qtquickcontrols-wearable.qdoc index b6665003fd..b261ddf1fd 100644 --- a/examples/quickcontrols/wearable/doc/src/qtquickcontrols-wearable.qdoc +++ b/examples/quickcontrols/wearable/doc/src/qtquickcontrols-wearable.qdoc @@ -19,8 +19,8 @@ The main .qml file, \c wearable.qml, consists of an ApplicationWindow, a StackView for a stack-based navigation model, and buttons for interactive navigation. - \quotefromfile wearable/wearable.qml - \skipuntil import "qml/Style" + \quotefromfile wearable/Wearable/Main.qml + \skipuntil import WearableStyle \printuntil id: window \dots \skipto header @@ -44,10 +44,10 @@ singleton type for various styling attributes, such as fonts and colors. \list - \li \c qml/Style/PageIndicator.qml - \li \c qml/Style/Slider.qml - \li \c qml/Style/Switch.qml - \li \c qml/Style/UIStyle.qml + \li \c WearableStyle/PageIndicator.qml + \li \c WearableStyle/Slider.qml + \li \c WearableStyle/Switch.qml + \li \c WearableStyle/UIStyle.qml \endlist The style is applied in \c main() in \c wearable.cpp: @@ -62,13 +62,13 @@ \section1 Custom Type The demo application contains a custom button type implemented in - \c qml/NaviButton.qml. The navigation button is used as a home and back + \c Wearable/NaviButton.qml. The navigation button is used as a home and back button in \c wearable.qml. \c NaviButton extends the AbstractButton type with properties that control the slide in and slide out transitions and the button image. - \quotefromfile wearable/qml/NaviButton.qml - \skipuntil import "Style" + \quotefromfile wearable/Wearable/NaviButton.qml + \skipuntil import WearableStyle \printuntil id: image \dots 8 \skipuntil } @@ -79,7 +79,7 @@ \section1 Icons - The demo ships a custom icon theme. The icons are bundled into the \c :/icons + The demo ships a custom icon theme. The icons are bundled into the \c :/Wearable/icons folder in the application's resources. The \c index.theme file lists the contents of the icon theme: @@ -98,7 +98,7 @@ \c LauncherPage.qml. Each application is in a separate .qml file, which is added to the ListModel on the launcher page. - \quotefromfile wearable/qml/LauncherPage.qml + \quotefromfile wearable/Wearable/LauncherPage.qml \skipto PathView \printuntil signal launched \dots diff --git a/examples/quickcontrols/wearable/qml/Style/qmldir b/examples/quickcontrols/wearable/qml/Style/qmldir deleted file mode 100644 index a04072bed6..0000000000 --- a/examples/quickcontrols/wearable/qml/Style/qmldir +++ /dev/null @@ -1 +0,0 @@ -singleton UIStyle 1.0 UIStyle.qml diff --git a/examples/quickcontrols/wearable/wearable.cpp b/examples/quickcontrols/wearable/wearable.cpp index 861d4b7610..eea815eff8 100644 --- a/examples/quickcontrols/wearable/wearable.cpp +++ b/examples/quickcontrols/wearable/wearable.cpp @@ -8,21 +8,25 @@ int main(int argc, char *argv[]) { + // Allow navigation.js to "GET" walk_route.json with XMLHttpRequest. + qputenv("QML_XHR_ALLOW_FILE_READ", "1"); + QCoreApplication::setApplicationName("Wearable"); QCoreApplication::setOrganizationName("QtProject"); QGuiApplication app(argc, argv); //! [style] - QQuickStyle::setStyle(QStringLiteral("qrc:/qml/Style")); + QQuickStyle::setStyle(QStringLiteral("WearableStyle")); //! [style] //! [icons] + QIcon::setThemeSearchPaths(QStringList() << ":/qt/qml/Wearable/icons"); QIcon::setThemeName(QStringLiteral("wearable")); //! [icons] QQmlApplicationEngine engine; - engine.load(QUrl(QStringLiteral("qrc:/wearable.qml"))); + engine.loadFromModule("Wearable", "Main"); return app.exec(); } diff --git a/examples/quickcontrols/wearable/wearable.qrc b/examples/quickcontrols/wearable/wearable.qrc index db59d038f6..73be70e842 100644 --- a/examples/quickcontrols/wearable/wearable.qrc +++ b/examples/quickcontrols/wearable/wearable.qrc @@ -1,155 +1,159 @@ +<!-- This file only exists for qmake. --> <RCC> - <qresource prefix="/"> - <file>wearable.qml</file> - <file>qml/LauncherPage.qml</file> - <file>qml/NaviButton.qml</file> - <file>icons/wearable/index.theme</file> - <file>icons/wearable/36x36/alarms.png</file> - <file>icons/wearable/36x36/fitness.png</file> - <file>icons/wearable/36x36/navigation.png</file> - <file>icons/wearable/36x36/notifications.png</file> - <file>icons/wearable/36x36/settings.png</file> - <file>icons/wearable/36x36/weather.png</file> - <file>icons/wearable/36x36/worldclock.png</file> - <file>icons/wearable/36x36@2/alarms.png</file> - <file>icons/wearable/36x36@2/fitness.png</file> - <file>icons/wearable/36x36@2/navigation.png</file> - <file>icons/wearable/36x36@2/notifications.png</file> - <file>icons/wearable/36x36@2/settings.png</file> - <file>icons/wearable/36x36@2/weather.png</file> - <file>icons/wearable/36x36@2/worldclock.png</file> - <file>images/background-light.png</file> - <file>images/background-dark.png</file> - <file>images/back.png</file> - <file>images/back@2x.png</file> - <file>images/home.png</file> - <file>images/home@2x.png</file> - <file>qml/Alarms/AlarmsPage.qml</file> - <file>qml/Fitness/fitness.js</file> - <file>qml/Fitness/FitnessPage.qml</file> - <file>qml/Fitness/images/man-running-light.png</file> - <file>qml/Fitness/images/man-running-light@2x.png</file> - <file>qml/Fitness/images/man-walking-light.png</file> - <file>qml/Fitness/images/man-walking-light@2x.png</file> - <file>qml/Fitness/images/man-running-dark.png</file> - <file>qml/Fitness/images/man-running-dark@2x.png</file> - <file>qml/Fitness/images/man-walking-dark.png</file> - <file>qml/Fitness/images/man-walking-dark@2x.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/end@2x.png</file> - <file>qml/Navigation/images/leftturn-light.png</file> - <file>qml/Navigation/images/leftturn-light@2x.png</file> - <file>qml/Navigation/images/leftturn-dark.png</file> - <file>qml/Navigation/images/leftturn-dark@2x.png</file> - <file>qml/Navigation/images/navigation-light.png</file> - <file>qml/Navigation/images/navigation-light@2x.png</file> - <file>qml/Navigation/images/navigation-dark.png</file> - <file>qml/Navigation/images/navigation-dark@2x.png</file> - <file>qml/Navigation/images/rightturn-light.png</file> - <file>qml/Navigation/images/rightturn-light@2x.png</file> - <file>qml/Navigation/images/rightturn-dark.png</file> - <file>qml/Navigation/images/rightturn-dark@2x.png</file> - <file>qml/Navigation/images/start.png</file> - <file>qml/Navigation/images/start@2x.png</file> - <file>qml/Navigation/images/straight-light.png</file> - <file>qml/Navigation/images/straight-light@2x.png</file> - <file>qml/Navigation/images/straight-dark.png</file> - <file>qml/Navigation/images/straight-dark@2x.png</file> - <file>qml/Navigation/images/uturn.png</file> - <file>qml/Navigation/images/uturn@2x.png</file> - <file>qml/Notifications/notifications.js</file> - <file>qml/Notifications/NotificationsPage.qml</file> - <file>qml/Notifications/images/avatarf-light.png</file> - <file>qml/Notifications/images/avatarf-light@2x.png</file> - <file>qml/Notifications/images/avatarm-light.png</file> - <file>qml/Notifications/images/avatarm-light@2x.png</file> - <file>qml/Notifications/images/missedcall-light.png</file> - <file>qml/Notifications/images/missedcall-light@2x.png</file> - <file>qml/Notifications/images/avatarf-dark.png</file> - <file>qml/Notifications/images/avatarf-dark@2x.png</file> - <file>qml/Notifications/images/avatarm-dark.png</file> - <file>qml/Notifications/images/avatarm-dark@2x.png</file> - <file>qml/Notifications/images/missedcall-dark.png</file> - <file>qml/Notifications/images/missedcall-dark@2x.png</file> - <file>qml/Settings/SettingsPage.qml</file> - <file>qml/Settings/images/bluetooth-light.png</file> - <file>qml/Settings/images/bluetooth-light@2x.png</file> - <file>qml/Settings/images/brightness-light.png</file> - <file>qml/Settings/images/brightness-light@2x.png</file> - <file>qml/Settings/images/demo-mode-light.png</file> - <file>qml/Settings/images/demo-mode-light@2x.png</file> - <file>qml/Settings/images/demo-mode-dark.png</file> - <file>qml/Settings/images/demo-mode-dark@2x.png</file> - <file>qml/Settings/images/demo-mode-white.png</file> - <file>qml/Settings/images/demo-mode-white@2x.png</file> - <file>qml/Settings/images/theme-light.png</file> - <file>qml/Settings/images/theme-light@2x.png</file> - <file>qml/Settings/images/wifi-light.png</file> - <file>qml/Settings/images/wifi-light@2x.png</file> - <file>qml/Settings/images/bluetooth-dark.png</file> - <file>qml/Settings/images/bluetooth-dark@2x.png</file> - <file>qml/Settings/images/brightness-dark.png</file> - <file>qml/Settings/images/brightness-dark@2x.png</file> - <file>qml/Settings/images/theme-dark.png</file> - <file>qml/Settings/images/theme-dark@2x.png</file> - <file>qml/Settings/images/wifi-dark.png</file> - <file>qml/Settings/images/wifi-dark@2x.png</file> - <file>qml/Style/qmldir</file> - <file>qml/Style/PageIndicator.qml</file> - <file>qml/Style/Slider.qml</file> - <file>qml/Style/Switch.qml</file> - <file>qml/Style/UIStyle.qml</file> - <file>qml/Weather/weather.js</file> - <file>qml/Weather/weather.json</file> - <file>qml/Weather/WeatherPage.qml</file> - <file>qml/Weather/images/humidity-light.png</file> - <file>qml/Weather/images/humidity-light@2x.png</file> - <file>qml/Weather/images/pressure-light.png</file> - <file>qml/Weather/images/pressure-light@2x.png</file> - <file>qml/Weather/images/sunrise-light.png</file> - <file>qml/Weather/images/sunrise-light@2x.png</file> - <file>qml/Weather/images/sunset-light.png</file> - <file>qml/Weather/images/sunset-light@2x.png</file> - <file>qml/Weather/images/temperature-light.png</file> - <file>qml/Weather/images/temperature-light@2x.png</file> - <file>qml/Weather/images/wind-light.png</file> - <file>qml/Weather/images/wind-light@2x.png</file> - <file>qml/Weather/images/humidity-dark.png</file> - <file>qml/Weather/images/humidity-dark@2x.png</file> - <file>qml/Weather/images/pressure-dark.png</file> - <file>qml/Weather/images/pressure-dark@2x.png</file> - <file>qml/Weather/images/sunrise-dark.png</file> - <file>qml/Weather/images/sunrise-dark@2x.png</file> - <file>qml/Weather/images/sunset-dark.png</file> - <file>qml/Weather/images/sunset-dark@2x.png</file> - <file>qml/Weather/images/temperature-dark.png</file> - <file>qml/Weather/images/temperature-dark@2x.png</file> - <file>qml/Weather/images/wind-dark.png</file> - <file>qml/Weather/images/wind-dark@2x.png</file> - <file>qml/WorldClock/Clock.qml</file> - <file>qml/WorldClock/WorldClockPage.qml</file> - <file>qml/WorldClock/images/center.png</file> - <file>qml/WorldClock/images/center@2x.png</file> - <file>qml/WorldClock/images/second.png</file> - <file>qml/WorldClock/images/second@2x.png</file> - <file>qml/WorldClock/images/swissdaydial.png</file> - <file>qml/WorldClock/images/swissdaydial@2x.png</file> - <file>qml/WorldClock/images/swissdayhour.png</file> - <file>qml/WorldClock/images/swissdayhour@2x.png</file> - <file>qml/WorldClock/images/swissdayminute.png</file> - <file>qml/WorldClock/images/swissdayminute@2x.png</file> - <file>qml/WorldClock/images/swissnightdial.png</file> - <file>qml/WorldClock/images/swissnightdial@2x.png</file> - <file>qml/WorldClock/images/swissnighthour.png</file> - <file>qml/WorldClock/images/swissnighthour@2x.png</file> - <file>qml/WorldClock/images/swissnightminute.png</file> - <file>qml/WorldClock/images/swissnightminute@2x.png</file> - <file>qml/SwipeViewPage.qml</file> - <file>qml/DemoMode.qml</file> - <file>qml/DemoModeIndicator.qml</file> + <qresource prefix="/qt/qml"> + <file>Wearable/AlarmsPage.qml</file> + <file>Wearable/Clock.qml</file> + <file>Wearable/DemoMode.qml</file> + <file>Wearable/DemoModeIndicator.qml</file> + <file>Wearable/FitnessPage.qml</file> + <file>Wearable/LauncherPage.qml</file> + <file>Wearable/Main.qml</file> + <file>Wearable/NaviButton.qml</file> + <file>Wearable/NavigationPage.qml</file> + <file>Wearable/NotificationsPage.qml</file> + <file>Wearable/RouteElement.qml</file> + <file>Wearable/SettingsPage.qml</file> + <file>Wearable/SwipeViewPage.qml</file> + <file>Wearable/WeatherPage.qml</file> + <file>Wearable/WorldClockPage.qml</file> + <file>Wearable/fitness.js</file> + <file>Wearable/icons/wearable/36x36/alarms.png</file> + <file>Wearable/icons/wearable/36x36/fitness.png</file> + <file>Wearable/icons/wearable/36x36/navigation.png</file> + <file>Wearable/icons/wearable/36x36/notifications.png</file> + <file>Wearable/icons/wearable/36x36/settings.png</file> + <file>Wearable/icons/wearable/36x36/weather.png</file> + <file>Wearable/icons/wearable/36x36/worldclock.png</file> + <file>Wearable/icons/wearable/36x36@2/alarms.png</file> + <file>Wearable/icons/wearable/36x36@2/fitness.png</file> + <file>Wearable/icons/wearable/36x36@2/navigation.png</file> + <file>Wearable/icons/wearable/36x36@2/notifications.png</file> + <file>Wearable/icons/wearable/36x36@2/settings.png</file> + <file>Wearable/icons/wearable/36x36@2/weather.png</file> + <file>Wearable/icons/wearable/36x36@2/worldclock.png</file> + <file>Wearable/icons/wearable/index.theme</file> + <file>Wearable/images/back.png</file> + <file>Wearable/images/back@2x.png</file> + <file>Wearable/images/background-dark.png</file> + <file>Wearable/images/background-light.png</file> + <file>Wearable/images/fitness-man-running-dark.png</file> + <file>Wearable/images/fitness-man-running-dark@2x.png</file> + <file>Wearable/images/fitness-man-running-light.png</file> + <file>Wearable/images/fitness-man-running-light@2x.png</file> + <file>Wearable/images/fitness-man-walking-dark.png</file> + <file>Wearable/images/fitness-man-walking-dark@2x.png</file> + <file>Wearable/images/fitness-man-walking-light.png</file> + <file>Wearable/images/fitness-man-walking-light@2x.png</file> + <file>Wearable/images/home.png</file> + <file>Wearable/images/home@2x.png</file> + <file>Wearable/images/navigation-dark.png</file> + <file>Wearable/images/navigation-dark@2x.png</file> + <file>Wearable/images/navigation-end.png</file> + <file>Wearable/images/navigation-end@2x.png</file> + <file>Wearable/images/navigation-leftturn-dark.png</file> + <file>Wearable/images/navigation-leftturn-dark@2x.png</file> + <file>Wearable/images/navigation-leftturn-light.png</file> + <file>Wearable/images/navigation-leftturn-light@2x.png</file> + <file>Wearable/images/navigation-light.png</file> + <file>Wearable/images/navigation-light@2x.png</file> + <file>Wearable/images/navigation-rightturn-dark.png</file> + <file>Wearable/images/navigation-rightturn-dark@2x.png</file> + <file>Wearable/images/navigation-rightturn-light.png</file> + <file>Wearable/images/navigation-rightturn-light@2x.png</file> + <file>Wearable/images/navigation-start.png</file> + <file>Wearable/images/navigation-start@2x.png</file> + <file>Wearable/images/navigation-straight-dark.png</file> + <file>Wearable/images/navigation-straight-dark@2x.png</file> + <file>Wearable/images/navigation-straight-light.png</file> + <file>Wearable/images/navigation-straight-light@2x.png</file> + <file>Wearable/images/navigation-uturn.png</file> + <file>Wearable/images/navigation-uturn@2x.png</file> + <file>Wearable/images/notifications-avatarf-dark.png</file> + <file>Wearable/images/notifications-avatarf-dark@2x.png</file> + <file>Wearable/images/notifications-avatarf-light.png</file> + <file>Wearable/images/notifications-avatarf-light@2x.png</file> + <file>Wearable/images/notifications-avatarm-dark.png</file> + <file>Wearable/images/notifications-avatarm-dark@2x.png</file> + <file>Wearable/images/notifications-avatarm-light.png</file> + <file>Wearable/images/notifications-avatarm-light@2x.png</file> + <file>Wearable/images/notifications-missedcall-dark.png</file> + <file>Wearable/images/notifications-missedcall-dark@2x.png</file> + <file>Wearable/images/notifications-missedcall-light.png</file> + <file>Wearable/images/notifications-missedcall-light@2x.png</file> + <file>Wearable/images/settings-bluetooth-dark.png</file> + <file>Wearable/images/settings-bluetooth-dark@2x.png</file> + <file>Wearable/images/settings-bluetooth-light.png</file> + <file>Wearable/images/settings-bluetooth-light@2x.png</file> + <file>Wearable/images/settings-brightness-dark.png</file> + <file>Wearable/images/settings-brightness-dark@2x.png</file> + <file>Wearable/images/settings-brightness-light.png</file> + <file>Wearable/images/settings-brightness-light@2x.png</file> + <file>Wearable/images/settings-demo-mode-dark.png</file> + <file>Wearable/images/settings-demo-mode-dark@2x.png</file> + <file>Wearable/images/settings-demo-mode-light.png</file> + <file>Wearable/images/settings-demo-mode-light@2x.png</file> + <file>Wearable/images/settings-demo-mode-white.png</file> + <file>Wearable/images/settings-demo-mode-white@2x.png</file> + <file>Wearable/images/settings-theme-dark.png</file> + <file>Wearable/images/settings-theme-dark@2x.png</file> + <file>Wearable/images/settings-theme-light.png</file> + <file>Wearable/images/settings-theme-light@2x.png</file> + <file>Wearable/images/settings-wifi-dark.png</file> + <file>Wearable/images/settings-wifi-dark@2x.png</file> + <file>Wearable/images/settings-wifi-light.png</file> + <file>Wearable/images/settings-wifi-light@2x.png</file> + <file>Wearable/images/weather-humidity-dark.png</file> + <file>Wearable/images/weather-humidity-dark@2x.png</file> + <file>Wearable/images/weather-humidity-light.png</file> + <file>Wearable/images/weather-humidity-light@2x.png</file> + <file>Wearable/images/weather-pressure-dark.png</file> + <file>Wearable/images/weather-pressure-dark@2x.png</file> + <file>Wearable/images/weather-pressure-light.png</file> + <file>Wearable/images/weather-pressure-light@2x.png</file> + <file>Wearable/images/weather-sunrise-dark.png</file> + <file>Wearable/images/weather-sunrise-dark@2x.png</file> + <file>Wearable/images/weather-sunrise-light.png</file> + <file>Wearable/images/weather-sunrise-light@2x.png</file> + <file>Wearable/images/weather-sunset-dark.png</file> + <file>Wearable/images/weather-sunset-dark@2x.png</file> + <file>Wearable/images/weather-sunset-light.png</file> + <file>Wearable/images/weather-sunset-light@2x.png</file> + <file>Wearable/images/weather-temperature-dark.png</file> + <file>Wearable/images/weather-temperature-dark@2x.png</file> + <file>Wearable/images/weather-temperature-light.png</file> + <file>Wearable/images/weather-temperature-light@2x.png</file> + <file>Wearable/images/weather-wind-dark.png</file> + <file>Wearable/images/weather-wind-dark@2x.png</file> + <file>Wearable/images/weather-wind-light.png</file> + <file>Wearable/images/weather-wind-light@2x.png</file> + <file>Wearable/images/world-clock-center.png</file> + <file>Wearable/images/world-clock-center@2x.png</file> + <file>Wearable/images/world-clock-second.png</file> + <file>Wearable/images/world-clock-second@2x.png</file> + <file>Wearable/images/world-clock-swissdaydial.png</file> + <file>Wearable/images/world-clock-swissdaydial@2x.png</file> + <file>Wearable/images/world-clock-swissdayhour.png</file> + <file>Wearable/images/world-clock-swissdayhour@2x.png</file> + <file>Wearable/images/world-clock-swissdayminute.png</file> + <file>Wearable/images/world-clock-swissdayminute@2x.png</file> + <file>Wearable/images/world-clock-swissnightdial.png</file> + <file>Wearable/images/world-clock-swissnightdial@2x.png</file> + <file>Wearable/images/world-clock-swissnighthour.png</file> + <file>Wearable/images/world-clock-swissnighthour@2x.png</file> + <file>Wearable/images/world-clock-swissnightminute.png</file> + <file>Wearable/images/world-clock-swissnightminute@2x.png</file> + <file>Wearable/navigation.js</file> + <file>Wearable/notifications.js</file> + <file>Wearable/qmldir</file> + <file>Wearable/walk_route.json</file> + <file>Wearable/weather.js</file> + <file>Wearable/weather.json</file> + <file>WearableSettings/qmldir</file> + <file>WearableSettings/WearableSettings.qml</file> + <file>WearableStyle/PageIndicator.qml</file> + <file>WearableStyle/Slider.qml</file> + <file>WearableStyle/Switch.qml</file> + <file>WearableStyle/UIStyle.qml</file> + <file>WearableStyle/qmldir</file> </qresource> </RCC> |
