diff --git a/src/qml/Bluetooth/Main.qml b/src/qml/Bluetooth/Main.qml index aabca5a..87936fe 100644 --- a/src/qml/Bluetooth/Main.qml +++ b/src/qml/Bluetooth/Main.qml @@ -26,6 +26,7 @@ import Cutefish.Bluez 1.0 as Bluez import "../" ItemPage { + id: control headerTitle: qsTr("Bluetooth") property bool bluetoothDisConnected: Bluez.Manager.bluetoothBlocked @@ -45,8 +46,12 @@ ItemPage { } Bluez.DevicesProxyModel { + id: devicesProxyModel + sourceModel: devicesModel + } + + Bluez.DevicesModel { id: devicesModel - sourceModel: Bluez.DevicesModel { } } BluetoothManager { @@ -110,7 +115,13 @@ ItemPage { Layout.fillWidth: true Layout.preferredHeight: itemHeight * count + ((count - 1) * spacing) - model: devicesModel //Bluez.Manager.bluetoothOperational ? devicesModel : [] + model: devicesProxyModel //Bluez.Manager.bluetoothOperational ? devicesModel : [] + + section.property: "Section" + section.delegate: Label { + text: section == "Connected" ? qsTr("Connected devices") + : qsTr("Available devices") + } delegate: Item { width: ListView.view.itemHeight @@ -120,7 +131,7 @@ ItemPage { anchors.fill: parent Label { - text: model.DeviceFullName + text: model.Device } } } diff --git a/src/qml/Power/Main.qml b/src/qml/Power/Main.qml index 7b711bb..39c526b 100644 --- a/src/qml/Power/Main.qml +++ b/src/qml/Power/Main.qml @@ -41,7 +41,7 @@ ItemPage { ColumnLayout { id: layout anchors.fill: parent - spacing: FishUI.Units.largeSpacing * 2 + spacing: FishUI.Units.largeSpacing RoundedItem { Label { @@ -73,6 +73,16 @@ ItemPage { } } } + + Label { + color: FishUI.Theme.disabledTextColor + leftPadding: FishUI.Units.largeSpacing * 2 + rightPadding: FishUI.Units.largeSpacing + Layout.fillWidth: true + wrapMode: Text.WordWrap + text: "%1: %2".arg(qsTr("Performance")) + .arg(qsTr("CPU and GPU frequencies will be increased, while power consumption and heat generation will be increased.")) + } } } } diff --git a/translations/en_US.ts b/translations/en_US.ts index 15c786a..1aa2cd4 100644 --- a/translations/en_US.ts +++ b/translations/en_US.ts @@ -381,9 +381,15 @@ + Performance + + + CPU and GPU frequencies will be increased, while power consumption and heat generation will be increased. + + User @@ -462,11 +468,21 @@ - - + + Bluetooth Bluetooth + + + Connected devices + + + + + Available devices + + diff --git a/translations/zh_CN.ts b/translations/zh_CN.ts index f0fc8fe..5c99ed9 100644 --- a/translations/zh_CN.ts +++ b/translations/zh_CN.ts @@ -381,9 +381,15 @@ + Performance 性能模式 + + + CPU and GPU frequencies will be increased, while power consumption and heat generation will be increased. + CPU和GPU频率将提升,同时耗电和发热将增加。 + User @@ -462,11 +468,21 @@ 无线网络 - - + + Bluetooth 蓝牙 + + + Connected devices + 已连接设备 + + + + Available devices + 可用设备 + @@ -681,7 +697,7 @@ Bluetooth - 蓝牙 + 蓝牙