From 0e5ce58bbe18cabb278fbe76e3fec3c7b838faaf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sebastian=20K=C3=BCgler?= Date: Fri, 19 Jun 2015 18:26:40 -0700 Subject: [PATCH] Remove old wifi module It's connman-based, not ported, doesn't work. --- CMakeLists.txt | 1 - settingsmodules/CMakeLists.txt | 4 - .../contents/ui/NetworkSettingsSheet.qml | 162 ------ .../wireless/contents/ui/SettingsSheet.qml | 539 ------------------ .../wireless/contents/ui/WirelessSettings.qml | 221 ------- .../wireless/contents/ui/mustache.js | 536 ----------------- settingsmodules/wireless/metadata.desktop | 18 - 7 files changed, 1481 deletions(-) delete mode 100644 settingsmodules/CMakeLists.txt delete mode 100644 settingsmodules/wireless/contents/ui/NetworkSettingsSheet.qml delete mode 100644 settingsmodules/wireless/contents/ui/SettingsSheet.qml delete mode 100644 settingsmodules/wireless/contents/ui/WirelessSettings.qml delete mode 100644 settingsmodules/wireless/contents/ui/mustache.js delete mode 100644 settingsmodules/wireless/metadata.desktop diff --git a/CMakeLists.txt b/CMakeLists.txt index 138867e2..6039a33c 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -50,7 +50,6 @@ install( FILES kwinmultitasking/metadata.desktop DESTINATION ${SERVICES_INSTALL_ add_subdirectory(bin) #add_subdirectory(services) -add_subdirectory(settingsmodules) add_subdirectory(applets) add_subdirectory(containments) add_subdirectory(dialer) diff --git a/settingsmodules/CMakeLists.txt b/settingsmodules/CMakeLists.txt deleted file mode 100644 index 269ed3e3..00000000 --- a/settingsmodules/CMakeLists.txt +++ /dev/null @@ -1,4 +0,0 @@ -plasma_install_package(wireless org.kde.plasma.phone.settings.wifi packages package) - - - diff --git a/settingsmodules/wireless/contents/ui/NetworkSettingsSheet.qml b/settingsmodules/wireless/contents/ui/NetworkSettingsSheet.qml deleted file mode 100644 index ca7cc890..00000000 --- a/settingsmodules/wireless/contents/ui/NetworkSettingsSheet.qml +++ /dev/null @@ -1,162 +0,0 @@ -/* - * Copyright (C) 2013 Robin Burchell - * Copyright (C) 2012 Jolla Ltd. - * - * You may use this file under the terms of the BSD license as follows: - * - * "Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions are - * met: - * * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in - * the documentation and/or other materials provided with the - * distribution. - * * Neither the name of Nemo Mobile nor the names of its contributors - * may be used to endorse or promote products derived from this - * software without specific prior written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR - * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT - * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, - * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT - * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, - * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY - * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT - * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE - * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE." - */ - -import QtQuick 2.0 -import org.kde.plasma.components 2.0 -import QtQuick.Layouts 1.1 -import MeeGo.Connman 0.2 -import "mustache.js" as M - -Item { - id: networkPage - property variant mustacheView - property UserAgent userAgent - property Timer scanTimer - - - property var netfields: {} - - function handleInput(key, value) { - var dict = {}; - var isDoneEnabled = false; - console.log("Received from TextField " + key + " " + value); - dict[key] = value; - networkPage.netfields = dict; - for (var id in networkPage.netfields) { - console.log(id + "-> " + networkPage.netfields[id]); - isDoneEnabled = isDoneEnabled || networkPage.netfields[id].length; - } - networkPage.acceptButtonEnabled = isDoneEnabled; - } - - Connections { - target: userAgent - onUserInputCanceled: { - console.log("qmlsettings: UserAgent cancelled user input request"); - networkPage.reject() - } - } - - RowLayout { - anchors { - horizontalCenter: parent.horizontalCenter - bottom: parent.bottom - bottomMargin: Qt.inputMethod.keyboardRectangle.height - } - Button { - text: "Reject" - onClicked: { - userAgent.sendUserReply({}); - scanTimer.running = true; - stackView.pop(); - } - } - - Button { - text: "Accept" - onClicked: { - console.log('clicked Done ' + 'x:' + x + ' y:' + y); - var fields = networkPage.netfields; - for (var key in fields) { - console.log(key + " --> " + fields[key]); - } - scanTimer.running = true; - userAgent.sendUserReply(fields); - stackView.pop(); - } - } - } - - Column { - spacing: 10 - anchors.fill: parent - Label { - anchors { left: parent.left; leftMargin: 10 } - text: "Sign in to secure Wi-Fi network" - } - Label { - id: networkName - anchors { left: parent.left; leftMargin: 10 } - } - Item { - height: 30 - } - Item { - id: dynFields - width: parent.width - height: 200 - property string form_tpl: " - import QtQuick 2.0 - import QtQuick.Controls 1.2 - Item { - id: form - anchors { fill: parent; margins: 10 } - Column { - spacing: 5 - anchors { fill: parent } - {{#fields}} - Text { - text: '{{name}}' - color: 'white' - font.pointSize: 14 - } - TextField { - id: {{id}} - signal send (string key, string value) - anchors { left: parent.left; right: parent.right } - placeholderText: 'enter {{name}}' - Component.onCompleted: { - {{id}}.send.connect(handleInput); - } - onTextChanged: { - console.log('Sending from TextField {{id}}' + {{id}}.text); - {{id}}.send('{{name}}', {{id}}.text); - } - } - {{/fields}} - } - } - " - Component.onCompleted: { - console.log(mustacheView) - console.log(form_tpl) - // TODO: can we replace mustache with just regular old bindings? - var output = M.Mustache.render(form_tpl, mustacheView); - console.log("Creating " + output) - var form = Qt.createQmlObject(output, dynFields, "dynamicForm1"); - console.log("Created " + form) - } - } - } -} - - diff --git a/settingsmodules/wireless/contents/ui/SettingsSheet.qml b/settingsmodules/wireless/contents/ui/SettingsSheet.qml deleted file mode 100644 index 09b2e377..00000000 --- a/settingsmodules/wireless/contents/ui/SettingsSheet.qml +++ /dev/null @@ -1,539 +0,0 @@ -/* - * Copyright (C) 2013 Robin Burchell - * Copyright (C) 2012 Jolla Ltd. - * - * You may use this file under the terms of the BSD license as follows: - * - * "Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions are - * met: - * * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in - * the documentation and/or other materials provided with the - * distribution. - * * Neither the name of Nemo Mobile nor the names of its contributors - * may be used to endorse or promote products derived from this - * software without specific prior written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR - * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT - * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, - * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT - * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, - * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY - * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT - * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE - * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE." - */ - -import QtQuick 2.0 -import QtQuick.Layouts 1.1 -import org.kde.plasma.components 2.0 -import org.kde.plasma.core 2.0 as PlasmaCore -import org.kde.plasma.extras 2.0 as PlasmaExtras -import MeeGo.Connman 0.2 - -Item { - id: sheet - - property QtObject network - - onNetworkChanged: { - proxyAutoUrl.checked = ! network.proxyConfig["URL"]; - form.networkName = network.name; - form.ipv4 = network.ipv4; - form.nameservers = network.nameservers; - form.domains = network.domains; - form.proxy = network.proxy; - form.proxyConfig = network.proxyConfig; - } - - RowLayout { - z: 2 - anchors { - bottom: parent.bottom - horizontalCenter: parent.horizontalCenter - bottomMargin: Qt.inputMethod.keyboardRectangle.height - } - - Button { - text: "Accept" - onClicked: { - var domains = [], - nameservers = [], - ipv4, - proxyconf, - proxy_server_text; - - console.log("Accept"); - - // Domains - if (network.domains.join() !== domainsField.text) { - if (domainsField.text) { - domains = domainsField.text.split(); - } - console.log("Update Domains: " + domains.join()); - network.domainsConfig = domains; - } - - // IPv4 - ipv4 = network.ipv4; - if (ipv4["Method"] !== method.state) { - ipv4["Method"] = method.state; - if (method.state === "manual") { - ipv4["Address"] = address.text - ipv4["Netmask"] = netmask.text - ipv4["Gateway"] = gateway.text - } - network.ipv4Config = ipv4; - } else if (network.ipv4["Method"] === "manual") { - if (ipv4["Address"] !== address.text || - ipv4["Netmask"] !== netmask.text || - ipv4["Gateway"] !== gateway.text) { - - ipv4["Address"] = address.text - ipv4["Netmask"] = netmask.text - ipv4["Gateway"] = gateway.text - network.ipv4Config = ipv4; - } - } - - // Nameservers - if (method.state === "manual" && - network.nameserversConfig.join() !== nameserversField.text) { - nameservers = nameserversField.text.split(); - network.nameserversConfig = nameservers; - } - - // Proxy - proxyconf = network.proxyConfig; - if (proxyconf["Method"] !== proxy.state) { - proxyconf["Method"] = proxy.state; - if (proxy.state === "auto") { - proxyconf["URL"] = proxyurl.text; - } else if (proxy.state === "manual") { - proxyconf["Servers"] = [proxyserver.text + ":" + proxyport.text]; - } - network.proxyConfig = proxyconf; - } else if (proxy.state === "manual") { - proxy_server_text = proxyserver.text + ":" + proxyport.text; - if (proxyconf["Servers"].length === 0 || proxyconf["Servers"][0] !== proxy_server_text) { - proxyconf["Servers"] = [proxy_server_text]; - network.proxyConfig = proxyconf; - } - } else if (proxy.state == "auto") { - if (proxyAutoUrl.checked && proxyconf["URL"]) { - // empty URL to use the provided by DHCP - proxyconf["URL"] = ""; - network.proxyConfig = proxyconf; - } else if (! proxyAutoUrl.checked && proxyurl.text !== proxyconf["URL"]) { - // manual URL is used and it needs update - proxyconf["URL"] = proxyurl.text; - network.proxyConfig = proxyconf; - } - } - - stackView.pop(); - } - } - Button { - text: "Cancel" - onClicked: { - stackView.pop(); - } - } - } - - PlasmaExtras.ScrollArea { - anchors.fill: parent - anchors.bottomMargin: Qt.inputMethod.keyboardRectangle.height - Flickable { - id: form - anchors.fill: parent - anchors.leftMargin: 10 - anchors.topMargin: 10 - //contentWidth: mainColumn.width - contentHeight: mainColumn.height - flickableDirection: Flickable.VerticalFlick - - property string networkName: "Error" - property variant ipv4: {"Method": "manual", "Address": "", "Netmask": "", "Gateway": ""} - property variant nameservers: [] - property variant domains: [] - property variant proxy: {"Method": "auto", "URL": ""} - property variant proxyConfig: {"Servers": []} - - Column { - id: mainColumn - anchors.top: parent.top - anchors.left: parent.left - anchors.right: parent.right - spacing: 10 - - Row { - anchors { left: parent.left; right: parent.right } - - PlasmaCore.IconItem { - height: units.iconSizes.large - width: height - source: { - var strength = form.strength; - var str_id = 0; - - if (strength >= 100) { - str_id = 100; - } else if (strength >= 80) { - str_id = 80; - } else if (strength >= 60) { - str_id = 60; - } else if (strength >= 40) { - str_id = 40; - } else if (strength >= 20) { - str_id = 20; - } - return "network-wireless-" + str_id; - } - } - - PlasmaExtras.Heading { - text: form.networkName - } - } - - Item { - anchors { left: parent.left; right: parent.right } - height: 100 - - Button { - id: disconnectButton - anchors { - horizontalCenter: parent.horizontalCenter - verticalCenter: parent.verticalCenter - } - text: "Disconnect" - onClicked: { - console.log("Disconnect clicked"); - network.requestDisconnect(); - stackView.pop(); - } - } - } - - Column { - anchors { left: parent.left; right: parent.right } - Text { - anchors { left: parent.left; leftMargin: 20 } - text: "Method" - } - ButtonRow { - id: method - anchors { left: parent.left; right: parent.right; leftMargin: 10; rightMargin: 10 } - state: form.ipv4.Method - - states: [ - State { - name: "dhcp" - PropertyChanges {target: networkInfo; visible: true} - PropertyChanges {target: networkFields; visible: false} - }, - State { - name: "manual" - PropertyChanges {target: networkInfo; visible: false} - PropertyChanges {target: networkFields; visible: true} - } - ] - - Button { - text: "DHCP" - checked: form.ipv4.Method == "dhcp" - onClicked: { - method.state = "dhcp" - } - } - Button { - text: "Static" - checked: form.ipv4.Method == "manual" - onClicked: { - method.state = "manual" - } - } - } - } - - Column { - id: networkInfo - anchors { left: parent.left; right: parent.right } - spacing: 50 - Column { - anchors { left: parent.left; right: parent.right } - - Text { - anchors { left: parent.left; leftMargin: 20; } - text: "IP address" - } - Text { - anchors { left: parent.left; leftMargin: 20; topMargin: 30 } - text: form.ipv4.Address - } - } - Column { - anchors { left: parent.left; right: parent.right } - - Text { - anchors { left: parent.left; leftMargin: 20 } - text: "Subnet mask" - } - Text { - anchors { left: parent.left; leftMargin: 20; topMargin: 30 } - text: form.ipv4.Netmask - } - } - Column { - anchors { left: parent.left; right: parent.right } - - Text { - anchors { left: parent.left; leftMargin: 20 } - text: "Router" - } - Text { - anchors { left: parent.left; leftMargin: 20; topMargin: 30 } - text: form.ipv4.Gateway - } - } - Column { - anchors { left: parent.left; right: parent.right } - - Text { - anchors { left: parent.left; leftMargin: 20 } - text: "DNS" - } - Text { - anchors { left: parent.left; leftMargin: 20; topMargin: 30 } - text: form.nameservers.join() - } - } - - } - - Item { - id: networkFields - anchors { left: parent.left; right: parent.right } - - Column { - spacing: 50 - Column { - anchors { left: parent.left; right: parent.right } - - Text { - anchors { left: parent.left; leftMargin: 20 } - text: "IP address" - } - TextField { - id: address - anchors { left: parent.left; leftMargin: 20; top:parent.top; topMargin: 30 } - width: 440 - text: form.ipv4.Address - } - } - Column { - anchors { left: parent.left; right: parent.right } - - Text { - anchors { left: parent.left; leftMargin: 20 } - text: "Subnet mask" - } - TextField { - id: netmask - anchors { left: parent.left; leftMargin: 20; topMargin: 30 } - width: 440 - text: form.ipv4.Netmask - } - } - Column { - anchors { left: parent.left; right: parent.right } - - Text { - anchors { left: parent.left; leftMargin: 20 } - text: "Router" - } - TextField { - id: gateway - anchors { left: parent.left; leftMargin: 20; topMargin: 30 } - width: 440 - text: form.ipv4.Gateway - } - } - Column { - anchors { left: parent.left; right: parent.right } - - Text { - anchors { left: parent.left; leftMargin: 20 } - text: "DNS" - } - TextField { - id: nameserversField - anchors { left: parent.left; leftMargin: 20; topMargin: 30 } - width: 440 - text: { - var nservs = ""; - if (sheet.network) { - nservs = sheet.network.nameserversConfig.join(); - return nservs ? nservs : form.nameservers.join(); - } else { - return ""; - } - } - } - } - } - } - - Column { - anchors { left: parent.left; right: parent.right } - - Text { - anchors { left: parent.left; leftMargin: 20 } - text: "Search domains" - } - TextField { - id: domainsField - anchors { left: parent.left; leftMargin: 20; topMargin: 30 } - width: 440 - text: form.domains.join() - } - } - - Column { - anchors { left: parent.left; right: parent.right } - Text { - anchors { left: parent.left; leftMargin: 20 } - text: "HTTP Proxy" - } - ButtonRow { - id: proxy - anchors { left: parent.left; right: parent.right; topMargin: 30; leftMargin: 10; rightMargin: 10 } - state: form.proxy.Method - - states: [ - State { - name: "direct" - PropertyChanges {target: proxyManualFields; visible: false} - PropertyChanges {target: proxyAutoFields; visible: false} - PropertyChanges {target: directProxyButton; checked: true} - PropertyChanges {target: manualProxyButton; checked: false} - PropertyChanges {target: autoProxyButton; checked: false} - }, - State { - name: "auto" - PropertyChanges {target: proxyManualFields; visible: false} - PropertyChanges {target: proxyAutoFields; visible: true} - PropertyChanges {target: directProxyButton; checked: false} - PropertyChanges {target: manualProxyButton; checked: false} - PropertyChanges {target: autoProxyButton; checked: true} - }, - State { - name: "manual" - PropertyChanges {target: proxyManualFields; visible: true} - PropertyChanges {target: proxyAutoFields; visible: false} - PropertyChanges {target: directProxyButton; checked: false} - PropertyChanges {target: manualProxyButton; checked: true} - PropertyChanges {target: autoProxyButton; checked: false} - } - ] - - Button { - id: directProxyButton - text: "Off" - onClicked: { - proxy.state = "direct" - } - } - Button { - id: manualProxyButton - text: "Manual" - onClicked: { - proxy.state = "manual" - } - } - Button { - id: autoProxyButton - text: "Auto" - onClicked: { - proxy.state = "auto" - } - } - } - } - - Column { - id: proxyManualFields - anchors { left: parent.left; right: parent.right } - - spacing: 50 - Column { - anchors { left: parent.left; right: parent.right } - - Text { - anchors { left: parent.left; leftMargin: 20 } - text: "Server" - } - TextField { - id: proxyserver - anchors { left: parent.left; leftMargin: 20; top:parent.top; topMargin: 30 } - width: 440 - text: form.proxyConfig.Servers ? form.proxyConfig.Servers[0].split(":")[0] : "" - } - } - Column { - anchors { left: parent.left; right: parent.right } - - Text { - anchors { left: parent.left; leftMargin: 20 } - text: "Port" - } - TextField { - id: proxyport - anchors { left: parent.left; leftMargin: 20; topMargin: 30 } - width: 440 - text: form.proxyConfig.Servers ? form.proxyConfig.Servers[0].split(":")[1] : "" - // TODO: validator - } - } - } - - Column { - id: proxyAutoFields - anchors { left: parent.left; right: parent.right } - - spacing: 50 - CheckBox { - id: proxyAutoUrl - text: "Use URL provided by DHCP server" - } - Column { - visible: !proxyAutoUrl.checked - anchors { left: parent.left; right: parent.right } - - Text { - anchors { left: parent.left; leftMargin: 20 } - text: "URL" - } - TextField { - id: proxyurl - anchors { left: parent.left; leftMargin: 20; top:parent.top; topMargin: 30 } - width: 440 - readOnly: proxyAutoUrl.checked - text: form.proxy.URL - // TODO: validator - } - } - } - } - } - } -} - diff --git a/settingsmodules/wireless/contents/ui/WirelessSettings.qml b/settingsmodules/wireless/contents/ui/WirelessSettings.qml deleted file mode 100644 index 90e12781..00000000 --- a/settingsmodules/wireless/contents/ui/WirelessSettings.qml +++ /dev/null @@ -1,221 +0,0 @@ -/* - * Copyright (C) 2013 Robin Burchell - * Copyright (C) 2012 Jolla Ltd. - * - * You may use this file under the terms of the BSD license as follows: - * - * "Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions are - * met: - * * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in - * the documentation and/or other materials provided with the - * distribution. - * * Neither the name of Nemo Mobile nor the names of its contributors - * may be used to endorse or promote products derived from this - * software without specific prior written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR - * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT - * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, - * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT - * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, - * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY - * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT - * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE - * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE." - */ - -import QtQuick 2.0 -import QtQuick.Layouts 1.1 -import org.kde.plasma.core 2.0 as PlasmaCore -import org.kde.plasma.components 2.0 as PlasmaComponents -import org.kde.plasma.extras 2.0 as PlasmaExtras -import MeeGo.Connman 0.2 -import QtQuick.Controls 1.2 - - -StackView { - id: stackView - initialItem: mainView - - Component { - id: mainView - Item { - id: mainWindow - property Item tools//: commonTools - - Timer { - id: scanTimer - interval: 25000 - running: networkingModel.powered - repeat: true - triggeredOnStart: true - onTriggered: networkingModel.requestScan(); - } - - TechnologyModel { - id: networkingModel - name: "wifi" - property bool sheetOpened - property string networkName - - onTechnologiesChanged: { - scanTimer.running = networkingModel.powered; - } - - onPoweredChanged: { - scanTimer.running = networkingModel.powered; - } - } - - UserAgent { - id: userAgent - onUserInputRequested: { - scanTimer.running = false; - scanTimer.triggeredOnStart = false; - console.log("USER INPUT REQUESTED"); - var view = { - "fields": [] - }; - for (var key in fields) { - view.fields.push({ - "name": key, - "id": key.toLowerCase(), - "type": fields[key]["Type"], - "requirement": fields[key]["Requirement"] - }); - console.log(key + ":"); - for (var inkey in fields[key]) { - console.log(" " + inkey + ": " + fields[key][inkey]); - } - } - if (!networkingModel.sheetOpened) { - networkingModel.sheetOpened = true - var sheet = stackView.push({item: Qt.resolvedUrl("NetworkSettingsSheet.qml"), properties:{ - mustacheView: view, - networkName: networkingModel.networkName, - userAgent: userAgent, - scanTimer: scanTimer - }}) - - // sheet.accepted.connect(function() { networkingModel.sheetOpened = false }) - //sheet.rejected.connect(function() { networkingModel.sheetOpened = false }) - // TODO: there was code that checked for stackView.busy and - // didn't open if it was true. What was that about? - } - } - - onErrorReported: { - console.log("Got error from model: " + error); - if (error == "invalid-key") { - mainpageNotificationBanner.text = "Incorrect value entered. Try again." - } else { - mainpageNotificationBanner.text = "Connect failed" - } - mainpageNotificationBanner.show() - } - } - - PlasmaExtras.Heading { - visible: !networkingModel.available || networkList.count == 0 - text: !networkingModel.available ? "Wireless networking unavailable" : "No wireless networks in range" - } - - PlasmaExtras.ScrollArea { - anchors.fill: parent - anchors.bottomMargin: Qt.inputMethod.keyboardRectangle.height - ListView { - id: networkList - //header: WirelessApplet { } - anchors.margins: 4//UiConstants.DefaultMargin - anchors.fill: parent - model: networkingModel - delegate: PlasmaComponents.ListItem { - enabled: true - PlasmaCore.IconItem { - id: icon - anchors { - left: parent.left - top: parent.top - bottom: parent.bototm - } - height: units.iconSizes.large - width: height - source: { - var strength = modelData.strength; - var str_id = 0; - - if (strength >= 100) { - str_id = 100; - } else if (strength >= 80) { - str_id = 80; - } else if (strength >= 60) { - str_id = 60; - } else if (strength >= 40) { - str_id = 40; - } else if (strength >= 20) { - str_id = 20; - } - return "network-wireless-" + str_id; - } - } - ColumnLayout { - anchors { - left: icon.right - top: parent.top - right: parent.right - bottom: parent.bottom - leftMargin: units.smallSpacing - } - PlasmaExtras.Heading { - level: 2 - text: modelData.name ? modelData.name : "(hidden network)" - } - PlasmaComponents.Label { - text: { - var state = modelData.state; - var security = modelData.security[0]; - - if ((state == "online") || (state == "ready")) { - return "connected"; - } else if (state == "association" || state == "configuration") { - return "connecting..."; - } else { - if (security == "none") { - return "open"; - } else { - return "secure"; - } - } - } - } - } - - // TODO: subtitleColor / subtitleColorPressed bindings - // depending on state like in old delegate? - onClicked: { - console.log("clicked " + modelData.name); - if (modelData.state == "idle" || modelData.state == "failure") { - modelData.requestConnect(); - networkingModel.networkName.text = modelData.name; - } else { - console.log("Show network status page"); - for (var key in modelData.ipv4) { - console.log(key + " -> " + modelData.ipv4[key]); - } - - stackView.push({item: Qt.resolvedUrl("SettingsSheet.qml"), properties: { network: modelData }}) - } - } - } - } - } - } - } -} - diff --git a/settingsmodules/wireless/contents/ui/mustache.js b/settingsmodules/wireless/contents/ui/mustache.js deleted file mode 100644 index 641cebd5..00000000 --- a/settingsmodules/wireless/contents/ui/mustache.js +++ /dev/null @@ -1,536 +0,0 @@ -/*! - * mustache.js - Logic-less {{mustache}} templates with JavaScript - * http://github.com/janl/mustache.js - */ -var Mustache = (typeof module !== "undefined" && module.exports) || {}; - -(function (exports) { - - exports.name = "mustache.js"; - exports.version = "0.5.0-dev"; - exports.tags = ["{{", "}}"]; - exports.parse = parse; - exports.compile = compile; - exports.render = render; - exports.clearCache = clearCache; - - // This is here for backwards compatibility with 0.4.x. - exports.to_html = function (template, view, partials, send) { - var result = render(template, view, partials); - - if (typeof send === "function") { - send(result); - } else { - return result; - } - }; - - var _toString = Object.prototype.toString; - var _isArray = Array.isArray; - var _forEach = Array.prototype.forEach; - var _trim = String.prototype.trim; - - var isArray; - if (_isArray) { - isArray = _isArray; - } else { - isArray = function (obj) { - return _toString.call(obj) === "[object Array]"; - }; - } - - var forEach; - if (_forEach) { - forEach = function (obj, callback, scope) { - return _forEach.call(obj, callback, scope); - }; - } else { - forEach = function (obj, callback, scope) { - for (var i = 0, len = obj.length; i < len; ++i) { - callback.call(scope, obj[i], i, obj); - } - }; - } - - var spaceRe = /^\s*$/; - - function isWhitespace(string) { - return spaceRe.test(string); - } - - var trim; - if (_trim) { - trim = function (string) { - return string == null ? "" : _trim.call(string); - }; - } else { - var trimLeft, trimRight; - - if (isWhitespace("\xA0")) { - trimLeft = /^\s+/; - trimRight = /\s+$/; - } else { - // IE doesn't match non-breaking spaces with \s, thanks jQuery. - trimLeft = /^[\s\xA0]+/; - trimRight = /[\s\xA0]+$/; - } - - trim = function (string) { - return string == null ? "" : - String(string).replace(trimLeft, "").replace(trimRight, ""); - }; - } - - var escapeMap = { - "&": "&", - "<": "<", - ">": ">", - '"': '"', - "'": ''' - }; - - function escapeHTML(string) { - return String(string).replace(/&(?!\w+;)|[<>"']/g, function (s) { - return escapeMap[s] || s; - }); - } - - /** - * Adds the `template`, `line`, and `file` properties to the given error - * object and alters the message to provide more useful debugging information. - */ - function debug(e, template, line, file) { - file = file || "