Merge pull request #19 from korapp/dev

Dev
korapp · Apr 11, 2023 · 56b721e · 56b721e
2 parents 69a6961 + 7e81e1b
commit 56b721e
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 1 deletion.
diff --git a/plasmoid/contents/config/main.xml b/plasmoid/contents/config/main.xml
@@ -15,6 +15,9 @@
     <entry name="showNotifications" type="Bool">
       <default>true</default>
     </entry>
+    <entry name="hideWhenDisconnected" type="Bool">
+      <default>false</default>
+    </entry>
   </group>
   <group name="Favorites">
     <entry name="favoriteConnections" type="String"></entry>

diff --git a/plasmoid/contents/ui/ConfigGeneral.qml b/plasmoid/contents/ui/ConfigGeneral.qml
@@ -8,6 +8,7 @@ Kirigami.FormLayout {
 
     property alias cfg_toggleConnectionOnMiddleButton: toggleConnectionOnMiddleButton.checked
     property alias cfg_showCountryIndicator: showCountryIndicator.checked
+    property alias cfg_hideWhenDisconnected: hideWhenDisconnected.checked
     property alias cfg_showNotifications: showNotifications.checked
 
     CheckBox {
@@ -20,6 +21,11 @@ Kirigami.FormLayout {
         Kirigami.FormData.label: i18n("Show country indicator")
     }
 
+    CheckBox {
+        id: hideWhenDisconnected
+        Kirigami.FormData.label: i18n("Hide when VPN is disconnected")
+    }
+
     CheckBox {
         id: showNotifications
         Kirigami.FormData.label: i18n("Show notifications")

diff --git a/plasmoid/contents/ui/main.qml b/plasmoid/contents/ui/main.qml
@@ -14,7 +14,9 @@ Item {
     Plasmoid.compactRepresentation: CompactRepresentation {}
     Plasmoid.fullRepresentation: FullRepresentation {}
     Plasmoid.toolTipSubText: getTooltipText()
-    Plasmoid.status: nordvpn.isServiceRunning ? PlasmaCore.Types.ActiveStatus : PlasmaCore.Types.PassiveStatus
+    Plasmoid.status: nordvpn.isServiceRunning && (nordvpn.isConnected || !plasmoid.configuration.hideWhenDisconnected)
+        ? PlasmaCore.Types.ActiveStatus
+        : PlasmaCore.Types.PassiveStatus
     Plasmoid.icon: Qt.resolvedUrl("../images/nordvpn.svgz")
 
     Plasmoid.switchWidth: PlasmaCore.Units.gridUnit * 14