diff options
| author | Sami Nurmenniemi <sami.nurmenniemi@qt.io> | 2017-09-28 13:31:32 +0300 |
|---|---|---|
| committer | Sami Nurmenniemi <sami.nurmenniemi@qt.io> | 2017-11-22 10:41:22 +0000 |
| commit | 62ba7239d6d1f498bc0e1a0c81fdf42ef835b1b7 (patch) | |
| tree | 97508de422a3f3164e50ffcd5127772cfcbc6a4e /src/settingsui/bluetooth/Bluetooth.qml | |
| parent | af3ec9e19133146ac2fbe4bed83696256d7556a2 (diff) | |
Unify fonts and layouts between settings pages
Task-number: QTBUG-63091
Change-Id: I2d4741f1d0ff23cb26a2cce7593c4fc7f5f8ec16
Reviewed-by: Kari Oikarinen <kari.oikarinen@qt.io>
Reviewed-by: Teemu Holappa <teemu.holappa@qt.io>
Diffstat (limited to 'src/settingsui/bluetooth/Bluetooth.qml')
| -rw-r--r-- | src/settingsui/bluetooth/Bluetooth.qml | 17 |
1 files changed, 8 insertions, 9 deletions
diff --git a/src/settingsui/bluetooth/Bluetooth.qml b/src/settingsui/bluetooth/Bluetooth.qml index f55d90c..60ee017 100644 --- a/src/settingsui/bluetooth/Bluetooth.qml +++ b/src/settingsui/bluetooth/Bluetooth.qml @@ -37,23 +37,22 @@ Item { Row { id: bluetoothRow anchors.top: parent.top - anchors.topMargin: parent.height * 0.05 anchors.left: parent.left anchors.right: parent.right - height: parent.height * 0.2 spacing: parent.width * 0.025 + Text { + id: bluetoothSwitchText anchors.verticalCenter: parent.verticalCenter - font.pixelSize: parent.height * 0.2 - color: "white" - text: "Bluetooth" + font.pixelSize: pluginMain.subTitleFontSize font.family: appFont - font.styleName: "Bold" + color: "white" + text: qsTr("Bluetooth") } CustomSwitch { anchors.verticalCenter: parent.verticalCenter - indicatorWidth: root.width * 0.25 - indicatorHeight: root.height * 0.1 + indicatorWidth: root.width * 0.15 + indicatorHeight: root.height * 0.06 checked: BtDevice.powered onCheckedChanged: BtDevice.powered = checked @@ -63,7 +62,7 @@ Item { id: scanningText anchors.verticalCenter: parent.verticalCenter verticalAlignment: Text.AlignVCenter - font.pixelSize: parent.height * 0.2 + font.pixelSize: pluginMain.valueFontSize color: "white" text: "Scanning" font.family: appFont |