start/stop/restart actions for service

Author: EriksRemess

Cargo.lock

@@ -1,6 +1,6 @@
 [package]
 name = "streamrs"
-version = "0.6.0"
+version = "0.6.1"
 edition = "2024"
 license = "MIT"
 

Cargo.toml

@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: streamrs\n"
-"POT-Creation-Date: 2026-03-13 17:53+0000\n"
+"POT-Creation-Date: 2026-03-13 18:49+0000\n"
 "PO-Revision-Date: 2026-03-13 17:11+0000\n"
 "Last-Translator: Ēriks Remess <eriks@remess.lv>\n"
 "Language-Team: English\n"
@@ -139,19 +139,16 @@ msgid "Failed to signal streamrs daemon ({systemctl_err}; {pkill_err})"
 msgstr "Failed to signal streamrs daemon ({systemctl_err}; {pkill_err})"
 
 #: src/gui/core/config_io.rs
-#, fuzzy
 msgid "Failed to start streamrs daemon (systemctl exit status {status})"
-msgstr "Failed to signal streamrs daemon ({systemctl_err}; {pkill_err})"
+msgstr "Failed to start streamrs daemon (systemctl exit status {status})"
 
 #: src/gui/core/config_io.rs
-#, fuzzy
 msgid "Failed to start streamrs daemon (systemctl failed: {err})"
-msgstr "Failed to signal streamrs daemon ({systemctl_err}; {pkill_err})"
+msgstr "Failed to start streamrs daemon (systemctl failed: {err})"
 
 #: src/gui/core/config_io.rs
-#, fuzzy
 msgid "Failed to stop streamrs daemon ({systemctl_err}; {pkill_err})"
-msgstr "Failed to signal streamrs daemon ({systemctl_err}; {pkill_err})"
+msgstr "Failed to stop streamrs daemon ({systemctl_err}; {pkill_err})"
 
 #: src/gui/main.rs
 msgid "Failed to write GUI lock '{path}': {err}"
@@ -309,6 +306,14 @@ msgstr "Reserved for page navigation in streamrs"
 msgid "Reserved slot"
 msgstr "Reserved slot"
 
+#: src/gui/ui.rs
+msgid "Restart"
+msgstr "Restart"
+
+#: src/gui/ui.rs
+msgid "Restarted streamrs daemon"
+msgstr "Restarted streamrs daemon"
+
 #: src/gui/ui.rs
 msgid "Save"
 msgstr "Save"
@@ -330,12 +335,12 @@ msgid "Select icon..."
 msgstr "Select icon..."
 
 #: src/gui/ui.rs
-msgid "Start streamrs daemon"
-msgstr ""
+msgid "Start"
+msgstr "Start"
 
 #: src/gui/ui.rs
 msgid "Started streamrs daemon"
-msgstr ""
+msgstr "Started streamrs daemon"
 
 #: src/gui/ui.rs
 msgid "Status"
@@ -358,12 +363,12 @@ msgid "Status-on icon updated"
 msgstr "Status-on icon updated"
 
 #: src/gui/ui.rs
-msgid "Stop streamrs daemon"
-msgstr ""
+msgid "Stop"
+msgstr "Stop"
 
 #: src/gui/ui.rs
 msgid "Stopped streamrs daemon"
-msgstr ""
+msgstr "Stopped streamrs daemon"
 
 #: src/gui/ui.rs
 msgid "Stream Deck preview"
@@ -385,6 +390,10 @@ msgstr "pkill exit status {status}"
 msgid "pkill failed: {err}"
 msgstr "pkill failed: {err}"
 
+#: src/gui/ui.rs
+msgid "streamrs service"
+msgstr "streamrs service"
+
 #: src/gui/core/config_io.rs
 msgid "systemctl exit status {status}"
 msgstr "systemctl exit status {status}"

po/en.po

@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: streamrs\n"
-"POT-Creation-Date: 2026-03-13 17:53+0000\n"
+"POT-Creation-Date: 2026-03-13 18:49+0000\n"
 "PO-Revision-Date: 2026-03-13 18:05+0000\n"
 "Last-Translator: Ēriks Remess <eriks@remess.lv>\n"
 "Language-Team: Latvian\n"
@@ -309,6 +309,14 @@ msgstr "Rezervēts lapu navigācijai streamrs"
 msgid "Reserved slot"
 msgstr "Rezervēta vieta"
 
+#: src/gui/ui.rs
+msgid "Restart"
+msgstr "Pārstartēt"
+
+#: src/gui/ui.rs
+msgid "Restarted streamrs daemon"
+msgstr "Streamrs dēmons pārstartēts"
+
 #: src/gui/ui.rs
 msgid "Save"
 msgstr "Saglabāt"
