lainns-mirror/noctalia-shell
1
0
Fork 0
mirror of https://github.com/noctalia-dev/noctalia-shell.git synced 2026-05-11 17:08:27 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #2312 from notiant/patch-2

Browse Source 
Rework Airplane Mode handling & remove bluetoothctl fallback
This commit is contained in:
Lysec
2026-03-30 12:06:13 +02:00
committed by GitHub
parent 62f55f54de b3a9aca837
commit 00392ff8d2
15 changed files with 262 additions and 413 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Modules/Panels/Bluetooth/BluetoothPanel.qml
+1 -1
View File
@@ -54,7 +54,7 @@ SmartPanel {
NToggle {
id: bluetoothSwitch
checked: BluetoothService.enabled
enabled: !Settings.data.network.airplaneModeEnabled && BluetoothService.bluetoothAvailable
enabled: !NetworkService.airplaneModeEnabled && BluetoothService.bluetoothAvailable
onToggled: checked => BluetoothService.setBluetoothEnabled(checked)
baseSize: Style.baseWidgetSize * 0.65
}
Modules/Panels/ControlCenter/Widgets/AirplaneMode.qml
+4 -3
View File
@@ -8,10 +8,11 @@ import qs.Widgets
NIconButtonHot {
property ShellScreen screen
icon: !Settings.data.network.airplaneModeEnabled ? "plane-off" : "plane"
hot: Settings.data.network.airplaneModeEnabled
icon: !NetworkService.airplaneModeEnabled ? "plane-off" : "plane"
hot: NetworkService.airplaneModeEnabled
tooltipText: I18n.tr("toast.airplane-mode.title")
onClicked: {
BluetoothService.setAirplaneMode(!Settings.data.network.airplaneModeEnabled);
NetworkService.setAirplaneMode(!NetworkService.airplaneModeEnabled);
}
enabled: NetworkService.wifiAvailable && BluetoothService.bluetoothAvailable
}
Modules/Panels/ControlCenter/Widgets/Bluetooth.qml
+1 -1
View File
@@ -16,7 +16,7 @@ NIconButtonHot {
p.toggle(this);
}
onRightClicked: {
if (!Settings.data.network.airplaneModeEnabled) {
if (!NetworkService.airplaneModeEnabled) {
BluetoothService.setBluetoothEnabled(!BluetoothService.enabled);
}
}
Modules/Panels/ControlCenter/Widgets/Network.qml
+1 -1
View File
@@ -14,7 +14,7 @@ NIconButtonHot {
panel?.toggle(this);
}
onRightClicked: {
if (!Settings.data.network.airplaneModeEnabled) {
if (!NetworkService.airplaneModeEnabled) {
NetworkService.setWifiEnabled(!NetworkService.wifiEnabled);
}
}
Modules/Panels/Network/NetworkPanel.qml
+1 -1
View File
@@ -144,7 +144,7 @@ SmartPanel {
id: wifiSwitch
visible: panelViewMode === "wifi"
checked: NetworkService.wifiEnabled
enabled: !Settings.data.network.airplaneModeEnabled && NetworkService.wifiAvailable
enabled: !NetworkService.airplaneModeEnabled && NetworkService.wifiAvailable
onToggled: checked => NetworkService.setWifiEnabled(checked)
baseSize: Style.baseWidgetSize * 0.7 // Slightly smaller
}
Modules/Panels/Settings/Tabs/Connections/BluetoothSubTab.qml
+1 -1
View File
@@ -161,7 +161,7 @@ Item {
label: I18n.tr("common.bluetooth")
icon: BluetoothService.enabled ? "bluetooth" : "bluetooth-off"
checked: BluetoothService.enabled
enabled: !Settings.data.network.airplaneModeEnabled && BluetoothService.bluetoothAvailable
enabled: !NetworkService.airplaneModeEnabled && BluetoothService.bluetoothAvailable
onToggled: checked => BluetoothService.setBluetoothEnabled(checked)
Layout.alignment: Qt.AlignVCenter
}
Modules/Panels/Settings/Tabs/Connections/WifiSubTab.qml
+6 -5
View File
@@ -149,7 +149,7 @@ Item {
icon: NetworkService.wifiEnabled ? "wifi" : "wifi-off"
checked: NetworkService.wifiEnabled
onToggled: checked => NetworkService.setWifiEnabled(checked)
enabled: ProgramCheckerService.nmcliAvailable && !Settings.data.network.airplaneModeEnabled && NetworkService.wifiAvailable
enabled: !NetworkService.airplaneModeEnabled && NetworkService.wifiAvailable
Layout.alignment: Qt.AlignVCenter
}
}
@@ -324,7 +324,7 @@ Item {
// Airplane Mode
NBox {
id: miscSettingsBox
visible: !root.showOnlyLists
visible: !root.showOnlyLists && miscSettingsCol.visibleChildren.length > 0
Layout.fillWidth: true
Layout.preferredHeight: miscSettingsCol.implicitHeight + Style.margin2XL
color: Color.mSurface
@@ -336,11 +336,12 @@ Item {
spacing: Style.marginM
NToggle {
visible: NetworkService.wifiAvailable && BluetoothService.bluetoothAvailable
label: I18n.tr("toast.airplane-mode.title")
description: I18n.tr("toast.airplane-mode.description")
icon: Settings.data.network.airplaneModeEnabled ? "plane" : "plane-off"
checked: Settings.data.network.airplaneModeEnabled
onToggled: checked => BluetoothService.setAirplaneMode(checked)
icon: NetworkService.airplaneModeEnabled ? "plane" : "plane-off"
checked: NetworkService.airplaneModeEnabled
onToggled: checked => NetworkService.setAirplaneMode(checked)
}
}
}