Skip to content

fix: Personal hotspot status when modifying airplane mode #326

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
caixr23 merged 1 commit into from
Apr 15, 2025
Merged

fix: Personal hotspot status when modifying airplane mode #326

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 13 additions & 7 deletions dcc-network/qml/PageAirplane.qml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,13 +24,19 @@ DccObject {
page: devCheck
Component {
id: devCheck
D.Switch {
checked: item.isEnabled
enabled: item.enabledable
onClicked: {
dccData.exec(NetManager.SetConnectInfo, item.id, {
"enable": checked
})
Item {
implicitHeight: switchControl.implicitHeight
implicitWidth: switchControl.implicitWidth
D.Switch {
id: switchControl
anchors.fill: parent
checked: item.isEnabled
enabled: item.enabledable
onClicked: {
dccData.exec(NetManager.SetConnectInfo, item.id, {
"enable": checked
})
}
}
}
}
Expand Down
37 changes: 24 additions & 13 deletions dcc-network/qml/PageHotspot.qml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@ DccObject {
property var item: null
property var airplaneItem: null
property var config: null
property bool isAirplane: false
property string interfaceName: ""

function setItem(netItem) {
Expand Down Expand Up @@ -87,22 +88,28 @@ DccObject {
page: devCheck
Component {
id: devCheck
D.Switch {
checked: item.isEnabled
enabled: item.enabledable
onClicked: {
if (checked) {
if (config["connection"]["uuid"] === "{00000000-0000-0000-0000-000000000000}") {
dccData.exec(NetManager.SetConnectInfo, item.id, config)
Item {
implicitHeight: switchControl.implicitHeight
implicitWidth: switchControl.implicitWidth
D.Switch {
id: switchControl
anchors.fill: parent
checked: item.isEnabled
enabled: item.enabledable && !isAirplane
onClicked: {
if (checked) {
if (config["connection"]["uuid"] === "{00000000-0000-0000-0000-000000000000}") {
dccData.exec(NetManager.SetConnectInfo, item.id, config)
} else {
dccData.exec(NetManager.Connect, item.id, {
"uuid": config["connection"]["uuid"]
})
}
} else {
dccData.exec(NetManager.Connect, item.id, {
dccData.exec(NetManager.Disconnect, item.id, {
"uuid": config["connection"]["uuid"]
})
}
} else {
dccData.exec(NetManager.Disconnect, item.id, {
"uuid": config["connection"]["uuid"]
})
}
}
}
Expand Down Expand Up @@ -132,6 +139,7 @@ DccObject {
name: "hotspotTitle"
parentName: root.name + "/menu"
weight: 20
visible: !isAirplane
displayName: qsTr("My Hotspot")
pageType: DccObject.Item
page: RowLayout {
Expand Down Expand Up @@ -342,6 +350,7 @@ DccObject {
name: "hotspotConfig"
parentName: root.name + "/menu"
weight: 30
visible: !isAirplane
pageType: DccObject.Item
page: DccGroupView {}
DccObject {
Expand Down Expand Up @@ -413,13 +422,15 @@ DccObject {
DccTitleObject {
name: "shareTitle"
parentName: root.name + "/menu"
visible: !isAirplane
weight: 40
displayName: qsTr("Shared Settings")
}
DccObject {
id: shareConfig
name: "shareConfig"
parentName: root.name + "/menu"
visible: !isAirplane
weight: 50
pageType: DccObject.Item
page: DccGroupView {}
Expand Down Expand Up @@ -487,7 +498,7 @@ DccObject {
DccObject {
name: "airplaneTips"
parentName: root.name + "/menu"
visible: root.airplaneItem && root.airplaneItem.isEnabled && root.airplaneItem.enabledable
visible: isAirplane
displayName: qsTr("If you want to use the personal hotspot, disable Airplane Mode first and then enable the wireless network adapter.")
weight: 70
pageType: DccObject.Item
Expand Down
12 changes: 7 additions & 5 deletions dcc-network/qml/PageWiredDevice.qml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,11 +27,13 @@ DccObject {

Component {
id: devCheck
D.Switch {
checked: item.isEnabled
enabled: item.enabledable
onClicked: {
dccData.exec(item.isEnabled ? NetManager.DisabledDevice : NetManager.EnabledDevice, item.id, {})
RowLayout {
D.Switch {
checked: item.isEnabled
enabled: item.enabledable
onClicked: {
dccData.exec(item.isEnabled ? NetManager.DisabledDevice : NetManager.EnabledDevice, item.id, {})
}
}
}
}
Expand Down
12 changes: 7 additions & 5 deletions dcc-network/qml/PageWirelessDevice.qml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,11 +29,13 @@ DccObject {

Component {
id: devCheck
D.Switch {
checked: root.item.isEnabled
enabled: root.item.enabledable
onClicked: {
dccData.exec(root.item.isEnabled ? NetManager.DisabledDevice : NetManager.EnabledDevice, root.item.id, {})
RowLayout {
D.Switch {
checked: root.item.isEnabled
enabled: root.item.enabledable
onClicked: {
dccData.exec(root.item.isEnabled ? NetManager.DisabledDevice : NetManager.EnabledDevice, root.item.id, {})
}
}
}
}
Expand Down
1 change: 1 addition & 0 deletions dcc-network/qml/networkMain.qml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -138,6 +138,7 @@ DccObject {
property var showPage: root.showPage
name: "personalHotspot"
parentName: "network"
isAirplane: dccData.root.isEnabled
weight: 3040
}
PageAirplane {
Expand Down