summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorKimmo Ollila <kimmo.ollila@theqtcompany.com>2016-05-11 12:52:49 +0300
committerKimmo Ollila <kimmo.ollila@theqtcompany.com>2016-05-13 13:11:35 +0000
commit15ac9af2680d63321403f49eca03cdb192851bd3 (patch)
treedcc08c12c6c6ac8bc6a5cb67e45016df349a5ac5 /src
parent046ad79065faff555168bae13e3414b23b0521a8 (diff)
Separated SettingsUI to its own plugin.
Change-Id: I7893231ab2d18270183f9838456d0e48cdc63186 Reviewed-by: Samuli Piippo <samuli.piippo@qt.io> Reviewed-by: Teemu Holappa <teemu.holappa@theqtcompany.com>
Diffstat (limited to 'src')
-rw-r--r--src/settingsui/AutoScroller.qml113
-rw-r--r--src/settingsui/bluetooth/Bluetooth.qml4
-rw-r--r--src/settingsui/bluetooth/Discovery.qml6
-rw-r--r--src/settingsui/common/CustomTableView.qml4
-rw-r--r--src/settingsui/display/Display.qml4
-rw-r--r--src/settingsui/locale/Language.qml4
-rw-r--r--src/settingsui/locale/RegionSelect.qml4
-rw-r--r--src/settingsui/main.cpp32
-rw-r--r--src/settingsui/main.qml302
-rw-r--r--src/settingsui/network/AddressListEntry.qml4
-rw-r--r--src/settingsui/network/ComboBoxEntry.qml4
-rw-r--r--src/settingsui/network/EditWiredSettings.qml4
-rw-r--r--src/settingsui/network/IpAddressTextField.qml4
-rw-r--r--src/settingsui/network/NetworkDetails.qml2
-rw-r--r--src/settingsui/network/NetworkSettings.qml7
-rw-r--r--src/settingsui/network/WifiSelectorDelegate.qml5
-rw-r--r--src/settingsui/network/WifiSettings.qml6
-rw-r--r--src/settingsui/network/WifiSignalMonitor.qml4
-rw-r--r--src/settingsui/network/WiredSettings.qml10
-rw-r--r--src/settingsui/qml.qrc28
-rw-r--r--src/settingsui/settingsui.pro6
-rw-r--r--src/settingsui/settingsuiapp.qrc7
-rw-r--r--src/settingsui/settingsuiplugin/icons.qrc (renamed from src/settingsui/icons.qrc)28
-rw-r--r--src/settingsui/settingsuiplugin/icons/Alert_yellow_1x.png (renamed from src/settingsui/icons/Alert_yellow_1x.png)bin775 -> 775 bytes
-rw-r--r--src/settingsui/settingsuiplugin/icons/Audio_qt_6x.png (renamed from src/settingsui/icons/Audio_qt_6x.png)bin444 -> 444 bytes
-rw-r--r--src/settingsui/settingsuiplugin/icons/Bluetooth_qt_1x.png (renamed from src/settingsui/icons/Bluetooth_qt_1x.png)bin858 -> 858 bytes
-rw-r--r--src/settingsui/settingsuiplugin/icons/Bluetooth_qt_6x.png (renamed from src/settingsui/icons/Bluetooth_qt_6x.png)bin2349 -> 2349 bytes
-rw-r--r--src/settingsui/settingsuiplugin/icons/Camcorder_qt_1x.png (renamed from src/settingsui/icons/Camcorder_qt_1x.png)bin719 -> 719 bytes
-rw-r--r--src/settingsui/settingsuiplugin/icons/Camera_qt_1x.png (renamed from src/settingsui/icons/Camera_qt_1x.png)bin1003 -> 1003 bytes
-rw-r--r--src/settingsui/settingsuiplugin/icons/Chevron-left_black_1x.png (renamed from src/settingsui/icons/Chevron-left_black_1x.png)bin707 -> 707 bytes
-rw-r--r--src/settingsui/settingsuiplugin/icons/Clock_qt_1x.png (renamed from src/settingsui/icons/Clock_qt_1x.png)bin1185 -> 1185 bytes
-rw-r--r--src/settingsui/settingsuiplugin/icons/Clock_qt_6x.png (renamed from src/settingsui/icons/Clock_qt_6x.png)bin3438 -> 3438 bytes
-rw-r--r--src/settingsui/settingsuiplugin/icons/Display_qt_6x.png (renamed from src/settingsui/icons/Display_qt_6x.png)bin1157 -> 1157 bytes
-rw-r--r--src/settingsui/settingsuiplugin/icons/Flag_qt_6x.png (renamed from src/settingsui/icons/Flag_qt_6x.png)bin1888 -> 1888 bytes
-rwxr-xr-xsrc/settingsui/settingsuiplugin/icons/FloatingButton_Active.png (renamed from src/settingsui/icons/FloatingButton_Active.png)bin3584 -> 3584 bytes
-rwxr-xr-xsrc/settingsui/settingsuiplugin/icons/FloatingButton_Available.png (renamed from src/settingsui/icons/FloatingButton_Available.png)bin3554 -> 3554 bytes
-rwxr-xr-xsrc/settingsui/settingsuiplugin/icons/FloatingButton_Unavailable.png (renamed from src/settingsui/icons/FloatingButton_Unavailable.png)bin3134 -> 3134 bytes
-rw-r--r--src/settingsui/settingsuiplugin/icons/Headphones_qt_1x.png (renamed from src/settingsui/icons/Headphones_qt_1x.png)bin1041 -> 1041 bytes
-rw-r--r--src/settingsui/settingsuiplugin/icons/Heartbeat_qt_1x.png (renamed from src/settingsui/icons/Heartbeat_qt_1x.png)bin1061 -> 1061 bytes
-rw-r--r--src/settingsui/settingsuiplugin/icons/Keyboard_qt_1x.png (renamed from src/settingsui/icons/Keyboard_qt_1x.png)bin1116 -> 1116 bytes
-rw-r--r--src/settingsui/settingsuiplugin/icons/Laptop_qt_1x.png (renamed from src/settingsui/icons/Laptop_qt_1x.png)bin861 -> 861 bytes
-rw-r--r--src/settingsui/settingsuiplugin/icons/Microphone_qt_1x.png (renamed from src/settingsui/icons/Microphone_qt_1x.png)bin943 -> 943 bytes
-rw-r--r--src/settingsui/settingsuiplugin/icons/MobilePhone_qt_1x.png (renamed from src/settingsui/icons/MobilePhone_qt_1x.png)bin785 -> 785 bytes
-rw-r--r--src/settingsui/settingsuiplugin/icons/Mouse_qt_1x.png (renamed from src/settingsui/icons/Mouse_qt_1x.png)bin732 -> 732 bytes
-rw-r--r--src/settingsui/settingsuiplugin/icons/Power_black_1x.png (renamed from src/settingsui/icons/Power_black_1x.png)bin1161 -> 1161 bytes
-rw-r--r--src/settingsui/settingsuiplugin/icons/Tablet_qt_1x.png (renamed from src/settingsui/icons/Tablet_qt_1x.png)bin721 -> 721 bytes
-rw-r--r--src/settingsui/settingsuiplugin/icons/Volume_down_qt_1x.png (renamed from src/settingsui/icons/Volume_down_qt_1x.png)bin571 -> 571 bytes
-rw-r--r--src/settingsui/settingsuiplugin/icons/Volume_mute_qt_1x.png (renamed from src/settingsui/icons/Volume_mute_qt_1x.png)bin778 -> 778 bytes
-rw-r--r--src/settingsui/settingsuiplugin/icons/Volume_up_qt_1x.png (renamed from src/settingsui/icons/Volume_up_qt_1x.png)bin632 -> 632 bytes
-rw-r--r--src/settingsui/settingsuiplugin/icons/WifiAnim_black_2x.png (renamed from src/settingsui/icons/WifiAnim_black_2x.png)bin1673 -> 1673 bytes
-rw-r--r--src/settingsui/settingsuiplugin/icons/Wifi_lightgray_2x.png (renamed from src/settingsui/icons/Wifi_lightgray_2x.png)bin924 -> 924 bytes
-rw-r--r--src/settingsui/settingsuiplugin/icons/World_qt_6x.png (renamed from src/settingsui/icons/World_qt_6x.png)bin5789 -> 5789 bytes
-rwxr-xr-xsrc/settingsui/settingsuiplugin/icons/generate_icons.sh (renamed from src/settingsui/icons/generate_icons.sh)0
-rw-r--r--src/settingsui/settingsuiplugin/icons/ref/Audio.png (renamed from src/settingsui/icons/ref/Audio.png)bin135 -> 135 bytes
-rw-r--r--src/settingsui/settingsuiplugin/icons/ref/Back.png (renamed from src/settingsui/icons/ref/Back.png)bin1725 -> 1725 bytes
-rw-r--r--src/settingsui/settingsuiplugin/icons/ref/Bluetooth.png (renamed from src/settingsui/icons/ref/Bluetooth.png)bin1364 -> 1364 bytes
-rw-r--r--src/settingsui/settingsuiplugin/icons/ref/Camcorder.png (renamed from src/settingsui/icons/ref/Camcorder.png)bin1036 -> 1036 bytes
-rw-r--r--src/settingsui/settingsuiplugin/icons/ref/Camera.png (renamed from src/settingsui/icons/ref/Camera.png)bin1889 -> 1889 bytes
-rw-r--r--src/settingsui/settingsuiplugin/icons/ref/Chevron-left.png (renamed from src/settingsui/icons/ref/Chevron-left.png)bin1475 -> 1475 bytes
-rw-r--r--src/settingsui/settingsuiplugin/icons/ref/Chevron-right.png (renamed from src/settingsui/icons/ref/Chevron-right.png)bin1463 -> 1463 bytes
-rw-r--r--src/settingsui/settingsuiplugin/icons/ref/Circle-x.png (renamed from src/settingsui/icons/ref/Circle-x.png)bin3358 -> 3358 bytes
-rw-r--r--src/settingsui/settingsuiplugin/icons/ref/Clock.png (renamed from src/settingsui/icons/ref/Clock.png)bin2438 -> 2438 bytes
-rw-r--r--src/settingsui/settingsuiplugin/icons/ref/Cogs.png (renamed from src/settingsui/icons/ref/Cogs.png)bin2756 -> 2756 bytes
-rw-r--r--src/settingsui/settingsuiplugin/icons/ref/Connections.png (renamed from src/settingsui/icons/ref/Connections.png)bin3226 -> 3226 bytes
-rw-r--r--src/settingsui/settingsuiplugin/icons/ref/Display.png (renamed from src/settingsui/icons/ref/Display.png)bin754 -> 754 bytes
-rw-r--r--src/settingsui/settingsuiplugin/icons/ref/Flag.png (renamed from src/settingsui/icons/ref/Flag.png)bin1395 -> 1395 bytes
-rw-r--r--src/settingsui/settingsuiplugin/icons/ref/Headphones.png (renamed from src/settingsui/icons/ref/Headphones.png)bin2141 -> 2141 bytes
-rw-r--r--src/settingsui/settingsuiplugin/icons/ref/Heartbeat.png (renamed from src/settingsui/icons/ref/Heartbeat.png)bin2280 -> 2280 bytes
-rw-r--r--src/settingsui/settingsuiplugin/icons/ref/Keyboard.png (renamed from src/settingsui/icons/ref/Keyboard.png)bin571 -> 571 bytes
-rw-r--r--src/settingsui/settingsuiplugin/icons/ref/Laptop.png (renamed from src/settingsui/icons/ref/Laptop.png)bin753 -> 753 bytes
-rw-r--r--src/settingsui/settingsuiplugin/icons/ref/Lock.png (renamed from src/settingsui/icons/ref/Lock.png)bin1043 -> 1043 bytes
-rw-r--r--src/settingsui/settingsuiplugin/icons/ref/Microphone.png (renamed from src/settingsui/icons/ref/Microphone.png)bin1891 -> 1891 bytes
-rw-r--r--src/settingsui/settingsuiplugin/icons/ref/MobilePhone.png (renamed from src/settingsui/icons/ref/MobilePhone.png)bin1034 -> 1034 bytes
-rw-r--r--src/settingsui/settingsuiplugin/icons/ref/Mouse.png (renamed from src/settingsui/icons/ref/Mouse.png)bin1560 -> 1560 bytes
-rw-r--r--src/settingsui/settingsuiplugin/icons/ref/Plus.png (renamed from src/settingsui/icons/ref/Plus.png)bin2888 -> 2888 bytes
-rw-r--r--src/settingsui/settingsuiplugin/icons/ref/Power.png (renamed from src/settingsui/icons/ref/Power.png)bin2466 -> 2466 bytes
-rw-r--r--src/settingsui/settingsuiplugin/icons/ref/Settings.png (renamed from src/settingsui/icons/ref/Settings.png)bin2630 -> 2630 bytes
-rw-r--r--src/settingsui/settingsuiplugin/icons/ref/Tablet.png (renamed from src/settingsui/icons/ref/Tablet.png)bin892 -> 892 bytes
-rw-r--r--src/settingsui/settingsuiplugin/icons/ref/Volume_down.png (renamed from src/settingsui/icons/ref/Volume_down.png)bin505 -> 505 bytes
-rw-r--r--src/settingsui/settingsuiplugin/icons/ref/Volume_mute.png (renamed from src/settingsui/icons/ref/Volume_mute.png)bin1000 -> 1000 bytes
-rw-r--r--src/settingsui/settingsuiplugin/icons/ref/Volume_up.png (renamed from src/settingsui/icons/ref/Volume_up.png)bin513 -> 513 bytes
-rw-r--r--src/settingsui/settingsuiplugin/icons/ref/Wifi.png (renamed from src/settingsui/icons/ref/Wifi.png)bin2102 -> 2102 bytes
-rw-r--r--src/settingsui/settingsuiplugin/icons/ref/Wifi1.png (renamed from src/settingsui/icons/ref/Wifi1.png)bin824 -> 824 bytes
-rw-r--r--src/settingsui/settingsuiplugin/icons/ref/Wifi2.png (renamed from src/settingsui/icons/ref/Wifi2.png)bin987 -> 987 bytes
-rw-r--r--src/settingsui/settingsuiplugin/icons/ref/Wifi3.png (renamed from src/settingsui/icons/ref/Wifi3.png)bin1195 -> 1195 bytes
-rw-r--r--src/settingsui/settingsuiplugin/icons/ref/Wifi4.png (renamed from src/settingsui/icons/ref/Wifi4.png)bin2102 -> 2102 bytes
-rw-r--r--src/settingsui/settingsuiplugin/icons/ref/WifiAnim.png (renamed from src/settingsui/icons/ref/WifiAnim.png)bin2830 -> 2830 bytes
-rw-r--r--src/settingsui/settingsuiplugin/icons/ref/World.png (renamed from src/settingsui/icons/ref/World.png)bin4559 -> 4559 bytes
-rw-r--r--src/settingsui/settingsuiplugin/icons/ref/Wrench.png (renamed from src/settingsui/icons/ref/Wrench.png)bin1677 -> 1677 bytes
-rw-r--r--src/settingsui/settingsuiplugin/icons/ref/extra/Alert.png (renamed from src/settingsui/icons/ref/extra/Alert.png)bin1502 -> 1502 bytes
-rwxr-xr-xsrc/settingsui/settingsuiplugin/icons/scripts/cimage.sh (renamed from src/settingsui/icons/scripts/cimage.sh)0
-rwxr-xr-xsrc/settingsui/settingsuiplugin/icons/scripts/cimages.sh (renamed from src/settingsui/icons/scripts/cimages.sh)0
-rwxr-xr-xsrc/settingsui/settingsuiplugin/icons/scripts/rimage.sh (renamed from src/settingsui/icons/scripts/rimage.sh)0
-rwxr-xr-xsrc/settingsui/settingsuiplugin/icons/scripts/rimages.sh (renamed from src/settingsui/icons/scripts/rimages.sh)0
-rw-r--r--src/settingsui/settingsuiplugin/plugin.qrc28
-rw-r--r--src/settingsui/settingsuiplugin/pluginMain.qml174
-rw-r--r--src/settingsui/settingsuiplugin/qmldir2
-rw-r--r--src/settingsui/settingsuiplugin/settingsuiplugin.pro38
-rw-r--r--src/settingsui/settingsuiplugin/settingsuiplugin_plugin.cpp10
-rw-r--r--src/settingsui/settingsuiplugin/settingsuiplugin_plugin.h50
-rw-r--r--src/settingsui/settingsuiplugin/settingsview.xml (renamed from src/settingsui/settingsview.xml)10
-rw-r--r--src/settingsui/timedate/AnalogClock.qml4
-rw-r--r--src/settingsui/timedate/CustomCalendar.qml8
-rw-r--r--src/settingsui/timedate/TimeDate.qml4
-rw-r--r--src/settingsui/timedate/TimezonesView.qml5
-rw-r--r--src/src.pro3
106 files changed, 603 insertions, 325 deletions
diff --git a/src/settingsui/AutoScroller.qml b/src/settingsui/AutoScroller.qml
new file mode 100644
index 0000000..14c7717
--- /dev/null
+++ b/src/settingsui/AutoScroller.qml
@@ -0,0 +1,113 @@
+/****************************************************************************
+**
+** Copyright (C) 2016 The Qt Company Ltd.
+** Contact: http://www.qt.io/licensing/
+**
+** This file is part of the Qt Device Utilities module of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL3$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and The Qt Company. For licensing terms
+** and conditions see http://www.qt.io/terms-conditions. For further
+** information use the contact form at http://www.qt.io/contact-us.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 3 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPLv3 included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU Lesser General Public License version 3 requirements
+** will be met: https://www.gnu.org/licenses/lgpl.html.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 2.0 or later as published by the Free
+** Software Foundation and appearing in the file LICENSE.GPL included in
+** the packaging of this file. Please review the following information to
+** ensure the GNU General Public License version 2.0 requirements will be
+** met: http://www.gnu.org/licenses/gpl-2.0.html.
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+import QtQuick 2.6
+import QtQuick.Enterprise.VirtualKeyboard 2.0
+
+Item {
+
+ property var innerFlickable
+ property var outerFlickable
+ property var inputItem: InputContext.inputItem
+
+ onInputItemChanged: {
+ innerFlickable = null
+ outerFlickable = null
+ if (inputItem !== null) {
+ var parent_ = inputItem.parent
+ while (parent_) {
+ if (parent_.maximumFlickVelocity) {
+ if (innerFlickable) {
+ outerFlickable = parent_
+ break
+ } else {
+ innerFlickable = parent_
+ }
+ }
+ parent_ = parent_.parent
+ }
+ delayedLoading.triggered()
+ }
+ }
+
+ function ensureVisible(flickable) {
+ if (Qt.inputMethod.visible && inputItem && flickable && flickable.visible && flickable.interactive) {
+
+ var verticallyFlickable = (flickable.flickableDirection === Flickable.HorizontalAndVerticalFlick || flickable.flickableDirection === Flickable.VerticalFlick
+ || (flickable.flickableDirection === Flickable.AutoFlickDirection && flickable.contentHeight > flickable.height))
+ var horizontallyFlickable = (flickable.flickableDirection === Flickable.HorizontalAndVerticalFlick || flickable.flickableDirection === Flickable.HorizontalFlick
+ || (flickable.flickableDirection === Flickable.AutoFlickDirection && flickable.contentWidth > flickable.width))
+
+ if ((!verticallyFlickable && !horizontallyFlickable) || !inputItem.hasOwnProperty("cursorRectangle"))
+ return
+
+ var cursorRectangle = flickable.contentItem.mapFromItem(inputItem, inputItem.cursorRectangle.x, inputItem.cursorRectangle.y)
+
+ var oldContentY = flickable.contentY
+ if (verticallyFlickable) {
+ var scrollMarginVertical = (flickable && flickable.scrollMarginVertical) ? flickable.scrollMarginVertical : 10
+ if (flickable.contentY >= cursorRectangle.y - scrollMarginVertical)
+ flickable.contentY = Math.max(0, cursorRectangle.y - scrollMarginVertical)
+ else if (flickable.contentY + flickable.height <= cursorRectangle.y + inputItem.cursorRectangle.height + scrollMarginVertical)
+ flickable.contentY = Math.min(flickable.contentHeight - flickable.height, cursorRectangle.y + inputItem.cursorRectangle.height - flickable.height + scrollMarginVertical)
+ }
+ if (horizontallyFlickable) {
+ var scrollMarginHorizontal = (flickable && flickable.scrollMarginHorizontal) ? flickable.scrollMarginHorizontal : 10
+ if (flickable.contentX >= cursorRectangle.x - scrollMarginHorizontal)
+ flickable.contentX = Math.max(0, cursorRectangle.x - scrollMarginHorizontal)
+ else if (flickable.contentX + flickable.width <= cursorRectangle.x + inputItem.cursorRectangle.width + scrollMarginHorizontal)
+ flickable.contentX = Math.min(flickable.contentWidth - flickable.width, cursorRectangle.x + inputItem.cursorRectangle.width - flickable.width + scrollMarginHorizontal)
+ }
+ }
+ }
+ Timer {
+ id: delayedLoading
+ interval: 10
+ onTriggered: {
+ ensureVisible(innerFlickable)
+ ensureVisible(outerFlickable)
+ }
+ }
+ Connections {
+ ignoreUnknownSignals: true
+ target: inputItem && !Qt.inputMethod.animating ? Qt.inputMethod : null
+ onKeyboardRectangleChanged: delayedLoading.triggered()
+ }
+ Connections {
+ ignoreUnknownSignals: true
+ target: inputItem && inputItem.activeFocus ? inputItem : null
+ onCursorRectangleChanged: delayedLoading.triggered()
+ }
+}
diff --git a/src/settingsui/bluetooth/Bluetooth.qml b/src/settingsui/bluetooth/Bluetooth.qml
index 2bffe5b..ee14247 100644
--- a/src/settingsui/bluetooth/Bluetooth.qml
+++ b/src/settingsui/bluetooth/Bluetooth.qml
@@ -35,9 +35,7 @@
****************************************************************************/
import QtQuick 2.6
import QtQuick.Layouts 1.3
-import Qt.labs.controls 1.0
-import Qt.labs.controls.material 1.0
-import Qt.labs.controls.universal 1.0
+import QtQuick.Controls 2.0
import com.theqtcompany.settings.bluetooth 1.0
Item {
diff --git a/src/settingsui/bluetooth/Discovery.qml b/src/settingsui/bluetooth/Discovery.qml
index 9c1b674..5a51214 100644
--- a/src/settingsui/bluetooth/Discovery.qml
+++ b/src/settingsui/bluetooth/Discovery.qml
@@ -35,9 +35,7 @@
****************************************************************************/
import QtQuick 2.6
import QtQuick.Layouts 1.3
-import Qt.labs.controls 1.0
-import Qt.labs.controls.material 1.0
-import Qt.labs.controls.universal 1.0
+import QtQuick.Controls 2.0
import com.theqtcompany.settings.bluetooth 1.0
Item {
@@ -91,7 +89,7 @@ Item {
anchors.left: parent.left
anchors.top: parent.top
anchors.topMargin: 4
- source: mainList.getIcon(type)
+ source: mainList.getIcon(deviceType)
}
Column {
id: column
diff --git a/src/settingsui/common/CustomTableView.qml b/src/settingsui/common/CustomTableView.qml
index 6073683..aa57011 100644
--- a/src/settingsui/common/CustomTableView.qml
+++ b/src/settingsui/common/CustomTableView.qml
@@ -35,9 +35,7 @@
****************************************************************************/
import QtQuick 2.6
import QtQuick.Layouts 1.3
-import Qt.labs.controls 1.0
-import Qt.labs.controls.material 1.0
-import Qt.labs.controls.universal 1.0
+import QtQuick.Controls 2.0
ColumnLayout {
id: root
diff --git a/src/settingsui/display/Display.qml b/src/settingsui/display/Display.qml
index 69be8f3..a871666 100644
--- a/src/settingsui/display/Display.qml
+++ b/src/settingsui/display/Display.qml
@@ -35,9 +35,7 @@
****************************************************************************/
import QtQuick 2.6
import QtQuick.Layouts 1.3
-import Qt.labs.controls 1.0
-import Qt.labs.controls.material 1.0
-import Qt.labs.controls.universal 1.0
+import QtQuick.Controls 2.0
import com.theqtcompany.settings.display 1.0
Item {
diff --git a/src/settingsui/locale/Language.qml b/src/settingsui/locale/Language.qml
index bdcfbef..feee1b8 100644
--- a/src/settingsui/locale/Language.qml
+++ b/src/settingsui/locale/Language.qml
@@ -35,9 +35,7 @@
****************************************************************************/
import QtQuick 2.6
import QtQuick.Layouts 1.3
-import Qt.labs.controls 1.0
-import Qt.labs.controls.material 1.0
-import Qt.labs.controls.universal 1.0
+import QtQuick.Controls 2.0
import com.theqtcompany.settings.locale 1.0
import QtQml 2.2
diff --git a/src/settingsui/locale/RegionSelect.qml b/src/settingsui/locale/RegionSelect.qml
index 9282177..9f998c6 100644
--- a/src/settingsui/locale/RegionSelect.qml
+++ b/src/settingsui/locale/RegionSelect.qml
@@ -35,9 +35,7 @@
****************************************************************************/
import QtQuick 2.6
import QtQuick.Layouts 1.3
-import Qt.labs.controls 1.0
-import Qt.labs.controls.material 1.0
-import Qt.labs.controls.universal 1.0
+import QtQuick.Controls 2.0
import com.theqtcompany.settings.locale 1.0
import "../common"
diff --git a/src/settingsui/main.cpp b/src/settingsui/main.cpp
index 9b26327..d2150ac 100644
--- a/src/settingsui/main.cpp
+++ b/src/settingsui/main.cpp
@@ -1,38 +1,46 @@
/****************************************************************************
**
** Copyright (C) 2016 The Qt Company Ltd.
-** Contact: https://www.qt.io/licensing/
+** Contact: http://www.qt.io/licensing/
**
-** This file is part of the FOO module of the Qt Toolkit.
+** This file is part of the Qt Device Utilities module of the Qt Toolkit.
**
-** $QT_BEGIN_LICENSE:GPL$
+** $QT_BEGIN_LICENSE:LGPL3$
** Commercial License Usage
** Licensees holding valid commercial Qt licenses may use this file in
** accordance with the commercial license agreement provided with the
** Software or, alternatively, in accordance with the terms contained in
** a written agreement between you and The Qt Company. For licensing terms
-** and conditions see https://www.qt.io/terms-conditions. For further
-** information use the contact form at https://www.qt.io/contact-us.
+** and conditions see http://www.qt.io/terms-conditions. For further
+** information use the contact form at http://www.qt.io/contact-us.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 3 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPLv3 included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU Lesser General Public License version 3 requirements
+** will be met: https://www.gnu.org/licenses/lgpl.html.
**
** GNU General Public License Usage
** Alternatively, this file may be used under the terms of the GNU
-** General Public License version 3 or (at your option) any later version
-** approved by the KDE Free Qt Foundation. The licenses are as published by
-** the Free Software Foundation and appearing in the file LICENSE.GPL3
-** included in the packaging of this file. Please review the following
-** information to ensure the GNU General Public License requirements will
-** be met: https://www.gnu.org/licenses/gpl-3.0.html.
+** General Public License version 2.0 or later as published by the Free
+** Software Foundation and appearing in the file LICENSE.GPL included in
+** the packaging of this file. Please review the following information to
+** ensure the GNU General Public License version 2.0 requirements will be
+** met: http://www.gnu.org/licenses/gpl-2.0.html.
**
** $QT_END_LICENSE$
**
****************************************************************************/
-
#include <QGuiApplication>
#include <QQmlApplicationEngine>
int main(int argc, char *argv[])
{
+ qputenv("QT_IM_MODULE", QByteArray("qtvirtualkeyboard"));
QGuiApplication::setAttribute(Qt::AA_EnableHighDpiScaling);
+
QGuiApplication app(argc, argv);
QQmlApplicationEngine engine;
diff --git a/src/settingsui/main.qml b/src/settingsui/main.qml
index 1ed1138..a194c4f 100644
--- a/src/settingsui/main.qml
+++ b/src/settingsui/main.qml
@@ -1,241 +1,143 @@
/****************************************************************************
**
** Copyright (C) 2016 The Qt Company Ltd.
-** Contact: https://www.qt.io/licensing/
+** Contact: http://www.qt.io/licensing/
**
-** This file is part of the FOO module of the Qt Toolkit.
+** This file is part of the Qt Device Utilities module of the Qt Toolkit.
**
-** $QT_BEGIN_LICENSE:GPL$
+** $QT_BEGIN_LICENSE:LGPL3$
** Commercial License Usage
** Licensees holding valid commercial Qt licenses may use this file in
** accordance with the commercial license agreement provided with the
** Software or, alternatively, in accordance with the terms contained in
** a written agreement between you and The Qt Company. For licensing terms
-** and conditions see https://www.qt.io/terms-conditions. For further
-** information use the contact form at https://www.qt.io/contact-us.
+** and conditions see http://www.qt.io/terms-conditions. For further
+** information use the contact form at http://www.qt.io/contact-us.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 3 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPLv3 included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU Lesser General Public License version 3 requirements
+** will be met: https://www.gnu.org/licenses/lgpl.html.
**
** GNU General Public License Usage
** Alternatively, this file may be used under the terms of the GNU
-** General Public License version 3 or (at your option) any later version
-** approved by the KDE Free Qt Foundation. The licenses are as published by
-** the Free Software Foundation and appearing in the file LICENSE.GPL3
-** included in the packaging of this file. Please review the following
-** information to ensure the GNU General Public License requirements will
-** be met: https://www.gnu.org/licenses/gpl-3.0.html.
+** General Public License version 2.0 or later as published by the Free
+** Software Foundation and appearing in the file LICENSE.GPL included in
+** the packaging of this file. Please review the following information to
+** ensure the GNU General Public License version 2.0 requirements will be
+** met: http://www.gnu.org/licenses/gpl-2.0.html.
**
** $QT_END_LICENSE$
**
****************************************************************************/
import QtQuick 2.6
-import QtQuick.Layouts 1.3
-import Qt.labs.controls 1.0
-import Qt.labs.controls.material 1.0
-import Qt.labs.controls.universal 1.0
-import Qt.labs.settings 1.0
-import QtQuick.XmlListModel 2.0
+import QtQuick.Window 2.2
+import com.theqtcompany.settingsui 1.0
import QtQuick.Enterprise.VirtualKeyboard 2.0
-import com.theqtcompany.localdevice 1.0
import "common"
-ApplicationWindow {
- id: root
- title: qsTr("Device settings")
- width: 800
- height: 600
+Window {
+ id: window
visible: true
- property var service
-
- header: ToolBar {
- id: titlebar
- property string title: ""
-
- RowLayout {
- spacing: 20
- anchors.fill: parent
-
- ToolButton {
- label: Image {
- source: "../icons/Chevron-left_black_1x.png"
- 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 {
- label: Image {
- source: "../icons/Power_black_1x.png"
- anchors.centerIn: parent
- }
- anchors.right: parent.right
-
- visible: stackView.depth === 1
- onClicked: menu.open();
-
- Menu {
- id: menu
- x: parent.width - width
-
- MenuItem {
- text: qsTr("Reboot")
- onTriggered: LocalDevice.reboot()
- }
- MenuItem {
- text: qsTr("Shutdown")
- onTriggered: LocalDevice.powerOff()
- }
- }
- }
- }
- }
- StackView {
- id: stackView
- initialItem: mainView
- anchors.top: parent.top
- anchors.bottom: parent.bottom
- anchors.left: parent.left
- anchors.right: parent.right
-
- Behavior on anchors.topMargin { NumberAnimation { duration: 250; easing.type: Easing.InOutQuad }}
-
- Component {
- id: mainView
-
- Item {
- property string title: qsTr("Device Settings")
-
- XmlListModel {
- id: xmlModel
- source: "settingsview.xml"
- query: "/xml/settings/item"
- XmlRole { name: "title"; query: "title/string()"}
- XmlRole { name: "icon"; query: "icon/string()"}
- XmlRole { name: "view"; query: "view/string()"}
- XmlRole { name: "path"; query: "path/string()"}
- }
- GridView {
- id: grid
- anchors.fill: parent
- anchors.margins: 40
- cellHeight: 133 + spacing
- cellWidth: 117 + spacing
- model: xmlModel
- property int spacing: 20
- delegate: MouseArea {
- width: grid.cellWidth - grid.spacing
- height: grid.cellHeight - grid.spacing
- Rectangle {
- anchors.fill: parent
- color: "#d6d6d6"
- radius: 5
- visible: pressed
- }
- Column {
- anchors.fill: parent
- anchors.topMargin: 10
- Image {
- id: image
- source: icon
- anchors.horizontalCenter: parent.horizontalCenter
- width: grid.cellWidth
- fillMode: Image.PreserveAspectFit
- }
- Label {
- text: title
- anchors.horizontalCenter: parent.horizontalCenter
- font.pixelSize: grid.cellHeight * .1
- }
- }
- onClicked: {
- var component = Qt.createComponent(path + '/' +view+'.qml');
- stackView.push(component.createObject(stackView));
- titlebar.title = title
- }
- }
- }
- }
- }
- }
-
- property var inputItem: InputContext.inputItem
-
- HandwritingInputPanel {
-
- id: handwritingInputPanel
+ Item {
+ id: root
anchors.fill: parent
- inputPanel: inputPanel
- Rectangle {
- z: -1
+ SettingsUI {
+ id: settingsUI
anchors.fill: parent
- color: "black"
- opacity: 0.10
+ anchors.bottomMargin: parent.height - inputPanel.y
}
- onAvailableChanged: {
- if (!available)
- inputPanel.ensureVisible()
- }
- }
- Item {
- visible: handwritingInputPanel.enabled && Qt.inputMethod.visible
- anchors { left: parent.left; top: parent.top; right: parent.right; bottom: inputPanel.top; }
+ /* Handwriting input panel for full screen handwriting input.
- HandwritingModeButton {
- id: handwritingModeButton
- anchors.top: parent.top
- anchors.right: parent.right
- anchors.margins: 10
- floating: true
- flipable: true
- width: 76
- height: width
- state: handwritingInputPanel.state
- onClicked: handwritingInputPanel.active = !handwritingInputPanel.active
- onDoubleClicked: handwritingInputPanel.available = !handwritingInputPanel.available
- }
- }
- InputPanel {
- id: inputPanel
- y: active ? parent.height - inputPanel.height : parent.height
- anchors.left: parent.left
- anchors.right: parent.right
-
- Behavior on y { NumberAnimation {duration: 250; easing.type: Easing.InOutQuad}}
+ This component is an optional add-on for the InputPanel component, that
+ is, its use does not affect the operation of the InputPanel component,
+ but it also can not be used as a standalone component.
- property var inputItem: InputContext.inputItem
+ The handwriting input panel is positioned to cover the entire area of
+ application. The panel itself is transparent, but once it is active the
+ user can draw handwriting on it.
+ */
- onInputItemChanged: {
- if (handwritingInputPanel.available)
- return;
-
- if (inputItem) {
- ensureVisible()
+ HandwritingInputPanel {
+ z: 79
+ id: handwritingInputPanel
+ anchors.fill: parent
+ inputPanel: inputPanel
+ Rectangle {
+ z: -1
+ anchors.fill: parent
+ color: "black"
+ opacity: 0.10
}
}
- onActiveChanged: {
- if (!active) {
- stackView.anchors.topMargin = 0
-
- if (!handwritingInputPanel.available && inputItem)
- inputItem.focus = false
+ /* Container area for the handwriting mode button.
+
+ Handwriting mode button can be moved freely within the container area.
+ In this example, a single click changes the handwriting mode and a
+ double-click changes the availability of the full screen handwriting input.
+ */
+ Item {
+ z: 89
+ visible: handwritingInputPanel.enabled && Qt.inputMethod.visible
+ anchors { left: parent.left; top: parent.top; right: parent.right; bottom: inputPanel.top; }
+ HandwritingModeButton {
+ id: handwritingModeButton
+ anchors.top: parent.top
+ anchors.right: parent.right
+ anchors.margins: 10
+ floating: true
+ flipable: true
+ width: 76
+ height: width
+ state: handwritingInputPanel.state
+ onClicked: handwritingInputPanel.active = !handwritingInputPanel.active
+ onDoubleClicked: handwritingInputPanel.available = !handwritingInputPanel.available
}
}
- function ensureVisible() {
- var mapped = inputItem.mapToItem(handwritingInputPanel, 0,0)
- if (mapped.y > (handwritingInputPanel.height-inputPanel.height-40)) {
- stackView.anchors.topMargin = -inputPanel.height
+ /* Keyboard input panel.
+ The keyboard is anchored to the bottom of the application.
+ */
+ InputPanel {
+ id: inputPanel
+ z: 99
+ y: root.height
+ anchors.left: root.left
+ anchors.right: root.right
+
+ states: State {
+ name: "visible"
+ /* The visibility of the InputPanel can be bound to the Qt.inputMethod.visible property,
+ but then the handwriting input panel and the keyboard input panel can be visible
+ at the same time. Here the visibility is bound to InputPanel.active property instead,
+ which allows the handwriting panel to control the visibility when necessary.
+ */
+ when: inputPanel.active
+ PropertyChanges {
+ target: inputPanel
+ y: root.height - inputPanel.height
+ }
+ }
+ transitions: Transition {
+ from: ""
+ to: "visible"
+ reversible: true
+ ParallelAnimation {
+ NumberAnimation {
+ properties: "y"
+ duration: 250
+ easing.type: Easing.InOutQuad
+ }
+ }
}
+ AutoScroller {}
}
}
}
diff --git a/src/settingsui/network/AddressListEntry.qml b/src/settingsui/network/AddressListEntry.qml
index 45c161f..312fc36 100644
--- a/src/settingsui/network/AddressListEntry.qml
+++ b/src/settingsui/network/AddressListEntry.qml
@@ -35,9 +35,7 @@
****************************************************************************/
import QtQuick 2.6
import QtQuick.Layouts 1.3
-import Qt.labs.controls 1.0
-import Qt.labs.controls.material 1.0
-import Qt.labs.controls.universal 1.0
+import QtQuick.Controls 2.0
RowLayout {
id: root
diff --git a/src/settingsui/network/ComboBoxEntry.qml b/src/settingsui/network/ComboBoxEntry.qml
index 791f2d5..edefcd3 100644
--- a/src/settingsui/network/ComboBoxEntry.qml
+++ b/src/settingsui/network/ComboBoxEntry.qml
@@ -35,9 +35,7 @@
****************************************************************************/
import QtQuick 2.6
import QtQuick.Layouts 1.3
-import Qt.labs.controls 1.0
-import Qt.labs.controls.material 1.0
-import Qt.labs.controls.universal 1.0
+import QtQuick.Controls 2.0
RowLayout {
id: root
diff --git a/src/settingsui/network/EditWiredSettings.qml b/src/settingsui/network/EditWiredSettings.qml
index 48a6abb..b2420ff 100644
--- a/src/settingsui/network/EditWiredSettings.qml
+++ b/src/settingsui/network/EditWiredSettings.qml
@@ -35,9 +35,7 @@
****************************************************************************/
import QtQuick 2.6
import QtQuick.Layouts 1.3
-import Qt.labs.controls 1.0
-import Qt.labs.controls.material 1.0
-import Qt.labs.controls.universal 1.0
+import QtQuick.Controls 2.0
import com.theqtcompany.settings.network 1.0
Item {
diff --git a/src/settingsui/network/IpAddressTextField.qml b/src/settingsui/network/IpAddressTextField.qml
index e7e90ab..b76598c 100644
--- a/src/settingsui/network/IpAddressTextField.qml
+++ b/src/settingsui/network/IpAddressTextField.qml
@@ -35,9 +35,7 @@
****************************************************************************/
import QtQuick 2.6
import QtQuick.Layouts 1.3
-import Qt.labs.controls 1.0
-import Qt.labs.controls.material 1.0
-import Qt.labs.controls.universal 1.0
+import QtQuick.Controls 2.0
TextField {
Layout.fillWidth: true
diff --git a/src/settingsui/network/NetworkDetails.qml b/src/settingsui/network/NetworkDetails.qml
index 3e71be0..33bdf69 100644
--- a/src/settingsui/network/NetworkDetails.qml
+++ b/src/settingsui/network/NetworkDetails.qml
@@ -33,7 +33,7 @@
** $QT_END_LICENSE$
**
****************************************************************************/
-import QtQuick 2.5
+import QtQuick 2.6
Loader {
id: root
diff --git a/src/settingsui/network/NetworkSettings.qml b/src/settingsui/network/NetworkSettings.qml
index 4fb1c0f..87df833 100644
--- a/src/settingsui/network/NetworkSettings.qml
+++ b/src/settingsui/network/NetworkSettings.qml
@@ -35,9 +35,7 @@
****************************************************************************/
import QtQuick 2.6
import QtQuick.Layouts 1.3
-import Qt.labs.controls 1.0
-import Qt.labs.controls.material 1.0
-import Qt.labs.controls.universal 1.0
+import QtQuick.Controls 2.0
import com.theqtcompany.settings.network 1.0
Item {
@@ -81,9 +79,8 @@ Item {
id: btn
Layout.fillWidth: true
implicitHeight: 54
- checkable: true
- label: Rectangle {
+ contentItem: Rectangle {
color: checked ? "#80c342" : "white"
border.color: "#bdbebf"
border.width: 1
diff --git a/src/settingsui/network/WifiSelectorDelegate.qml b/src/settingsui/network/WifiSelectorDelegate.qml
index 17ec931..1f08d4b 100644
--- a/src/settingsui/network/WifiSelectorDelegate.qml
+++ b/src/settingsui/network/WifiSelectorDelegate.qml
@@ -35,15 +35,12 @@
****************************************************************************/
import QtQuick 2.6
import QtQuick.Layouts 1.3
-import Qt.labs.controls 1.0
-import Qt.labs.controls.material 1.0
-import Qt.labs.controls.universal 1.0
+import QtQuick.Controls 2.0
import com.theqtcompany.settings.network 1.0
ItemDelegate {
id: root
autoExclusive: true
- checkable: true
property bool connect: modelData["connected"]
width: parent.width
contentItem: Item {
diff --git a/src/settingsui/network/WifiSettings.qml b/src/settingsui/network/WifiSettings.qml
index 8ad1517..a78a5e5 100644
--- a/src/settingsui/network/WifiSettings.qml
+++ b/src/settingsui/network/WifiSettings.qml
@@ -35,9 +35,7 @@
****************************************************************************/
import QtQuick 2.6
import QtQuick.Layouts 1.3
-import Qt.labs.controls 1.0
-import Qt.labs.controls.material 1.0
-import Qt.labs.controls.universal 1.0
+import QtQuick.Controls 2.0
import com.theqtcompany.settings.network 1.0
Item {
@@ -107,7 +105,7 @@ Item {
property alias text: text.text
Image {
- source: "Alert_yellow_1x.png"
+ source: "../icons/Alert_yellow_1x.png"
Layout.alignment: Qt.AlignVCenter
}
Text {
diff --git a/src/settingsui/network/WifiSignalMonitor.qml b/src/settingsui/network/WifiSignalMonitor.qml
index 40a0837..6059e96 100644
--- a/src/settingsui/network/WifiSignalMonitor.qml
+++ b/src/settingsui/network/WifiSignalMonitor.qml
@@ -65,7 +65,7 @@ Item {
id: sprite
property int currentFrame: 0
anchors.fill: parent
- source: "Wifi_lightgray_2x.png"
+ source: "../icons/Wifi_lightgray_2x.png"
clip: true
Timer {
@@ -84,7 +84,7 @@ Item {
Image {
height: parent.height
width: parent.width * 4
- source: "WifiAnim_black_2x.png"
+ source: "../icons/WifiAnim_black_2x.png"
x: -parent.currentFrame * width / 4
}
}
diff --git a/src/settingsui/network/WiredSettings.qml b/src/settingsui/network/WiredSettings.qml
index 9359484..294e1a2 100644
--- a/src/settingsui/network/WiredSettings.qml
+++ b/src/settingsui/network/WiredSettings.qml
@@ -35,9 +35,7 @@
****************************************************************************/
import QtQuick 2.6
import QtQuick.Layouts 1.3
-import Qt.labs.controls 1.0
-import Qt.labs.controls.material 1.0
-import Qt.labs.controls.universal 1.0
+import QtQuick.Controls 2.0
import com.theqtcompany.settings.network 1.0
Item {
@@ -132,10 +130,14 @@ Item {
onAccepted: if (text.length > 0) service.ipv4.gateway = text
}
Label {
+ Layout.alignment: Qt.AlignTop
text: qsTr("DNS server: ")
}
- Row {
+ Column {
spacing: 10
+ Layout.fillWidth: true
+ Layout.alignment: Qt.AlignTop
+
Repeater {
model: service.nameservers
diff --git a/src/settingsui/qml.qrc b/src/settingsui/qml.qrc
deleted file mode 100644
index cd5d5af..0000000
--- a/src/settingsui/qml.qrc
+++ /dev/null
@@ -1,28 +0,0 @@
-<RCC>
- <qresource prefix="/">
- <file>main.qml</file>
- <file>settingsview.xml</file>
- <file>network/EditWiredSettings.qml</file>
- <file>network/IpAddressTextField.qml</file>
- <file>network/NetworkDetails.qml</file>
- <file>network/NetworkSettings.qml</file>
- <file>network/WifiSelectorDelegate.qml</file>
- <file>network/WifiSettings.qml</file>
- <file>network/WifiSignalMonitor.qml</file>
- <file>network/WiredSettings.qml</file>
- <file>bluetooth/Bluetooth.qml</file>
- <file>bluetooth/Discovery.qml</file>
- <file>display/Display.qml</file>
- <file>locale/RegionSelect.qml</file>
- <file>locale/Language.qml</file>
- <file>timedate/AnalogClock.qml</file>
- <file>timedate/TimeDate.qml</file>
- <file>timedate/TimezonesView.qml</file>
- <file>network/AddressListEntry.qml</file>
- <file>network/ComboBoxEntry.qml</file>
- <file>timedate/CustomCalendar.qml</file>
- <file>common/CustomTableView.qml</file>
- <file>common/HandwritingModeButton.qml</file>
- <file>timedate/ClockHand.qml</file>
- </qresource>
-</RCC>
diff --git a/src/settingsui/settingsui.pro b/src/settingsui/settingsui.pro
index 026d911..51b6dca 100644
--- a/src/settingsui/settingsui.pro
+++ b/src/settingsui/settingsui.pro
@@ -4,14 +4,10 @@ QT += qml quick
SOURCES += main.cpp
RESOURCES += \
- qml.qrc \
- icons.qrc
+ settingsuiapp.qrc
# Additional import path used to resolve QML modules in Qt Creator's code model
QML_IMPORT_PATH =
# Default rules for deployment.
include(deployment.pri)
-
-DISTFILES += \
- settingsview.xml
diff --git a/src/settingsui/settingsuiapp.qrc b/src/settingsui/settingsuiapp.qrc
new file mode 100644
index 0000000..58687e0
--- /dev/null
+++ b/src/settingsui/settingsuiapp.qrc
@@ -0,0 +1,7 @@
+<RCC>
+ <qresource prefix="/">
+ <file>main.qml</file>
+ <file>common/HandwritingModeButton.qml</file>
+ <file>AutoScroller.qml</file>
+ </qresource>
+</RCC>
diff --git a/src/settingsui/icons.qrc b/src/settingsui/settingsuiplugin/icons.qrc
index 29d0e1a..639af66 100644
--- a/src/settingsui/icons.qrc
+++ b/src/settingsui/settingsuiplugin/icons.qrc
@@ -1,21 +1,33 @@
<RCC>
<qresource prefix="/">
+ <file>icons/Alert_yellow_1x.png</file>
<file>icons/Audio_qt_6x.png</file>
+ <file>icons/Bluetooth_qt_1x.png</file>
+ <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/Power_black_1x.png</file>
- <file>icons/Display_qt_6x.png</file>
+ <file>icons/Clock_qt_1x.png</file>
<file>icons/Clock_qt_6x.png</file>
+ <file>icons/Display_qt_6x.png</file>
<file>icons/Flag_qt_6x.png</file>
- <file>icons/World_qt_6x.png</file>
- <file>icons/Bluetooth_qt_6x.png</file>
- <file>icons/Bluetooth_qt_1x.png</file>
+ <file>icons/FloatingButton_Active.png</file>
+ <file>icons/FloatingButton_Available.png</file>
+ <file>icons/FloatingButton_Unavailable.png</file>
<file>icons/Headphones_qt_1x.png</file>
+ <file>icons/Heartbeat_qt_1x.png</file>
<file>icons/Keyboard_qt_1x.png</file>
<file>icons/Laptop_qt_1x.png</file>
<file>icons/Microphone_qt_1x.png</file>
+ <file>icons/MobilePhone_qt_1x.png</file>
<file>icons/Mouse_qt_1x.png</file>
- <file>icons/FloatingButton_Active.png</file>
- <file>icons/FloatingButton_Available.png</file>
- <file>icons/FloatingButton_Unavailable.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>
+ <file>icons/Volume_up_qt_1x.png</file>
+ <file>icons/WifiAnim_black_2x.png</file>
+ <file>icons/Wifi_lightgray_2x.png</file>
+ <file>icons/World_qt_6x.png</file>
</qresource>
</RCC>
diff --git a/src/settingsui/icons/Alert_yellow_1x.png b/src/settingsui/settingsuiplugin/icons/Alert_yellow_1x.png
index 2306ff6..2306ff6 100644
--- a/src/settingsui/icons/Alert_yellow_1x.png
+++ b/src/settingsui/settingsuiplugin/icons/Alert_yellow_1x.png
Binary files differ
diff --git a/src/settingsui/icons/Audio_qt_6x.png b/src/settingsui/settingsuiplugin/icons/Audio_qt_6x.png
index 8251129..8251129 100644
--- a/src/settingsui/icons/Audio_qt_6x.png
+++ b/src/settingsui/settingsuiplugin/icons/Audio_qt_6x.png
Binary files differ
diff --git a/src/settingsui/icons/Bluetooth_qt_1x.png b/src/settingsui/settingsuiplugin/icons/Bluetooth_qt_1x.png
index af6968d..af6968d 100644
--- a/src/settingsui/icons/Bluetooth_qt_1x.png
+++ b/src/settingsui/settingsuiplugin/icons/Bluetooth_qt_1x.png
Binary files differ
diff --git a/src/settingsui/icons/Bluetooth_qt_6x.png b/src/settingsui/settingsuiplugin/icons/Bluetooth_qt_6x.png
index 55e4fb1..55e4fb1 100644
--- a/src/settingsui/icons/Bluetooth_qt_6x.png
+++ b/src/settingsui/settingsuiplugin/icons/Bluetooth_qt_6x.png
Binary files differ
diff --git a/src/settingsui/icons/Camcorder_qt_1x.png b/src/settingsui/settingsuiplugin/icons/Camcorder_qt_1x.png
index 7ffb2c8..7ffb2c8 100644
--- a/src/settingsui/icons/Camcorder_qt_1x.png
+++ b/src/settingsui/settingsuiplugin/icons/Camcorder_qt_1x.png
Binary files differ
diff --git a/src/settingsui/icons/Camera_qt_1x.png b/src/settingsui/settingsuiplugin/icons/Camera_qt_1x.png
index b84e53a..b84e53a 100644
--- a/src/settingsui/icons/Camera_qt_1x.png
+++ b/src/settingsui/settingsuiplugin/icons/Camera_qt_1x.png
Binary files differ
diff --git a/src/settingsui/icons/Chevron-left_black_1x.png b/src/settingsui/settingsuiplugin/icons/Chevron-left_black_1x.png
index 225176b..225176b 100644
--- a/src/settingsui/icons/Chevron-left_black_1x.png
+++ b/src/settingsui/settingsuiplugin/icons/Chevron-left_black_1x.png
Binary files differ
diff --git a/src/settingsui/icons/Clock_qt_1x.png b/src/settingsui/settingsuiplugin/icons/Clock_qt_1x.png
index ee58f95..ee58f95 100644
--- a/src/settingsui/icons/Clock_qt_1x.png
+++ b/src/settingsui/settingsuiplugin/icons/Clock_qt_1x.png
Binary files differ
diff --git a/src/settingsui/icons/Clock_qt_6x.png b/src/settingsui/settingsuiplugin/icons/Clock_qt_6x.png
index aba8b60..aba8b60 100644
--- a/src/settingsui/icons/Clock_qt_6x.png
+++ b/src/settingsui/settingsuiplugin/icons/Clock_qt_6x.png
Binary files differ
diff --git a/src/settingsui/icons/Display_qt_6x.png b/src/settingsui/settingsuiplugin/icons/Display_qt_6x.png
index e45c45c..e45c45c 100644
--- a/src/settingsui/icons/Display_qt_6x.png
+++ b/src/settingsui/settingsuiplugin/icons/Display_qt_6x.png
Binary files differ
diff --git a/src/settingsui/icons/Flag_qt_6x.png b/src/settingsui/settingsuiplugin/icons/Flag_qt_6x.png
index f549ebd..f549ebd 100644
--- a/src/settingsui/icons/Flag_qt_6x.png
+++ b/src/settingsui/settingsuiplugin/icons/Flag_qt_6x.png
Binary files differ
diff --git a/src/settingsui/icons/FloatingButton_Active.png b/src/settingsui/settingsuiplugin/icons/FloatingButton_Active.png
index 9b55146..9b55146 100755
--- a/src/settingsui/icons/FloatingButton_Active.png
+++ b/src/settingsui/settingsuiplugin/icons/FloatingButton_Active.png
Binary files differ
diff --git a/src/settingsui/icons/FloatingButton_Available.png b/src/settingsui/settingsuiplugin/icons/FloatingButton_Available.png
index 1479881..1479881 100755
--- a/src/settingsui/icons/FloatingButton_Available.png
+++ b/src/settingsui/settingsuiplugin/icons/FloatingButton_Available.png
Binary files differ
diff --git a/src/settingsui/icons/FloatingButton_Unavailable.png b/src/settingsui/settingsuiplugin/icons/FloatingButton_Unavailable.png
index 33aa87d..33aa87d 100755
--- a/src/settingsui/icons/FloatingButton_Unavailable.png
+++ b/src/settingsui/settingsuiplugin/icons/FloatingButton_Unavailable.png
Binary files differ
diff --git a/src/settingsui/icons/Headphones_qt_1x.png b/src/settingsui/settingsuiplugin/icons/Headphones_qt_1x.png
index 82b04e7..82b04e7 100644
--- a/src/settingsui/icons/Headphones_qt_1x.png
+++ b/src/settingsui/settingsuiplugin/icons/Headphones_qt_1x.png
Binary files differ
diff --git a/src/settingsui/icons/Heartbeat_qt_1x.png b/src/settingsui/settingsuiplugin/icons/Heartbeat_qt_1x.png
index 16a94bc..16a94bc 100644
--- a/src/settingsui/icons/Heartbeat_qt_1x.png
+++ b/src/settingsui/settingsuiplugin/icons/Heartbeat_qt_1x.png
Binary files differ
diff --git a/src/settingsui/icons/Keyboard_qt_1x.png b/src/settingsui/settingsuiplugin/icons/Keyboard_qt_1x.png
index cc6417d..cc6417d 100644
--- a/src/settingsui/icons/Keyboard_qt_1x.png
+++ b/src/settingsui/settingsuiplugin/icons/Keyboard_qt_1x.png
Binary files differ
diff --git a/src/settingsui/icons/Laptop_qt_1x.png b/src/settingsui/settingsuiplugin/icons/Laptop_qt_1x.png
index 2924015..2924015 100644
--- a/src/settingsui/icons/Laptop_qt_1x.png
+++ b/src/settingsui/settingsuiplugin/icons/Laptop_qt_1x.png
Binary files differ
diff --git a/src/settingsui/icons/Microphone_qt_1x.png b/src/settingsui/settingsuiplugin/icons/Microphone_qt_1x.png
index f76a963..f76a963 100644
--- a/src/settingsui/icons/Microphone_qt_1x.png
+++ b/src/settingsui/settingsuiplugin/icons/Microphone_qt_1x.png
Binary files differ
diff --git a/src/settingsui/icons/MobilePhone_qt_1x.png b/src/settingsui/settingsuiplugin/icons/MobilePhone_qt_1x.png
index 363d667..363d667 100644
--- a/src/settingsui/icons/MobilePhone_qt_1x.png
+++ b/src/settingsui/settingsuiplugin/icons/MobilePhone_qt_1x.png
Binary files differ
diff --git a/src/settingsui/icons/Mouse_qt_1x.png b/src/settingsui/settingsuiplugin/icons/Mouse_qt_1x.png
index 24d057d..24d057d 100644
--- a/src/settingsui/icons/Mouse_qt_1x.png
+++ b/src/settingsui/settingsuiplugin/icons/Mouse_qt_1x.png
Binary files differ
diff --git a/src/settingsui/icons/Power_black_1x.png b/src/settingsui/settingsuiplugin/icons/Power_black_1x.png
index cca0fe8..cca0fe8 100644
--- a/src/settingsui/icons/Power_black_1x.png
+++ b/src/settingsui/settingsuiplugin/icons/Power_black_1x.png
Binary files differ
diff --git a/src/settingsui/icons/Tablet_qt_1x.png b/src/settingsui/settingsuiplugin/icons/Tablet_qt_1x.png
index e218184..e218184 100644
--- a/src/settingsui/icons/Tablet_qt_1x.png
+++ b/src/settingsui/settingsuiplugin/icons/Tablet_qt_1x.png
Binary files differ
diff --git a/src/settingsui/icons/Volume_down_qt_1x.png b/src/settingsui/settingsuiplugin/icons/Volume_down_qt_1x.png
index 2068819..2068819 100644
--- a/src/settingsui/icons/Volume_down_qt_1x.png
+++ b/src/settingsui/settingsuiplugin/icons/Volume_down_qt_1x.png
Binary files differ
diff --git a/src/settingsui/icons/Volume_mute_qt_1x.png b/src/settingsui/settingsuiplugin/icons/Volume_mute_qt_1x.png
index 1a41927..1a41927 100644
--- a/src/settingsui/icons/Volume_mute_qt_1x.png
+++ b/src/settingsui/settingsuiplugin/icons/Volume_mute_qt_1x.png
Binary files differ
diff --git a/src/settingsui/icons/Volume_up_qt_1x.png b/src/settingsui/settingsuiplugin/icons/Volume_up_qt_1x.png
index 45a8b61..45a8b61 100644
--- a/src/settingsui/icons/Volume_up_qt_1x.png
+++ b/src/settingsui/settingsuiplugin/icons/Volume_up_qt_1x.png
Binary files differ
diff --git a/src/settingsui/icons/WifiAnim_black_2x.png b/src/settingsui/settingsuiplugin/icons/WifiAnim_black_2x.png
index 76c850d..76c850d 100644
--- a/src/settingsui/icons/WifiAnim_black_2x.png
+++ b/src/settingsui/settingsuiplugin/icons/WifiAnim_black_2x.png
Binary files differ
diff --git a/src/settingsui/icons/Wifi_lightgray_2x.png b/src/settingsui/settingsuiplugin/icons/Wifi_lightgray_2x.png
index 3e6183a..3e6183a 100644
--- a/src/settingsui/icons/Wifi_lightgray_2x.png
+++ b/src/settingsui/settingsuiplugin/icons/Wifi_lightgray_2x.png
Binary files differ
diff --git a/src/settingsui/icons/World_qt_6x.png b/src/settingsui/settingsuiplugin/icons/World_qt_6x.png
index 9024031..9024031 100644
--- a/src/settingsui/icons/World_qt_6x.png
+++ b/src/settingsui/settingsuiplugin/icons/World_qt_6x.png
Binary files differ
diff --git a/src/settingsui/icons/generate_icons.sh b/src/settingsui/settingsuiplugin/icons/generate_icons.sh
index 55867b8..55867b8 100755
--- a/src/settingsui/icons/generate_icons.sh
+++ b/src/settingsui/settingsuiplugin/icons/generate_icons.sh
diff --git a/src/settingsui/icons/ref/Audio.png b/src/settingsui/settingsuiplugin/icons/ref/Audio.png
index 8434f0a..8434f0a 100644
--- a/src/settingsui/icons/ref/Audio.png
+++ b/src/settingsui/settingsuiplugin/icons/ref/Audio.png
Binary files differ
diff --git a/src/settingsui/icons/ref/Back.png b/src/settingsui/settingsuiplugin/icons/ref/Back.png
index 9029fd0..9029fd0 100644
--- a/src/settingsui/icons/ref/Back.png
+++ b/src/settingsui/settingsuiplugin/icons/ref/Back.png
Binary files differ
diff --git a/src/settingsui/icons/ref/Bluetooth.png b/src/settingsui/settingsuiplugin/icons/ref/Bluetooth.png
index e7c80a9..e7c80a9 100644
--- a/src/settingsui/icons/ref/Bluetooth.png
+++ b/src/settingsui/settingsuiplugin/icons/ref/Bluetooth.png
Binary files differ
diff --git a/src/settingsui/icons/ref/Camcorder.png b/src/settingsui/settingsuiplugin/icons/ref/Camcorder.png
index 8c317a2..8c317a2 100644
--- a/src/settingsui/icons/ref/Camcorder.png
+++ b/src/settingsui/settingsuiplugin/icons/ref/Camcorder.png
Binary files differ
diff --git a/src/settingsui/icons/ref/Camera.png b/src/settingsui/settingsuiplugin/icons/ref/Camera.png
index c71ab25..c71ab25 100644
--- a/src/settingsui/icons/ref/Camera.png
+++ b/src/settingsui/settingsuiplugin/icons/ref/Camera.png
Binary files differ
diff --git a/src/settingsui/icons/ref/Chevron-left.png b/src/settingsui/settingsuiplugin/icons/ref/Chevron-left.png
index 95006f4..95006f4 100644
--- a/src/settingsui/icons/ref/Chevron-left.png
+++ b/src/settingsui/settingsuiplugin/icons/ref/Chevron-left.png
Binary files differ
diff --git a/src/settingsui/icons/ref/Chevron-right.png b/src/settingsui/settingsuiplugin/icons/ref/Chevron-right.png
index 2860e9a..2860e9a 100644
--- a/src/settingsui/icons/ref/Chevron-right.png
+++ b/src/settingsui/settingsuiplugin/icons/ref/Chevron-right.png
Binary files differ
diff --git a/src/settingsui/icons/ref/Circle-x.png b/src/settingsui/settingsuiplugin/icons/ref/Circle-x.png
index 2bbfa97..2bbfa97 100644
--- a/src/settingsui/icons/ref/Circle-x.png
+++ b/src/settingsui/settingsuiplugin/icons/ref/Circle-x.png
Binary files differ
diff --git a/src/settingsui/icons/ref/Clock.png b/src/settingsui/settingsuiplugin/icons/ref/Clock.png
index 1dae63e..1dae63e 100644
--- a/src/settingsui/icons/ref/Clock.png
+++ b/src/settingsui/settingsuiplugin/icons/ref/Clock.png
Binary files differ
diff --git a/src/settingsui/icons/ref/Cogs.png b/src/settingsui/settingsuiplugin/icons/ref/Cogs.png
index feaae50..feaae50 100644
--- a/src/settingsui/icons/ref/Cogs.png
+++ b/src/settingsui/settingsuiplugin/icons/ref/Cogs.png
Binary files differ
diff --git a/src/settingsui/icons/ref/Connections.png b/src/settingsui/settingsuiplugin/icons/ref/Connections.png
index b042d3c..b042d3c 100644
--- a/src/settingsui/icons/ref/Connections.png
+++ b/src/settingsui/settingsuiplugin/icons/ref/Connections.png
Binary files differ
diff --git a/src/settingsui/icons/ref/Display.png b/src/settingsui/settingsuiplugin/icons/ref/Display.png
index cf1251a..cf1251a 100644
--- a/src/settingsui/icons/ref/Display.png
+++ b/src/settingsui/settingsuiplugin/icons/ref/Display.png
Binary files differ
diff --git a/src/settingsui/icons/ref/Flag.png b/src/settingsui/settingsuiplugin/icons/ref/Flag.png
index 485ed48..485ed48 100644
--- a/src/settingsui/icons/ref/Flag.png
+++ b/src/settingsui/settingsuiplugin/icons/ref/Flag.png
Binary files differ
diff --git a/src/settingsui/icons/ref/Headphones.png b/src/settingsui/settingsuiplugin/icons/ref/Headphones.png
index 9e5c483..9e5c483 100644
--- a/src/settingsui/icons/ref/Headphones.png
+++ b/src/settingsui/settingsuiplugin/icons/ref/Headphones.png
Binary files differ
diff --git a/src/settingsui/icons/ref/Heartbeat.png b/src/settingsui/settingsuiplugin/icons/ref/Heartbeat.png
index 168135e..168135e 100644
--- a/src/settingsui/icons/ref/Heartbeat.png
+++ b/src/settingsui/settingsuiplugin/icons/ref/Heartbeat.png
Binary files differ
diff --git a/src/settingsui/icons/ref/Keyboard.png b/src/settingsui/settingsuiplugin/icons/ref/Keyboard.png
index c814e8e..c814e8e 100644
--- a/src/settingsui/icons/ref/Keyboard.png
+++ b/src/settingsui/settingsuiplugin/icons/ref/Keyboard.png
Binary files differ
diff --git a/src/settingsui/icons/ref/Laptop.png b/src/settingsui/settingsuiplugin/icons/ref/Laptop.png
index 465bb54..465bb54 100644
--- a/src/settingsui/icons/ref/Laptop.png
+++ b/src/settingsui/settingsuiplugin/icons/ref/Laptop.png
Binary files differ
diff --git a/src/settingsui/icons/ref/Lock.png b/src/settingsui/settingsuiplugin/icons/ref/Lock.png
index 6afb6ac..6afb6ac 100644
--- a/src/settingsui/icons/ref/Lock.png
+++ b/src/settingsui/settingsuiplugin/icons/ref/Lock.png
Binary files differ
diff --git a/src/settingsui/icons/ref/Microphone.png b/src/settingsui/settingsuiplugin/icons/ref/Microphone.png
index 63cb500..63cb500 100644
--- a/src/settingsui/icons/ref/Microphone.png
+++ b/src/settingsui/settingsuiplugin/icons/ref/Microphone.png
Binary files differ
diff --git a/src/settingsui/icons/ref/MobilePhone.png b/src/settingsui/settingsuiplugin/icons/ref/MobilePhone.png
index b186c09..b186c09 100644
--- a/src/settingsui/icons/ref/MobilePhone.png
+++ b/src/settingsui/settingsuiplugin/icons/ref/MobilePhone.png
Binary files differ
diff --git a/src/settingsui/icons/ref/Mouse.png b/src/settingsui/settingsuiplugin/icons/ref/Mouse.png
index 146305b..146305b 100644
--- a/src/settingsui/icons/ref/Mouse.png
+++ b/src/settingsui/settingsuiplugin/icons/ref/Mouse.png
Binary files differ
diff --git a/src/settingsui/icons/ref/Plus.png b/src/settingsui/settingsuiplugin/icons/ref/Plus.png
index 391fe94..391fe94 100644
--- a/src/settingsui/icons/ref/Plus.png
+++ b/src/settingsui/settingsuiplugin/icons/ref/Plus.png
Binary files differ
diff --git a/src/settingsui/icons/ref/Power.png b/src/settingsui/settingsuiplugin/icons/ref/Power.png
index b54a084..b54a084 100644
--- a/src/settingsui/icons/ref/Power.png
+++ b/src/settingsui/settingsuiplugin/icons/ref/Power.png
Binary files differ
diff --git a/src/settingsui/icons/ref/Settings.png b/src/settingsui/settingsuiplugin/icons/ref/Settings.png
index d8b255c..d8b255c 100644
--- a/src/settingsui/icons/ref/Settings.png
+++ b/src/settingsui/settingsuiplugin/icons/ref/Settings.png
Binary files differ
diff --git a/src/settingsui/icons/ref/Tablet.png b/src/settingsui/settingsuiplugin/icons/ref/Tablet.png
index 71b0065..71b0065 100644
--- a/src/settingsui/icons/ref/Tablet.png
+++ b/src/settingsui/settingsuiplugin/icons/ref/Tablet.png
Binary files differ
diff --git a/src/settingsui/icons/ref/Volume_down.png b/src/settingsui/settingsuiplugin/icons/ref/Volume_down.png
index 0773b1d..0773b1d 100644
--- a/src/settingsui/icons/ref/Volume_down.png
+++ b/src/settingsui/settingsuiplugin/icons/ref/Volume_down.png
Binary files differ
diff --git a/src/settingsui/icons/ref/Volume_mute.png b/src/settingsui/settingsuiplugin/icons/ref/Volume_mute.png
index 36ab384..36ab384 100644
--- a/src/settingsui/icons/ref/Volume_mute.png
+++ b/src/settingsui/settingsuiplugin/icons/ref/Volume_mute.png
Binary files differ
diff --git a/src/settingsui/icons/ref/Volume_up.png b/src/settingsui/settingsuiplugin/icons/ref/Volume_up.png
index 61eebbd..61eebbd 100644
--- a/src/settingsui/icons/ref/Volume_up.png
+++ b/src/settingsui/settingsuiplugin/icons/ref/Volume_up.png
Binary files differ
diff --git a/src/settingsui/icons/ref/Wifi.png b/src/settingsui/settingsuiplugin/icons/ref/Wifi.png
index 5d1e0d9..5d1e0d9 100644
--- a/src/settingsui/icons/ref/Wifi.png
+++ b/src/settingsui/settingsuiplugin/icons/ref/Wifi.png
Binary files differ
diff --git a/src/settingsui/icons/ref/Wifi1.png b/src/settingsui/settingsuiplugin/icons/ref/Wifi1.png
index f1b1489..f1b1489 100644
--- a/src/settingsui/icons/ref/Wifi1.png
+++ b/src/settingsui/settingsuiplugin/icons/ref/Wifi1.png
Binary files differ
diff --git a/src/settingsui/icons/ref/Wifi2.png b/src/settingsui/settingsuiplugin/icons/ref/Wifi2.png
index a22b472..a22b472 100644
--- a/src/settingsui/icons/ref/Wifi2.png
+++ b/src/settingsui/settingsuiplugin/icons/ref/Wifi2.png
Binary files differ
diff --git a/src/settingsui/icons/ref/Wifi3.png b/src/settingsui/settingsuiplugin/icons/ref/Wifi3.png
index 76d412b..76d412b 100644
--- a/src/settingsui/icons/ref/Wifi3.png
+++ b/src/settingsui/settingsuiplugin/icons/ref/Wifi3.png
Binary files differ
diff --git a/src/settingsui/icons/ref/Wifi4.png b/src/settingsui/settingsuiplugin/icons/ref/Wifi4.png
index 5d1e0d9..5d1e0d9 100644
--- a/src/settingsui/icons/ref/Wifi4.png
+++ b/src/settingsui/settingsuiplugin/icons/ref/Wifi4.png
Binary files differ
diff --git a/src/settingsui/icons/ref/WifiAnim.png b/src/settingsui/settingsuiplugin/icons/ref/WifiAnim.png
index 0694f63..0694f63 100644
--- a/src/settingsui/icons/ref/WifiAnim.png
+++ b/src/settingsui/settingsuiplugin/icons/ref/WifiAnim.png
Binary files differ
diff --git a/src/settingsui/icons/ref/World.png b/src/settingsui/settingsuiplugin/icons/ref/World.png
index cf6eaf0..cf6eaf0 100644
--- a/src/settingsui/icons/ref/World.png
+++ b/src/settingsui/settingsuiplugin/icons/ref/World.png
Binary files differ
diff --git a/src/settingsui/icons/ref/Wrench.png b/src/settingsui/settingsuiplugin/icons/ref/Wrench.png
index 5b6e1c6..5b6e1c6 100644
--- a/src/settingsui/icons/ref/Wrench.png
+++ b/src/settingsui/settingsuiplugin/icons/ref/Wrench.png
Binary files differ
diff --git a/src/settingsui/icons/ref/extra/Alert.png b/src/settingsui/settingsuiplugin/icons/ref/extra/Alert.png
index 80914fc..80914fc 100644
--- a/src/settingsui/icons/ref/extra/Alert.png
+++ b/src/settingsui/settingsuiplugin/icons/ref/extra/Alert.png
Binary files differ
diff --git a/src/settingsui/icons/scripts/cimage.sh b/src/settingsui/settingsuiplugin/icons/scripts/cimage.sh
index ae73622..ae73622 100755
--- a/src/settingsui/icons/scripts/cimage.sh
+++ b/src/settingsui/settingsuiplugin/icons/scripts/cimage.sh
diff --git a/src/settingsui/icons/scripts/cimages.sh b/src/settingsui/settingsuiplugin/icons/scripts/cimages.sh
index 94ac1cd..94ac1cd 100755
--- a/src/settingsui/icons/scripts/cimages.sh
+++ b/src/settingsui/settingsuiplugin/icons/scripts/cimages.sh
diff --git a/src/settingsui/icons/scripts/rimage.sh b/src/settingsui/settingsuiplugin/icons/scripts/rimage.sh
index d98088f..d98088f 100755
--- a/src/settingsui/icons/scripts/rimage.sh
+++ b/src/settingsui/settingsuiplugin/icons/scripts/rimage.sh
diff --git a/src/settingsui/icons/scripts/rimages.sh b/src/settingsui/settingsuiplugin/icons/scripts/rimages.sh
index 7b76da8..7b76da8 100755
--- a/src/settingsui/icons/scripts/rimages.sh
+++ b/src/settingsui/settingsuiplugin/icons/scripts/rimages.sh
diff --git a/src/settingsui/settingsuiplugin/plugin.qrc b/src/settingsui/settingsuiplugin/plugin.qrc
new file mode 100644
index 0000000..58cb4af
--- /dev/null
+++ b/src/settingsui/settingsuiplugin/plugin.qrc
@@ -0,0 +1,28 @@
+<RCC>
+ <qresource prefix="/">
+ <file>pluginMain.qml</file>
+ <file>../bluetooth/Bluetooth.qml</file>
+ <file>../bluetooth/Discovery.qml</file>
+ <file>../common/CustomTableView.qml</file>
+ <file>../common/HandwritingModeButton.qml</file>
+ <file>../display/Display.qml</file>
+ <file>../locale/Language.qml</file>
+ <file>../locale/RegionSelect.qml</file>
+ <file>../network/AddressListEntry.qml</file>
+ <file>../network/ComboBoxEntry.qml</file>
+ <file>../network/EditWiredSettings.qml</file>
+ <file>../network/IpAddressTextField.qml</file>
+ <file>../network/NetworkDetails.qml</file>
+ <file>../network/NetworkSettings.qml</file>
+ <file>../network/WifiSelectorDelegate.qml</file>
+ <file>../network/WifiSettings.qml</file>
+ <file>../network/WifiSignalMonitor.qml</file>
+ <file>../network/WiredSettings.qml</file>
+ <file>../timedate/AnalogClock.qml</file>
+ <file>../timedate/ClockHand.qml</file>
+ <file>../timedate/CustomCalendar.qml</file>
+ <file>../timedate/TimeDate.qml</file>
+ <file>../timedate/TimezonesView.qml</file>
+ <file>settingsview.xml</file>
+ </qresource>
+</RCC>
diff --git a/src/settingsui/settingsuiplugin/pluginMain.qml b/src/settingsui/settingsuiplugin/pluginMain.qml
new file mode 100644
index 0000000..c465e52
--- /dev/null
+++ b/src/settingsui/settingsuiplugin/pluginMain.qml
@@ -0,0 +1,174 @@
+/****************************************************************************
+**
+** Copyright (C) 2015 The Qt Company Ltd.
+** Contact: http://www.qt.io/licensing/
+**
+** This file is part of the Qt Device Utilities module of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL3$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and The Qt Company. For licensing terms
+** and conditions see http://www.qt.io/terms-conditions. For further
+** information use the contact form at http://www.qt.io/contact-us.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 3 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPLv3 included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU Lesser General Public License version 3 requirements
+** will be met: https://www.gnu.org/licenses/lgpl.html.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 2.0 or later as published by the Free
+** Software Foundation and appearing in the file LICENSE.GPL included in
+** the packaging of this file. Please review the following information to
+** ensure the GNU General Public License version 2.0 requirements will be
+** met: http://www.gnu.org/licenses/gpl-2.0.html.
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+import QtQuick 2.5
+import QtQuick.Layouts 1.2
+import QtQuick.Controls 2.0
+import Qt.labs.settings 1.0
+import QtQuick.XmlListModel 2.0
+import QtQuick.Enterprise.VirtualKeyboard 2.0
+import com.theqtcompany.localdevice 1.0
+
+Rectangle {
+ id: root
+ anchors.fill: parent
+ color: "white"
+ visible: true
+ property var service
+
+ ToolBar {
+ id: titlebar
+ property string title: ""
+ width: parent.width
+ 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();
+ }
+ Label {
+ id: titleText
+ font.pixelSize: 20
+ text: stackView.currentItem.title
+ horizontalAlignment: Qt.AlignHCenter
+ verticalAlignment: Qt.AlignVCenter
+ anchors.centerIn: parent
+ }
+ ToolButton {
+ contentItem: Image {
+ fillMode: Image.PreserveAspectFit
+ source: "../icons/Power_black_1x.png"
+ anchors.centerIn: parent
+ }
+ anchors.right: parent.right
+
+ visible: stackView.depth === 1
+ onClicked: menu.open();
+
+ Menu {
+ id: menu
+ x: parent.width - width
+
+ MenuItem {
+ text: qsTr("Reboot")
+ onTriggered: LocalDevice.reboot()
+ }
+ MenuItem {
+ text: qsTr("Shutdown")
+ onTriggered: LocalDevice.powerOff()
+ }
+ }
+ }
+ }
+ }
+
+ StackView {
+ id: stackView
+ initialItem: mainView
+ anchors.top: titlebar.bottom
+ anchors.bottom: parent.bottom
+ anchors.left: parent.left
+ anchors.right: parent.right
+
+ Component {
+ id: mainView
+
+ Item {
+ property string title: qsTr("Device Settings")
+
+ XmlListModel {
+ id: xmlModel
+ source: "settingsview.xml"
+ query: "/xml/settings/item"
+ XmlRole { name: "title"; query: "title/string()"}
+ XmlRole { name: "icon"; query: "icon/string()"}
+ XmlRole { name: "view"; query: "view/string()"}
+ XmlRole { name: "path"; query: "path/string()"}
+ }
+ GridView {
+ id: grid
+ anchors.fill: parent
+ anchors.margins: 40
+ cellHeight: 133 + spacing
+ cellWidth: 117 + spacing
+ model: xmlModel
+ property int spacing: 20
+ delegate: MouseArea {
+ width: grid.cellWidth - grid.spacing
+ height: grid.cellHeight - grid.spacing
+
+ Rectangle {
+ anchors.fill: parent
+ color: "#d6d6d6"
+ radius: 5
+ visible: pressed
+ }
+ Column {
+ anchors.fill: parent
+ anchors.topMargin: 10
+ Image {
+ id: image
+ source: icon
+ anchors.horizontalCenter: parent.horizontalCenter
+ width: grid.cellWidth
+ fillMode: Image.PreserveAspectFit
+ }
+ Label {
+ text: title
+ anchors.horizontalCenter: parent.horizontalCenter
+ font.pixelSize: grid.cellHeight * .1
+ }
+ }
+ onClicked: {
+ var component = Qt.createComponent(path+'/'+view+'.qml');
+ stackView.push(component.createObject(stackView));
+ }
+ }
+ }
+ }
+ }
+ }
+}
diff --git a/src/settingsui/settingsuiplugin/qmldir b/src/settingsui/settingsuiplugin/qmldir
new file mode 100644
index 0000000..0a883ed
--- /dev/null
+++ b/src/settingsui/settingsuiplugin/qmldir
@@ -0,0 +1,2 @@
+module com.theqtcompany.settingsui
+plugin settingsuiplugin
diff --git a/src/settingsui/settingsuiplugin/settingsuiplugin.pro b/src/settingsui/settingsuiplugin/settingsuiplugin.pro
new file mode 100644
index 0000000..40f4ce3
--- /dev/null
+++ b/src/settingsui/settingsuiplugin/settingsuiplugin.pro
@@ -0,0 +1,38 @@
+TEMPLATE = lib
+TARGET = settingsuiplugin
+QT += qml quick
+CONFIG += qt plugin c++11
+
+TARGET = $$qtLibraryTarget($$TARGET)
+uri = com.theqtcompany.settingsui
+
+# Input
+SOURCES += \
+ settingsuiplugin_plugin.cpp
+
+HEADERS += \
+ settingsuiplugin_plugin.h
+
+DISTFILES += \
+ qmldir
+
+!equals(_PRO_FILE_PWD_, $$OUT_PWD) {
+ copy_qmldir.target = $$OUT_PWD/qmldir
+ copy_qmldir.depends = $$_PRO_FILE_PWD_/qmldir
+ copy_qmldir.commands = $(COPY_FILE) \"$$replace(copy_qmldir.depends, /, $$QMAKE_DIR_SEP)\" \"$$replace(copy_qmldir.target, /, $$QMAKE_DIR_SEP)\"
+ QMAKE_EXTRA_TARGETS += copy_qmldir
+ PRE_TARGETDEPS += $$copy_qmldir.target
+}
+
+qmldir.files = qmldir
+
+unix {
+ installPath = $$[QT_INSTALL_QML]/$$replace(uri, \\., /)
+ qmldir.path = $$installPath
+ target.path = $$installPath
+ INSTALLS += target qmldir
+}
+
+RESOURCES += \
+ icons.qrc \
+ plugin.qrc
diff --git a/src/settingsui/settingsuiplugin/settingsuiplugin_plugin.cpp b/src/settingsui/settingsuiplugin/settingsuiplugin_plugin.cpp
new file mode 100644
index 0000000..8a8c1ee
--- /dev/null
+++ b/src/settingsui/settingsuiplugin/settingsuiplugin_plugin.cpp
@@ -0,0 +1,10 @@
+#include "settingsuiplugin_plugin.h"
+
+#include <qqml.h>
+
+void SettingsuipluginPlugin::registerTypes(const char *uri)
+{
+ // @uri com.theqtcompany.settingsui
+ qmlRegisterType(QUrl("qrc:/pluginMain.qml"), uri, 1, 0, "SettingsUI");
+}
+
diff --git a/src/settingsui/settingsuiplugin/settingsuiplugin_plugin.h b/src/settingsui/settingsuiplugin/settingsuiplugin_plugin.h
new file mode 100644
index 0000000..826c171
--- /dev/null
+++ b/src/settingsui/settingsuiplugin/settingsuiplugin_plugin.h
@@ -0,0 +1,50 @@
+/****************************************************************************
+**
+** Copyright (C) 2016 The Qt Company Ltd.
+** Contact: http://www.qt.io/licensing/
+**
+** This file is part of the Qt Device Utilities module of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL3$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and The Qt Company. For licensing terms
+** and conditions see http://www.qt.io/terms-conditions. For further
+** information use the contact form at http://www.qt.io/contact-us.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 3 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPLv3 included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU Lesser General Public License version 3 requirements
+** will be met: https://www.gnu.org/licenses/lgpl.html.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 2.0 or later as published by the Free
+** Software Foundation and appearing in the file LICENSE.GPL included in
+** the packaging of this file. Please review the following information to
+** ensure the GNU General Public License version 2.0 requirements will be
+** met: http://www.gnu.org/licenses/gpl-2.0.html.
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+#ifndef SETTINGSUIPLUGIN_PLUGIN_H
+#define SETTINGSUIPLUGIN_PLUGIN_H
+
+#include <QQmlExtensionPlugin>
+
+class SettingsuipluginPlugin : public QQmlExtensionPlugin
+{
+ Q_OBJECT
+ Q_PLUGIN_METADATA(IID "org.qt-project.Qt.QQmlExtensionInterface")
+
+public:
+ void registerTypes(const char *uri);
+};
+
+#endif // SETTINGSUIPLUGIN_PLUGIN_H
diff --git a/src/settingsui/settingsview.xml b/src/settingsui/settingsuiplugin/settingsview.xml
index 4f3b52e..23915db 100644
--- a/src/settingsui/settingsview.xml
+++ b/src/settingsui/settingsuiplugin/settingsview.xml
@@ -5,31 +5,31 @@
<title>Network</title>
<view>NetworkSettings</view>
<path>network</path>
- <icon>../icons/World_qt_6x.png</icon>
+ <icon>icons/World_qt_6x.png</icon>
</item>
<item>
<title>Display</title>
<view>Display</view>
<path>display</path>
- <icon>../icons/Display_qt_6x.png</icon>
+ <icon>icons/Display_qt_6x.png</icon>
</item>
<item>
<title>Date and Time</title>
<view>TimeDate</view>
<path>timedate</path>
- <icon>../icons/Clock_qt_6x.png</icon>
+ <icon>icons/Clock_qt_6x.png</icon>
</item>
<item>
<title>Language</title>
<view>Language</view>
<path>locale</path>
- <icon>../icons/Flag_qt_6x.png</icon>
+ <icon>icons/Flag_qt_6x.png</icon>
</item>
<item>
<title>Bluetooth</title>
<view>Bluetooth</view>
<path>bluetooth</path>
- <icon>../icons/Bluetooth_qt_6x.png</icon>
+ <icon>icons/Bluetooth_qt_6x.png</icon>
</item>
</settings>
</xml>
diff --git a/src/settingsui/timedate/AnalogClock.qml b/src/settingsui/timedate/AnalogClock.qml
index ff43347..b57ac7f 100644
--- a/src/settingsui/timedate/AnalogClock.qml
+++ b/src/settingsui/timedate/AnalogClock.qml
@@ -34,9 +34,7 @@
**
****************************************************************************/
import QtQuick 2.6
-import Qt.labs.controls 1.0
-import Qt.labs.controls.material 1.0
-import Qt.labs.controls.universal 1.0
+import QtQuick.Controls 2.0
import com.theqtcompany.settings.timedate 1.0
Item {
diff --git a/src/settingsui/timedate/CustomCalendar.qml b/src/settingsui/timedate/CustomCalendar.qml
index 09d4e3e..b720a44 100644
--- a/src/settingsui/timedate/CustomCalendar.qml
+++ b/src/settingsui/timedate/CustomCalendar.qml
@@ -35,9 +35,7 @@
****************************************************************************/
import QtQuick 2.6
import QtQuick.Layouts 1.3
-import Qt.labs.controls 1.0
-import Qt.labs.controls.material 1.0
-import Qt.labs.controls.universal 1.0
+import QtQuick.Controls 2.0
import Qt.labs.calendar 1.0
import QtQml 2.2
import com.theqtcompany.settings.timedate 1.0
@@ -70,7 +68,7 @@ Rectangle {
id: previousMonth
Layout.preferredWidth: height
visible: enabled
- label: Rectangle {
+ contentItem: Rectangle {
anchors.fill: parent
color: "#d6d6d6"
@@ -105,7 +103,7 @@ Rectangle {
id: nextMonth
Layout.preferredWidth: height
visible: enabled
- label: Rectangle {
+ contentItem: Rectangle {
anchors.fill: parent
color: "#d6d6d6"
diff --git a/src/settingsui/timedate/TimeDate.qml b/src/settingsui/timedate/TimeDate.qml
index cc46b78..2426f4a 100644
--- a/src/settingsui/timedate/TimeDate.qml
+++ b/src/settingsui/timedate/TimeDate.qml
@@ -35,9 +35,7 @@
****************************************************************************/
import QtQuick 2.6
import QtQuick.Layouts 1.3
-import Qt.labs.controls 1.0
-import Qt.labs.controls.material 1.0
-import Qt.labs.controls.universal 1.0
+import QtQuick.Controls 2.0
import com.theqtcompany.settings.timedate 1.0
Item {
diff --git a/src/settingsui/timedate/TimezonesView.qml b/src/settingsui/timedate/TimezonesView.qml
index 16ac10e..5d81121 100644
--- a/src/settingsui/timedate/TimezonesView.qml
+++ b/src/settingsui/timedate/TimezonesView.qml
@@ -35,12 +35,9 @@
****************************************************************************/
import QtQuick 2.6
import QtQuick.Layouts 1.3
-import Qt.labs.controls 1.0
-import Qt.labs.controls.material 1.0
-import Qt.labs.controls.universal 1.0
+import QtQuick.Controls 2.0
import com.theqtcompany.settings.timedate 1.0
import "../common"
-
Item {
id: root
property string title: qsTr("Timezone settings")
diff --git a/src/src.pro b/src/src.pro
index 1cbf0ed..faa9a6d 100644
--- a/src/src.pro
+++ b/src/src.pro
@@ -7,6 +7,7 @@ SUBDIRS += \
displaysettings \
timedatesettings \
localdevice \
+ settingsui/settingsuiplugin \
settingsui \
imports \
- doc
+ doc \