More refactoring

src/cold_clear.rs

@@ -3,10 +3,10 @@ use std::thread;
 use std::time::{Instant, Duration};
 use std::sync::{mpsc, Arc, Mutex};
 use slint::SharedString;
+use slint::ComponentHandle;
 use tokio::runtime::Runtime;
 use crate::dirs::paths;
-
-slint::include_modules!();
+use crate::slint_types::ColdClearWaitWindow;
 
 enum LoadingIPCMessage {
     AdvanceTo(

src/conf.rs

@@ -1,10 +1,9 @@
 use std::fs;
 use crate::dirs::paths;
 use crate::git;
+use crate::slint_types::Settings;
 use serde::{Serialize, Deserialize};
 
-slint::include_modules!();
-
 #[derive(Serialize, Deserialize, Clone, Debug)]
 pub struct Config {
     // Editing this struct?
@@ -146,4 +145,31 @@ impl Default for Config {
     fn default() -> Self {
         return Self::new();
     }
+}
+
+impl From<Settings> for Config {
+    fn from(settings: Settings) -> Self {
+        Self {
+            sandboxed: settings.sandboxed,
+            clear_temp_dir: settings.clear_temp_dir,
+            import_save_on_play: settings.import_save_on_play,
+            repo_initialized: settings.repo_initialized,
+            game_repo_path: settings.game_repo_path.as_str().to_string(),
+            use_gui: true,
+            use_cold_clear: settings.use_cold_clear,
+        }
+    }
+}
+
+impl From<Config> for Settings {
+    fn from(cfg: Config) -> Self {
+        Self {
+            sandboxed: cfg.sandboxed,
+            clear_temp_dir: cfg.clear_temp_dir,
+            import_save_on_play: cfg.import_save_on_play,
+            game_repo_path: cfg.game_repo_path.clone().into(),
+            repo_initialized: cfg.repo_initialized,
+            use_cold_clear: cfg.use_cold_clear,
+        }
+    }
 }

src/error_window.rs

@@ -1,4 +1,5 @@
-slint::include_modules!();
+use crate::slint_types::ErrorWindow;
+use slint::ComponentHandle;
 
 pub fn open(
     title: Option<String>,

src/git.rs

@@ -1,10 +1,8 @@
-use crate::dirs;
+use crate::slint_types::GitCloneWaitWindow;
 use std::fs;
 use std::io;
 use std::process::{Command, ExitStatus, Stdio};
-use slint::{SharedString};
-
-slint::include_modules!();
+use slint::{SharedString, ComponentHandle};
 
 pub fn tags(repo_path: &str) -> Vec<String> {
     let mut cmd = Command::new("git");

src/main.rs

@@ -26,7 +26,7 @@ mod git;
 mod main_window;
 mod error_window;
 mod setup;
-
+mod slint_types;
 fn main() -> Result<(), slint::PlatformError> {
     print_intro();
 

src/main_window.rs

@@ -5,9 +5,8 @@ use crate::conf::Config;
 use crate::game;
 use crate::git;
 use crate::error_window;
-use slint::{ModelRc, VecModel, SharedString};
-
-slint::include_modules!();
+use crate::slint_types::{Settings, MainWindow};
+use slint::{ModelRc, VecModel, SharedString, ModelExt, ComponentHandle};
 
 pub fn open(cfg: &Config) -> Result<MainWindow, slint::PlatformError> {
     let main_window = MainWindow::new()?;
@@ -64,14 +63,7 @@ pub fn open(cfg: &Config) -> Result<MainWindow, slint::PlatformError> {
             );
         }
     });
-    main_window.set_settings(Settings {
-        sandboxed: cfg.sandboxed,
-        clear_temp_dir: cfg.clear_temp_dir,
-        import_save_on_play: cfg.import_save_on_play,
-        game_repo_path: cfg.game_repo_path.clone().into(),
-        repo_initialized: cfg.repo_initialized,
-        use_cold_clear: cfg.use_cold_clear,
-    });
+    main_window.set_settings(cfg.clone().into());
     main_window.set_is_wayland_used(is_wayland_session());
     main_window.set_versions(
         ModelRc::new(

src/setup.rs

@@ -1,12 +1,12 @@
 use crate::error_window;
+use crate::slint_types::SetupWindow;
 use crate::git;
 use crate::conf;
+use crate::dirs;
 use rfd::FileDialog;
 use std::cell::RefCell;
-use crate::dirs;
 use std::rc::Rc;
-
-slint::include_modules!();
+use slint::ComponentHandle;
 
 pub fn run_setup() -> Result<(), slint::PlatformError> {
     // Wrap `setup_finished` and `setup_window` in Rc<RefCell> for shared access.

src/slint_types.rs

@@ -0,0 +1 @@
+slint::include_modules!();