blob: 5bcf33cc5af9d813e61cadc16a5f86728d82ba2d (
plain)
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
|
pragma ComponentBehavior: Bound
import ".."
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: {
// Prefer pendingNetwork, then active network
if (session.network.pendingNetwork) {
return session.network.pendingNetwork;
}
if (session.network.active) {
return session.network.active;
}
return null;
}
visible: session.network.showPasswordDialog
enabled: visible
focus: visible
Keys.onEscapePressed: {
closeDialog();
}
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: closeDialog();
}
}
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: closeDialog();
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")
Connections {
target: root
function onVisibleChanged(): void {
if (root.visible) {
passwordField.forceActiveFocus();
passwordField.text = "";
Network.clearConnectionStatus();
}
}
}
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
SimpleButton {
id: cancelButton
Layout.fillWidth: true
color: Colours.palette.m3secondaryContainer
onColor: Colours.palette.m3onSecondaryContainer
text: qsTr("Cancel")
onClicked: closeDialog();
}
SimpleButton {
id: connectButton
Layout.fillWidth: true
color: Colours.palette.m3primary
onColor: Colours.palette.m3onPrimary
text: qsTr("Connect")
enabled: passwordField.text.length > 0 && !connecting
property bool connecting: false
onClicked: {
if (!root.network || connecting) {
return;
}
const password = passwordField.text;
if (!password || password.length === 0) {
return;
}
// Set connecting state
connecting = true;
enabled = false;
text = qsTr("Connecting...");
Network.clearConnectionStatus();
// Connect to network
Network.connectToNetwork(
root.network.ssid,
password,
root.network.bssid || "",
null
);
// Start monitoring connection
connectionMonitor.start();
}
}
}
}
}
function checkConnectionStatus(): void {
if (!root.visible || !connectButton.connecting) {
return;
}
// Check connection status message for success indicators
const status = Network.connectionStatus;
const statusLower = status.toLowerCase();
// Check for success indicators in status message
const hasSuccessIndicator = statusLower.includes("connection activated") ||
statusLower.includes("successfully") ||
statusLower.includes("connected successfully") ||
(statusLower.includes("connected") && !statusLower.includes("error") && !statusLower.includes("failed"));
// Check if we're connected to the target network (case-insensitive SSID comparison)
const isConnected = root.network && Network.active && Network.active.ssid &&
Network.active.ssid.toLowerCase().trim() === root.network.ssid.toLowerCase().trim();
if (isConnected || hasSuccessIndicator) {
// Successfully connected - give it a moment for network list to update
Qt.callLater(() => {
// Double-check connection is still active
if (root.visible && Network.active && Network.active.ssid) {
const stillConnected = Network.active.ssid.toLowerCase().trim() === root.network.ssid.toLowerCase().trim();
if (stillConnected || hasSuccessIndicator) {
connectionMonitor.stop();
connectButton.connecting = false;
connectButton.text = qsTr("Connect");
closeDialog();
}
}
}, 500);
return;
}
// Check for connection errors (but not warnings about duplicate names)
if (status.includes("Error") || (status.includes("error") && !status.includes("Warning"))) {
// Only treat as error if it's not just a warning about duplicate names
if (!status.includes("another connection with the name") && !status.includes("Reference the connection by its uuid")) {
// Connection failed
connectionMonitor.stop();
connectButton.connecting = false;
connectButton.enabled = true;
connectButton.text = qsTr("Connect");
}
}
}
Timer {
id: connectionMonitor
interval: 1000
repeat: true
triggeredOnStart: false
onTriggered: {
checkConnectionStatus();
}
}
Connections {
target: Network
function onActiveChanged() {
if (root.visible) {
checkConnectionStatus();
}
}
}
function closeDialog(): void {
session.network.showPasswordDialog = false;
passwordField.text = "";
connectButton.connecting = false;
connectButton.text = qsTr("Connect");
connectionMonitor.stop();
Network.clearConnectionStatus();
}
}
|