diff --git a/debian/changelog b/debian/changelog index 8597d21..2353303 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,8 +1,8 @@ -cutefish-settings (0.6.2) UNRELEASED; urgency=high +cutefish-settings (0.7-1) UNRELEASED; urgency=high * Update - -- CutefishOS Mon, 22 Nov 2021 14:04:37 +0800 + -- CutefishOS Mon, 27 Dec 2021 15:11:18 +0800 cutefish-settings (0.5.1) UNRELEASED; urgency=high diff --git a/src/qml/SideBar.qml b/src/qml/SideBar.qml index 9020d55..41f43e9 100644 --- a/src/qml/SideBar.qml +++ b/src/qml/SideBar.qml @@ -213,14 +213,14 @@ Item { category: qsTr("System") } - ListElement { - title: qsTr("Default Applications") - name: "datetime" - page: "qrc:/qml/DefaultApp/Main.qml" - iconSource: "defaultapps.svg" - iconColor: "#418CFF" - category: qsTr("System") - } +// ListElement { +// title: qsTr("Default Applications") +// name: "datetime" +// page: "qrc:/qml/DefaultApp/Main.qml" +// iconSource: "defaultapps.svg" +// iconColor: "#418CFF" +// category: qsTr("System") +// } ListElement { title: qsTr("Language") diff --git a/src/qml/WLAN/WifiItem.qml b/src/qml/WLAN/WifiItem.qml index 6f1715b..69e439c 100644 --- a/src/qml/WLAN/WifiItem.qml +++ b/src/qml/WLAN/WifiItem.qml @@ -67,14 +67,22 @@ Item { if (busyIndicator.visible) return - if ((!model.uuid || predictableWirelessPassword)) { + if (model.uuid || !predictableWirelessPassword) { + if (connectionState === NM.Enums.Deactivated) { + if (!predictableWirelessPassword && !model.uuid) { + handler.addAndActivateConnection(model.devicePath, model.specificPath) + } else { + handler.activateConnection(model.connectionPath, model.devicePath, model.specificPath) + } + } else { + additionalSettings.toggle() + } + } else if (predictableWirelessPassword) { connectDialog.name = model.itemUniqueName connectDialog.securityType = model.securityType connectDialog.devicePath = model.devicePath connectDialog.specificPath = model.specificPath connectDialog.show() - } else { - additionalSettings.toggle() } // if (model.uuid || !predictableWirelessPassword) {