Adds icon, build script and shows build version

This commit is contained in:
Dandaedre 2024-09-27 03:05:46 -05:00
parent 82aa266e18
commit eccca9eb1c
4 changed files with 65 additions and 18 deletions

View File

@ -50,3 +50,6 @@ lto = true
codegen-units = 1
incremental = false
panic = "abort"
[build-dependencies]
winresource = "0.1.17"

BIN
assets/icon.ico Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 144 KiB

23
build.rs Normal file
View File

@ -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(())
}

View File

@ -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(())
}