From f02b7be878db4a9b9d161497332daf425d68f55a Mon Sep 17 00:00:00 2001 From: Mikolaj Wielgus Date: Tue, 8 Oct 2024 04:46:54 +0200 Subject: [PATCH] style(egui): update to match locale string tags --- src/bin/topola-egui/app.rs | 12 +++++----- src/bin/topola-egui/error_dialog.rs | 6 ++--- src/bin/topola-egui/menu_bar.rs | 34 ++++++++++++++--------------- 3 files changed, 26 insertions(+), 26 deletions(-) diff --git a/src/bin/topola-egui/app.rs b/src/bin/topola-egui/app.rs index aae1fde..740c6e7 100644 --- a/src/bin/topola-egui/app.rs +++ b/src/bin/topola-egui/app.rs @@ -126,7 +126,7 @@ impl App { format!( "{}; {}", self.translator - .text("tr-error_failed-to-parse-as-specctra-dsn"), + .text("tr-error-failed-to-parse-as-specctra-dsn"), err ), ); @@ -136,7 +136,7 @@ impl App { "tr-module-specctra-dsn-file-loader", format!( "{}; {}", - self.translator.text("tr-error_unable-to-read-file"), + self.translator.text("tr-error-unable-to-read-file"), err ), ); @@ -156,7 +156,7 @@ impl App { "tr-module-history-file-loader", format!( "{}; {}", - tr.text("tr-error_failed-to-parse-as-history-json"), + tr.text("tr-error-failed-to-parse-as-history-json"), err ), ); @@ -164,7 +164,7 @@ impl App { Err(err) => { self.error_dialog.push_error( "tr-module-history-file-loader", - format!("{}; {}", tr.text("tr-error_unable-to-read-file"), err), + format!("{}; {}", tr.text("tr-error-unable-to-read-file"), err), ); } } @@ -195,7 +195,7 @@ impl App { let overlay = Overlay::new(&board).map_err(|err| { format!( "{}; {}", - tr.text("tr-error_unable-to-initialize-overlay"), + tr.text("tr-error-unable-to-initialize-overlay"), err ) })?; @@ -203,7 +203,7 @@ impl App { let autorouter = Autorouter::new(board).map_err(|err| { format!( "{}; {}", - tr.text("tr-error_unable-to-initialize-autorouter"), + tr.text("tr-error-unable-to-initialize-autorouter"), err ) })?; diff --git a/src/bin/topola-egui/error_dialog.rs b/src/bin/topola-egui/error_dialog.rs index 2058121..f721ad5 100644 --- a/src/bin/topola-egui/error_dialog.rs +++ b/src/bin/topola-egui/error_dialog.rs @@ -33,13 +33,13 @@ impl ErrorDialog { pub fn update(&mut self, ctx: &egui::Context, tr: &Translator) { let mut messages_cleared = false; - egui::Window::new(tr.text("tr-dialog-tr-error-messages")) + egui::Window::new(tr.text("tr-dialog-error-messages")) .id("error-messages-dialog".into()) .open(&mut self.window_open) .scroll(true) .show(ctx, |ui| { if ui - .button(tr.text("tr-dialog-tr-error-messages_reset")) + .button(tr.text("tr-dialog-error-messages-reset")) .clicked() { self.messages.clear(); @@ -77,7 +77,7 @@ impl ErrorDialog { // (provide alt text in that case!) if ui .add(egui::Button::new( - tr.text("tr-dialog-tr-error-messages_discard"), + tr.text("tr-dialog-error-messages-discard"), )) .clicked() { diff --git a/src/bin/topola-egui/menu_bar.rs b/src/bin/topola-egui/menu_bar.rs index ee67dc8..cd7830e 100644 --- a/src/bin/topola-egui/menu_bar.rs +++ b/src/bin/topola-egui/menu_bar.rs @@ -97,22 +97,22 @@ impl MenuBar { egui::Key::Q, )); let mut undo = Trigger::new(Action::new( - tr.text("tr-menu-edit_undo"), + tr.text("tr-menu-edit-undo"), egui::Modifiers::CTRL, egui::Key::Z, )); let mut redo = Trigger::new(Action::new( - tr.text("tr-menu-edit_redo"), + tr.text("tr-menu-edit-redo"), egui::Modifiers::CTRL, egui::Key::Y, )); let mut abort = Trigger::new(Action::new( - tr.text("tr-menu-edit_abort"), + tr.text("tr-menu-edit-abort"), egui::Modifiers::NONE, egui::Key::Escape, )); let mut remove_bands = Trigger::new(Action::new( - tr.text("tr-menu-edit_remove-bands"), + tr.text("tr-menu-edit-remove-bands"), egui::Modifiers::NONE, egui::Key::Delete, )); @@ -127,12 +127,12 @@ impl MenuBar { egui::Key::A, )); let mut compare_detours = Trigger::new(Action::new( - tr.text("tr-menu-inspect_compare-detours"), + tr.text("tr-menu-inspect-compare-detours"), egui::Modifiers::NONE, egui::Key::Minus, )); let mut measure_length = Trigger::new(Action::new( - tr.text("tr-menu-inspect_measure-length"), + tr.text("tr-menu-inspect-measure-length"), egui::Modifiers::NONE, egui::Key::Plus, )); @@ -173,32 +173,32 @@ impl MenuBar { ui.menu_button(tr.text("tr-menu-view"), |ui| { ui.toggle_value( &mut viewport.scheduled_zoom_to_fit, - tr.text("tr-menu-view_zoom-to-fit"), + tr.text("tr-menu-view-zoom-to-fit"), ); ui.separator(); ui.checkbox( &mut self.show_ratsnest, - tr.text("tr-menu-view_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_bboxes, tr.text("tr-menu-view_show-bboxes")); + 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_origin_destination, - tr.text("tr-menu-view_show-origin-destination"), + tr.text("tr-menu-view-show-origin-destination"), ); ui.separator(); ui.checkbox( &mut self.show_layer_manager, - tr.text("tr-menu-view_show-layer-manager"), + tr.text("tr-menu-view-show-layer-manager"), ); ui.separator(); - ui.label(tr.text("tr-menu-view_frame-timestep")); + ui.label(tr.text("tr-menu-view-frame-timestep")); ui.add( egui::widgets::Slider::new(&mut self.frame_timestep, 0.0..=3.0) .suffix(" s"), @@ -216,18 +216,18 @@ impl MenuBar { ui.menu_button(tr.text("tr-menu-options"), |ui| { ui.checkbox( &mut self.autorouter_options.presort_by_pairwise_detours, - tr.text("tr-menu-route-options_presort-by-pairwise-detours"), + tr.text("tr-menu-route-options-presort-by-pairwise-detours"), ); ui.checkbox( &mut self .autorouter_options .router_options .squeeze_through_under_bands, - tr.text("tr-menu-route-options_squeeze-through-under-bands"), + tr.text("tr-menu-route-options-squeeze-through-under-bands"), ); ui.checkbox( &mut self.autorouter_options.router_options.wrap_around_bands, - tr.text("tr-menu-route-options_wrap-around-bands"), + tr.text("tr-menu-route-options-wrap-around-bands"), ); }); }); @@ -275,7 +275,7 @@ impl MenuBar { } } let task = dialog - .add_filter(tr.text("tr-menu-open_specctra-session-file"), &["ses"]) + .add_filter(tr.text("tr-menu-open-specctra-session-file"), &["ses"]) .save_file(); execute(async move {