Simplified station add logic and allow for removal

Author: k-donn

README.md

@@ -8,33 +8,20 @@ you input the station ID then view the properties that the station sends up.
 
 ## Running
 
-Configure the widget by finding weather stations (ie. [KGADACUL1](https://www.wunderground.com/dashboard/pws/KGADACUL1)). You can get an overview of stations in your area at [`wunderground.com/wundermap`](https://wunderground.com/wundermap) Weather station IDs can be entered manually or there is a search functionality to search by geographic region.
+Configure the widget by finding weather stations (ie. [KGADACUL1](https://www.wunderground.com/dashboard/pws/KGADACUL1)). You can get an overview of stations in your area at [`wunderground.com/wundermap`](https://wunderground.com/wundermap).
 
-### Manual Entry
-
-1. Enter the case-sensitive ID into the text field and press `Test Station`. The settings page will query the station to determine if it is reporting valid data.
-    -   If it is valid, then the status bar will report that the station is active and can be used.
-    -   Otherwise, the status bar will report that the station is not active and you must use a different station or check for a spelling error.
-2. Then, press the `Select` button at the bottom right to add this station to the list of available stations.
-
-### Geographic Search
-
-1. Enter your city/locality into the top text field and press `Find Station`.
-2. The combo box below will populate with localities matching your search. Choose the closest.
-3. Further below, the combox box will populate with weather station IDs in that locality. Choose a desired station.
-4. Press `Test Station` to determine if the station is reporting valid data. Like above,
-    -   If it is valid, then the status bar will report that the station is active and can be used.
-    -   Otherwise, the status bar will report that the station is not active and you must use a different station or check for a spelling error.
-5. Then, press the `Select` button at the bottom right to add this station to the list of available stations.  
-
-### Saved Weather Stations
+Navigate to the settings page by clicking `Configure Wunderground` or right-clicking the widget. Then, under `Station`, click `Choose...`. This will open up the saved stations dialog. Enter the case-sensitive ID into the field then press `Add` or hit enter.
 
 Once a station has been added to the list, it is automatically selected and will be highlighted. Otherwise, click on the desired station ID then press `Select` at the bottom right.
 
 Then, the station ID will appear on the config page and the settings can be applied to change the station.
 
 Furthermore, some stations update at different rates so you can set the refresh rate.
 
+### Removing Stations
+
+Navigate back to the saved stations dialog and select the station to be removed. Click the `Remove` button at the bottom left and then confirm the removal. You can then close the window or click `Cancel`. If you have removed all of the stations, you can close the window or click `Cancel` as well.
+
 ## Translating
 
 Translations welcome!
@@ -72,7 +59,6 @@ Under Appearance in the widget settings, toggle "Show Background."
 - Customizability
   -   [x] Context menu refresh option
   -   [ ] Widget size/padding/scaling
-  -   [ ] Allow removal of stations from saved stations
   -   [x] Specific units choice (eg. from km/h to m/s for metric)
 - Graphical
   -   [ ] Improve text coloring of temp and alerts for dark/transparent themes

kpac

@@ -47,7 +47,7 @@ class TC:
 	FG_Purple='\033[35m'
 	FG_Cyan='\033[36m'
 	FG_LightGray='\033[37m'
-	FG_DarkGray='\033[90m'
+	FG_DarkGray='\033[1m'
 	FG_LightRed='\033[91m'
 	FG_LightGreen='\033[92m'
 	FG_Yellow='\033[93m'
@@ -56,10 +56,6 @@ class TC:
 	FG_LightCyan='\033[96m'
 	FG_White='\033[97m'
 
-	@staticmethod
-	def stripColors(str):
-		return re.sub('\033' + '\[((\d{1,2});)?(\d{1,2})m', '', str)
-
 def echoTC(terminalColor, *args):
 	print(terminalColor + ' '.join(args) + TC.Reset)
 def echoGray(*args):

plasmoid/contents/code/pws-api.js

@@ -429,9 +429,11 @@ function getCurrentData(callback = function() {}) {
 				weatherData["winddir"] = obs["winddir"];
 				weatherData["lat"] = obs["lat"];
 				weatherData["lon"] = obs["lon"];
+				weatherData["neighborhood"] = obs["neighborhood"];
 
 				plasmoid.configuration.latitude = weatherData["lat"];
 				plasmoid.configuration.longitude = weatherData["lon"];
+				plasmoid.configuration.stationName = weatherData["neighborhood"];
 
 				printDebug("[pws-api.js] Got new current data");
 

plasmoid/contents/config/main.xml

@@ -5,6 +5,9 @@
         <entry name="stationID" type="String">
             <default/>
         </entry>
+        <entry name="stationName" type="String">
+            <default/>
+        </entry>
         <entry name="savedStations" type="StringList">
             <default/>
         </entry>

plasmoid/contents/ui/config/ConfigStation.qml

@@ -72,6 +72,14 @@ KCM.SimpleKCM {
             text: plasmoid.configuration.stationID !== "" ? plasmoid.configuration.stationID : "KGADACUL1"
         }
 
+        PlasmaComponents.Label {
+            Kirigami.FormData.label: i18n("Weatherstation Name:")
+
+            color: plasmoid.configuration.stationName !== "" ? Kirigami.Theme.textColor : Kirigami.Theme.disabledTextColor
+
+            text: plasmoid.configuration.stationName !== "" ? plasmoid.configuration.stationName : "Hog Mountain"
+        }
+
         PlasmaComponents.Label {
             Kirigami.FormData.label: i18n("Longitude:")
 

plasmoid/contents/ui/lib/StationPicker.qml

@@ -68,6 +68,12 @@ RowLayout {
                 // Reset error
                 fixedErrorState = false;
             }
+
+            if (stationListModel.count === 0) {
+                // selectedStation may have picked up a value; if user removes all stations,
+                // clear that value.
+                selectedStation = "";
+            }
         }
     }
 
@@ -83,7 +89,7 @@ RowLayout {
         id: selectBtn
         Layout.fillWidth: true
         icon.name: "find-location"
-        text: i18ndc("plasma_applet_org.kde.plasma.weather", "@action:button", "Choose…")
-        onClicked: stationPicker.visible = true
+        text: i18n("Choose…")
+        onClicked: stationPicker.open()
     }
 }

plasmoid/contents/ui/lib/StationPickerDialog.qml

@@ -20,7 +20,7 @@
 import QtQuick
 import QtQuick.Controls
 import QtQuick.Layouts
-import org.kde.kcmutils as KCM
+import QtQuick.Dialogs
 import org.kde.plasma.components as PlasmaComponents
 import org.kde.kirigami as Kirigami
 
@@ -55,32 +55,7 @@ Window {
         id: syspal
     }
 
-    StationSearcher {
-        id: stationSearcher
-
-        onChoosen: {
-            // User searched for a new station. Check for duplicate, add, and make it the current selection.
-            var isDuplicate = false;
-
-            for (let i = 0; i < stationListModel.count; i++) {
-                if (stationListModel.get(i).name === newStation) {
-                    isDuplicate = true;
-                }
-            }
-
-            if (!isDuplicate) {
-                stationListModel.append({"name": newStation});
-            }
-
-            // The duplicate was not added twice, but make still make it the current selection.
-            for (let i = 0; i < stationListModel.count; i++) {
-                if (stationListModel.get(i).name === newStation) {
-                    stationListView.currentIndex = i;
-                }
-            }
-            dialog.source = newStation;
-        }
-    }
+    signal open
 
     signal accepted
 
@@ -89,7 +64,6 @@ Window {
     Action {
         id: acceptAction
 
-        shortcut: "Return"
         enabled: stationListModel.count > 0
         onTriggered: {
             accepted();
@@ -107,6 +81,36 @@ Window {
         }
     }
 
+    MessageDialog {
+        id: confirmRemoveDialog
+
+        text: i18n("Remove Selected")
+        informativeText: i18n("Confirm Remove %1", stationListModel.get(stationListView.currentIndex).name)
+        buttons: MessageDialog.Ok | MessageDialog.Cancel
+
+        onAccepted: {
+            var toRemoveName = stationListModel.get(stationListView.currentIndex).name;
+            var toRemoveIndex = stationListView.currentIndex;
+
+            var wasLast = toRemoveIndex === stationListModel.count - 1;
+
+            stationListModel.remove(toRemoveIndex);
+
+            if (stationListModel.count > 0) {
+                if (wasLast) {
+                    // If we removed the last element, set selected to new last.
+                    stationListView.currentIndex = stationListModel.count - 1;
+                    dialog.source = stationListModel.get(stationListView.currentIndex).name;
+                } else {
+                    // If we removed the n'th element and there are remaining elements, set selected to new n'th.
+                    dialog.source = stationListModel.get(stationListView.currentIndex).name;
+                }
+            } else {
+                dialog.source = "";
+            }
+        }
+    }
+
     Component.onCompleted: {
         if (plasmoid.configuration.stationID !== "") {
             // Transition state where user has stationID set but no savedStations
@@ -142,7 +146,26 @@ Window {
                 stationListView.currentIndex = i;
             }
         }
-        stationListView.forceActiveFocus();
+    }
+
+    onOpen: {
+        dialog.visible = true;
+
+        stationListModel.clear();
+
+        // Populate ListModel with saved stations
+        for (let i = 0; i < plasmoid.configuration.savedStations.length; i++) {
+            stationListModel.append({"name": plasmoid.configuration.savedStations[i]});
+        }
+
+        // Set selected station to force highlight
+        for (let i = 0; i < stationListModel.count; i++) {
+            if (stationListModel.get(i).name === plasmoid.configuration.stationID) {
+                dialog.source = plasmoid.configuration.stationID;
+
+                stationListView.currentIndex = i;
+            }
+        }
     }
 
     ColumnLayout {
@@ -155,12 +178,53 @@ Window {
         Layout.minimumWidth: Math.max(stationPicker.Layout.minimumWidth, buttonsRow.implicitWidth) + 2*anchors.margins
         Layout.minimumHeight: stationPicker.Layout.minimumHeight + buttonsRow.implicitHeight + 2*anchors.margins
 
-        Button {
-            id: addMoreBtn
+        RowLayout {
             Layout.fillWidth: true
-            icon.name: "list-add"
-            text: i18n("Add more...")
-            onClicked: stationSearcher.visible = true 
+
+            Kirigami.SearchField {
+                id: addField
+
+                Layout.fillWidth: true
+                focus: true
+                placeholderText: "KGADACUL1"
+
+                Keys.onReturnPressed: function(keyEvent) {
+                    if (text.trim().length > 0) {
+                        addBtn.clicked();
+                        keyEvent.accepted = true;
+                    }
+                }
+            }
+
+            Button {
+                id: addBtn
+
+                text: i18n("Add")
+                enabled: addField.text.length > 0
+                icon.name: "list-add"
+
+                onClicked: {
+                    var isNew = true;
+
+                    // Check for duplicate
+                    for (let i = 0; i < stationListModel.count; i++) {
+                        if (stationListModel.get(i).name === addField.text.trim()) {
+                            isNew = false;
+                        }
+                    }
+
+                    if (isNew) {
+                        stationListModel.append({"name": addField.text.trim()});
+
+                        dialog.source = addField.text.trim();
+
+                        stationListView.currentIndex = stationListModel.count - 1;
+                        stationListView.forceActiveFocus();
+
+                        addField.text = "";
+                    }
+                }
+            }
         }
 
         ListView {
@@ -196,19 +260,30 @@ Window {
         RowLayout {
             id: buttonsRow
 
-            Layout.alignment: Qt.AlignVCenter | Qt.AlignRight
+            Layout.alignment: Qt.AlignVCenter
+            Layout.fillWidth: true
+
+            Button {
+                icon.name: "list-remove"
+                text: i18n("Remove")
+                enabled: stationListModel.count > 0
+                onClicked: {
+                    confirmRemoveDialog.visible = true;
+                }
+            }
 
             Button {
+                Layout.fillWidth: true
                 icon.name: "dialog-ok"
-                text: i18ndc("plasma_applet_org.kde.plasma.weather", "@action:button", "Select")
+                text: i18n("Select")
                 enabled: stationListModel.count > 0
                 onClicked: {
                     acceptAction.trigger();
                 }
             }
             Button {
                 icon.name: "dialog-cancel"
-                text: i18ndc("plasma_applet_org.kde.plasma.weather", "@action:button", "Cancel")
+                text: i18n("Cancel")
                 onClicked: {
                     cancelAction.trigger();
                 }