Clean up add to steam, make it clear when shortcut has actually been added, add back restart hint

Author: MrAwesome

gui/godot/scripts/Main.gd

@@ -22,6 +22,10 @@ var INFO_WINDOW = preload("res://scenes/info_window.tscn")
 
 signal restart_steam_hint
 
+func send_steam_restart_hint():
+	print("Sending restart hint")
+	emit_signal("restart_steam_hint")
+
 func initialize_action_button(
 	action_button: ActionButton,
 ):
@@ -47,11 +51,15 @@ func update_action_button(
 	display_text: String,
 	is_available: bool,
 	is_ongoing: bool,
+	is_completed: bool,
 ) -> void:
 	action_button.set_name(identifier)
 	action_button.set_text(display_text)
 	action_button.set_visible(is_available)
 
+	if is_completed:
+		action_button.modulate = Color.DARK_GRAY
+
 	# TODO: make not clickable while running
 	if is_ongoing:
 		if not action_button.button_known_ongoing_state:
@@ -124,13 +132,13 @@ func _input(event: InputEvent) -> void:
 		get_tree().quit()
 
 	# NOTE: could focus the first element of the first subtab here if desired
-	if event.is_action_pressed("ui_next_main_tab"):		
+	if event.is_action_pressed("ui_next_main_tab"):
 		var did_change_tab = %MainTabs.select_next_available()
 		if did_change_tab:
 			%MainTabs.get_tab_bar().grab_focus()
 		elif $UpdateButton.visible:
 			$UpdateButton.grab_focus()
-		
+
 	if event.is_action_pressed("ui_prev_main_tab"):
 		if not $UpdateButton.has_focus():
 			%MainTabs.select_previous_available()
@@ -150,7 +158,7 @@ func _ready():
 	dd.context_was_updated.connect(_on_context_was_updated)
 	dd.update_action_button.connect(update_action_button.call_deferred)
 	dd.initialize_action_button.connect(initialize_action_button.call_deferred)
-	dd.added_to_steam.connect(func (): emit_signal("restart_steam_hint"))
+	dd.added_to_steam.connect(send_steam_restart_hint.call_deferred)
 
 	var should_test = OS.get_environment("DECKTRICKS_GUI_TEST_COMMAND_ONLY")
 	var should_exit = OS.get_environment("DECKTRICKS_GUI_EXIT_IMMEDIATELY")
@@ -162,14 +170,14 @@ func _ready():
 
 	%LogContainer.populate_logs()
 	dd.populate_categories(%Categories)
-	
+
 	%Categories.select_next_available()
 	%Categories.get_tab_control(1).find_child("ActionButton")
-	
+
 	var main_tab_bar: TabBar = %MainTabs.get_tab_bar()
 	main_tab_bar.set_focus_neighbor(SIDE_RIGHT, $UpdateButton.get_path())
 	$UpdateButton.set_focus_neighbor(SIDE_LEFT, main_tab_bar.get_path())
-	$UpdateButton.set_focus_neighbor(SIDE_RIGHT, '')	
+	$UpdateButton.set_focus_neighbor(SIDE_RIGHT, '')
 
 	var first_button = get_tree().get_nodes_in_group("first_button").pop_front()
 	if first_button:
@@ -184,7 +192,3 @@ func _ready():
 
 	if should_exit:
 		get_tree().quit()
-		
-		
-		
-	

gui/rust/src/action_button.rs

@@ -15,6 +15,8 @@ use godot::prelude::*;
 // NOTE: This should not be initialized directly, use the factory functions below
 //       This is only class(init) because class(no_init) breaks hot reloading right now:
 //       https://github.com/godot-rust/gdext/issues/539
+//
+//       looks like adding "reloadable = true" to the gdextension file will fix that, from ^
 
 #[derive(GodotClass)]
 #[class(init,base=Button)]
@@ -52,11 +54,9 @@ impl IButton for ActionButton {
             return;
         }
 
