From 6ff5ca6bc5422272d4dd51da946bbd9ca785a58e Mon Sep 17 00:00:00 2001 From: Nathan Dane Date: Tue, 3 Nov 2026 18:47:24 +0000 Subject: [PATCH] Preferences: one heavier, evenly detailed icon set for the page tabs (#11368) * Preferences: one heavier, evenly detailed icon set for the page tabs * Build: import traced body records from their new owner * Build: read exported kernel records from their new crate --- ATTRIBUTION.md | 12 ++++++++++ assets/icons/ui/design/requested_icons.txt | 17 +++++++++---- .../ui/design/svg/flat/prefs_appearance.svg | 4 ++++ .../ui/design/svg/flat/prefs_assistant.svg | 4 ++++ .../icons/ui/design/svg/flat/prefs_design.svg | 4 ++++ .../ui/design/svg/flat/prefs_general.svg | 4 ++++ .../ui/design/svg/flat/prefs_graphics.svg | 4 ++++ .../icons/ui/design/svg/flat/prefs_layout.svg | 4 ++++ .../ui/design/svg/flat/prefs_mouse3d.svg | 4 ++++ .../ui/design/svg/flat/prefs_navigation.svg | 4 ++++ .../ui/design/svg/flat/prefs_plugins.svg | 4 ++++ .../ui/design/svg/flat/prefs_shortcuts.svg | 4 ++++ .../icons/ui/design/svg/flat/prefs_sketch.svg | 4 ++++ .../icons/ui/design/svg/flat/prefs_tools.svg | 4 ++++ crates/ui-egui/src/prefs.rs | 24 +++++++++---------- crates/ui-egui/src/settings_profiles.rs | 10 ++++---- 16 files changed, 89 insertions(+), 22 deletions(-) create mode 100644 assets/icons/ui/design/svg/flat/prefs_appearance.svg create mode 100644 assets/icons/ui/design/svg/flat/prefs_assistant.svg create mode 100644 assets/icons/ui/design/svg/flat/prefs_design.svg create mode 100644 assets/icons/ui/design/svg/flat/prefs_general.svg create mode 100644 assets/icons/ui/design/svg/flat/prefs_graphics.svg create mode 100644 assets/icons/ui/design/svg/flat/prefs_layout.svg create mode 100644 assets/icons/ui/design/svg/flat/prefs_mouse3d.svg create mode 100644 assets/icons/ui/design/svg/flat/prefs_navigation.svg create mode 100644 assets/icons/ui/design/svg/flat/prefs_plugins.svg create mode 100644 assets/icons/ui/design/svg/flat/prefs_shortcuts.svg create mode 100644 assets/icons/ui/design/svg/flat/prefs_sketch.svg create mode 100644 assets/icons/ui/design/svg/flat/prefs_tools.svg diff --git a/ATTRIBUTION.md b/ATTRIBUTION.md index 44e633668..ee04dfb25 100644 --- a/ATTRIBUTION.md +++ b/ATTRIBUTION.md @@ -245,6 +245,18 @@ Editable drawing code, native projects and shipped exports are collected under ` | assets/icons/ui/design/svg/flat/plus.svg | SolidCraft contributors | single-colour application/navigation icon master (64 grid), original SolidCraft artwork | MIT OR Apache-2.0 | | assets/icons/ui/design/svg/flat/pan.svg | SolidCraft contributors | single-colour application/navigation icon master (64 grid), original SolidCraft artwork | MIT OR Apache-2.0 | | assets/icons/ui/design/svg/flat/perspective.svg | SolidCraft contributors | single-colour application/navigation icon master (64 grid), original SolidCraft artwork | MIT OR Apache-2.0 | +| assets/icons/ui/design/svg/flat/prefs_appearance.svg | SolidCraft contributors | original icon master (64 grid) | MIT OR Apache-2.0 | +| assets/icons/ui/design/svg/flat/prefs_assistant.svg | SolidCraft contributors | original icon master (64 grid) | MIT OR Apache-2.0 | +| assets/icons/ui/design/svg/flat/prefs_design.svg | SolidCraft contributors | original icon master (64 grid) | MIT OR Apache-2.0 | +| assets/icons/ui/design/svg/flat/prefs_general.svg | SolidCraft contributors | original icon master (64 grid) | MIT OR Apache-2.0 | +| assets/icons/ui/design/svg/flat/prefs_graphics.svg | SolidCraft contributors | original icon master (64 grid) | MIT OR Apache-2.0 | +| assets/icons/ui/design/svg/flat/prefs_layout.svg | SolidCraft contributors | original icon master (64 grid) | MIT OR Apache-2.0 | +| assets/icons/ui/design/svg/flat/prefs_mouse3d.svg | SolidCraft contributors | original icon master (64 grid) | MIT OR Apache-2.0 | +| assets/icons/ui/design/svg/flat/prefs_navigation.svg | SolidCraft contributors | original icon master (64 grid) | MIT OR Apache-2.0 | +| assets/icons/ui/design/svg/flat/prefs_plugins.svg | SolidCraft contributors | original icon master (64 grid) | MIT OR Apache-2.0 | +| assets/icons/ui/design/svg/flat/prefs_shortcuts.svg | SolidCraft contributors | original icon master (64 grid) | MIT OR Apache-2.0 | +| assets/icons/ui/design/svg/flat/prefs_sketch.svg | SolidCraft contributors | original icon master (64 grid) | MIT OR Apache-2.0 | +| assets/icons/ui/design/svg/flat/prefs_tools.svg | SolidCraft contributors | original icon master (64 grid) | MIT OR Apache-2.0 | | assets/icons/ui/design/svg/flat/redo.svg | SolidCraft contributors | single-colour application/navigation icon master (64 grid), original SolidCraft artwork | MIT OR Apache-2.0 | | assets/icons/ui/design/svg/flat/save.svg | SolidCraft contributors | single-colour application/navigation icon master (64 grid), original SolidCraft artwork | MIT OR Apache-2.0 | | assets/icons/ui/design/svg/flat/settings.svg | SolidCraft contributors | single-colour application/navigation icon master (64 grid), original SolidCraft artwork | MIT OR Apache-2.0 | diff --git a/assets/icons/ui/design/requested_icons.txt b/assets/icons/ui/design/requested_icons.txt index 04f5dd9ec..54442b942 100644 --- a/assets/icons/ui/design/requested_icons.txt +++ b/assets/icons/ui/design/requested_icons.txt @@ -201,6 +201,18 @@ point_vertex false polygon false polygon_circumscribed false polygon_edge false +prefs_appearance false +prefs_assistant false +prefs_design false +prefs_general false +prefs_graphics false +prefs_layout false +prefs_mouse3d false +prefs_navigation false +prefs_plugins false +prefs_shortcuts false +prefs_sketch false +prefs_tools false presspull false print_face false project false @@ -232,11 +244,6 @@ section false select false send false settings false -settings_keyboard false -settings_monitor false -settings_mouse false -settings_palette false -settings_plug false settings_profile false sheet false sheet_rules false diff --git a/assets/icons/ui/design/svg/flat/prefs_appearance.svg b/assets/icons/ui/design/svg/flat/prefs_appearance.svg new file mode 100644 index 000000000..7b2de0a20 --- /dev/null +++ b/assets/icons/ui/design/svg/flat/prefs_appearance.svg @@ -0,0 +1,4 @@ + + Appearance + + diff --git a/assets/icons/ui/design/svg/flat/prefs_assistant.svg b/assets/icons/ui/design/svg/flat/prefs_assistant.svg new file mode 100644 index 000000000..e837db5f2 --- /dev/null +++ b/assets/icons/ui/design/svg/flat/prefs_assistant.svg @@ -0,0 +1,4 @@ + + Assistant + + diff --git a/assets/icons/ui/design/svg/flat/prefs_design.svg b/assets/icons/ui/design/svg/flat/prefs_design.svg new file mode 100644 index 000000000..d7779761b --- /dev/null +++ b/assets/icons/ui/design/svg/flat/prefs_design.svg @@ -0,0 +1,4 @@ + + Design + + diff --git a/assets/icons/ui/design/svg/flat/prefs_general.svg b/assets/icons/ui/design/svg/flat/prefs_general.svg new file mode 100644 index 000000000..2af3b2387 --- /dev/null +++ b/assets/icons/ui/design/svg/flat/prefs_general.svg @@ -0,0 +1,4 @@ + + General + + diff --git a/assets/icons/ui/design/svg/flat/prefs_graphics.svg b/assets/icons/ui/design/svg/flat/prefs_graphics.svg new file mode 100644 index 000000000..6cebe6617 --- /dev/null +++ b/assets/icons/ui/design/svg/flat/prefs_graphics.svg @@ -0,0 +1,4 @@ + + Graphics + + diff --git a/assets/icons/ui/design/svg/flat/prefs_layout.svg b/assets/icons/ui/design/svg/flat/prefs_layout.svg new file mode 100644 index 000000000..33e4fa587 --- /dev/null +++ b/assets/icons/ui/design/svg/flat/prefs_layout.svg @@ -0,0 +1,4 @@ + + Layout + + diff --git a/assets/icons/ui/design/svg/flat/prefs_mouse3d.svg b/assets/icons/ui/design/svg/flat/prefs_mouse3d.svg new file mode 100644 index 000000000..718f48a1d --- /dev/null +++ b/assets/icons/ui/design/svg/flat/prefs_mouse3d.svg @@ -0,0 +1,4 @@ + + 3D mouse + + diff --git a/assets/icons/ui/design/svg/flat/prefs_navigation.svg b/assets/icons/ui/design/svg/flat/prefs_navigation.svg new file mode 100644 index 000000000..197108965 --- /dev/null +++ b/assets/icons/ui/design/svg/flat/prefs_navigation.svg @@ -0,0 +1,4 @@ + + Navigation + + diff --git a/assets/icons/ui/design/svg/flat/prefs_plugins.svg b/assets/icons/ui/design/svg/flat/prefs_plugins.svg new file mode 100644 index 000000000..9de1501d9 --- /dev/null +++ b/assets/icons/ui/design/svg/flat/prefs_plugins.svg @@ -0,0 +1,4 @@ + + Plugins + + diff --git a/assets/icons/ui/design/svg/flat/prefs_shortcuts.svg b/assets/icons/ui/design/svg/flat/prefs_shortcuts.svg new file mode 100644 index 000000000..063bc7585 --- /dev/null +++ b/assets/icons/ui/design/svg/flat/prefs_shortcuts.svg @@ -0,0 +1,4 @@ + + Shortcuts + + diff --git a/assets/icons/ui/design/svg/flat/prefs_sketch.svg b/assets/icons/ui/design/svg/flat/prefs_sketch.svg new file mode 100644 index 000000000..3a3dc7a87 --- /dev/null +++ b/assets/icons/ui/design/svg/flat/prefs_sketch.svg @@ -0,0 +1,4 @@ + + Sketch + + diff --git a/assets/icons/ui/design/svg/flat/prefs_tools.svg b/assets/icons/ui/design/svg/flat/prefs_tools.svg new file mode 100644 index 000000000..41b8612a7 --- /dev/null +++ b/assets/icons/ui/design/svg/flat/prefs_tools.svg @@ -0,0 +1,4 @@ + + Tools + + diff --git a/crates/ui-egui/src/prefs.rs b/crates/ui-egui/src/prefs.rs index 39b2efce7..2c97ff1d1 100644 --- a/crates/ui-egui/src/prefs.rs +++ b/crates/ui-egui/src/prefs.rs @@ -339,7 +339,7 @@ pub const PAGE_PLUGINS: usize = 11; pub const PARAMETER_LIST_ROWS: std::ops::RangeInclusive = 5..=200; const WINDOW_PAGES: &[ui_kit::WindowPage] = &[ ui_kit::WindowPage { - icon: "settings", + icon: "prefs_general", label: "ui.general", group: None, handle: "prefs:page:General", @@ -347,7 +347,7 @@ const WINDOW_PAGES: &[ui_kit::WindowPage] = &[ draw: window_page::, }, ui_kit::WindowPage { - icon: "settings_palette", + icon: "prefs_appearance", label: "prefs.structure.appearance", group: Some("prefs.structure.look"), handle: "prefs:page:Appearance", @@ -355,7 +355,7 @@ const WINDOW_PAGES: &[ui_kit::WindowPage] = &[ draw: window_page::, }, ui_kit::WindowPage { - icon: "settings_monitor", + icon: "prefs_layout", label: "prefs.structure.layout", group: None, handle: "prefs:page:Layout", @@ -363,7 +363,7 @@ const WINDOW_PAGES: &[ui_kit::WindowPage] = &[ draw: window_page::, }, ui_kit::WindowPage { - icon: "settings_monitor", + icon: "prefs_graphics", label: "ui.graphics", group: None, handle: "prefs:page:Graphics", @@ -371,7 +371,7 @@ const WINDOW_PAGES: &[ui_kit::WindowPage] = &[ draw: window_page::, }, ui_kit::WindowPage { - icon: "ws_design", + icon: "prefs_design", label: "ui.design", group: Some("prefs.structure.work"), handle: "prefs:page:Design", @@ -379,7 +379,7 @@ const WINDOW_PAGES: &[ui_kit::WindowPage] = &[ draw: window_page::, }, ui_kit::WindowPage { - icon: "sketch", + icon: "prefs_sketch", label: "prefs.structure.sketch", group: None, handle: "prefs:page:Sketch", @@ -387,7 +387,7 @@ const WINDOW_PAGES: &[ui_kit::WindowPage] = &[ draw: window_page::, }, ui_kit::WindowPage { - icon: "settings", + icon: "prefs_tools", label: "prefs.structure.tools", group: None, handle: "prefs:page:Tools", @@ -395,7 +395,7 @@ const WINDOW_PAGES: &[ui_kit::WindowPage] = &[ draw: window_page::, }, ui_kit::WindowPage { - icon: "settings_mouse", + icon: "prefs_navigation", label: "ui.navigation", group: Some("prefs.input"), handle: "prefs:page:Navigation", @@ -403,7 +403,7 @@ const WINDOW_PAGES: &[ui_kit::WindowPage] = &[ draw: window_page::, }, ui_kit::WindowPage { - icon: "settings_mouse", + icon: "prefs_mouse3d", label: "prefs.structure.mouse3d", group: None, handle: "prefs:page:3D mouse", @@ -411,7 +411,7 @@ const WINDOW_PAGES: &[ui_kit::WindowPage] = &[ draw: window_page::, }, ui_kit::WindowPage { - icon: "settings_keyboard", + icon: "prefs_shortcuts", label: "prefs.shortcuts", group: None, handle: "prefs:page:Shortcuts", @@ -419,7 +419,7 @@ const WINDOW_PAGES: &[ui_kit::WindowPage] = &[ draw: window_page::, }, ui_kit::WindowPage { - icon: "assistant", + icon: "prefs_assistant", label: "prefs.assistant", group: Some("prefs.extend"), handle: "prefs:page:Assistant", @@ -427,7 +427,7 @@ const WINDOW_PAGES: &[ui_kit::WindowPage] = &[ draw: window_page::, }, ui_kit::WindowPage { - icon: "settings_plug", + icon: "prefs_plugins", label: "ui.plugins", group: None, handle: "prefs:page:Plugins", diff --git a/crates/ui-egui/src/settings_profiles.rs b/crates/ui-egui/src/settings_profiles.rs index b68f73529..14a31aa0c 100644 --- a/crates/ui-egui/src/settings_profiles.rs +++ b/crates/ui-egui/src/settings_profiles.rs @@ -639,11 +639,11 @@ pub(crate) fn section(app: &mut SolveApp, ui: &mut egui::Ui) { ( app.tr("prefs.general.held"), &[ - ("prefs.structure.appearance", "settings_palette"), - ("prefs.structure.layout", "settings_monitor"), - ("ui.navigation", "settings_mouse"), - ("prefs.structure.sketch", "select_sketch"), - ("prefs.shortcuts", "settings_keyboard"), + ("prefs.structure.appearance", "prefs_appearance"), + ("prefs.structure.layout", "prefs_layout"), + ("ui.navigation", "prefs_navigation"), + ("prefs.structure.sketch", "prefs_sketch"), + ("prefs.shortcuts", "prefs_shortcuts"), ("ui.language", "settings"), ][..], true,