1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
212
213
214
215
216
217
218
219
220
221
222
223
224
225
226
227
228
229
230
231
232
233
234
235
236
237
238
239
240
241
242
243
244
245
246
247
248
249
250
251
252
253
254
255
256
257
258
259
260
261
262
263
264
265
266
267
268
269
270
271
272
273
274
275
276
277
278
279
280
281
282
283
284
285
286
287
288
289
290
291
292
293
294
295
296
297
298
299
300
301
302
303
304
305
306
307
308
309
310
311
312
313
314
315
316
317
318
319
320
321
322
323
324
325
326
327
328
329
330
331
332
333
334
335
336
337
338
339
340
341
342
343
344
345
346
347
348
349
350
351
352
353
354
355
356
357
358
359
360
361
362
363
364
365
366
367
368
369
370
371
372
373
374
375
376
377
378
379
380
381
382
383
384
385
386
387
388
389
390
391
392
393
394
395
396
397
398
399
400
401
402
403
404
405
406
407
408
409
410
411
412
413
414
415
416
417
418
419
420
421
422
423
424
425
426
427
428
429
430
431
432
433
434
435
436
437
438
439
440
441
442
443
444
445
446
447
448
449
450
451
452
453
454
455
456
457
458
459
460
461
462
463
464
465
466
467
468
469
470
471
472
473
474
475
476
477
478
479
480
481
482
483
484
485
486
487
488
489
490
491
492
493
494
495
496
497
498
499
500
501
502
503
504
505
506
507
508
509
510
511
512
513
514
|
pragma ComponentBehavior: Bound
import ".."
import qs.components
import qs.components.controls
import qs.components.effects
import qs.components.containers
import qs.services
import qs.config
import QtQuick
import QtQuick.Layouts
Item {
id: root
required property Session session
readonly property var network: {
// Try pendingNetwork first, then fall back to active network selection
if (session.network.pendingNetwork) {
return session.network.pendingNetwork;
}
// Fallback to active network if available
if (session.network.active) {
return session.network.active;
}
return null;
}
visible: session.network.showPasswordDialog
enabled: visible
focus: visible
// Ensure network is set when dialog opens
Component.onCompleted: {
if (visible && !session.network.pendingNetwork && session.network.active) {
session.network.pendingNetwork = session.network.active;
}
}
Connections {
target: root
function onVisibleChanged(): void {
if (visible && !session.network.pendingNetwork && session.network.active) {
session.network.pendingNetwork = session.network.active;
}
}
}
Keys.onEscapePressed: {
root.session.network.showPasswordDialog = false;
passwordField.text = "";
}
Rectangle {
anchors.fill: parent
color: Qt.rgba(0, 0, 0, 0.5)
opacity: root.visible ? 1 : 0
Behavior on opacity {
NumberAnimation {
duration: 200
}
}
MouseArea {
anchors.fill: parent
onClicked: {
root.session.network.showPasswordDialog = false;
passwordField.text = "";
}
}
}
StyledRect {
id: dialog
anchors.centerIn: parent
implicitWidth: 400
implicitHeight: content.implicitHeight + Appearance.padding.large * 2
radius: Appearance.rounding.normal
color: Colours.tPalette.m3surface
opacity: root.visible ? 1 : 0
scale: root.visible ? 1 : 0.9
Behavior on opacity {
NumberAnimation {
duration: 200
}
}
Behavior on scale {
NumberAnimation {
duration: 200
}
}
Keys.onEscapePressed: {
root.session.network.showPasswordDialog = false;
passwordField.text = "";
}
ColumnLayout {
id: content
anchors.left: parent.left
anchors.right: parent.right
anchors.verticalCenter: parent.verticalCenter
anchors.margins: Appearance.padding.large
spacing: Appearance.spacing.normal
MaterialIcon {
Layout.alignment: Qt.AlignHCenter
text: "lock"
font.pointSize: Appearance.font.size.extraLarge * 2
}
StyledText {
Layout.alignment: Qt.AlignHCenter
text: qsTr("Enter password")
font.pointSize: Appearance.font.size.large
font.weight: 500
}
StyledText {
Layout.alignment: Qt.AlignHCenter
text: root.network ? qsTr("Network: %1").arg(root.network.ssid) : ""
color: Colours.palette.m3outline
font.pointSize: Appearance.font.size.small
}
StyledText {
id: statusText
Layout.alignment: Qt.AlignHCenter
Layout.topMargin: Appearance.spacing.small
visible: Network.connectionStatus.length > 0 || connectButton.connecting
text: {
if (Network.connectionStatus.length > 0) {
return Network.connectionStatus;
} else if (connectButton.connecting) {
return qsTr("Connecting...");
}
return "";
}
color: {
const status = Network.connectionStatus;
if (status.includes("Error") || status.includes("error") || status.includes("failed")) {
return Colours.palette.m3error;
} else if (status.includes("successful") || status.includes("Connected") || status.includes("success")) {
return Colours.palette.m3primary;
}
return Colours.palette.m3onSurfaceVariant;
}
font.pointSize: Appearance.font.size.small
font.weight: (Network.connectionStatus.includes("Error") || Network.connectionStatus.includes("error")) ? 500 : 400
wrapMode: Text.WordWrap
Layout.maximumWidth: parent.width - Appearance.padding.large * 2
}
Item {
Layout.topMargin: Appearance.spacing.large
Layout.fillWidth: true
implicitHeight: passwordField.implicitHeight + Appearance.padding.normal * 2
StyledRect {
anchors.fill: parent
radius: Appearance.rounding.normal
color: Colours.tPalette.m3surfaceContainer
border.width: passwordField.activeFocus ? 2 : 1
border.color: passwordField.activeFocus ? Colours.palette.m3primary : Colours.palette.m3outline
Behavior on border.color {
CAnim {}
}
}
StyledTextField {
id: passwordField
anchors.left: parent.left
anchors.right: parent.right
anchors.verticalCenter: parent.verticalCenter
anchors.margins: Appearance.padding.normal
echoMode: TextField.Password
placeholderText: qsTr("Password")
Component.onCompleted: {
if (root.visible) {
forceActiveFocus();
}
}
Connections {
target: root
function onVisibleChanged(): void {
if (root.visible) {
passwordField.forceActiveFocus();
passwordField.text = "";
Network.connectionStatus = "";
}
}
}
Connections {
target: Network
function onConnectionStatusChanged(): void {
// Status updated, ensure it's visible
}
}
Keys.onReturnPressed: {
if (connectButton.enabled) {
connectButton.clicked();
}
}
Keys.onEnterPressed: {
if (connectButton.enabled) {
connectButton.clicked();
}
}
}
}
RowLayout {
Layout.topMargin: Appearance.spacing.normal
Layout.fillWidth: true
spacing: Appearance.spacing.normal
Button {
id: cancelButton
Layout.fillWidth: true
color: Colours.palette.m3secondaryContainer
onColor: Colours.palette.m3onSecondaryContainer
text: qsTr("Cancel")
function onClicked(): void {
root.session.network.showPasswordDialog = false;
passwordField.text = "";
}
}
Button {
id: connectButton
Layout.fillWidth: true
color: Colours.palette.m3primary
onColor: Colours.palette.m3onPrimary
text: qsTr("Connect")
enabled: passwordField.text.length > 0
property bool connecting: false
function onClicked(): void {
Network.connectionStatus = "";
// Get password first
const password = passwordField.text;
// Try multiple ways to get the network
let networkToUse = null;
// Try 1: root.network (computed property)
if (root.network) {
networkToUse = root.network;
}
// Try 2: pendingNetwork
if (!networkToUse && root.session.network.pendingNetwork) {
networkToUse = root.session.network.pendingNetwork;
}
// Try 3: active network
if (!networkToUse && root.session.network.active) {
networkToUse = root.session.network.active;
root.session.network.pendingNetwork = networkToUse;
}
// Check all conditions
const hasNetwork = !!networkToUse;
const hasPassword = password && password.length > 0;
const notConnecting = !connecting;
if (hasNetwork && hasPassword && notConnecting) {
// Set status immediately
Network.connectionStatus = qsTr("Preparing to connect...");
// Keep dialog open and track connection
connecting = true;
connectButton.enabled = false;
connectButton.text = qsTr("Connecting...");
// Force immediate UI update
statusText.visible = true;
// Store target SSID for later comparison
const ssidToConnect = networkToUse.ssid || "";
const bssidToConnect = networkToUse.bssid || "";
// Store the SSID we're connecting to so we can compare later
// even if root.network changes
content.connectingToSsid = ssidToConnect;
// Execute connection immediately
Network.connectToNetwork(
ssidToConnect,
password,
bssidToConnect,
() => {
// Callback if connection fails - keep dialog open
connecting = false;
connectButton.enabled = true;
connectButton.text = qsTr("Connect");
content.connectingToSsid = ""; // Clear on failure
}
);
// Start connection check timer immediately
connectionCheckTimer.checkCount = 0;
connectionCheckTimer.start();
// Also check immediately after a short delay to catch quick connections
Qt.callLater(() => {
if (root.visible) {
closeDialogIfConnected();
}
});
} else {
// Show error in status
Network.connectionStatus = qsTr("Error: Cannot connect - missing network or password");
}
}
}
}
// Store the SSID we're connecting to when connection starts
property string connectingToSsid: ""
property string targetSsid: {
// Track the SSID we're trying to connect to
// Prefer explicitly stored connectingToSsid, then computed values
if (connectingToSsid && connectingToSsid.length > 0) {
return connectingToSsid;
}
if (root.network && root.network.ssid) {
return root.network.ssid;
}
if (root.session.network.pendingNetwork && root.session.network.pendingNetwork.ssid) {
return root.session.network.pendingNetwork.ssid;
}
return "";
}
function closeDialogIfConnected(): bool {
// Check if we're connected to the network we're trying to connect to
const ssid = targetSsid;
if (!ssid || ssid.length === 0) {
return false;
}
if (!Network.active) {
return false;
}
const activeSsid = Network.active.ssid || "";
if (activeSsid === ssid) {
// Connection succeeded - close dialog
connectionCheckTimer.stop();
aggressiveCheckTimer.stop();
connectionCheckTimer.checkCount = 0;
connectButton.connecting = false;
Network.connectionStatus = "";
root.session.network.showPasswordDialog = false;
passwordField.text = "";
content.connectingToSsid = ""; // Clear stored SSID
return true;
}
return false;
}
Timer {
id: connectionCheckTimer
interval: 1000 // Check every 1 second for faster response
repeat: true
triggeredOnStart: false
property int checkCount: 0
onTriggered: {
checkCount++;
// Try to close dialog if connected
const closed = content.closeDialogIfConnected();
if (closed) {
return;
}
if (connectButton.connecting) {
// Still connecting, check again
// Limit to 20 checks (20 seconds total)
if (checkCount >= 20) {
connectionCheckTimer.stop();
connectionCheckTimer.checkCount = 0;
connectButton.connecting = false;
connectButton.enabled = true;
connectButton.text = qsTr("Connect");
}
} else {
// Not connecting anymore, stop timer
connectionCheckTimer.stop();
connectionCheckTimer.checkCount = 0;
}
}
}
Connections {
target: Network
function onActiveChanged(): void {
// Check immediately when active network changes
if (root.visible) {
// Check immediately - if connected, close right away
if (content.closeDialogIfConnected()) {
return;
}
// Also check after a delay in case the active network isn't fully updated yet
Qt.callLater(() => {
if (root.visible) {
content.closeDialogIfConnected();
}
});
}
}
}
// Also check when dialog becomes visible
Connections {
target: root
function onVisibleChanged(): void {
if (root.visible) {
// Check immediately when dialog opens
Qt.callLater(() => {
if (root.visible) {
closeDialogIfConnected();
}
});
}
}
}
// Aggressive polling timer - checks every 500ms when dialog is visible and connecting
// This ensures we catch the connection even if signals are missed
Timer {
id: aggressiveCheckTimer
interval: 500
repeat: true
running: root.visible && connectButton.connecting
triggeredOnStart: true
onTriggered: {
if (root.visible && connectButton.connecting) {
if (content.closeDialogIfConnected()) {
stop();
}
} else {
stop();
}
}
}
}
}
component Button: StyledRect {
property color onColor: Colours.palette.m3onSurface
property alias disabled: stateLayer.disabled
property alias text: label.text
property alias enabled: stateLayer.enabled
function onClicked(): void {
}
radius: Appearance.rounding.small
implicitHeight: label.implicitHeight + Appearance.padding.small * 2
opacity: enabled ? 1 : 0.5
StateLayer {
id: stateLayer
enabled: parent.enabled
color: parent.onColor
function onClicked(): void {
if (enabled) {
parent.onClicked();
}
}
}
StyledText {
id: label
anchors.centerIn: parent
animate: true
color: parent.onColor
font.pointSize: Appearance.font.size.normal
}
}
}
|