berkus
/
topola
mirror of https://codeberg.org/topola/topola.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

egui: run cargo fmt

This commit is contained in:
Alain Emilia Anna Zscheile 2024-10-04 02:16:45 +02:00
parent ee9ccf5fd6
commit 68d4589e81
3 changed files with 48 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
src/bin/topola-egui/app.rs
View File

@ -115,7 +115,8 @@ impl App {
Ok(design) => match self.load_specctra_dsn(design) { Ok(design) => match self.load_specctra_dsn(design) {
Ok(()) => {} Ok(()) => {}
Err(err) => { Err(err) => {
self.error_dialog.push_error("tr-module-specctra-dsn-file-loader", err); self.error_dialog
.push_error("tr-module-specctra-dsn-file-loader", err);
} }
}, },
Err(SpecctraLoadingError::Parse(err)) => { Err(SpecctraLoadingError::Parse(err)) => {
@ -123,7 +124,8 @@ impl App {
"tr-module-specctra-dsn-file-loader", "tr-module-specctra-dsn-file-loader",
format!( format!(
"{}; {}", "{}; {}",
self.translator.text("tr-error_failed-to-parse-as-specctra-dsn"), self.translator
.text("tr-error_failed-to-parse-as-specctra-dsn"),
err err
), ),
); );
@ -131,7 +133,11 @@ impl App {
Err(SpecctraLoadingError::Io(err)) => { Err(SpecctraLoadingError::Io(err)) => {
self.error_dialog.push_error( self.error_dialog.push_error(
"tr-module-specctra-dsn-file-loader", "tr-module-specctra-dsn-file-loader",
format!("{}; {}", self.translator.text("tr-error_unable-to-read-file"), err), format!(
"{}; {}",
self.translator.text("tr-error_unable-to-read-file"),
err
),
); );
} }
} }
@ -147,7 +153,11 @@ impl App {
Ok(Err(err)) => { Ok(Err(err)) => {
self.error_dialog.push_error( self.error_dialog.push_error(
"tr-module-history-file-loader", "tr-module-history-file-loader",
format!("{}; {}", tr.text("tr-error_failed-to-parse-as-history-json"), err), format!(
"{}; {}",
tr.text("tr-error_failed-to-parse-as-history-json"),
err
),
); );
} }
Err(err) => { Err(err) => {
@ -164,7 +174,8 @@ impl App {
Ok(ActivityStatus::Running) => true, Ok(ActivityStatus::Running) => true,
Ok(ActivityStatus::Finished(..)) => false, Ok(ActivityStatus::Finished(..)) => false,
Err(err) => { Err(err) => {
self.error_dialog.push_error("tr-module-invoker", format!("{}", err)); self.error_dialog
.push_error("tr-module-invoker", format!("{}", err));
false false
} }
}; };
@ -177,11 +188,21 @@ impl App {
fn load_specctra_dsn(&mut self, design: SpecctraDesign) -> Result<(), String> { fn load_specctra_dsn(&mut self, design: SpecctraDesign) -> Result<(), String> {
let tr = &self.translator; let tr = &self.translator;
let board = design.make_board(); let board = design.make_board();
let overlay = Overlay::new(&board) let overlay = Overlay::new(&board).map_err(|err| {
.map_err(|err| format!("{}; {}", tr.text("tr-error_unable-to-initialize-overlay"), err))?; format!(
"{}; {}",
tr.text("tr-error_unable-to-initialize-overlay"),
err
)
})?;
let layers = Layers::new(&board); let layers = Layers::new(&board);
let autorouter = Autorouter::new(board) let autorouter = Autorouter::new(board).map_err(|err| {
.map_err(|err| format!("{}; {}", tr.text("tr-error_unable-to-initialize-autorouter"), err))?; format!(
"{}; {}",
tr.text("tr-error_unable-to-initialize-autorouter"),
err
)
})?;
self.maybe_overlay = Some(overlay); self.maybe_overlay = Some(overlay);
self.maybe_layers = Some(layers); self.maybe_layers = Some(layers);
self.maybe_design = Some(design); self.maybe_design = Some(design);

12
src/bin/topola-egui/error_dialog.rs
View File

@ -38,7 +38,10 @@ impl ErrorDialog {
.open(&mut self.window_open) .open(&mut self.window_open)
.scroll(true) .scroll(true)
.show(ctx, |ui| { .show(ctx, |ui| {
if ui.button(tr.text("tr-dialog-tr-error-messages_reset")).clicked() { if ui
.button(tr.text("tr-dialog-tr-error-messages_reset"))
.clicked()
{
self.messages.clear(); self.messages.clear();
messages_cleared = true; messages_cleared = true;
} }
@ -72,7 +75,12 @@ impl ErrorDialog {
// TODO: perhaps alternatively, use small icon instead? // TODO: perhaps alternatively, use small icon instead?
// (provide alt text in that case!) // (provide alt text in that case!)
if ui.add(egui::Button::new(tr.text("tr-dialog-tr-error-messages_discard"))).clicked() { if ui
.add(egui::Button::new(
tr.text("tr-dialog-tr-error-messages_discard"),
))
.clicked()
{
messages_to_discard.insert(msg_id); messages_to_discard.insert(msg_id);
} }
ui.label(WidgetText::LayoutJob(loj)); ui.label(WidgetText::LayoutJob(loj));

10
src/bin/topola-egui/menu_bar.rs
View File

@ -177,7 +177,10 @@ impl MenuBar {
ui.separator(); ui.separator();
ui.checkbox(&mut self.show_ratsnest, tr.text("tr-menu-view_show-ratsnest")); ui.checkbox(
&mut self.show_ratsnest,
tr.text("tr-menu-view_show-ratsnest"),
);
ui.checkbox(&mut self.show_navmesh, tr.text("tr-menu-view_show-navmesh")); ui.checkbox(&mut self.show_navmesh, tr.text("tr-menu-view_show-navmesh"));
ui.checkbox(&mut self.show_bboxes, tr.text("tr-menu-view_show-bboxes")); ui.checkbox(&mut self.show_bboxes, tr.text("tr-menu-view_show-bboxes"));
ui.checkbox( ui.checkbox(
@ -187,7 +190,10 @@ impl MenuBar {
ui.separator(); ui.separator();
ui.checkbox(&mut self.show_layer_manager, tr.text("tr-menu-view_show-layer-manager")); ui.checkbox(
&mut self.show_layer_manager,
tr.text("tr-menu-view_show-layer-manager"),
);
ui.separator(); ui.separator();