Merge pull request #197 from lilopkins/develop

0.21.0-rc.9
lilopkins · May 1, 2024 · a5a913c · a5a913c
2 parents c30690a + e3bd8e6
commit a5a913c
Show file tree

Hide file tree

Showing 6 changed files with 32 additions and 13 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -1,5 +1,5 @@
 [workspace.package]
-version = "0.21.0-rc.8"
+version = "0.21.0-rc.9"
 edition = "2021"
 
 [workspace]

diff --git a/testangel/src/ui/about.rs b/testangel/src/ui/about.rs
@@ -71,8 +71,14 @@ impl SimpleComponent for AppAbout {
 
         let engine_list = init.0;
         let action_map = init.1;
+        let mut env_var_data = String::new();
+        for (var, val) in std::env::vars() {
+            if var.starts_with("TA_") {
+                env_var_data.push_str(&format!("{var}={val}\n"));
+            }
+        }
         let log_data = format!(
-            "Debug data generated at: {}\nSoftware version: {}\nLocale: {} (system wanted: {:?})\n\nEngines:\n{:#?}\n\nActions:\n{:#?}",
+            "Debug data generated at: {}\nSoftware version: {}\nLocale: {} (system wanted: {:?})\n\nEnvironment:\n{env_var_data}\nEngines:\n{:#?}\n\nActions:\n{:#?}",
             chrono::Local::now(),
             env!("CARGO_PKG_VERSION"),
             lang::current_locale(),

diff --git a/testangel/src/ui/flows/action_component.rs b/testangel/src/ui/flows/action_component.rs
@@ -191,7 +191,7 @@ impl FactoryComponent for ActionComponent {
                                 1
                             };
                             sender.output(ActionComponentOutput::MoveStep(*from, to, offset)).unwrap();
-                            sender.input(ActionComponentInput::ProposedDrop { above: false, below: false, });
+                            sender.input(ActionComponentInput::ProposedDrop { above: false, below: false });
                             return true;
                         }
                         false

diff --git a/testangel/src/ui/flows/mod.rs b/testangel/src/ui/flows/mod.rs
@@ -712,9 +712,19 @@ impl Component for FlowsModel {
 
                 self.needs_saving = true;
             }
-            FlowInputs::PasteStep(idx, config) => {
+            FlowInputs::PasteStep(idx, mut config) => {
                 let flow = self.open_flow.as_mut().unwrap();
                 let idx = idx.max(0).min(flow.actions.len());
+
+                // Adjust step just about to paste
+                for (_param_idx, source) in config.parameter_sources.iter_mut() {
+                    if let ActionParameterSource::FromOutput(from_step, _output_idx) = source {
+                        if *from_step <= idx {
+                            *source = ActionParameterSource::Literal;
+                        }
+                    }
+                }
+
                 log::info!("Pasting step to {}", idx + 1);
                 flow.actions.insert(idx, config);
 
@@ -747,10 +757,13 @@ impl Component for FlowsModel {
                 let current_from = from.current_index();
                 let step = self.open_flow.as_ref().unwrap().actions[current_from].clone();
                 sender.input(FlowInputs::CutStep(from));
+
+                // Establish new position
                 let mut to = (to.current_index() as isize + offset).max(0) as usize;
                 if to > current_from && to > 0 {
                     to -= 1;
                 }
+
                 sender.input(FlowInputs::PasteStep(to, step));
             }
         }

diff --git a/testangel/src/ui/mod.rs b/testangel/src/ui/mod.rs
@@ -77,7 +77,7 @@ impl Component for AppModel {
             set_title: Some(&lang::lookup("app-name")),
             set_default_width: 800,
             set_default_height: 600,
-            set_icon_name: Some("testangel"),
+            set_icon_name: Some(relm4_icons::icon_names::TESTANGEL),
 
             gtk::Box {
                 set_orientation: gtk::Orientation::Vertical,