diff --git a/Cargo.lock b/Cargo.lock index 111c2e2..ce118eb 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -548,7 +548,7 @@ dependencies = [ [[package]] name = "canvas-pilot" -version = "0.9.13" +version = "0.9.14" dependencies = [ "base64", "craft-dwg", diff --git a/Cargo.toml b/Cargo.toml index 9999009..9887c8f 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -4,7 +4,7 @@ default-members = ["crates/canvas-pilot"] resolver = "3" [workspace.package] -version = "0.9.13" +version = "0.9.14" edition = "2024" license = "MIT" repository = "https://proxy.dandaedre.com/gitea/idle-org/canvas-pilot" diff --git a/crates/canvas-pilot/src/gui.rs b/crates/canvas-pilot/src/gui.rs index b23f3cf..c474e1a 100644 --- a/crates/canvas-pilot/src/gui.rs +++ b/crates/canvas-pilot/src/gui.rs @@ -3145,7 +3145,14 @@ impl Editor { |ui| { ui.spacing_mut().interact_size = Vec2::new(36.0, 32.0); ui.spacing_mut().button_padding.x = 11.0; - let menu = toolbar_menu(ui, " ", |ui| self.viewport_options_menu(ui)); + let menu = toolbar_menu(ui, " ", |ui| { + if ui.button(tr(ui.ctx(), "ui.open-all-settings")).clicked() { + self.preferences_open = true; + ui.close(); + } + ui.separator(); + self.viewport_options_menu(ui); + }); let response = menu .response .on_hover_text(tr(ui.ctx(), "ui.viewport-options")); diff --git a/crates/canvas-pilot/src/menu_ui.rs b/crates/canvas-pilot/src/menu_ui.rs index 2146c1e..d90d409 100644 --- a/crates/canvas-pilot/src/menu_ui.rs +++ b/crates/canvas-pilot/src/menu_ui.rs @@ -162,11 +162,6 @@ impl Editor { } } pub(super) fn viewport_options_menu(&mut self, ui: &mut egui::Ui) { - if ui.button(tr(ui.ctx(), "ui.open-all-settings")).clicked() { - self.preferences_open = true; - ui.close(); - } - ui.separator(); self.snapping_menu(ui); ui.menu_button(tr(ui.ctx(), "ui.example-backdrop"), |ui| { self.backdrop_options(ui) diff --git a/docs/canvas-pilot/changelog.md b/docs/canvas-pilot/changelog.md index 1a20d46..2ab4dce 100644 --- a/docs/canvas-pilot/changelog.md +++ b/docs/canvas-pilot/changelog.md @@ -4,6 +4,14 @@ ## Unreleased +### v0.9.14 + +- Removed the duplicate Open all settings entry from Menu → Options. Full settings + remain directly in Menu and in the standalone toolbar cog; Options keeps the + quick controls. No saved preferences or shortcuts changed. +- Verified the native menus and settings shortcut; required checks passed, with + whole-application line coverage at 91.54%. + ### v0.9.13 - Added optional Mask edges snapping for movement, resize targets and pivots, diff --git a/docs/canvas-pilot/guide/preferences.md b/docs/canvas-pilot/guide/preferences.md index fddd74e..93cca51 100644 --- a/docs/canvas-pilot/guide/preferences.md +++ b/docs/canvas-pilot/guide/preferences.md @@ -6,15 +6,19 @@ The header’s **Menu** brings the application’s commands together: +- **Open all settings…**: the full preferences window. - **Project**: open/save JSON and export SVG. - **Import**: SVG, clipboard layer values, and reference images. - **Edit**: undo/redo, copy values, select all editable layers, or deselect. - **View**: fit screen/selection, 1:1 pixels, output format, and reference settings. - **Layers**: selected-layer properties, crop/reset, alignment, shared resizing, lock/hide, and per-layer selection/visibility/lock controls. -- **Options**: resize aspect ratio and the source-coordinate preview. +- **Options**: quick controls for snapping, backdrop, theme, outlines, toolbar + captions, resize aspect ratio and the source-coordinate preview. The full + settings shortcut stays at the top of Menu, rather than repeating here. The toolbar, cog and right-click shortcuts use the same commands and preferences. +The standalone cog also provides **Open all settings…** above its quick controls. Detailed numeric controls remain in their existing properties dialogs. Enable **Options → Show toolbar icon names** (also available from the toolbar cog)