Add env variable for toggle button

ErikReider · Oct 11, 2023 · ceb2248 · ceb2248
1 parent 7b8ae81
commit ceb2248
Show file tree

Hide file tree

Showing 4 changed files with 21 additions and 5 deletions.
diff --git a/man/swaync.5.scd b/man/swaync.5.scd
@@ -416,7 +416,9 @@ config file to be able to detect config errors
 										type: string ++
 										default: "normal" ++
 										description: Type of the button ++
-											Toggle buttons receive the '.active' css class ++
+											Toggle buttons receive the '.active' css class and an env ++
+											variable "SWAYNC_TOGGLE_STATE" is set. See example usage in the ++
+											default config.json ++
 										enum: ["normal", "toggle"] ++
 									active: ++
 										type: bool ++
@@ -446,7 +448,9 @@ config file to be able to detect config errors
 								type: string ++
 								default: "normal" ++
 								description: Type of the button ++
-									Toggle buttons receive the '.active' css class ++
+									Toggle buttons receive the '.active' css class and an env ++
+									variable "SWAYNC_TOGGLE_STATE" is set. See example usage in the ++
+									default config.json ++
 								enum: ["normal", "toggle"] ++
 							active: ++
 								type: bool ++

diff --git a/src/config.json.in b/src/config.json.in
@@ -74,6 +74,16 @@
     "mpris": {
       "image-size": 96,
       "image-radius": 12
+    },
+    "buttons-grid": {
+      "actions": [
+        {
+          "label": "直",
+          "type": "toggle",
+          "active": true,
+          "command": "sh -c '[[ $SWAYNC_TOGGLE_STATE == true ]] && nmcli radio wifi on || nmcli radio wifi off'"
+        }
+      ]
     }
   }
 }
diff --git a/src/configSchema.json b/src/configSchema.json
@@ -430,7 +430,7 @@
               },
               "type": {
                 "type": "string",
-                "description": "Type of the button; toggle buttons receive the .active css class",
+                "description": "Type of the button; toggle buttons receive the .active css class and an env variable 'SWAYNC_TOGGLE_STATE' is set. See example in the default config.json",
                 "default": "normal",
                 "enum": ["normal", "toggle"]
               },

diff --git a/src/controlCenter/widgets/shared/toggleButton.vala b/src/controlCenter/widgets/shared/toggleButton.vala
@@ -14,8 +14,10 @@ namespace SwayNotificationCenter.Widgets {
             this.toggled.connect (on_toggle);
         }
 
-        private void on_toggle (Gtk.ToggleButton tb) {
-            BaseWidget.execute_command (command);
+        private async void on_toggle () {
+            string msg = "";
+            string[] env_additions = { "SWAYNC_TOGGLE_STATE="+this.active.to_string () };
+            yield Functions.execute_command (this.command, env_additions, out msg);
         }
     }
 }