diff --git a/Cargo.toml b/Cargo.toml index 86a5594..3681cac 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -50,3 +50,6 @@ lto = true codegen-units = 1 incremental = false panic = "abort" + +[build-dependencies] +winresource = "0.1.17" diff --git a/assets/icon.ico b/assets/icon.ico new file mode 100644 index 0000000..600e523 Binary files /dev/null and b/assets/icon.ico differ diff --git a/build.rs b/build.rs new file mode 100644 index 0000000..14b46ac --- /dev/null +++ b/build.rs @@ -0,0 +1,23 @@ +use { + std::{env, io}, + winresource::WindowsResource, +}; + +use std::process::Command; + +fn main() -> io::Result<()> { + if env::var_os("CARGO_CFG_WINDOWS").is_some() { + WindowsResource::new() + // This path can be absolute, or relative to your crate root. + .set_icon("assets/icon.ico") + .compile()?; + } + + let output = Command::new("git") + .args(&["rev-parse", "--short", "HEAD"]) + .output() + .unwrap(); + let git_hash = String::from_utf8(output.stdout).unwrap(); + println!("cargo:rustc-env=GIT_HASH={}", git_hash); + Ok(()) +} diff --git a/src/ui.rs b/src/ui.rs index b2f401a..5f42fe7 100644 --- a/src/ui.rs +++ b/src/ui.rs @@ -151,6 +151,11 @@ impl<'a> AppInfo<'a> { ) .repeat_highlight_symbol(true), ); + self.status_message = format!( + "TinyWB version {}-{}, by the Dandaedre 🄯 2024", + env!("CARGO_PKG_VERSION"), + env!("GIT_HASH") + ); self.update_color() } @@ -167,20 +172,26 @@ impl<'a> AppInfo<'a> { /// Draw the final configuration labels fn draw_final_config(&mut self, frame: &mut Frame<'_>) -> Result<(), TinyUIError> { - let [title_area, main_area, _, status_area] = Layout::vertical([ - Constraint::Length(2), + let [_, spaced, _] = Layout::horizontal([ + Constraint::Min(7), + Constraint::Percentage(100), + Constraint::Min(7), + ]) + .areas(frame.area()); + let [_, title_area, _, main_area, _, status_area] = Layout::vertical([ + Constraint::Length(1), + Constraint::Length(3), + Constraint::Length(1), Constraint::Length(3), Constraint::Min(0), Constraint::Length(1), ]) - .areas(frame.area()); - let [_, area_minf, area_maxf, area_points, repeat, _] = Layout::horizontal([ - Constraint::Min(7), + .areas(spaced); + let [area_minf, area_maxf, area_points, repeat] = Layout::horizontal([ Constraint::Percentage(25), Constraint::Percentage(25), Constraint::Percentage(25), Constraint::Percentage(25), - Constraint::Min(7), ]) .areas(main_area); // TODO: Move this in the color update @@ -239,7 +250,10 @@ impl<'a> AppInfo<'a> { ); self.update_color()?; - frame.render_widget(Paragraph::new(self.status_message.clone()), title_area); + frame.render_widget( + Paragraph::new(self.status_message.clone()).block(Block::bordered()), + title_area, + ); self.render_footer(frame, status_area); Ok(()) } @@ -267,19 +281,23 @@ impl<'a> AppInfo<'a> { /// Draw the config info fn draw_config(&mut self, frame: &mut Frame) -> Result<(), TinyUIError> { - let [title_area, main_area, status_area] = Layout::vertical([ - Constraint::Length(2), + let [_, spaced, _] = Layout::horizontal([ + Constraint::Min(7), + Constraint::Percentage(100), + Constraint::Min(7), + ]) + .areas(frame.area()); + let [_, title_area, _, main_area, status_area] = Layout::vertical([ + Constraint::Length(1), + Constraint::Length(3), + Constraint::Length(1), Constraint::Min(10), Constraint::Length(1), ]) - .areas(frame.area()); - let [_, area_ports, area_baud, _] = Layout::horizontal([ - Constraint::Min(7), - Constraint::Percentage(50), - Constraint::Percentage(50), - Constraint::Min(7), - ]) - .areas(main_area); + .areas(spaced); + let [area_ports, area_baud] = + Layout::horizontal([Constraint::Percentage(50), Constraint::Percentage(50)]) + .areas(main_area); let list_ports = self .menu_items .portlist @@ -293,7 +311,10 @@ impl<'a> AppInfo<'a> { // self.status_message = format!("{:?} ", self.flow_state); frame.render_stateful_widget(list_ports, area_ports, &mut self.port_list.state); frame.render_stateful_widget(list_baudrates, area_baud, &mut self.baudrate.state); - frame.render_widget(Paragraph::new(self.status_message.clone()), title_area); + frame.render_widget( + Paragraph::new(self.status_message.clone()).block(Block::bordered()), + title_area, + ); self.render_footer(frame, status_area); Ok(()) }