diff options
author | Mikko Gronoff <mikko.gronoff@qt.io> | 2018-02-06 12:43:01 +0200 |
---|---|---|
committer | Mikko Gronoff <mikko.gronoff@qt.io> | 2018-02-06 12:43:35 +0200 |
commit | e0a8b06317bb51ca844818682ebec3cd2c2b5108 (patch) | |
tree | 8bbdd58472a9c4304cbe7893a57492a8d980e390 | |
parent | d39647d3605595ba1b4ba710edea08584061e43f (diff) | |
parent | e552d5920590673fb391288ccf20ca0030916615 (diff) |
Merge remote-tracking branch 'origin/5.9' into 5.105.10
* origin/5.9:
Fix the appearance of network settings
Doc: Bump version to 5.9.4
Conflicts:
.qmake.conf
Change-Id: I5ab18bbe6ec854060407507cad99c1f34a027b3f
-rw-r--r-- | src/settingsui/network/NetworkSettings.qml | 36 |
1 files changed, 16 insertions, 20 deletions
diff --git a/src/settingsui/network/NetworkSettings.qml b/src/settingsui/network/NetworkSettings.qml index 947aae5..bb09954 100644 --- a/src/settingsui/network/NetworkSettings.qml +++ b/src/settingsui/network/NetworkSettings.qml @@ -76,33 +76,29 @@ Item { Layout.fillWidth: true implicitHeight: 54 + indicator: Item {} contentItem: Rectangle { color: checked ? "#80c342" : "white" border.color: "#bdbebf" border.width: 1 anchors.fill: parent - Row { - anchors.fill: parent - spacing: 10 - - Image { - id: typeId - height: parent.height - width: height + Column { + height: parent.height * .7 + width: parent.width + spacing: 0 + anchors.verticalCenter: parent.verticalCenter + Label { + width: parent.width + horizontalAlignment: Text.AlignHCenter + text: name } - Column { - height: parent.height * .7 - spacing: 0 - anchors.verticalCenter: parent.verticalCenter - Label { - text: name - } - Label { - text: ((type == NetworkSettingsType.Wired) && !NetworkSettingsManager.services.wiredNetworksAvailable) ? - qsTr("No networks") : networkSelect.stateToStr(modelData.state) - font.pixelSize: 12 - } + Label { + width: parent.width + horizontalAlignment: Text.AlignHCenter + text: ((type == NetworkSettingsType.Wired) && !NetworkSettingsManager.services.wiredNetworksAvailable) ? + qsTr("No networks") : networkSelect.stateToStr(modelData.state) + font.pixelSize: 12 } } } |