From cf52c95113700e1045201a79587f3fab95cb0bd6 Mon Sep 17 00:00:00 2001
From: Mikolaj Wielgus <wielgusmikolaj@gmail.com>
Date: Mon, 9 Sep 2024 15:20:48 +0200
Subject: [PATCH] egui: arrange the menus more typically

---
 locales/en-US/main.ftl     |  6 ++++
 src/bin/topola-egui/top.rs | 61 +++++++++++++++++++-------------------
 2 files changed, 37 insertions(+), 30 deletions(-)

diff --git a/locales/en-US/main.ftl b/locales/en-US/main.ftl
index 319d288..6d5a9c4 100644
--- a/locales/en-US/main.ftl
+++ b/locales/en-US/main.ftl
@@ -1,4 +1,10 @@
 menu-file = File
+menu-edit = Edit
+menu-view = View
+menu-place = Place
+menu-route = Route
+menu-inspect = Inspect
+
 menu-options = Options
 menu-debug = Debug
 
diff --git a/src/bin/topola-egui/top.rs b/src/bin/topola-egui/top.rs
index e48ff14..b959950 100644
--- a/src/bin/topola-egui/top.rs
+++ b/src/bin/topola-egui/top.rs
@@ -140,39 +140,15 @@ impl Top {
                         }
                     });
 
-                    ui.separator();
+                    ui.menu_button(tr.text("menu-edit"), |ui| {
+                        undo.button(ctx, ui);
+                        redo.button(ctx, ui);
 
-                    autoroute.button(ctx, ui);
-
-                    ui.menu_button(tr.text("menu-options"), |ui| {
-                        ui.checkbox(
-                            &mut self.autorouter_options.presort_by_pairwise_detours,
-                            tr.text("presort-by-pairwise-detours"),
-                        );
-                        ui.checkbox(
-                            &mut self.autorouter_options.router_options.squeeze_under_bands,
-                            tr.text("squeeze-under-bands"),
-                        );
-                        ui.checkbox(
-                            &mut self.autorouter_options.router_options.wrap_around_bands,
-                            tr.text("wrap-around-bands"),
-                        );
+                        ui.separator();
+                        remove_bands.button(ctx, ui);
                     });
 
-                    ui.separator();
-
-                    place_via.toggle_widget(ctx, ui, &mut self.is_placing_via);
-
-                    remove_bands.button(ctx, ui);
-
-                    ui.separator();
-
-                    undo.button(ctx, ui);
-                    redo.button(ctx, ui);
-
-                    ui.separator();
-
-                    ui.menu_button(tr.text("menu-debug"), |ui| {
+                    ui.menu_button(tr.text("menu-view"), |ui| {
                         ui.checkbox(&mut self.show_ratsnest, tr.text("show-ratsnest"));
                         ui.checkbox(&mut self.show_navmesh, tr.text("show-navmesh"));
                         ui.checkbox(&mut self.show_bboxes, tr.text("show-bboxes"));
@@ -180,8 +156,33 @@ impl Top {
                             &mut self.show_origin_destination,
                             tr.text("show-origin-destination"),
                         );
+                    });
 
+                    ui.menu_button(tr.text("menu-place"), |ui| {
+                        place_via.toggle_widget(ctx, ui, &mut self.is_placing_via);
+                    });
+
+                    ui.menu_button(tr.text("menu-route"), |ui| {
+                        autoroute.button(ctx, ui);
                         ui.separator();
+
+                        ui.menu_button(tr.text("menu-options"), |ui| {
+                            ui.checkbox(
+                                &mut self.autorouter_options.presort_by_pairwise_detours,
+                                tr.text("presort-by-pairwise-detours"),
+                            );
+                            ui.checkbox(
+                                &mut self.autorouter_options.router_options.squeeze_under_bands,
+                                tr.text("squeeze-under-bands"),
+                            );
+                            ui.checkbox(
+                                &mut self.autorouter_options.router_options.wrap_around_bands,
+                                tr.text("wrap-around-bands"),
+                            );
+                        });
+                    });
+
+                    ui.menu_button(tr.text("menu-inspect"), |ui| {
                         compare_detours.button(ctx, ui);
                         measure_length.button(ctx, ui);
                     });