diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/settingsui/bluetooth/Bluetooth.qml | 17 | ||||
| -rw-r--r-- | src/settingsui/display/Display.qml | 5 | ||||
| -rw-r--r-- | src/settingsui/settingsuiapp.qrc | 17 |
3 files changed, 29 insertions, 10 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 diff --git a/src/settingsui/display/Display.qml b/src/settingsui/display/Display.qml index 0936e89..dd5f389 100644 --- a/src/settingsui/display/Display.qml +++ b/src/settingsui/display/Display.qml @@ -39,11 +39,11 @@ Item { Column { spacing: pluginMain.spacing anchors.top: parent.top - anchors.topMargin: pluginMain.margin Text { verticalAlignment: Text.AlignVCenter font.pixelSize: pluginMain.subTitleFontSize + font.family: appFont text: qsTr("Brightness ") + (brightnessSlider.value / 255 * 100).toFixed(1) + "%" color: "white" height: pluginMain.fieldTextHeight @@ -93,6 +93,7 @@ Item { verticalAlignment: Text.AlignVCenter height: pluginMain.fieldTextHeight font.pixelSize: pluginMain.subTitleFontSize + font.family: appFont text: qsTr("Physical screen size") Layout.preferredWidth: root.width * 0.3 Layout.alignment: Qt.AlignVCenter @@ -113,6 +114,7 @@ Item { text: qsTr("Width") color: "white" font.pixelSize: pluginMain.valueFontSize + font.family: appFont verticalAlignment: Text.AlignVCenter } TextField { @@ -135,6 +137,7 @@ Item { text: qsTr("Height") color: "white" font.pixelSize: pluginMain.valueFontSize + font.family: appFont verticalAlignment: Text.AlignVCenter } TextField { diff --git a/src/settingsui/settingsuiapp.qrc b/src/settingsui/settingsuiapp.qrc index e0170de..6fddb2d 100644 --- a/src/settingsui/settingsuiapp.qrc +++ b/src/settingsui/settingsuiapp.qrc @@ -10,9 +10,26 @@ <file>network/PassphraseEnter.qml</file> <file>locale/TableKey.qml</file> <file>locale/TableValue.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/NetworkListView.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>settingsuiplugin/pluginMain.qml</file> <file>settingsuiplugin/SettingsDelegate.qml</file> <file>settingsuiplugin/SettingsHeader.qml</file> <file>settingsuiplugin/SettingsTitleItem.qml</file> <file>settingsuiplugin/ShutdownPopup.qml</file> + <file>bluetooth/Bluetooth.qml</file> + <file>bluetooth/Discovery.qml</file> </qresource> </RCC> |