@@ -330,8 +338,8 @@ msgid "Select icon..."
 msgstr "Izvēlieties ikonu..."
 
 #: src/gui/ui.rs
-msgid "Start streamrs daemon"
-msgstr "Palaist streamrs dēmonu"
+msgid "Start"
+msgstr "Palaist"
 
 #: src/gui/ui.rs
 msgid "Started streamrs daemon"
@@ -358,8 +366,8 @@ msgid "Status-on icon updated"
 msgstr "Ieslēgta statusa ikona atjaunināta"
 
 #: src/gui/ui.rs
-msgid "Stop streamrs daemon"
-msgstr "Apturēt streamrs dēmonu"
+msgid "Stop"
+msgstr "Apturēt"
 
 #: src/gui/ui.rs
 msgid "Stopped streamrs daemon"
@@ -385,6 +393,10 @@ msgstr "pkill izejas statuss {status}"
 msgid "pkill failed: {err}"
 msgstr "pkill neizdevās: {err}"
 
+#: src/gui/ui.rs
+msgid "streamrs service"
+msgstr "streamrs serviss"
+
 #: src/gui/core/config_io.rs
 msgid "systemctl exit status {status}"
 msgstr "systemctl izejas statuss {status}"

po/lv.po

@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: streamrs\n"
-"POT-Creation-Date: 2026-03-13 17:53+0000\n"
+"POT-Creation-Date: 2026-03-13 18:50+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -312,6 +312,14 @@ msgstr ""
 msgid "Reserved slot"
 msgstr ""
 
+#: src/gui/ui.rs
+msgid "Restart"
+msgstr ""
+
+#: src/gui/ui.rs
+msgid "Restarted streamrs daemon"
+msgstr ""
+
 #: src/gui/ui.rs
 msgid "Save"
 msgstr ""
@@ -333,7 +341,7 @@ msgid "Select icon..."
 msgstr ""
 
 #: src/gui/ui.rs
-msgid "Start streamrs daemon"
+msgid "Start"
 msgstr ""
 
 #: src/gui/ui.rs
@@ -361,7 +369,7 @@ msgid "Status-on icon updated"
 msgstr ""
 
 #: src/gui/ui.rs
-msgid "Stop streamrs daemon"
+msgid "Stop"
 msgstr ""
 
 #: src/gui/ui.rs
@@ -388,6 +396,10 @@ msgstr ""
 msgid "pkill failed: {err}"
 msgstr ""
 
+#: src/gui/ui.rs
+msgid "streamrs service"
+msgstr ""
+
 #: src/gui/core/config_io.rs
 msgid "systemctl exit status {status}"
 msgstr ""

po/streamrs.pot

@@ -133,6 +133,13 @@ pub(crate) fn set_daemon_running(should_run: bool) -> Result<(), String> {
     ))
 }
 
+pub(crate) fn restart_daemon() -> Result<(), String> {
+    if daemon_running() {
+        set_daemon_running(false)?;
+    }
+    set_daemon_running(true)
+}
+
 pub(crate) fn profile_slug_from_input(raw: &str) -> Option<String> {
     profile_slug_from_input_generic(raw)
 }

src/gui/core/config_io.rs

