diff options
Diffstat (limited to 'examples/quickcontrols2/wearable/qml/Navigation')
18 files changed, 17 insertions, 15 deletions
diff --git a/examples/quickcontrols2/wearable/qml/Navigation/NavigationPage.qml b/examples/quickcontrols2/wearable/qml/Navigation/NavigationPage.qml index 185f7986..8ab82bac 100644 --- a/examples/quickcontrols2/wearable/qml/Navigation/NavigationPage.qml +++ b/examples/quickcontrols2/wearable/qml/Navigation/NavigationPage.qml @@ -48,11 +48,13 @@ ** ****************************************************************************/ -import QtQuick 2.7 +import QtQuick 2.10 import "../Style" import "navigation.js" as NavigationData Item { + property alias routeListView: routeView + Column { anchors.fill: parent anchors.margins: 2 @@ -63,7 +65,7 @@ Item { width: parent.width height: titleRow.height - color: UIStyle.colorQtGray9 + color: UIStyle.themeColorQtGray9 Row { id: titleRow @@ -72,7 +74,7 @@ Item { Image { anchors.verticalCenter: parent.verticalCenter - source: "images/navigation.png" + source: UIStyle.themeImagePath("images/navigation") fillMode: Image.PreserveAspectCrop } Text { @@ -80,7 +82,7 @@ Item { text: qsTr("Walking") font.pixelSize: UIStyle.fontSizeM font.letterSpacing: 2 - color: UIStyle.colorQtGray2 + color: UIStyle.themeColorQtGray2 } } } @@ -94,12 +96,12 @@ Item { width: parent.width height: parent.height - titleRow.height - parent.spacing - property var imageList: ["straight.png", - "leftturn.png", - "rightturn.png", - "uturn.png", - "start.png", - "end.png"] + property var imageList: [UIStyle.themeImagePath("images/straight"), + UIStyle.themeImagePath("images/leftturn"), + UIStyle.themeImagePath("images/rightturn"), + "images/uturn.png", + "images/start.png", + "images/end.png"] clip: true focus: true diff --git a/examples/quickcontrols2/wearable/qml/Navigation/RouteElement.qml b/examples/quickcontrols2/wearable/qml/Navigation/RouteElement.qml index 79928012..937b84a8 100644 --- a/examples/quickcontrols2/wearable/qml/Navigation/RouteElement.qml +++ b/examples/quickcontrols2/wearable/qml/Navigation/RouteElement.qml @@ -48,11 +48,11 @@ ** ****************************************************************************/ -import QtQuick 2.7 +import QtQuick 2.10 import "../Style" Rectangle { - color: UIStyle.colorQtGray8 + color: UIStyle.themeColorQtGray8 Row { spacing: 5 @@ -62,7 +62,7 @@ Rectangle { Image { id: img anchors.verticalCenter: parent.verticalCenter - source: "images/" + navImage + source: navImage fillMode: Image.PreserveAspectFit } @@ -78,7 +78,7 @@ Rectangle { font.pixelSize: UIStyle.fontSizeS verticalAlignment: Text.AlignVCenter padding: 1 - color: UIStyle.colorQtGray1 + color: UIStyle.themeColorQtGray1 } Text { @@ -88,7 +88,7 @@ Rectangle { font.pixelSize: UIStyle.fontSizeXS verticalAlignment: Text.AlignVCenter padding: 1 - color: UIStyle.colorQtGray2 + color: UIStyle.themeColorQtGray2 } } } diff --git a/examples/quickcontrols2/wearable/qml/Navigation/images/leftturn-dark.png b/examples/quickcontrols2/wearable/qml/Navigation/images/leftturn-dark.png Binary files differnew file mode 100644 index 00000000..b318b954 --- /dev/null +++ b/examples/quickcontrols2/wearable/qml/Navigation/images/leftturn-dark.png diff --git a/examples/quickcontrols2/wearable/qml/Navigation/images/leftturn-dark@2x.png b/examples/quickcontrols2/wearable/qml/Navigation/images/leftturn-dark@2x.png Binary files differnew file mode 100644 index 00000000..ec782ebd --- /dev/null +++ b/examples/quickcontrols2/wearable/qml/Navigation/images/leftturn-dark@2x.png diff --git a/examples/quickcontrols2/wearable/qml/Navigation/images/leftturn.png b/examples/quickcontrols2/wearable/qml/Navigation/images/leftturn-light.png Binary files differindex 3c416304..3c416304 100644 --- a/examples/quickcontrols2/wearable/qml/Navigation/images/leftturn.png +++ b/examples/quickcontrols2/wearable/qml/Navigation/images/leftturn-light.png diff --git a/examples/quickcontrols2/wearable/qml/Navigation/images/leftturn@2x.png b/examples/quickcontrols2/wearable/qml/Navigation/images/leftturn-light@2x.png Binary files differindex 39e9be84..39e9be84 100644 --- a/examples/quickcontrols2/wearable/qml/Navigation/images/leftturn@2x.png +++ b/examples/quickcontrols2/wearable/qml/Navigation/images/leftturn-light@2x.png diff --git a/examples/quickcontrols2/wearable/qml/Navigation/images/navigation-dark.png b/examples/quickcontrols2/wearable/qml/Navigation/images/navigation-dark.png Binary files differnew file mode 100644 index 00000000..7dce6aa5 --- /dev/null +++ b/examples/quickcontrols2/wearable/qml/Navigation/images/navigation-dark.png diff --git a/examples/quickcontrols2/wearable/qml/Navigation/images/navigation-dark@2x.png b/examples/quickcontrols2/wearable/qml/Navigation/images/navigation-dark@2x.png Binary files differnew file mode 100644 index 00000000..5061e52b --- /dev/null +++ b/examples/quickcontrols2/wearable/qml/Navigation/images/navigation-dark@2x.png diff --git a/examples/quickcontrols2/wearable/qml/Navigation/images/navigation.png b/examples/quickcontrols2/wearable/qml/Navigation/images/navigation-light.png Binary files differindex 9b8cb8e6..9b8cb8e6 100644 --- a/examples/quickcontrols2/wearable/qml/Navigation/images/navigation.png +++ b/examples/quickcontrols2/wearable/qml/Navigation/images/navigation-light.png diff --git a/examples/quickcontrols2/wearable/qml/Navigation/images/navigation@2x.png b/examples/quickcontrols2/wearable/qml/Navigation/images/navigation-light@2x.png Binary files differindex 8d133abc..8d133abc 100644 --- a/examples/quickcontrols2/wearable/qml/Navigation/images/navigation@2x.png +++ b/examples/quickcontrols2/wearable/qml/Navigation/images/navigation-light@2x.png diff --git a/examples/quickcontrols2/wearable/qml/Navigation/images/rightturn-dark.png b/examples/quickcontrols2/wearable/qml/Navigation/images/rightturn-dark.png Binary files differnew file mode 100644 index 00000000..634ab593 --- /dev/null +++ b/examples/quickcontrols2/wearable/qml/Navigation/images/rightturn-dark.png diff --git a/examples/quickcontrols2/wearable/qml/Navigation/images/rightturn-dark@2x.png b/examples/quickcontrols2/wearable/qml/Navigation/images/rightturn-dark@2x.png Binary files differnew file mode 100644 index 00000000..9a388440 --- /dev/null +++ b/examples/quickcontrols2/wearable/qml/Navigation/images/rightturn-dark@2x.png diff --git a/examples/quickcontrols2/wearable/qml/Navigation/images/rightturn.png b/examples/quickcontrols2/wearable/qml/Navigation/images/rightturn-light.png Binary files differindex a29ec694..a29ec694 100644 --- a/examples/quickcontrols2/wearable/qml/Navigation/images/rightturn.png +++ b/examples/quickcontrols2/wearable/qml/Navigation/images/rightturn-light.png diff --git a/examples/quickcontrols2/wearable/qml/Navigation/images/rightturn@2x.png b/examples/quickcontrols2/wearable/qml/Navigation/images/rightturn-light@2x.png Binary files differindex 258c4144..258c4144 100644 --- a/examples/quickcontrols2/wearable/qml/Navigation/images/rightturn@2x.png +++ b/examples/quickcontrols2/wearable/qml/Navigation/images/rightturn-light@2x.png diff --git a/examples/quickcontrols2/wearable/qml/Navigation/images/straight-dark.png b/examples/quickcontrols2/wearable/qml/Navigation/images/straight-dark.png Binary files differnew file mode 100644 index 00000000..014ed7c8 --- /dev/null +++ b/examples/quickcontrols2/wearable/qml/Navigation/images/straight-dark.png diff --git a/examples/quickcontrols2/wearable/qml/Navigation/images/straight-dark@2x.png b/examples/quickcontrols2/wearable/qml/Navigation/images/straight-dark@2x.png Binary files differnew file mode 100644 index 00000000..be51d2ac --- /dev/null +++ b/examples/quickcontrols2/wearable/qml/Navigation/images/straight-dark@2x.png diff --git a/examples/quickcontrols2/wearable/qml/Navigation/images/straight.png b/examples/quickcontrols2/wearable/qml/Navigation/images/straight-light.png Binary files differindex e3c5bb5c..e3c5bb5c 100644 --- a/examples/quickcontrols2/wearable/qml/Navigation/images/straight.png +++ b/examples/quickcontrols2/wearable/qml/Navigation/images/straight-light.png diff --git a/examples/quickcontrols2/wearable/qml/Navigation/images/straight@2x.png b/examples/quickcontrols2/wearable/qml/Navigation/images/straight-light@2x.png Binary files differindex ef71ab1b..ef71ab1b 100644 --- a/examples/quickcontrols2/wearable/qml/Navigation/images/straight@2x.png +++ b/examples/quickcontrols2/wearable/qml/Navigation/images/straight-light@2x.png |