From 15ac9af2680d63321403f49eca03cdb192851bd3 Mon Sep 17 00:00:00 2001 From: Kimmo Ollila Date: Wed, 11 May 2016 12:52:49 +0300 Subject: Separated SettingsUI to its own plugin. Change-Id: I7893231ab2d18270183f9838456d0e48cdc63186 Reviewed-by: Samuli Piippo Reviewed-by: Teemu Holappa --- src/settingsui/network/AddressListEntry.qml | 4 +--- src/settingsui/network/ComboBoxEntry.qml | 4 +--- src/settingsui/network/EditWiredSettings.qml | 4 +--- src/settingsui/network/IpAddressTextField.qml | 4 +--- src/settingsui/network/NetworkDetails.qml | 2 +- src/settingsui/network/NetworkSettings.qml | 7 ++----- src/settingsui/network/WifiSelectorDelegate.qml | 5 +---- src/settingsui/network/WifiSettings.qml | 6 ++---- src/settingsui/network/WifiSignalMonitor.qml | 4 ++-- src/settingsui/network/WiredSettings.qml | 10 ++++++---- 10 files changed, 18 insertions(+), 32 deletions(-) (limited to 'src/settingsui/network') 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 -- cgit v1.2.3