diff options
author | Kimmo Ollila <kimmo.ollila@theqtcompany.com> | 2016-06-14 14:07:02 +0300 |
---|---|---|
committer | Kimmo Ollila <kimmo.ollila@theqtcompany.com> | 2016-06-14 11:40:01 +0000 |
commit | 05eed5820a5f7778c49ff0f51f0782c4373c6127 (patch) | |
tree | 5064a5fee408ac61548e70bd400a6a8c64d8e4e6 /src/settingsui | |
parent | 90d8b98c3517d3339b6dc00e35a3975d23b00b8c (diff) |
Updated icons
Change-Id: I7f48724d6bb8be583c9f6d7c3c332c572f3ce5b6
Reviewed-by: Teemu Holappa <teemu.holappa@theqtcompany.com>
Diffstat (limited to 'src/settingsui')
32 files changed, 52 insertions, 46 deletions
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 @@ <file>icons/Bluetooth_qt_6x.png</file> <file>icons/Camcorder_qt_1x.png</file> <file>icons/Camera_qt_1x.png</file> - <file>icons/Chevron-left_black_1x.png</file> <file>icons/Clock_qt_1x.png</file> <file>icons/Clock_qt_6x.png</file> <file>icons/Display_qt_6x.png</file> @@ -21,7 +20,6 @@ <file>icons/Microphone_qt_1x.png</file> <file>icons/MobilePhone_qt_1x.png</file> <file>icons/Mouse_qt_1x.png</file> - <file>icons/Power_black_1x.png</file> <file>icons/Tablet_qt_1x.png</file> <file>icons/Volume_down_qt_1x.png</file> <file>icons/Volume_mute_qt_1x.png</file> @@ -29,5 +27,8 @@ <file>icons/WifiAnim_black_2x.png</file> <file>icons/Wifi_lightgray_2x.png</file> <file>icons/World_qt_6x.png</file> + <file>icons/Chevron-left_black_6x.png</file> + <file>icons/Chevron-left_black.png</file> + <file>icons/Power_black_6x.png</file> </qresource> </RCC> diff --git a/src/settingsui/settingsuiplugin/icons/Alert_yellow_1x.png b/src/settingsui/settingsuiplugin/icons/Alert_yellow_1x.png Binary files differindex 2306ff6..6fd25cb 100644 --- a/src/settingsui/settingsuiplugin/icons/Alert_yellow_1x.png +++ b/src/settingsui/settingsuiplugin/icons/Alert_yellow_1x.png diff --git a/src/settingsui/settingsuiplugin/icons/Audio_qt_6x.png b/src/settingsui/settingsuiplugin/icons/Audio_qt_6x.png Binary files differindex 8251129..a33b286 100644 --- a/src/settingsui/settingsuiplugin/icons/Audio_qt_6x.png +++ b/src/settingsui/settingsuiplugin/icons/Audio_qt_6x.png diff --git a/src/settingsui/settingsuiplugin/icons/Bluetooth_qt_1x.png b/src/settingsui/settingsuiplugin/icons/Bluetooth_qt_1x.png Binary files differindex af6968d..d9378b4 100644 --- a/src/settingsui/settingsuiplugin/icons/Bluetooth_qt_1x.png +++ b/src/settingsui/settingsuiplugin/icons/Bluetooth_qt_1x.png diff --git a/src/settingsui/settingsuiplugin/icons/Bluetooth_qt_6x.png b/src/settingsui/settingsuiplugin/icons/Bluetooth_qt_6x.png Binary files differindex 55e4fb1..87d80cd 100644 --- a/src/settingsui/settingsuiplugin/icons/Bluetooth_qt_6x.png +++ b/src/settingsui/settingsuiplugin/icons/Bluetooth_qt_6x.png diff --git a/src/settingsui/settingsuiplugin/icons/Camcorder_qt_1x.png b/src/settingsui/settingsuiplugin/icons/Camcorder_qt_1x.png Binary files differindex 7ffb2c8..79db562 100644 --- a/src/settingsui/settingsuiplugin/icons/Camcorder_qt_1x.png +++ b/src/settingsui/settingsuiplugin/icons/Camcorder_qt_1x.png diff --git a/src/settingsui/settingsuiplugin/icons/Camera_qt_1x.png b/src/settingsui/settingsuiplugin/icons/Camera_qt_1x.png Binary files differindex b84e53a..0b831c5 100644 --- a/src/settingsui/settingsuiplugin/icons/Camera_qt_1x.png +++ b/src/settingsui/settingsuiplugin/icons/Camera_qt_1x.png diff --git a/src/settingsui/settingsuiplugin/icons/Chevron-left_black.png b/src/settingsui/settingsuiplugin/icons/Chevron-left_black.png Binary files differnew file mode 100644 index 0000000..0ebc3f4 --- /dev/null +++ b/src/settingsui/settingsuiplugin/icons/Chevron-left_black.png diff --git a/src/settingsui/settingsuiplugin/icons/Chevron-left_black_1x.png b/src/settingsui/settingsuiplugin/icons/Chevron-left_black_1x.png Binary files differdeleted file mode 100644 index 225176b..0000000 --- a/src/settingsui/settingsuiplugin/icons/Chevron-left_black_1x.png +++ /dev/null diff --git a/src/settingsui/settingsuiplugin/icons/Chevron-left_black_6x.png b/src/settingsui/settingsuiplugin/icons/Chevron-left_black_6x.png Binary files differnew file mode 100644 index 0000000..c1a8cff --- /dev/null +++ b/src/settingsui/settingsuiplugin/icons/Chevron-left_black_6x.png diff --git a/src/settingsui/settingsuiplugin/icons/Clock_qt_1x.png b/src/settingsui/settingsuiplugin/icons/Clock_qt_1x.png Binary files differindex ee58f95..d4b220d 100644 --- a/src/settingsui/settingsuiplugin/icons/Clock_qt_1x.png +++ b/src/settingsui/settingsuiplugin/icons/Clock_qt_1x.png diff --git a/src/settingsui/settingsuiplugin/icons/Clock_qt_6x.png b/src/settingsui/settingsuiplugin/icons/Clock_qt_6x.png Binary files differindex aba8b60..b351887 100644 --- a/src/settingsui/settingsuiplugin/icons/Clock_qt_6x.png +++ b/src/settingsui/settingsuiplugin/icons/Clock_qt_6x.png diff --git a/src/settingsui/settingsuiplugin/icons/Display_qt_6x.png b/src/settingsui/settingsuiplugin/icons/Display_qt_6x.png Binary files differindex e45c45c..89d1845 100644 --- a/src/settingsui/settingsuiplugin/icons/Display_qt_6x.png +++ b/src/settingsui/settingsuiplugin/icons/Display_qt_6x.png diff --git a/src/settingsui/settingsuiplugin/icons/Flag_qt_6x.png b/src/settingsui/settingsuiplugin/icons/Flag_qt_6x.png Binary files differindex f549ebd..32212da 100644 --- a/src/settingsui/settingsuiplugin/icons/Flag_qt_6x.png +++ b/src/settingsui/settingsuiplugin/icons/Flag_qt_6x.png diff --git a/src/settingsui/settingsuiplugin/icons/Headphones_qt_1x.png b/src/settingsui/settingsuiplugin/icons/Headphones_qt_1x.png Binary files differindex 82b04e7..da86427 100644 --- a/src/settingsui/settingsuiplugin/icons/Headphones_qt_1x.png +++ b/src/settingsui/settingsuiplugin/icons/Headphones_qt_1x.png diff --git a/src/settingsui/settingsuiplugin/icons/Heartbeat_qt_1x.png b/src/settingsui/settingsuiplugin/icons/Heartbeat_qt_1x.png Binary files differindex 16a94bc..9599158 100644 --- a/src/settingsui/settingsuiplugin/icons/Heartbeat_qt_1x.png +++ b/src/settingsui/settingsuiplugin/icons/Heartbeat_qt_1x.png diff --git a/src/settingsui/settingsuiplugin/icons/Keyboard_qt_1x.png b/src/settingsui/settingsuiplugin/icons/Keyboard_qt_1x.png Binary files differindex cc6417d..5911e06 100644 --- a/src/settingsui/settingsuiplugin/icons/Keyboard_qt_1x.png +++ b/src/settingsui/settingsuiplugin/icons/Keyboard_qt_1x.png diff --git a/src/settingsui/settingsuiplugin/icons/Laptop_qt_1x.png b/src/settingsui/settingsuiplugin/icons/Laptop_qt_1x.png Binary files differindex 2924015..4708259 100644 --- a/src/settingsui/settingsuiplugin/icons/Laptop_qt_1x.png +++ b/src/settingsui/settingsuiplugin/icons/Laptop_qt_1x.png diff --git a/src/settingsui/settingsuiplugin/icons/Microphone_qt_1x.png b/src/settingsui/settingsuiplugin/icons/Microphone_qt_1x.png Binary files differindex f76a963..9182212 100644 --- a/src/settingsui/settingsuiplugin/icons/Microphone_qt_1x.png +++ b/src/settingsui/settingsuiplugin/icons/Microphone_qt_1x.png diff --git a/src/settingsui/settingsuiplugin/icons/MobilePhone_qt_1x.png b/src/settingsui/settingsuiplugin/icons/MobilePhone_qt_1x.png Binary files differindex 363d667..50fcc0a 100644 --- a/src/settingsui/settingsuiplugin/icons/MobilePhone_qt_1x.png +++ b/src/settingsui/settingsuiplugin/icons/MobilePhone_qt_1x.png diff --git a/src/settingsui/settingsuiplugin/icons/Mouse_qt_1x.png b/src/settingsui/settingsuiplugin/icons/Mouse_qt_1x.png Binary files differindex 24d057d..a1eefe5 100644 --- a/src/settingsui/settingsuiplugin/icons/Mouse_qt_1x.png +++ b/src/settingsui/settingsuiplugin/icons/Mouse_qt_1x.png diff --git a/src/settingsui/settingsuiplugin/icons/Power_black_1x.png b/src/settingsui/settingsuiplugin/icons/Power_black_1x.png Binary files differdeleted file mode 100644 index cca0fe8..0000000 --- a/src/settingsui/settingsuiplugin/icons/Power_black_1x.png +++ /dev/null diff --git a/src/settingsui/settingsuiplugin/icons/Power_black_6x.png b/src/settingsui/settingsuiplugin/icons/Power_black_6x.png Binary files differnew file mode 100644 index 0000000..d6add07 --- /dev/null +++ b/src/settingsui/settingsuiplugin/icons/Power_black_6x.png diff --git a/src/settingsui/settingsuiplugin/icons/Tablet_qt_1x.png b/src/settingsui/settingsuiplugin/icons/Tablet_qt_1x.png Binary files differindex e218184..1d0bc4f 100644 --- a/src/settingsui/settingsuiplugin/icons/Tablet_qt_1x.png +++ b/src/settingsui/settingsuiplugin/icons/Tablet_qt_1x.png diff --git a/src/settingsui/settingsuiplugin/icons/Volume_down_qt_1x.png b/src/settingsui/settingsuiplugin/icons/Volume_down_qt_1x.png Binary files differindex 2068819..05c2ce4 100644 --- a/src/settingsui/settingsuiplugin/icons/Volume_down_qt_1x.png +++ b/src/settingsui/settingsuiplugin/icons/Volume_down_qt_1x.png diff --git a/src/settingsui/settingsuiplugin/icons/Volume_mute_qt_1x.png b/src/settingsui/settingsuiplugin/icons/Volume_mute_qt_1x.png Binary files differindex 1a41927..ca14213 100644 --- a/src/settingsui/settingsuiplugin/icons/Volume_mute_qt_1x.png +++ b/src/settingsui/settingsuiplugin/icons/Volume_mute_qt_1x.png diff --git a/src/settingsui/settingsuiplugin/icons/Volume_up_qt_1x.png b/src/settingsui/settingsuiplugin/icons/Volume_up_qt_1x.png Binary files differindex 45a8b61..08f6221 100644 --- a/src/settingsui/settingsuiplugin/icons/Volume_up_qt_1x.png +++ b/src/settingsui/settingsuiplugin/icons/Volume_up_qt_1x.png diff --git a/src/settingsui/settingsuiplugin/icons/WifiAnim_black_2x.png b/src/settingsui/settingsuiplugin/icons/WifiAnim_black_2x.png Binary files differindex 76c850d..c2dc8c5 100644 --- a/src/settingsui/settingsuiplugin/icons/WifiAnim_black_2x.png +++ b/src/settingsui/settingsuiplugin/icons/WifiAnim_black_2x.png diff --git a/src/settingsui/settingsuiplugin/icons/Wifi_lightgray_2x.png b/src/settingsui/settingsuiplugin/icons/Wifi_lightgray_2x.png Binary files differindex 3e6183a..b71b22e 100644 --- a/src/settingsui/settingsuiplugin/icons/Wifi_lightgray_2x.png +++ b/src/settingsui/settingsuiplugin/icons/Wifi_lightgray_2x.png diff --git a/src/settingsui/settingsuiplugin/icons/World_qt_6x.png b/src/settingsui/settingsuiplugin/icons/World_qt_6x.png Binary files differindex 9024031..2aee655 100644 --- a/src/settingsui/settingsuiplugin/icons/World_qt_6x.png +++ b/src/settingsui/settingsuiplugin/icons/World_qt_6x.png 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: { |