From 05eed5820a5f7778c49ff0f51f0782c4373c6127 Mon Sep 17 00:00:00 2001 From: Kimmo Ollila Date: Tue, 14 Jun 2016 14:07:02 +0300 Subject: Updated icons Change-Id: I7f48724d6bb8be583c9f6d7c3c332c572f3ce5b6 Reviewed-by: Teemu Holappa --- src/settingsui/settingsuiplugin/icons.qrc | 5 +- .../settingsuiplugin/icons/Alert_yellow_1x.png | Bin 775 -> 631 bytes .../settingsuiplugin/icons/Audio_qt_6x.png | Bin 444 -> 499 bytes .../settingsuiplugin/icons/Bluetooth_qt_1x.png | Bin 858 -> 748 bytes .../settingsuiplugin/icons/Bluetooth_qt_6x.png | Bin 2349 -> 1859 bytes .../settingsuiplugin/icons/Camcorder_qt_1x.png | Bin 719 -> 616 bytes .../settingsuiplugin/icons/Camera_qt_1x.png | Bin 1003 -> 766 bytes .../settingsuiplugin/icons/Chevron-left_black.png | Bin 0 -> 1541 bytes .../icons/Chevron-left_black_1x.png | Bin 707 -> 0 bytes .../icons/Chevron-left_black_6x.png | Bin 0 -> 1569 bytes .../settingsuiplugin/icons/Clock_qt_1x.png | Bin 1185 -> 881 bytes .../settingsuiplugin/icons/Clock_qt_6x.png | Bin 3438 -> 3114 bytes .../settingsuiplugin/icons/Display_qt_6x.png | Bin 1157 -> 864 bytes .../settingsuiplugin/icons/Flag_qt_6x.png | Bin 1888 -> 1938 bytes .../settingsuiplugin/icons/Headphones_qt_1x.png | Bin 1041 -> 736 bytes .../settingsuiplugin/icons/Heartbeat_qt_1x.png | Bin 1061 -> 864 bytes .../settingsuiplugin/icons/Keyboard_qt_1x.png | Bin 1116 -> 741 bytes .../settingsuiplugin/icons/Laptop_qt_1x.png | Bin 861 -> 651 bytes .../settingsuiplugin/icons/Microphone_qt_1x.png | Bin 943 -> 811 bytes .../settingsuiplugin/icons/MobilePhone_qt_1x.png | Bin 785 -> 657 bytes .../settingsuiplugin/icons/Mouse_qt_1x.png | Bin 732 -> 658 bytes .../settingsuiplugin/icons/Power_black_1x.png | Bin 1161 -> 0 bytes .../settingsuiplugin/icons/Power_black_6x.png | Bin 0 -> 3106 bytes .../settingsuiplugin/icons/Tablet_qt_1x.png | Bin 721 -> 518 bytes .../settingsuiplugin/icons/Volume_down_qt_1x.png | Bin 571 -> 474 bytes .../settingsuiplugin/icons/Volume_mute_qt_1x.png | Bin 778 -> 684 bytes .../settingsuiplugin/icons/Volume_up_qt_1x.png | Bin 632 -> 517 bytes .../settingsuiplugin/icons/WifiAnim_black_2x.png | Bin 1673 -> 1870 bytes .../settingsuiplugin/icons/Wifi_lightgray_2x.png | Bin 924 -> 939 bytes .../settingsuiplugin/icons/World_qt_6x.png | Bin 5789 -> 3745 bytes src/settingsui/settingsuiplugin/pluginMain.qml | 81 +++++++++++---------- src/settingsui/timedate/CustomCalendar.qml | 12 ++- 32 files changed, 52 insertions(+), 46 deletions(-) create mode 100644 src/settingsui/settingsuiplugin/icons/Chevron-left_black.png delete mode 100644 src/settingsui/settingsuiplugin/icons/Chevron-left_black_1x.png create mode 100644 src/settingsui/settingsuiplugin/icons/Chevron-left_black_6x.png delete mode 100644 src/settingsui/settingsuiplugin/icons/Power_black_1x.png create mode 100644 src/settingsui/settingsuiplugin/icons/Power_black_6x.png diff --git a/src/settingsui/settingsuiplugin/icons.qrc b/src/settingsui/settingsuiplugin/icons.qrc index 639af66..88bdeac 100644 --- a/src/settingsui/settingsuiplugin/icons.qrc +++ b/src/settingsui/settingsuiplugin/icons.qrc @@ -6,7 +6,6 @@ icons/Bluetooth_qt_6x.png icons/Camcorder_qt_1x.png icons/Camera_qt_1x.png - icons/Chevron-left_black_1x.png icons/Clock_qt_1x.png icons/Clock_qt_6x.png icons/Display_qt_6x.png @@ -21,7 +20,6 @@ icons/Microphone_qt_1x.png icons/MobilePhone_qt_1x.png icons/Mouse_qt_1x.png - icons/Power_black_1x.png icons/Tablet_qt_1x.png icons/Volume_down_qt_1x.png icons/Volume_mute_qt_1x.png @@ -29,5 +27,8 @@ icons/WifiAnim_black_2x.png icons/Wifi_lightgray_2x.png icons/World_qt_6x.png + icons/Chevron-left_black_6x.png + icons/Chevron-left_black.png + icons/Power_black_6x.png diff --git a/src/settingsui/settingsuiplugin/icons/Alert_yellow_1x.png b/src/settingsui/settingsuiplugin/icons/Alert_yellow_1x.png index 2306ff6..6fd25cb 100644 Binary files a/src/settingsui/settingsuiplugin/icons/Alert_yellow_1x.png and b/src/settingsui/settingsuiplugin/icons/Alert_yellow_1x.png differ diff --git a/src/settingsui/settingsuiplugin/icons/Audio_qt_6x.png b/src/settingsui/settingsuiplugin/icons/Audio_qt_6x.png index 8251129..a33b286 100644 Binary files a/src/settingsui/settingsuiplugin/icons/Audio_qt_6x.png and b/src/settingsui/settingsuiplugin/icons/Audio_qt_6x.png differ diff --git a/src/settingsui/settingsuiplugin/icons/Bluetooth_qt_1x.png b/src/settingsui/settingsuiplugin/icons/Bluetooth_qt_1x.png index af6968d..d9378b4 100644 Binary files a/src/settingsui/settingsuiplugin/icons/Bluetooth_qt_1x.png and b/src/settingsui/settingsuiplugin/icons/Bluetooth_qt_1x.png differ diff --git a/src/settingsui/settingsuiplugin/icons/Bluetooth_qt_6x.png b/src/settingsui/settingsuiplugin/icons/Bluetooth_qt_6x.png index 55e4fb1..87d80cd 100644 Binary files a/src/settingsui/settingsuiplugin/icons/Bluetooth_qt_6x.png and b/src/settingsui/settingsuiplugin/icons/Bluetooth_qt_6x.png differ diff --git a/src/settingsui/settingsuiplugin/icons/Camcorder_qt_1x.png b/src/settingsui/settingsuiplugin/icons/Camcorder_qt_1x.png index 7ffb2c8..79db562 100644 Binary files a/src/settingsui/settingsuiplugin/icons/Camcorder_qt_1x.png and b/src/settingsui/settingsuiplugin/icons/Camcorder_qt_1x.png differ diff --git a/src/settingsui/settingsuiplugin/icons/Camera_qt_1x.png b/src/settingsui/settingsuiplugin/icons/Camera_qt_1x.png index b84e53a..0b831c5 100644 Binary files a/src/settingsui/settingsuiplugin/icons/Camera_qt_1x.png and b/src/settingsui/settingsuiplugin/icons/Camera_qt_1x.png differ diff --git a/src/settingsui/settingsuiplugin/icons/Chevron-left_black.png b/src/settingsui/settingsuiplugin/icons/Chevron-left_black.png new file mode 100644 index 0000000..0ebc3f4 Binary files /dev/null and b/src/settingsui/settingsuiplugin/icons/Chevron-left_black.png differ diff --git a/src/settingsui/settingsuiplugin/icons/Chevron-left_black_1x.png b/src/settingsui/settingsuiplugin/icons/Chevron-left_black_1x.png deleted file mode 100644 index 225176b..0000000 Binary files a/src/settingsui/settingsuiplugin/icons/Chevron-left_black_1x.png and /dev/null differ diff --git a/src/settingsui/settingsuiplugin/icons/Chevron-left_black_6x.png b/src/settingsui/settingsuiplugin/icons/Chevron-left_black_6x.png new file mode 100644 index 0000000..c1a8cff Binary files /dev/null and b/src/settingsui/settingsuiplugin/icons/Chevron-left_black_6x.png differ diff --git a/src/settingsui/settingsuiplugin/icons/Clock_qt_1x.png b/src/settingsui/settingsuiplugin/icons/Clock_qt_1x.png index ee58f95..d4b220d 100644 Binary files a/src/settingsui/settingsuiplugin/icons/Clock_qt_1x.png and b/src/settingsui/settingsuiplugin/icons/Clock_qt_1x.png differ diff --git a/src/settingsui/settingsuiplugin/icons/Clock_qt_6x.png b/src/settingsui/settingsuiplugin/icons/Clock_qt_6x.png index aba8b60..b351887 100644 Binary files a/src/settingsui/settingsuiplugin/icons/Clock_qt_6x.png and b/src/settingsui/settingsuiplugin/icons/Clock_qt_6x.png differ diff --git a/src/settingsui/settingsuiplugin/icons/Display_qt_6x.png b/src/settingsui/settingsuiplugin/icons/Display_qt_6x.png index e45c45c..89d1845 100644 Binary files a/src/settingsui/settingsuiplugin/icons/Display_qt_6x.png and b/src/settingsui/settingsuiplugin/icons/Display_qt_6x.png differ diff --git a/src/settingsui/settingsuiplugin/icons/Flag_qt_6x.png b/src/settingsui/settingsuiplugin/icons/Flag_qt_6x.png index f549ebd..32212da 100644 Binary files a/src/settingsui/settingsuiplugin/icons/Flag_qt_6x.png and b/src/settingsui/settingsuiplugin/icons/Flag_qt_6x.png differ diff --git a/src/settingsui/settingsuiplugin/icons/Headphones_qt_1x.png b/src/settingsui/settingsuiplugin/icons/Headphones_qt_1x.png index 82b04e7..da86427 100644 Binary files a/src/settingsui/settingsuiplugin/icons/Headphones_qt_1x.png and b/src/settingsui/settingsuiplugin/icons/Headphones_qt_1x.png differ diff --git a/src/settingsui/settingsuiplugin/icons/Heartbeat_qt_1x.png b/src/settingsui/settingsuiplugin/icons/Heartbeat_qt_1x.png index 16a94bc..9599158 100644 Binary files a/src/settingsui/settingsuiplugin/icons/Heartbeat_qt_1x.png and b/src/settingsui/settingsuiplugin/icons/Heartbeat_qt_1x.png differ diff --git a/src/settingsui/settingsuiplugin/icons/Keyboard_qt_1x.png b/src/settingsui/settingsuiplugin/icons/Keyboard_qt_1x.png index cc6417d..5911e06 100644 Binary files a/src/settingsui/settingsuiplugin/icons/Keyboard_qt_1x.png and b/src/settingsui/settingsuiplugin/icons/Keyboard_qt_1x.png differ diff --git a/src/settingsui/settingsuiplugin/icons/Laptop_qt_1x.png b/src/settingsui/settingsuiplugin/icons/Laptop_qt_1x.png index 2924015..4708259 100644 Binary files a/src/settingsui/settingsuiplugin/icons/Laptop_qt_1x.png and b/src/settingsui/settingsuiplugin/icons/Laptop_qt_1x.png differ diff --git a/src/settingsui/settingsuiplugin/icons/Microphone_qt_1x.png b/src/settingsui/settingsuiplugin/icons/Microphone_qt_1x.png index f76a963..9182212 100644 Binary files a/src/settingsui/settingsuiplugin/icons/Microphone_qt_1x.png and b/src/settingsui/settingsuiplugin/icons/Microphone_qt_1x.png differ diff --git a/src/settingsui/settingsuiplugin/icons/MobilePhone_qt_1x.png b/src/settingsui/settingsuiplugin/icons/MobilePhone_qt_1x.png index 363d667..50fcc0a 100644 Binary files a/src/settingsui/settingsuiplugin/icons/MobilePhone_qt_1x.png and b/src/settingsui/settingsuiplugin/icons/MobilePhone_qt_1x.png differ diff --git a/src/settingsui/settingsuiplugin/icons/Mouse_qt_1x.png b/src/settingsui/settingsuiplugin/icons/Mouse_qt_1x.png index 24d057d..a1eefe5 100644 Binary files a/src/settingsui/settingsuiplugin/icons/Mouse_qt_1x.png and b/src/settingsui/settingsuiplugin/icons/Mouse_qt_1x.png differ diff --git a/src/settingsui/settingsuiplugin/icons/Power_black_1x.png b/src/settingsui/settingsuiplugin/icons/Power_black_1x.png deleted file mode 100644 index cca0fe8..0000000 Binary files a/src/settingsui/settingsuiplugin/icons/Power_black_1x.png and /dev/null differ diff --git a/src/settingsui/settingsuiplugin/icons/Power_black_6x.png b/src/settingsui/settingsuiplugin/icons/Power_black_6x.png new file mode 100644 index 0000000..d6add07 Binary files /dev/null and b/src/settingsui/settingsuiplugin/icons/Power_black_6x.png differ diff --git a/src/settingsui/settingsuiplugin/icons/Tablet_qt_1x.png b/src/settingsui/settingsuiplugin/icons/Tablet_qt_1x.png index e218184..1d0bc4f 100644 Binary files a/src/settingsui/settingsuiplugin/icons/Tablet_qt_1x.png and b/src/settingsui/settingsuiplugin/icons/Tablet_qt_1x.png differ diff --git a/src/settingsui/settingsuiplugin/icons/Volume_down_qt_1x.png b/src/settingsui/settingsuiplugin/icons/Volume_down_qt_1x.png index 2068819..05c2ce4 100644 Binary files a/src/settingsui/settingsuiplugin/icons/Volume_down_qt_1x.png and b/src/settingsui/settingsuiplugin/icons/Volume_down_qt_1x.png differ diff --git a/src/settingsui/settingsuiplugin/icons/Volume_mute_qt_1x.png b/src/settingsui/settingsuiplugin/icons/Volume_mute_qt_1x.png index 1a41927..ca14213 100644 Binary files a/src/settingsui/settingsuiplugin/icons/Volume_mute_qt_1x.png and b/src/settingsui/settingsuiplugin/icons/Volume_mute_qt_1x.png differ diff --git a/src/settingsui/settingsuiplugin/icons/Volume_up_qt_1x.png b/src/settingsui/settingsuiplugin/icons/Volume_up_qt_1x.png index 45a8b61..08f6221 100644 Binary files a/src/settingsui/settingsuiplugin/icons/Volume_up_qt_1x.png and b/src/settingsui/settingsuiplugin/icons/Volume_up_qt_1x.png differ diff --git a/src/settingsui/settingsuiplugin/icons/WifiAnim_black_2x.png b/src/settingsui/settingsuiplugin/icons/WifiAnim_black_2x.png index 76c850d..c2dc8c5 100644 Binary files a/src/settingsui/settingsuiplugin/icons/WifiAnim_black_2x.png and b/src/settingsui/settingsuiplugin/icons/WifiAnim_black_2x.png differ diff --git a/src/settingsui/settingsuiplugin/icons/Wifi_lightgray_2x.png b/src/settingsui/settingsuiplugin/icons/Wifi_lightgray_2x.png index 3e6183a..b71b22e 100644 Binary files a/src/settingsui/settingsuiplugin/icons/Wifi_lightgray_2x.png and b/src/settingsui/settingsuiplugin/icons/Wifi_lightgray_2x.png differ diff --git a/src/settingsui/settingsuiplugin/icons/World_qt_6x.png b/src/settingsui/settingsuiplugin/icons/World_qt_6x.png index 9024031..2aee655 100644 Binary files a/src/settingsui/settingsuiplugin/icons/World_qt_6x.png and b/src/settingsui/settingsuiplugin/icons/World_qt_6x.png differ diff --git a/src/settingsui/settingsuiplugin/pluginMain.qml b/src/settingsui/settingsuiplugin/pluginMain.qml index 4df473f..3f15c57 100644 --- a/src/settingsui/settingsuiplugin/pluginMain.qml +++ b/src/settingsui/settingsuiplugin/pluginMain.qml @@ -47,51 +47,52 @@ Rectangle { height: 40 z: 2 - RowLayout { - spacing: 20 - anchors.fill: parent - - ToolButton { - contentItem: Image { - fillMode: Image.PreserveAspectFit - source: "../icons/Chevron-left_black_1x.png" - anchors.centerIn: parent - } - - visible: stackView.depth > 1 - onClicked: stackView.pop(); + ToolButton { + height: parent.height + width: height + contentItem: Image { + fillMode: Image.PreserveAspectFit + source: "../icons/Chevron-left_black_6x.png" + anchors.fill: parent + anchors.margins: parent.height * .2 } - Label { - id: titleText - font.pixelSize: 20 - text: stackView.currentItem.title - horizontalAlignment: Qt.AlignHCenter - verticalAlignment: Qt.AlignVCenter - anchors.centerIn: parent + + visible: stackView.depth > 1 + onClicked: stackView.pop(); + } + Label { + id: titleText + font.pixelSize: 20 + text: stackView.currentItem.title + horizontalAlignment: Qt.AlignHCenter + verticalAlignment: Qt.AlignVCenter + anchors.centerIn: parent + } + ToolButton { + height: parent.height + width: height + contentItem: Image { + fillMode: Image.PreserveAspectFit + source: "../icons/Power_black_6x.png" + anchors.fill: parent + anchors.margins: parent.height * .2 } - ToolButton { - contentItem: Image { - fillMode: Image.PreserveAspectFit - source: "../icons/Power_black_1x.png" - anchors.centerIn: parent - } - anchors.right: parent.right + anchors.right: parent.right - visible: stackView.depth === 1 - onClicked: menu.open(); + visible: stackView.depth === 1 + onClicked: menu.open(); - Menu { - id: menu - x: parent.width - width + Menu { + id: menu + x: parent.width - width - MenuItem { - text: qsTr("Reboot") - onTriggered: LocalDevice.reboot() - } - MenuItem { - text: qsTr("Shutdown") - onTriggered: LocalDevice.powerOff() - } + MenuItem { + text: qsTr("Reboot") + onTriggered: LocalDevice.reboot() + } + MenuItem { + text: qsTr("Shutdown") + onTriggered: LocalDevice.powerOff() } } } diff --git a/src/settingsui/timedate/CustomCalendar.qml b/src/settingsui/timedate/CustomCalendar.qml index 5be8398..a1deff0 100644 --- a/src/settingsui/timedate/CustomCalendar.qml +++ b/src/settingsui/timedate/CustomCalendar.qml @@ -66,8 +66,10 @@ Rectangle { color: "#d6d6d6" Image { - anchors.centerIn: parent - source: "../icons/Chevron-left_black_1x.png" + anchors.fill: parent + anchors.margins: parent.height * .2 + source: "../icons/Chevron-left_black.png" + fillMode: Image.PreserveAspectFit } } onClicked: { @@ -101,9 +103,11 @@ Rectangle { color: "#d6d6d6" Image { - anchors.centerIn: parent - source: "../icons/Chevron-left_black_1x.png" + anchors.fill: parent + anchors.margins: parent.height * .2 + source: "../icons/Chevron-left_black.png" mirror: true + fillMode: Image.PreserveAspectFit } } onClicked: { -- cgit v1.2.3