@@ -69,13 +69,25 @@ fn present_about_dialog(parent: &ApplicationWindow) {
 
 fn rebuild_window_menu(menu: &gtk::gio::Menu) {
     menu.remove_all();
-    let daemon_label = if daemon_running() {
-        tr("Stop streamrs daemon")
-    } else {
-        tr("Start streamrs daemon")
-    };
-    menu.append(Some(&daemon_label), Some("win.toggle-daemon"));
-    menu.append(Some(&tr("About streamrs")), Some("win.show-about"));
+
+    let daemon_section = gtk::gio::Menu::new();
+    daemon_section.append(Some(&tr("Start")), Some("win.start-daemon"));
+    daemon_section.append(Some(&tr("Stop")), Some("win.stop-daemon"));
+    daemon_section.append(Some(&tr("Restart")), Some("win.restart-daemon"));
+    menu.append_section(Some(&tr("streamrs service")), &daemon_section);
+
+    let app_section = gtk::gio::Menu::new();
+    app_section.append(Some(&tr("About streamrs")), Some("win.show-about"));
+    menu.append_section(None, &app_section);
+}
+
+fn sync_daemon_actions(
+    start_action: &gtk::gio::SimpleAction,
+    stop_action: &gtk::gio::SimpleAction,
+) {
+    let running = daemon_running();
+    start_action.set_enabled(!running);
+    stop_action.set_enabled(running);
 }
 
 pub(crate) fn build_ui(app: &Application) {
@@ -499,12 +511,6 @@ pub(crate) fn build_ui(app: &Application) {
     menu_button.set_tooltip_text(Some(&tr("Menu")));
     menu_button.set_menu_model(Some(&window_menu));
     menu_button.add_css_class("flat");
-    {
-        let window_menu_for_open = window_menu.clone();
-        menu_button.set_create_popup_func(move |_| {
-            rebuild_window_menu(&window_menu_for_open);
-        });
-    }
 
     let about_action = gtk::gio::SimpleAction::new("show-about", None);
     {
@@ -515,27 +521,67 @@ pub(crate) fn build_ui(app: &Application) {
     }
     window.add_action(&about_action);
 
-    let daemon_action = gtk::gio::SimpleAction::new("toggle-daemon", None);
+    let start_daemon_action = gtk::gio::SimpleAction::new("start-daemon", None);
+    let stop_daemon_action = gtk::gio::SimpleAction::new("stop-daemon", None);
+    let restart_daemon_action = gtk::gio::SimpleAction::new("restart-daemon", None);
+    sync_daemon_actions(&start_daemon_action, &stop_daemon_action);
+    {
+        let start_daemon_action_for_open = start_daemon_action.clone();
+        let stop_daemon_action_for_open = stop_daemon_action.clone();
+        menu_button.connect_notify_local(Some("active"), move |button, _| {
+            if button.property::<bool>("active") {
+                sync_daemon_actions(&start_daemon_action_for_open, &stop_daemon_action_for_open);
+            }
+        });
+    }
+    {
+        let status_line_for_start = status_line.clone();
+        let start_daemon_action_for_start = start_daemon_action.clone();
+        let stop_daemon_action_for_start = stop_daemon_action.clone();
+        start_daemon_action.connect_activate(move |_, _| {
+            let message = match set_daemon_running(true) {
+                Ok(()) => tr("Started streamrs daemon"),
+                Err(err) => err,
+            };
+            status_line_for_start.set_text(&message);
+            sync_daemon_actions(
+                &start_daemon_action_for_start,
+                &stop_daemon_action_for_start,
+            );
+        });
+    }
+    {
+        let status_line_for_stop = status_line.clone();
+        let start_daemon_action_for_stop = start_daemon_action.clone();
+        let stop_daemon_action_for_stop = stop_daemon_action.clone();
+        stop_daemon_action.connect_activate(move |_, _| {
+            let message = match set_daemon_running(false) {
+                Ok(()) => tr("Stopped streamrs daemon"),
+                Err(err) => err,
+            };
+            status_line_for_stop.set_text(&message);
+            sync_daemon_actions(&start_daemon_action_for_stop, &stop_daemon_action_for_stop);
+        });
+    }
     {
-        let status_line_for_daemon = status_line.clone();
-        let window_menu_for_daemon = window_menu.clone();
-        daemon_action.connect_activate(move |_, _| {
-            let should_run = !daemon_running();
-            let message = match set_daemon_running(should_run) {
-                Ok(()) => {
-                    if should_run {
-                        tr("Started streamrs daemon")
-                    } else {
-                        tr("Stopped streamrs daemon")
-                    }
-                }
+        let status_line_for_restart = status_line.clone();
+        let start_daemon_action_for_restart = start_daemon_action.clone();
+        let stop_daemon_action_for_restart = stop_daemon_action.clone();
+        restart_daemon_action.connect_activate(move |_, _| {
+            let message = match restart_daemon() {
+                Ok(()) => tr("Restarted streamrs daemon"),
                 Err(err) => err,
             };
-            status_line_for_daemon.set_text(&message);
-            rebuild_window_menu(&window_menu_for_daemon);
+            status_line_for_restart.set_text(&message);
+            sync_daemon_actions(
+                &start_daemon_action_for_restart,
+                &stop_daemon_action_for_restart,
+            );
         });
     }
-    window.add_action(&daemon_action);
+    window.add_action(&start_daemon_action);
+    window.add_action(&stop_daemon_action);
+    window.add_action(&restart_daemon_action);
 
     let title_row = GtkBox::new(Orientation::Horizontal, UI_SPACING_HORIZONTAL);
     title_row.set_halign(Align::Start);

src/gui/ui.rs

@@ -99,7 +99,9 @@ pub(crate) fn wire_primary_action_signals(
                             eprintln!("{err}");
                         }
                         key_index
-                            .map(|index| trf("Saved {ordinal} button", &[("ordinal", tr_ordinal(index))]))
+                            .map(|index| {
+                                trf("Saved {ordinal} button", &[("ordinal", tr_ordinal(index))])
+                            })
                             .unwrap_or_else(|| tr("Saved changes"))
                     }
                     Err(err) => trf("Save failed: {err}", &[("err", err)]),