Skip to content

ISSUE-1373: Added wired ethernet only option #1575

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

Open
herbenderbler wants to merge 1 commit into
base: main
Choose a base branch
from
+26 −5
Open

ISSUE-1373: Added wired ethernet only option #1575

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
31 changes: 26 additions & 5 deletions src/wizard/WifiCustomizationStep.qml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@ WizardStepBase {
function ssidUnchanged(ssid, prev) { return (ssid || "") === (prev || "") }

title: qsTr("Customisation: Choose Wi‑Fi")
subtitle: qsTr("If you will use a network cable only, you can skip Wi‑Fi setup below.")
showSkipButton: true
nextButtonAccessibleDescription: qsTr("Save Wi-Fi settings and continue to next customisation step")
backButtonAccessibleDescription: qsTr("Return to previous step")
Expand All @@ -35,9 +36,19 @@ WizardStepBase {
// Track whether we've already auto-detected SSID/PSK to avoid re-prompting
property bool ssidAutoDetected: false

function useWiredEthernetOnly() {
fieldWifiSSID.text = ""
fieldWifiPassword.text = ""
fieldWifiPasswordConfirm.text = ""
chkWifiHidden.checked = false
wifiMode = "secure"
updatePasswordFieldUI()
root.nextClicked()
}

Component.onCompleted: {
root.registerFocusGroup("wifi_modes", function() {
return [tabSecure, tabOpen]
return [btnUseEthernet, tabSecure, tabOpen]
}, 0)
// Labels are automatically skipped when screen reader is not active (via activeFocusOnTab)
root.registerFocusGroup("wifi_fields", function(){
Expand All @@ -52,15 +63,11 @@ WizardStepBase {
}, 1)
root.registerFocusGroup("wifi_options", function(){ return [chkWifiHidden] }, 2)

// Set SSID placeholder before prefilling text content
fieldWifiSSID.placeholderText = qsTr("Network name")

// Prefill from conserved customization settings
var settings = wizardContainer.customizationSettings

// Set SSID placeholder first (before setting any text)
fieldWifiSSID.placeholderText = qsTr("Network name")

// Then set text values after, so they properly override the placeholder
if (settings.wifiSSID) {
fieldWifiSSID.text = settings.wifiSSID
Expand Down Expand Up @@ -232,6 +239,20 @@ WizardStepBase {
width: wifiScroll.availableWidth

WizardSectionContainer {
RowLayout {
Layout.fillWidth: true
spacing: Style.spacingSmall

ImButton {
id: btnUseEthernet
text: qsTr("Use wired Ethernet only")
accessibleDescription: qsTr("Clear Wi-Fi settings and continue to the next step. Other customisation settings are kept.")
onClicked: root.useWiredEthernetOnly()
}

Item { Layout.fillWidth: true }
}

RowLayout {
Layout.fillWidth: true
spacing: Style.spacingSmall
Expand Down