implement path

Author: Swarkin

Cargo.toml

@@ -13,3 +13,4 @@ panic = "abort"
 eframe = { version = "0.28.1", default-features = false, features = ["glow", "default_fonts"] }
 serde = { version = "1.0", features = ["derive"] }
 indexmap = "2.5.0"
+rfd = "0.14.1"

src/app.rs

@@ -7,17 +7,18 @@ pub struct GodotSconsGUI {
 	state: AppState,
 }
 
-#[derive(Debug, Default)]
+#[derive(Debug)]
 pub enum AppState {
-	#[default] Start,
+	Start(StartState),
 	Clone(CloneState),
 	Setup(SetupState),
 	Build(BuildState),
 }
 
+
 impl AppState {
 	pub fn start() -> Self {
-		AppState::Start
+		AppState::Start(Default::default())
 	}
 	pub fn clone() -> Self {
 		AppState::Clone(Default::default())
@@ -30,6 +31,12 @@ impl AppState {
 	}
 }
 
+impl Default for AppState {
+	fn default() -> Self {
+		Self::Start(Default::default())
+	}
+}
+
 
 impl GodotSconsGUI {
 	pub fn new(cc: &eframe::CreationContext) -> Self {
@@ -60,14 +67,14 @@ impl eframe::App for GodotSconsGUI {
 		}
 
 		let new_state = match &mut self.state {
-			AppState::Start => start::show(ctx),
+			AppState::Start(state) => start::show(state, ctx),
 			AppState::Clone(state) => clone::show(state, ctx),
 			AppState::Setup(state) => setup::show(state, ctx),
 			AppState::Build(state) => build::show(state, ctx),
 		};
 
 		if let Some(s) = new_state {
-			println!("Transitioning to {s:?}");
+			#[cfg(debug_assertions)] println!("Transitioning to {s:?}");
 			self.state = s;
 		}
 	}

src/main.rs

@@ -2,7 +2,6 @@
 
 mod app;
 mod options;
-mod states;
 mod views;
 
 use eframe::egui;

src/states.rs

@@ -6,8 +6,9 @@ pub mod build;
 pub use build::BuildState;
 pub use clone::CloneState;
 pub use setup::SetupState;
+pub use start::StartState;
 
 use crate::app::AppState;
 use eframe::egui;
-use egui::{Align, Button, Color32, Context, Frame, Layout, Stroke, TextEdit, Vec2};
+use egui::{Align, Button, Color32, Context, Frame, Label, Layout, Stroke, TextEdit, Vec2};
 use egui::{CentralPanel, ScrollArea, TopBottomPanel};

src/views.rs

@@ -1,7 +1,9 @@
 use super::*;
 
 #[derive(Debug, Default)]
-pub struct BuildState {}
+pub struct BuildState {
+	pub path: String,
+}
 
 pub fn show(state: &mut BuildState, ctx: &Context) -> Option<AppState> {
 	CentralPanel::default().show(ctx, |_ui| {});

src/views/build.rs

@@ -4,6 +4,7 @@ use std::sync::mpsc::Receiver;
 
 #[derive(Debug, Default)]
 pub struct CloneState {
+	pub path: String,
 	pub rx: Option<Receiver<i32>>,
 	pub status: Option<i32>,
 }
@@ -21,6 +22,7 @@ pub fn show(state: &mut CloneState, ctx: &egui::Context) -> Option<AppState> {
 					let (tx, rx) = std::sync::mpsc::channel::<i32>();
 					state.rx = Some(rx);
 
+					let path = state.path.clone();
 					std::thread::spawn(move || {
 						let status = Command::new("git")
 							.args([
@@ -31,7 +33,7 @@ pub fn show(state: &mut CloneState, ctx: &egui::Context) -> Option<AppState> {
 								"4.3-stable",
 								"https://github.com/godotengine/godot",
 							])
-							.current_dir("D:/Godot/test")
+							.current_dir(path)
 							.status()
 							.unwrap()
 							.code()
@@ -62,7 +64,7 @@ pub fn show(state: &mut CloneState, ctx: &egui::Context) -> Option<AppState> {
 
 					let btn = Button::new("Continue ➡");
 					if ui.add_sized(Vec2::new(100., 40.), btn).clicked() {
-						return Some(AppState::setup());
+						return Some(AppState::Setup(SetupState { path: state.path.clone(), ..Default::default()}));
 					}
 				} else {
 					ui.add_space(10.);

src/views/clone.rs

@@ -1,6 +1,5 @@
 use super::*;
 use crate::{OptionDetail, Options};
-use eframe::egui::Label;
 use std::collections::HashMap;
 use std::process::Command;
 use std::sync::mpsc::{channel, Receiver};
@@ -18,6 +17,7 @@ pub enum SetupScreen {
 
 #[derive(Debug, Default)]
 pub struct SetupState {
+	pub path: String,
 	pub changes: Changes,
 	pub cmd: String,
 	pub screen: SetupScreen,
@@ -27,55 +27,53 @@ impl SetupState {
 	fn compute_command(&mut self) {
 		let mut cmd = String::from("scons");
 		for (k, v) in &self.changes {
-			cmd += &format!(" {k}={v}");
+			cmd += &format!(" {k}={}", v.replace(' ', "_"));
 		}
 		self.cmd = cmd;
 	}
 }
 
 pub fn show(state: &mut SetupState, ctx: &Context) -> Option<AppState> {
-	//state.compute_command();
 	TopBottomPanel::bottom("cmd")
 		.max_height(150.)
 		.resizable(true)
 		.show(ctx, |ui| {
 			ScrollArea::vertical().show(ui, |ui| {
 				ui.add_space(6.);
 
-				Frame::default()
-					.inner_margin(6.)
-					.rounding(6.)
-					.fill(Color32::from_rgb(22, 22, 22))
-					.stroke(Stroke::new(2., Color32::from_rgb(15, 15, 15)))
-					.show(ui, |ui| {
-						//ui.allocate_space(Vec2::new(ui.available_width(), 0.));
-						
-						let text = egui::RichText::new(&state.cmd).monospace();
-						let label = Label::new(text);
-						ui.add_sized(Vec2::new(ui.available_width() - ui.spacing().item_spacing.x - 40., f32::INFINITY), label);
-
-						if ui.add_sized(Vec2::new(ui.available_width(), f32::INFINITY), Button::new("📋")).clicked() {
-							ui.ctx().copy_text(state.cmd.clone());
-						}
+				ui.with_layout(Layout::right_to_left(Align::Center), |ui| {
+					if ui.button("📋 Copy").clicked() {
+						ui.ctx().copy_text(state.cmd.clone());
+					}
+					Frame::default()
+						.inner_margin(6.)
+						.rounding(6.)
+						.fill(Color32::from_rgb(22, 22, 22))
+						.stroke(Stroke::new(2., Color32::from_rgb(15, 15, 15)))
+						.show(ui, |ui| {
+							let text = egui::RichText::new(&state.cmd).monospace();
+							ui.add_sized(ui.available_size(), Label::new(text));
+						});
+				});
 
-					});
 			});
-			ui.allocate_space(Vec2::new(0., ui.available_height()));
 		});
 	CentralPanel::default().show(ctx, |ui| {
 		ScrollArea::vertical()
 			.auto_shrink(false)
 			.show(ui, |ui| {
+				ui.label(&state.path);
 				match &state.screen {
 					SetupScreen::Start => {
 						let btn = Button::new("Load compilation options");
 						if ui.add_sized(Vec2::new(200., 30.), btn).clicked() {
 							let (tx, rx) = channel();
-							
+
+							let path = state.path.clone() + "/godot";
 							spawn(move || {
 								let output = Command::new("scons")
 									.arg("--help")
-									.current_dir("D:/Godot/test/godot")
+									.current_dir(path)
 									.output()
 									.unwrap();
 

src/views/setup.rs

@@ -1,15 +1,29 @@
 use super::*;
 
-pub fn show(ctx: &Context) -> Option<AppState> {
+#[derive(Debug, Default)]
+pub struct StartState {
+	pub path: Option<String>,
+}
+
+pub fn show(state: &mut StartState, ctx: &Context) -> Option<AppState> {
 	CentralPanel::default()
 		.show(ctx, |ui| {
+			let btn_size = Vec2::new(180., 80.);
 			ui.vertical_centered(|ui| {
-				let btn = Button::new("➕ Create");
-				if ui.add_sized(Vec2::new(180., 80.), btn).clicked() {
-					Some(AppState::clone())
-				} else {
-					None
+				if ui.add_sized(btn_size, Button::new("📁 Choose Directory")).clicked() {
+					if let Some(path) = rfd::FileDialog::new().pick_folder() {
+						state.path = Some(path.display().to_string());
+					}
 				}
+				
+				ui.add_enabled_ui(state.path.is_some(), |ui| {
+					ui.add_space(8.);
+					
+					return if ui.add_sized(btn_size, Button::new("➕ Create")).clicked() {
+						let path = state.path.as_ref().unwrap().to_owned();
+						Some(AppState::Clone(CloneState { path, ..Default::default() }))
+					} else { None }
+				}).inner
 			})
 		}).inner.inner
 }