From f24a76bea9bf033e6f2eea70ea9cdb43cdb8f6f9 Mon Sep 17 00:00:00 2001 From: J-P Nurmi Date: Fri, 15 Sep 2017 16:25:40 +0200 Subject: Wearable Demo: make use of the icon support Change-Id: I7a691f7b7c3d2f2a9f1d9a1ded29269184ddfcfe Reviewed-by: Mitch Curtis --- .../doc/src/qtquickcontrols2-wearable.qdoc | 18 +++++++++++ .../wearable/icons/wearable/36x36/alarms.png | Bin 0 -> 689 bytes .../wearable/icons/wearable/36x36/fitness.png | Bin 0 -> 541 bytes .../wearable/icons/wearable/36x36/navigation.png | Bin 0 -> 581 bytes .../icons/wearable/36x36/notifications.png | Bin 0 -> 683 bytes .../wearable/icons/wearable/36x36/settings.png | Bin 0 -> 703 bytes .../wearable/icons/wearable/36x36/weather.png | Bin 0 -> 548 bytes .../wearable/icons/wearable/36x36/worldclock.png | Bin 0 -> 601 bytes .../wearable/icons/wearable/36x36@2/alarms.png | Bin 0 -> 1208 bytes .../wearable/icons/wearable/36x36@2/fitness.png | Bin 0 -> 958 bytes .../wearable/icons/wearable/36x36@2/navigation.png | Bin 0 -> 1063 bytes .../icons/wearable/36x36@2/notifications.png | Bin 0 -> 1316 bytes .../wearable/icons/wearable/36x36@2/settings.png | Bin 0 -> 1233 bytes .../wearable/icons/wearable/36x36@2/weather.png | Bin 0 -> 1061 bytes .../wearable/icons/wearable/36x36@2/worldclock.png | Bin 0 -> 1101 bytes .../wearable/icons/wearable/index.theme | 14 +++++++++ .../wearable/qml/Alarms/images/alarms.png | Bin 689 -> 0 bytes .../wearable/qml/Alarms/images/alarms@2x.png | Bin 1208 -> 0 bytes .../wearable/qml/Fitness/images/fitness.png | Bin 541 -> 0 bytes .../wearable/qml/Fitness/images/fitness@2x.png | Bin 958 -> 0 bytes .../quickcontrols2/wearable/qml/LauncherPage.qml | 33 ++++++++++----------- .../qml/Notifications/images/notifications.png | Bin 683 -> 0 bytes .../qml/Notifications/images/notifications@2x.png | Bin 1316 -> 0 bytes .../wearable/qml/Settings/images/settings.png | Bin 703 -> 0 bytes .../wearable/qml/Settings/images/settings@2x.png | Bin 1233 -> 0 bytes .../wearable/qml/Weather/images/weather.png | Bin 548 -> 0 bytes .../wearable/qml/Weather/images/weather@2x.png | Bin 1061 -> 0 bytes .../wearable/qml/WorldClock/images/worldclock.png | Bin 601 -> 0 bytes .../qml/WorldClock/images/worldclock@2x.png | Bin 1101 -> 0 bytes examples/quickcontrols2/wearable/wearable.cpp | 5 ++++ examples/quickcontrols2/wearable/wearable.qrc | 27 +++++++++-------- 31 files changed, 67 insertions(+), 30 deletions(-) create mode 100644 examples/quickcontrols2/wearable/icons/wearable/36x36/alarms.png create mode 100644 examples/quickcontrols2/wearable/icons/wearable/36x36/fitness.png create mode 100644 examples/quickcontrols2/wearable/icons/wearable/36x36/navigation.png create mode 100644 examples/quickcontrols2/wearable/icons/wearable/36x36/notifications.png create mode 100644 examples/quickcontrols2/wearable/icons/wearable/36x36/settings.png create mode 100644 examples/quickcontrols2/wearable/icons/wearable/36x36/weather.png create mode 100644 examples/quickcontrols2/wearable/icons/wearable/36x36/worldclock.png create mode 100644 examples/quickcontrols2/wearable/icons/wearable/36x36@2/alarms.png create mode 100644 examples/quickcontrols2/wearable/icons/wearable/36x36@2/fitness.png create mode 100644 examples/quickcontrols2/wearable/icons/wearable/36x36@2/navigation.png create mode 100644 examples/quickcontrols2/wearable/icons/wearable/36x36@2/notifications.png create mode 100644 examples/quickcontrols2/wearable/icons/wearable/36x36@2/settings.png create mode 100644 examples/quickcontrols2/wearable/icons/wearable/36x36@2/weather.png create mode 100644 examples/quickcontrols2/wearable/icons/wearable/36x36@2/worldclock.png create mode 100644 examples/quickcontrols2/wearable/icons/wearable/index.theme delete mode 100644 examples/quickcontrols2/wearable/qml/Alarms/images/alarms.png delete mode 100644 examples/quickcontrols2/wearable/qml/Alarms/images/alarms@2x.png delete mode 100644 examples/quickcontrols2/wearable/qml/Fitness/images/fitness.png delete mode 100644 examples/quickcontrols2/wearable/qml/Fitness/images/fitness@2x.png delete mode 100644 examples/quickcontrols2/wearable/qml/Notifications/images/notifications.png delete mode 100644 examples/quickcontrols2/wearable/qml/Notifications/images/notifications@2x.png delete mode 100644 examples/quickcontrols2/wearable/qml/Settings/images/settings.png delete mode 100644 examples/quickcontrols2/wearable/qml/Settings/images/settings@2x.png delete mode 100644 examples/quickcontrols2/wearable/qml/Weather/images/weather.png delete mode 100644 examples/quickcontrols2/wearable/qml/Weather/images/weather@2x.png delete mode 100644 examples/quickcontrols2/wearable/qml/WorldClock/images/worldclock.png delete mode 100644 examples/quickcontrols2/wearable/qml/WorldClock/images/worldclock@2x.png (limited to 'examples/quickcontrols2') diff --git a/examples/quickcontrols2/wearable/doc/src/qtquickcontrols2-wearable.qdoc b/examples/quickcontrols2/wearable/doc/src/qtquickcontrols2-wearable.qdoc index 7d4a6a23..124984c1 100644 --- a/examples/quickcontrols2/wearable/doc/src/qtquickcontrols2-wearable.qdoc +++ b/examples/quickcontrols2/wearable/doc/src/qtquickcontrols2-wearable.qdoc @@ -99,6 +99,21 @@ \skipto } \printuntil /^\}/ + \section1 Icons + + The demo ships a custom icon theme. The icons are bundled into the \c :/icons + folder in the application's resources. The \c index.theme file lists the contents + of the icon theme: + + \quotefile wearable/icons/wearable/index.theme + + Finally, the icon theme is selected in \c main(): + + \snippet wearable/wearable.cpp icons + + The icons are used on the Launcher Page, which is presented below. See + \l {Icons in Qt Quick Controls 2} for more details about icons and themes. + \section1 Launcher Page The application launcher is implemented using a circular PathView in @@ -116,6 +131,9 @@ \skipto "Settings" \printuntil delegate: \dots 8 + \skipto icon.width + \printuntil icon.name + \dots 8 \skipto onClicked: \printto path: \dots diff --git a/examples/quickcontrols2/wearable/icons/wearable/36x36/alarms.png b/examples/quickcontrols2/wearable/icons/wearable/36x36/alarms.png new file mode 100644 index 00000000..f38b3d4e Binary files /dev/null and b/examples/quickcontrols2/wearable/icons/wearable/36x36/alarms.png differ diff --git a/examples/quickcontrols2/wearable/icons/wearable/36x36/fitness.png b/examples/quickcontrols2/wearable/icons/wearable/36x36/fitness.png new file mode 100644 index 00000000..80ec43cc Binary files /dev/null and b/examples/quickcontrols2/wearable/icons/wearable/36x36/fitness.png differ diff --git a/examples/quickcontrols2/wearable/icons/wearable/36x36/navigation.png b/examples/quickcontrols2/wearable/icons/wearable/36x36/navigation.png new file mode 100644 index 00000000..9b8cb8e6 Binary files /dev/null and b/examples/quickcontrols2/wearable/icons/wearable/36x36/navigation.png differ diff --git a/examples/quickcontrols2/wearable/icons/wearable/36x36/notifications.png b/examples/quickcontrols2/wearable/icons/wearable/36x36/notifications.png new file mode 100644 index 00000000..bcbe85ef Binary files /dev/null and b/examples/quickcontrols2/wearable/icons/wearable/36x36/notifications.png differ diff --git a/examples/quickcontrols2/wearable/icons/wearable/36x36/settings.png b/examples/quickcontrols2/wearable/icons/wearable/36x36/settings.png new file mode 100644 index 00000000..093404f9 Binary files /dev/null and b/examples/quickcontrols2/wearable/icons/wearable/36x36/settings.png differ diff --git a/examples/quickcontrols2/wearable/icons/wearable/36x36/weather.png b/examples/quickcontrols2/wearable/icons/wearable/36x36/weather.png new file mode 100644 index 00000000..07bf8187 Binary files /dev/null and b/examples/quickcontrols2/wearable/icons/wearable/36x36/weather.png differ diff --git a/examples/quickcontrols2/wearable/icons/wearable/36x36/worldclock.png b/examples/quickcontrols2/wearable/icons/wearable/36x36/worldclock.png new file mode 100644 index 00000000..91a70493 Binary files /dev/null and b/examples/quickcontrols2/wearable/icons/wearable/36x36/worldclock.png differ diff --git a/examples/quickcontrols2/wearable/icons/wearable/36x36@2/alarms.png b/examples/quickcontrols2/wearable/icons/wearable/36x36@2/alarms.png new file mode 100644 index 00000000..ba68519a Binary files /dev/null and b/examples/quickcontrols2/wearable/icons/wearable/36x36@2/alarms.png differ diff --git a/examples/quickcontrols2/wearable/icons/wearable/36x36@2/fitness.png b/examples/quickcontrols2/wearable/icons/wearable/36x36@2/fitness.png new file mode 100644 index 00000000..088c15b8 Binary files /dev/null and b/examples/quickcontrols2/wearable/icons/wearable/36x36@2/fitness.png differ diff --git a/examples/quickcontrols2/wearable/icons/wearable/36x36@2/navigation.png b/examples/quickcontrols2/wearable/icons/wearable/36x36@2/navigation.png new file mode 100644 index 00000000..8d133abc Binary files /dev/null and b/examples/quickcontrols2/wearable/icons/wearable/36x36@2/navigation.png differ diff --git a/examples/quickcontrols2/wearable/icons/wearable/36x36@2/notifications.png b/examples/quickcontrols2/wearable/icons/wearable/36x36@2/notifications.png new file mode 100644 index 00000000..c3b284ed Binary files /dev/null and b/examples/quickcontrols2/wearable/icons/wearable/36x36@2/notifications.png differ diff --git a/examples/quickcontrols2/wearable/icons/wearable/36x36@2/settings.png b/examples/quickcontrols2/wearable/icons/wearable/36x36@2/settings.png new file mode 100644 index 00000000..a24a1df7 Binary files /dev/null and b/examples/quickcontrols2/wearable/icons/wearable/36x36@2/settings.png differ diff --git a/examples/quickcontrols2/wearable/icons/wearable/36x36@2/weather.png b/examples/quickcontrols2/wearable/icons/wearable/36x36@2/weather.png new file mode 100644 index 00000000..6e4ce2f3 Binary files /dev/null and b/examples/quickcontrols2/wearable/icons/wearable/36x36@2/weather.png differ diff --git a/examples/quickcontrols2/wearable/icons/wearable/36x36@2/worldclock.png b/examples/quickcontrols2/wearable/icons/wearable/36x36@2/worldclock.png new file mode 100644 index 00000000..03abe162 Binary files /dev/null and b/examples/quickcontrols2/wearable/icons/wearable/36x36@2/worldclock.png differ diff --git a/examples/quickcontrols2/wearable/icons/wearable/index.theme b/examples/quickcontrols2/wearable/icons/wearable/index.theme new file mode 100644 index 00000000..da702d4a --- /dev/null +++ b/examples/quickcontrols2/wearable/icons/wearable/index.theme @@ -0,0 +1,14 @@ +[Icon Theme] +Name=Wearable +Comment=Qt Quick Controls 2 Wearable Demo Icon Theme + +Directories=36x36,36x36@2 + +[36x36] +Size=36 +Type=Fixed + +[36x36@2] +Size=36 +Scale=2 +Type=Fixed diff --git a/examples/quickcontrols2/wearable/qml/Alarms/images/alarms.png b/examples/quickcontrols2/wearable/qml/Alarms/images/alarms.png deleted file mode 100644 index f38b3d4e..00000000 Binary files a/examples/quickcontrols2/wearable/qml/Alarms/images/alarms.png and /dev/null differ diff --git a/examples/quickcontrols2/wearable/qml/Alarms/images/alarms@2x.png b/examples/quickcontrols2/wearable/qml/Alarms/images/alarms@2x.png deleted file mode 100644 index ba68519a..00000000 Binary files a/examples/quickcontrols2/wearable/qml/Alarms/images/alarms@2x.png and /dev/null differ diff --git a/examples/quickcontrols2/wearable/qml/Fitness/images/fitness.png b/examples/quickcontrols2/wearable/qml/Fitness/images/fitness.png deleted file mode 100644 index 80ec43cc..00000000 Binary files a/examples/quickcontrols2/wearable/qml/Fitness/images/fitness.png and /dev/null differ diff --git a/examples/quickcontrols2/wearable/qml/Fitness/images/fitness@2x.png b/examples/quickcontrols2/wearable/qml/Fitness/images/fitness@2x.png deleted file mode 100644 index 088c15b8..00000000 Binary files a/examples/quickcontrols2/wearable/qml/Fitness/images/fitness@2x.png and /dev/null differ diff --git a/examples/quickcontrols2/wearable/qml/LauncherPage.qml b/examples/quickcontrols2/wearable/qml/LauncherPage.qml index 34f117c4..9d6d9ae9 100644 --- a/examples/quickcontrols2/wearable/qml/LauncherPage.qml +++ b/examples/quickcontrols2/wearable/qml/LauncherPage.qml @@ -49,7 +49,7 @@ ****************************************************************************/ import QtQuick 2.7 -import QtQuick.Controls 2.0 as QQC2 +import QtQuick.Controls 2.1 as QQC2 import "Style" PathView { @@ -68,56 +68,53 @@ PathView { model: ListModel { ListElement { title: qsTr("World Clock") - icon: "WorldClock/images/worldclock.png" + icon: "worldclock" page: "WorldClock/WorldClockPage.qml" } ListElement { title: qsTr("Navigation") - icon: "Navigation/images/navigation.png" + icon: "navigation" page: "Navigation/NavigationPage.qml" } ListElement { title: qsTr("Weather") - icon: "Weather/images/weather.png" + icon: "weather" page: "Weather/WeatherPage.qml" } ListElement { title: qsTr("Fitness") - icon: "Fitness/images/fitness.png" + icon: "fitness" page: "Fitness/FitnessPage.qml" } ListElement { title: qsTr("Notifications") - icon: "Notifications/images/notifications.png" + icon: "notifications" page: "Notifications/NotificationsPage.qml" } ListElement { title: qsTr("Alarm") - icon: "Alarms/images/alarms.png" + icon: "alarms" page: "Alarms/AlarmsPage.qml" } ListElement { title: qsTr("Settings") - icon: "Settings/images/settings.png" + icon: "settings" page: "Settings/SettingsPage.qml" } } - delegate: QQC2.AbstractButton { + delegate: QQC2.RoundButton { width: circularView.itemSize height: circularView.itemSize - text: model.title + property string title: model.title + + icon.width: 36 + icon.height: 36 + icon.name: model.icon opacity: PathView.itemOpacity padding: 12 - contentItem: Image { - source: model.icon - fillMode: Image.Pad - sourceSize.width: parent.availableWidth - sourceSize.height: parent.availableHeight - } - background: Rectangle { radius: width / 2 border.width: 3 @@ -180,7 +177,7 @@ PathView { visible: currentItem ? currentItem.PathView.itemOpacity === 1.0 : 0 - text: currentItem ? currentItem.text : "" + text: currentItem ? currentItem.title : "" anchors.centerIn: parent anchors.verticalCenterOffset: (circularView.itemSize + height) / 2 diff --git a/examples/quickcontrols2/wearable/qml/Notifications/images/notifications.png b/examples/quickcontrols2/wearable/qml/Notifications/images/notifications.png deleted file mode 100644 index bcbe85ef..00000000 Binary files a/examples/quickcontrols2/wearable/qml/Notifications/images/notifications.png and /dev/null differ diff --git a/examples/quickcontrols2/wearable/qml/Notifications/images/notifications@2x.png b/examples/quickcontrols2/wearable/qml/Notifications/images/notifications@2x.png deleted file mode 100644 index c3b284ed..00000000 Binary files a/examples/quickcontrols2/wearable/qml/Notifications/images/notifications@2x.png and /dev/null differ diff --git a/examples/quickcontrols2/wearable/qml/Settings/images/settings.png b/examples/quickcontrols2/wearable/qml/Settings/images/settings.png deleted file mode 100644 index 093404f9..00000000 Binary files a/examples/quickcontrols2/wearable/qml/Settings/images/settings.png and /dev/null differ diff --git a/examples/quickcontrols2/wearable/qml/Settings/images/settings@2x.png b/examples/quickcontrols2/wearable/qml/Settings/images/settings@2x.png deleted file mode 100644 index a24a1df7..00000000 Binary files a/examples/quickcontrols2/wearable/qml/Settings/images/settings@2x.png and /dev/null differ diff --git a/examples/quickcontrols2/wearable/qml/Weather/images/weather.png b/examples/quickcontrols2/wearable/qml/Weather/images/weather.png deleted file mode 100644 index 07bf8187..00000000 Binary files a/examples/quickcontrols2/wearable/qml/Weather/images/weather.png and /dev/null differ diff --git a/examples/quickcontrols2/wearable/qml/Weather/images/weather@2x.png b/examples/quickcontrols2/wearable/qml/Weather/images/weather@2x.png deleted file mode 100644 index 6e4ce2f3..00000000 Binary files a/examples/quickcontrols2/wearable/qml/Weather/images/weather@2x.png and /dev/null differ diff --git a/examples/quickcontrols2/wearable/qml/WorldClock/images/worldclock.png b/examples/quickcontrols2/wearable/qml/WorldClock/images/worldclock.png deleted file mode 100644 index 91a70493..00000000 Binary files a/examples/quickcontrols2/wearable/qml/WorldClock/images/worldclock.png and /dev/null differ diff --git a/examples/quickcontrols2/wearable/qml/WorldClock/images/worldclock@2x.png b/examples/quickcontrols2/wearable/qml/WorldClock/images/worldclock@2x.png deleted file mode 100644 index 03abe162..00000000 Binary files a/examples/quickcontrols2/wearable/qml/WorldClock/images/worldclock@2x.png and /dev/null differ diff --git a/examples/quickcontrols2/wearable/wearable.cpp b/examples/quickcontrols2/wearable/wearable.cpp index e6fdad74..e90ec413 100644 --- a/examples/quickcontrols2/wearable/wearable.cpp +++ b/examples/quickcontrols2/wearable/wearable.cpp @@ -51,6 +51,7 @@ #include #include #include +#include int main(int argc, char *argv[]) { @@ -61,6 +62,10 @@ int main(int argc, char *argv[]) QQuickStyle::setStyle(QStringLiteral("qrc:/qml/Style")); //! [style] + //! [icons] + QIcon::setThemeName(QStringLiteral("wearable")); + //! [icons] + QQmlApplicationEngine engine; engine.load(QUrl(QStringLiteral("qrc:/wearable.qml"))); diff --git a/examples/quickcontrols2/wearable/wearable.qrc b/examples/quickcontrols2/wearable/wearable.qrc index c8143a18..ea81edc6 100644 --- a/examples/quickcontrols2/wearable/wearable.qrc +++ b/examples/quickcontrols2/wearable/wearable.qrc @@ -3,18 +3,29 @@ wearable.qml qml/LauncherPage.qml qml/NaviButton.qml + icons/wearable/index.theme + 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 images/background.png images/back.png images/back@2x.png images/home.png images/home@2x.png qml/Alarms/AlarmsPage.qml - qml/Alarms/images/alarms.png - qml/Alarms/images/alarms@2x.png qml/Fitness/fitness.js qml/Fitness/FitnessPage.qml - qml/Fitness/images/fitness.png - qml/Fitness/images/fitness@2x.png qml/Fitness/images/man-running.png qml/Fitness/images/man-running@2x.png qml/Fitness/images/man-walking.png @@ -45,8 +56,6 @@ qml/Notifications/images/avatarm@2x.png qml/Notifications/images/missedcall.png qml/Notifications/images/missedcall@2x.png - qml/Notifications/images/notifications.png - qml/Notifications/images/notifications@2x.png qml/Settings/SettingsPage.qml qml/Settings/images/bluetooth.png qml/Settings/images/bluetooth@2x.png @@ -54,8 +63,6 @@ qml/Settings/images/brightness@2x.png qml/Settings/images/contrast.png qml/Settings/images/contrast@2x.png - qml/Settings/images/settings.png - qml/Settings/images/settings@2x.png qml/Settings/images/wifi.png qml/Settings/images/wifi@2x.png qml/Style/qmldir @@ -76,8 +83,6 @@ qml/Weather/images/sunset@2x.png qml/Weather/images/temperature.png qml/Weather/images/temperature@2x.png - qml/Weather/images/weather.png - qml/Weather/images/weather@2x.png qml/Weather/images/wind.png qml/Weather/images/wind@2x.png qml/WorldClock/Clock.qml @@ -98,7 +103,5 @@ qml/WorldClock/images/swissnighthour@2x.png qml/WorldClock/images/swissnightminute.png qml/WorldClock/images/swissnightminute@2x.png - qml/WorldClock/images/worldclock.png - qml/WorldClock/images/worldclock@2x.png -- cgit v1.2.3