Skip to content

fix: Modify the SSID location on the wireless network configuration page #284

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
Dec 12, 2024
Merged

fix: Modify the SSID location on the wireless network configuration page #284

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
5 changes: 0 additions & 5 deletions dcc-network/qml/PageDSLSettings.qml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,11 +61,6 @@ DccObject {
weight: 500
canNotBind: false
onEditClicked: modified = true
onSsidChanged: {
if (root.type === NetType.WirelessItem && !root.config[root.config.connection.type].hasOwnProperty("id")) {
sectionGeneric.settingsID = sectionDevice.ssid
}
}
}
SectionPPP {
id: sectionPPP
Expand Down
8 changes: 3 additions & 5 deletions dcc-network/qml/PageSettings.qml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,11 +67,6 @@ DccObject {
weight: 600
type: root.type
onEditClicked: modified = true
onSsidChanged: {
if (root.type === NetType.WirelessItem && !root.config[root.config.connection.type].hasOwnProperty("id")) {
sectionGeneric.settingsID = sectionDevice.ssid
}
}
}
}
onConfigChanged: {
Expand Down Expand Up @@ -209,6 +204,9 @@ DccObject {
} else {
nConfig["connection"]["interface-name"] = devConfig.interfaceName
}
if (nConfig["connection"].type === "802-11-wireless" && !devConfig.hasOwnProperty("ssid")) {
devConfig["ssid"] = nConfig["connection"]["id"]
}

nConfig[config.connection.type] = devConfig
if (item) {
Expand Down
2 changes: 1 addition & 1 deletion dcc-network/qml/PageSystemProxy.qml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,6 @@ DccObject {
"method": method
})
}
console.log("method=====", method)
}
}
Connections {
Expand Down Expand Up @@ -113,6 +112,7 @@ DccObject {
page: D.LineEdit {
topInset: 4
bottomInset: 4
placeholderText: qsTr("Required")
text: dccObj.config
Layout.fillWidth: true
showAlert: autoUrlAlert
Expand Down
1 change: 1 addition & 0 deletions dcc-network/qml/PageWirelessDevice.qml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -122,6 +122,7 @@ DccObject {
Layout.fillWidth: true
leftPadding: 36
contentItem: Label {
verticalAlignment: Text.AlignVCenter
text: model.item.name
color: palette.link
}
Expand Down
41 changes: 0 additions & 41 deletions dcc-network/qml/SectionDevice.qml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,6 @@ DccTitleObject {
property var devData: []
property bool hasMTU: false
property string interfaceName: ""
property string ssid: ""
property bool ssidEnabled: false

property string errorKey: ""
signal editClicked
Expand Down Expand Up @@ -54,8 +52,6 @@ DccTitleObject {
if (root.config.hasOwnProperty("cloned-mac-address")) {
root.config["cloned-mac-address"] = NetUtils.macToStr(root.config["cloned-mac-address"])
}
ssid = root.config.hasOwnProperty("ssid") ? root.config["ssid"] : ""
ssidEnabled = type === NetType.WirelessItem && !root.config.hasOwnProperty("ssid")
}
function getConfig() {
let saveConfig = root.config ? root.config : {}
Expand All @@ -72,18 +68,11 @@ DccTitleObject {
delete saveConfig["mtu"]
}

if (type === NetType.WirelessItem) {
saveConfig["ssid"] = ssid
}
saveConfig["band"] = root.config["band"]
return saveConfig
}
function checkInput() {
errorKey = ""
if (type === NetType.WirelessItem && ssid.length === 0) {
errorKey = "ssid"
return false
}
if (root.config.hasOwnProperty("cloned-mac-address") && !NetUtils.macRegExp.test(root.config["cloned-mac-address"])) {
errorKey = "cloned-mac-address"
console.log(errorKey, root.config[errorKey])
Expand All @@ -108,36 +97,6 @@ DccTitleObject {
weight: root.weight + 20
pageType: DccObject.Item
page: DccGroupView {}
DccObject {
name: "ssid"
parentName: root.parentName + "/devGroup"
weight: 10
displayName: qsTr("SSID")
pageType: DccObject.Editor
visible: type === NetType.WirelessItem
page: D.LineEdit {
enabled: ssidEnabled
placeholderText: qsTr("Required")
text: ssid
onTextChanged: {
if (showAlert) {
errorKey = ""
}
if (text !== ssid) {
ssid = text
root.editClicked()
}
}
showAlert: errorKey === dccObj.name
alertDuration: 2000
onShowAlertChanged: {
if (showAlert) {
DccApp.showPage(dccObj)
forceActiveFocus()
}
}
}
}
DccObject {
name: "mac-address"
parentName: root.parentName + "/devGroup"
Expand Down
7 changes: 4 additions & 3 deletions dcc-network/qml/SectionGeneric.qml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ DccTitleObject {
root.config.id = settingsID
errorKey = ""
console.log("root.config.id.length", root.config.id, root.config.id.length)
if (root.config.type !== "802-11-wireless" && root.config.id.length === 0) {
if (root.config.id.length === 0) {
errorKey = "id"
}

Expand All @@ -47,12 +47,13 @@ DccTitleObject {
DccObject {
name: "name"
parentName: root.parentName + "/genericGroup"
displayName: qsTr("Name")
displayName: root.config.type === "802-11-wireless" ? qsTr("Name (SSID)") : qsTr("Name")
weight: 10
enabled: root.config.type !== "802-11-wireless"
enabled: !root.config.hasOwnProperty("id") || root.config.id.length === 0
pageType: DccObject.Editor
page: D.LineEdit {
text: settingsID
placeholderText: qsTr("Required")
onTextChanged: {
if (showAlert) {
errorKey = ""
Expand Down
20 changes: 12 additions & 8 deletions dcc-network/translations/network.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -342,6 +342,10 @@
<source>Set up proxy servers</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Required</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>PageVPN</name>
Expand Down Expand Up @@ -540,10 +544,6 @@
<source>Ethernet</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>SSID</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Device MAC Addr</source>
<translation type="unfinished"></translation>
Expand Down Expand Up @@ -576,10 +576,6 @@
<source>5 GHz</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Required</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>SectionGeneric</name>
Expand All @@ -595,6 +591,14 @@
<source>Auto Connect</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Required</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Name (SSID)</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>SectionIPv4</name>
Expand Down
20 changes: 12 additions & 8 deletions dcc-network/translations/network_az.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -342,6 +342,10 @@
<source>Set up proxy servers</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Required</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>PageVPN</name>
Expand Down Expand Up @@ -540,10 +544,6 @@
<source>Ethernet</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>SSID</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Device MAC Addr</source>
<translation type="unfinished"></translation>
Expand Down Expand Up @@ -576,10 +576,6 @@
<source>5 GHz</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Required</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>SectionGeneric</name>
Expand All @@ -595,6 +591,14 @@
<source>Auto Connect</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Required</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Name (SSID)</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>SectionIPv4</name>
Expand Down
20 changes: 12 additions & 8 deletions dcc-network/translations/network_bo.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -342,6 +342,10 @@
<source>Set up proxy servers</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Required</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>PageVPN</name>
Expand Down Expand Up @@ -540,10 +544,6 @@
<source>Ethernet</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>SSID</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Device MAC Addr</source>
<translation type="unfinished"></translation>
Expand Down Expand Up @@ -576,10 +576,6 @@
<source>5 GHz</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Required</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>SectionGeneric</name>
Expand All @@ -595,6 +591,14 @@
<source>Auto Connect</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Required</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Name (SSID)</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>SectionIPv4</name>
Expand Down
20 changes: 12 additions & 8 deletions dcc-network/translations/network_ca.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -342,6 +342,10 @@
<source>Set up proxy servers</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Required</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>PageVPN</name>
Expand Down Expand Up @@ -540,10 +544,6 @@
<source>Ethernet</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>SSID</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Device MAC Addr</source>
<translation type="unfinished"></translation>
Expand Down Expand Up @@ -576,10 +576,6 @@
<source>5 GHz</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Required</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>SectionGeneric</name>
Expand All @@ -595,6 +591,14 @@
<source>Auto Connect</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Required</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Name (SSID)</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>SectionIPv4</name>
Expand Down
20 changes: 12 additions & 8 deletions dcc-network/translations/network_es.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -342,6 +342,10 @@
<source>Set up proxy servers</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Required</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>PageVPN</name>
Expand Down Expand Up @@ -540,10 +544,6 @@
<source>Ethernet</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>SSID</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Device MAC Addr</source>
<translation type="unfinished"></translation>
Expand Down Expand Up @@ -576,10 +576,6 @@
<source>5 GHz</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Required</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>SectionGeneric</name>
Expand All @@ -595,6 +591,14 @@
<source>Auto Connect</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Required</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Name (SSID)</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>SectionIPv4</name>
Expand Down
Loading
Loading