merge from main, settings window wifi updates, component creation, remove known network window
C++ / fmt (pull_request) Successful in 6s
C++ / build (pull_request) Successful in 2m9s
JS/TS / fmt (pull_request) Successful in 16s
JS/TS / lint (pull_request) Successful in 16s
Python / static (pull_request) Successful in 49s
C++ / clang-tidy (pull_request) Successful in 3m34s
Rust / build (pull_request) Successful in 1m1s
Rust / fmt (pull_request) Successful in 31s
Python / verify (pull_request) Successful in 1m45s
Rust / clippy (pull_request) Successful in 45s
C++ / fmt (pull_request) Successful in 6s
C++ / build (pull_request) Successful in 2m9s
JS/TS / fmt (pull_request) Successful in 16s
JS/TS / lint (pull_request) Successful in 16s
Python / static (pull_request) Successful in 49s
C++ / clang-tidy (pull_request) Successful in 3m34s
Rust / build (pull_request) Successful in 1m1s
Rust / fmt (pull_request) Successful in 31s
Python / verify (pull_request) Successful in 1m45s
Rust / clippy (pull_request) Successful in 45s
This commit is contained in:
@@ -30,12 +30,12 @@ Singleton {
|
||||
|
||||
signal networkConnected
|
||||
|
||||
function forgetNetworks(target): void {
|
||||
const list = Array.isArray(target) ? target : [target];
|
||||
for (const n of list) {
|
||||
if (n)
|
||||
n.forget();
|
||||
function forgetNetwork(target): void {
|
||||
if (!target) {
|
||||
return;
|
||||
}
|
||||
|
||||
target.forget();
|
||||
}
|
||||
|
||||
function isSecure(security): bool {
|
||||
|
||||
@@ -2,8 +2,10 @@ import QtQuick
|
||||
import QtQuick.Layouts
|
||||
import ZShell.Config
|
||||
import qs.Modules.Settings.Common
|
||||
import qs.Modules.Bar.Popouts.Network
|
||||
import qs.Components
|
||||
import qs.Helpers
|
||||
import qs.Helpers.Network
|
||||
import qs.Services
|
||||
|
||||
ConnectedRect {
|
||||
@@ -49,7 +51,7 @@ ConnectedRect {
|
||||
Layout.rightMargin: Tokens.spacing.extraSmall
|
||||
color: networkItem.modelData.active ? Colors.palette.m3primary : Colors.palette.m3onSurface
|
||||
elide: Text.ElideRight
|
||||
text: networkItem.modelData.name
|
||||
text: networkItem.modelData.name ? networkItem.modelData.name : qsTr("Unknown Network")
|
||||
}
|
||||
|
||||
CustomText {
|
||||
@@ -105,7 +107,7 @@ ConnectedRect {
|
||||
|
||||
onClicked: {
|
||||
if (networkItem.isSecure && !networkItem.known) {
|
||||
PopupManager.requestOpen(Qt.resolvedUrl("Network/PSKOverlay.qml"), {
|
||||
PopupManager.requestOpen(Qt.resolvedUrl("../../Modules/Bar/Popouts/Network/PSKOverlay.qml"), {
|
||||
network: networkItem.modelData
|
||||
});
|
||||
} else {
|
||||
|
||||
Reference in New Issue
Block a user