-        // TODO: This doesn't work because of the way button text is updated from Godot, fix it:
-        // if matches!(action, SpecificAction::AddToSteam { .. }) {
-        //    self.base_mut().call_deferred("set_text", &[Variant::from("Added to Steam...")]);
-        //    DecktricksDispatcher::emit_added_to_steam();
-        //}
+        if matches!(action, SpecificAction::AddToSteam { .. }) {
+            DecktricksDispatcher::emit_added_to_steam();
+        }
 
         spawn(move || {
             // TODO: run DecktricksCommand instead of SpecificAction just to have access to flags?
@@ -96,17 +96,19 @@ impl ActionButton {
 
     fn update_appearance(&mut self) {
         let info = &self.info;
-        let display_text = info.action_id.get_display_name(info.is_ongoing);
-        let action_id = info.action_id.to_string();
         let is_available = info.is_available;
         let is_ongoing = info.is_ongoing;
+        let is_completed = info.is_completed;
+        let display_text = info.action_id.get_display_name(is_ongoing, is_completed);
+        let action_id = info.action_id.to_string();
 
         DecktricksDispatcher::emit_update_action_button(
             self.to_gd(),
             action_id,
             display_text.into(),
             is_available,
             is_ongoing,
+            is_completed,
         );
 
         //        let mut base = self.base_mut();

gui/rust/src/dispatcher.rs

@@ -290,6 +290,7 @@ impl DecktricksDispatcher {
         display_text: String,
         is_available: bool,
         is_ongoing: bool,
+        is_completed: bool,
     ) {
         let mut singleton = Self::get_singleton();
         singleton.emit_signal(
@@ -300,6 +301,7 @@ impl DecktricksDispatcher {
                 Variant::from(GString::from(display_text)),
                 Variant::from(is_available),
                 Variant::from(is_ongoing),
+                Variant::from(is_completed),
             ],
         );
     }

gui/rust/tests/lib.rs

@@ -68,6 +68,7 @@ static GODOT_BINARY_PATH: LazyLock<PathBuf> = LazyLock::new(|| {
     Command::new("godot")
         .current_dir(GODOT_BASE_DIR)
         .args(["--import"])
+        .args(["--headless"])
         .output()
         .unwrap();
 

src/actions/general.rs

@@ -64,7 +64,9 @@ impl GeneralAction {
                                 runner.clone(),
                                 current_log_level,
                                 logger.clone(),
-                                // Whether or not we're currently installing doesn't matter here:
+                                // Whether or not we're currently installing or added to Steam doesn't matter here:
+                                // TODO: code smell
+                                false,
                                 false,
                             );
                             let provider = DynTrickProvider::new(&trick_ctx, full_ctx);
@@ -166,6 +168,7 @@ struct SpecificActionContext {
     trick_id: String,
     is_installing: bool,
     is_running: bool,
+    is_added_to_steam: bool,
     available_actions: Vec<String>,
 }
 
@@ -205,16 +208,16 @@ fn get_action_context_for_trick(
         runner.clone(),
         current_log_level,
         logger,
-        full_ctx
-            .procs_ctx
-            .tricks_to_installing_pids
-            .contains_key(&trick.id),
+        full_ctx.is_installing(&trick.id),
+        full_ctx.is_added_to_steam(&trick.id),
     );
     let provider = DynTrickProvider::new(&ctx, full_ctx);
 
     // TODO: unit/integration test that this all works as expected
     let is_installing = provider.is_installing();
     let is_running = provider.is_running();
+    let is_added_to_steam = provider.is_added_to_steam();
+
     let available_actions = provider
         .get_available_actions()
         .iter()
@@ -224,6 +227,7 @@ fn get_action_context_for_trick(
         trick_id: trick.id.clone(),
         is_installing,
         is_running,
+        is_added_to_steam,
         available_actions,
     }
 }

src/actions/specific.rs

@@ -50,10 +50,10 @@ impl Default for SpecificActionID {
 
 impl SpecificActionID {
     #[must_use]
-    pub fn get_display_name(&self, is_ongoing: bool) -> &'static str {
+    pub fn get_display_name(&self, is_ongoing: bool, is_completed: bool) -> &'static str {
         match self {
             Self::Run => if is_ongoing { "Running" } else { "Run" },
-            Self::AddToSteam => "Add To Steam",
+            Self::AddToSteam => if is_completed { "Added To Steam" } else { "Add To Steam" },
             Self::Install => if is_ongoing { "Installing" } else { "Install" },
             Self::Uninstall => if is_ongoing { "Uninstalling" } else { "Uninstall" },
             Self::Update => if is_ongoing { "Updating" } else { "Update" },
@@ -68,7 +68,7 @@ impl SpecificActionID {
         all_vars
             .into_iter()
             .map(|v| {
-                let dname = v.get_display_name(false);
+                let dname = v.get_display_name(false, false);
                 (v.to_string(), dname)
             })
             .collect()
@@ -156,8 +156,10 @@ impl SpecificAction {
             runner.clone(),
             current_log_level,
             logger,
-            // In the context of actually taking an action, we don't care if we're installing,
-            // since at the moment is_installing is purely for cosmetic purposes
+            // In the context of actually taking an action, we don't care if we're installing
+            // or added to Steam, since at the moment these are purely for cosmetic purposes
+            // TODO: code smell
+            false,
             false,
         );
         let provider = DynTrickProvider::new(&ctx, full_ctx);