summaryrefslogtreecommitdiffstats
path: root/src/settingsui/network
diff options
context:
space:
mode:
Diffstat (limited to 'src/settingsui/network')
-rw-r--r--src/settingsui/network/AddressListEntry.qml6
-rw-r--r--src/settingsui/network/ComboBoxEntry.qml6
-rw-r--r--src/settingsui/network/EditWiredSettings.qml8
-rw-r--r--src/settingsui/network/IpAddressTextField.qml6
-rw-r--r--src/settingsui/network/NetworkDetails.qml2
-rw-r--r--src/settingsui/network/NetworkListView.qml10
-rw-r--r--src/settingsui/network/NetworkSettings.qml15
-rw-r--r--src/settingsui/network/PassphraseEnter.qml8
-rw-r--r--src/settingsui/network/WifiSelectorDelegate.qml8
-rw-r--r--src/settingsui/network/WifiSettings.qml8
-rw-r--r--src/settingsui/network/WifiSignalMonitor.qml2
-rw-r--r--src/settingsui/network/WiredSettings.qml8
12 files changed, 44 insertions, 43 deletions
diff --git a/src/settingsui/network/AddressListEntry.qml b/src/settingsui/network/AddressListEntry.qml
index 9612778..9701587 100644
--- a/src/settingsui/network/AddressListEntry.qml
+++ b/src/settingsui/network/AddressListEntry.qml
@@ -26,9 +26,9 @@
** $QT_END_LICENSE$
**
****************************************************************************/
-import QtQuick 2.6
-import QtQuick.Layouts 1.3
-import QtQuick.Controls 2.0
+import QtQuick
+import QtQuick.Layouts
+import QtQuick.Controls
RowLayout {
id: root
diff --git a/src/settingsui/network/ComboBoxEntry.qml b/src/settingsui/network/ComboBoxEntry.qml
index 1d4858a..ce88964 100644
--- a/src/settingsui/network/ComboBoxEntry.qml
+++ b/src/settingsui/network/ComboBoxEntry.qml
@@ -26,9 +26,9 @@
** $QT_END_LICENSE$
**
****************************************************************************/
-import QtQuick 2.6
-import QtQuick.Layouts 1.3
-import QtQuick.Controls 2.0
+import QtQuick
+import QtQuick.Layouts
+import QtQuick.Controls
RowLayout {
id: root
diff --git a/src/settingsui/network/EditWiredSettings.qml b/src/settingsui/network/EditWiredSettings.qml
index 857c8e9..a59da20 100644
--- a/src/settingsui/network/EditWiredSettings.qml
+++ b/src/settingsui/network/EditWiredSettings.qml
@@ -26,10 +26,10 @@
** $QT_END_LICENSE$
**
****************************************************************************/
-import QtQuick 2.6
-import QtQuick.Layouts 1.3
-import QtQuick.Controls 2.0
-import QtDeviceUtilities.NetworkSettings 1.0
+import QtQuick
+import QtQuick.Layouts
+import QtQuick.Controls
+import QtDeviceUtilities.NetworkSettings
Item {
id: root
diff --git a/src/settingsui/network/IpAddressTextField.qml b/src/settingsui/network/IpAddressTextField.qml
index dcf8771..748e402 100644
--- a/src/settingsui/network/IpAddressTextField.qml
+++ b/src/settingsui/network/IpAddressTextField.qml
@@ -26,9 +26,9 @@
** $QT_END_LICENSE$
**
****************************************************************************/
-import QtQuick 2.6
-import QtQuick.Layouts 1.3
-import QtQuick.Controls 2.0
+import QtQuick
+import QtQuick.Layouts
+import QtQuick.Controls
TextField {
Layout.fillWidth: true
diff --git a/src/settingsui/network/NetworkDetails.qml b/src/settingsui/network/NetworkDetails.qml
index 6e9ee4c..88b0946 100644
--- a/src/settingsui/network/NetworkDetails.qml
+++ b/src/settingsui/network/NetworkDetails.qml
@@ -26,7 +26,7 @@
** $QT_END_LICENSE$
**
****************************************************************************/
-import QtQuick 2.6
+import QtQuick
Loader {
id: root
diff --git a/src/settingsui/network/NetworkListView.qml b/src/settingsui/network/NetworkListView.qml
index 3b75412..7c35433 100644
--- a/src/settingsui/network/NetworkListView.qml
+++ b/src/settingsui/network/NetworkListView.qml
@@ -26,11 +26,11 @@
** $QT_END_LICENSE$
**
****************************************************************************/
-import QtQuick 2.0
-import QtQml 2.0
-import QtDeviceUtilities.NetworkSettings 1.0
-import QtDeviceUtilities.QtButtonImageProvider 1.0
-import QtQuick.Controls 2.1
+import QtQuick
+import QtQml
+import QtDeviceUtilities.NetworkSettings
+import QtDeviceUtilities.QtButtonImageProvider
+import QtQuick.Controls
ListView {
id: list
diff --git a/src/settingsui/network/NetworkSettings.qml b/src/settingsui/network/NetworkSettings.qml
index 8aa8cc0..a0555f4 100644
--- a/src/settingsui/network/NetworkSettings.qml
+++ b/src/settingsui/network/NetworkSettings.qml
@@ -26,11 +26,11 @@
** $QT_END_LICENSE$
**
****************************************************************************/
-import QtQuick 2.6
-import QtQuick.Layouts 1.3
-import QtQuick.Controls 2.2
-import QtDeviceUtilities.NetworkSettings 1.0
-import QtDeviceUtilities.QtButtonImageProvider 1.0
+import QtQuick
+import QtQuick.Layouts
+import QtQuick.Controls
+import QtDeviceUtilities.NetworkSettings
+import QtDeviceUtilities.QtButtonImageProvider
import "../common"
Item {
@@ -88,7 +88,7 @@ Item {
anchors.top: wlanText.bottom
anchors.left: wifiSwitch.right
anchors.right: manualDisconnect.left
- anchors.rightMargin: 15
+ anchors.rightMargin: 10
enabled: wifiSwitch.checked
fillColor: enabled ? viewSettings.buttonGreenColor : viewSettings.buttonGrayColor
borderColor: "transparent"
@@ -115,12 +115,13 @@ Item {
}
Text {
id: networkListTextItem
- text: qsTr("Network list")
+ text: qsTr("Network list:")
font.pixelSize: pluginMain.subTitleFontSize
font.family: appFont
font.styleName: "SemiBold"
color: "white"
anchors.top: wifiSwitch.bottom
+ anchors.topMargin: 10
}
NetworkListView {
id: networkList
diff --git a/src/settingsui/network/PassphraseEnter.qml b/src/settingsui/network/PassphraseEnter.qml
index 1ed8d92..5d3167c 100644
--- a/src/settingsui/network/PassphraseEnter.qml
+++ b/src/settingsui/network/PassphraseEnter.qml
@@ -26,10 +26,10 @@
** $QT_END_LICENSE$
**
****************************************************************************/
-import QtQuick 2.0
-import QtQuick.Controls 2.0
-import QtDeviceUtilities.QtButtonImageProvider 1.0
-import QtDeviceUtilities.NetworkSettings 1.0
+import QtQuick
+import QtQuick.Controls
+import QtDeviceUtilities.QtButtonImageProvider
+import QtDeviceUtilities.NetworkSettings
Rectangle {
id: passphrasePopup
diff --git a/src/settingsui/network/WifiSelectorDelegate.qml b/src/settingsui/network/WifiSelectorDelegate.qml
index ea044f6..3c462c5 100644
--- a/src/settingsui/network/WifiSelectorDelegate.qml
+++ b/src/settingsui/network/WifiSelectorDelegate.qml
@@ -26,10 +26,10 @@
** $QT_END_LICENSE$
**
****************************************************************************/
-import QtQuick 2.6
-import QtQuick.Layouts 1.3
-import QtQuick.Controls 2.0
-import QtDeviceUtilities.NetworkSettings 1.0
+import QtQuick
+import QtQuick.Layouts
+import QtQuick.Controls
+import QtDeviceUtilities.NetworkSettings
ItemDelegate {
id: root
diff --git a/src/settingsui/network/WifiSettings.qml b/src/settingsui/network/WifiSettings.qml
index a6130ac..0286483 100644
--- a/src/settingsui/network/WifiSettings.qml
+++ b/src/settingsui/network/WifiSettings.qml
@@ -26,10 +26,10 @@
** $QT_END_LICENSE$
**
****************************************************************************/
-import QtQuick 2.6
-import QtQuick.Layouts 1.3
-import QtQuick.Controls 2.0
-import QtDeviceUtilities.NetworkSettings 1.0
+import QtQuick
+import QtQuick.Layouts
+import QtQuick.Controls
+import QtDeviceUtilities.NetworkSettings
Item {
id: root
diff --git a/src/settingsui/network/WifiSignalMonitor.qml b/src/settingsui/network/WifiSignalMonitor.qml
index 06afca4..25e4aa4 100644
--- a/src/settingsui/network/WifiSignalMonitor.qml
+++ b/src/settingsui/network/WifiSignalMonitor.qml
@@ -26,7 +26,7 @@
** $QT_END_LICENSE$
**
****************************************************************************/
-import QtQuick 2.6
+import QtQuick
Item {
id: root
diff --git a/src/settingsui/network/WiredSettings.qml b/src/settingsui/network/WiredSettings.qml
index 11c6c24..f5d3a8f 100644
--- a/src/settingsui/network/WiredSettings.qml
+++ b/src/settingsui/network/WiredSettings.qml
@@ -26,10 +26,10 @@
** $QT_END_LICENSE$
**
****************************************************************************/
-import QtQuick 2.6
-import QtQuick.Layouts 1.3
-import QtQuick.Controls 2.0
-import QtDeviceUtilities.NetworkSettings 1.0
+import QtQuick
+import QtQuick.Layouts
+import QtQuick.Controls
+import QtDeviceUtilities.NetworkSettings
Item {
id: root