Skip to content

SolidCraft: an open-source parametric 3D CAD application built in pure Rust. Desktop, web, and automation through MCP.

Preferences: one heavier, evenly detailed icon set for the page tabs (#11368)

Nathan Dane6ff5ca6bc542
diff --git a/ATTRIBUTION.md b/ATTRIBUTION.md
index 44e633668e..ee04dfb258 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 04f5dd9ec9..54442b9421 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 0000000000..7b2de0a200
--- /dev/null
+++ b/assets/icons/ui/design/svg/flat/prefs_appearance.svg
@@ -0,0 +1,4 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 64 64">
+ <title>Appearance</title>
+ <path d="M32 7.5C18 7.5 7.5 18.5 7.5 32C7.5 45.5 18.5 56.5 32 56.5C37.5 56.5 40 53 38 49C36 45 38.5 42 43 42L47.5 42C52.5 42 56.5 38 56.5 33C56.5 18.5 46 7.5 32 7.5Z" fill="none" stroke="currentColor" stroke-width="6.8" stroke-linejoin="round" stroke-linecap="round"/><circle cx="20" cy="33" r="4" fill="currentColor"/><circle cx="28" cy="20" r="4" fill="currentColor"/><circle cx="42" cy="22" r="4" fill="currentColor"/>
+</svg>
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 0000000000..e837db5f2d
--- /dev/null
+++ b/assets/icons/ui/design/svg/flat/prefs_assistant.svg
@@ -0,0 +1,4 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 64 64">
+ <title>Assistant</title>
+ <path d="M29 12.5Q30.2 33.8 51.5 35Q30.2 36.2 29 57.5Q27.8 36.2 6.5 35Q27.8 33.8 29 12.5Z" fill="none" stroke="currentColor" stroke-width="6.8" stroke-linejoin="round" stroke-linecap="round"/><path d="M50 6Q50.6 12.4 57 13Q50.6 13.6 50 20Q49.4 13.6 43 13Q49.4 12.4 50 6Z" fill="currentColor" stroke="currentColor" stroke-width="4.6" stroke-linejoin="round" stroke-linecap="round"/>
+</svg>
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 0000000000..d7779761b5
--- /dev/null
+++ b/assets/icons/ui/design/svg/flat/prefs_design.svg
@@ -0,0 +1,4 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 64 64">
+ <title>Design</title>
+ <path d="M32 7.7L53.04 19.85L53.04 44.15L32 56.3L10.96 44.15L10.96 19.85Z" fill="none" stroke="currentColor" stroke-width="6.8" stroke-linejoin="round" stroke-linecap="round"/><path d="M10.96 19.85L32 32L53.04 19.85M32 32L32 56.3" fill="none" stroke="currentColor" stroke-width="6.8" stroke-linejoin="round" stroke-linecap="round"/>
+</svg>
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 0000000000..2af3b23876
--- /dev/null
+++ b/assets/icons/ui/design/svg/flat/prefs_general.svg
@@ -0,0 +1,4 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 64 64">
+ <title>General</title>
+ <path d="M27.24 14.85L27.15 7.07L36.85 7.07L36.76 14.85L44.48 19.3L51.17 15.34L56.02 23.73L49.23 27.54L49.23 36.46L56.02 40.27L51.17 48.66L44.48 44.7L36.76 49.15L36.85 56.93L27.15 56.93L27.24 49.15L19.52 44.7L12.83 48.66L7.98 40.27L14.77 36.46L14.77 27.54L7.98 23.73L12.83 15.34L19.52 19.3Z" fill="none" stroke="currentColor" stroke-width="6.8" stroke-linejoin="round" stroke-linecap="round"/><path d="M25 32A7 7 0 1 0 39 32A7 7 0 1 0 25 32Z" fill="none" stroke="currentColor" stroke-width="6.8" stroke-linejoin="round" stroke-linecap="round"/>
+</svg>
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 0000000000..6cebe6617a
--- /dev/null
+++ b/assets/icons/ui/design/svg/flat/prefs_graphics.svg
@@ -0,0 +1,4 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 64 64">
+ <title>Graphics</title>
+ <path d="M14 8L50 8A6 6 0 0 1 56 14L56 38A6 6 0 0 1 50 44L14 44A6 6 0 0 1 8 38L8 14A6 6 0 0 1 14 8ZM32 44L32 54M20 54L44 54" fill="none" stroke="currentColor" stroke-width="6.8" stroke-linejoin="round" stroke-linecap="round"/>
+</svg>
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 0000000000..33e4fa587f
--- /dev/null
+++ b/assets/icons/ui/design/svg/flat/prefs_layout.svg
@@ -0,0 +1,4 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 64 64">
+ <title>Layout</title>
+ <path d="M14 10L50 10A6 6 0 0 1 56 16L56 48A6 6 0 0 1 50 54L14 54A6 6 0 0 1 8 48L8 16A6 6 0 0 1 14 10Z" fill="none" stroke="currentColor" stroke-width="6.8" stroke-linejoin="round" stroke-linecap="round"/><path d="M24 10L24 54M24 39L56 39" fill="none" stroke="currentColor" stroke-width="6.8" stroke-linejoin="round" stroke-linecap="round"/>
+</svg>
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 0000000000..718f48a1df
--- /dev/null
+++ b/assets/icons/ui/design/svg/flat/prefs_mouse3d.svg
@@ -0,0 +1,4 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 64 64">
+ <title>3D mouse</title>
+ <path d="M6.5 32A25.5 25.5 0 1 0 57.5 32A25.5 25.5 0 1 0 6.5 32Z" fill="none" stroke="currentColor" stroke-width="6.8" stroke-linejoin="round" stroke-linecap="round"/><path d="M24 32A8 8 0 1 0 40 32A8 8 0 1 0 24 32Z" fill="currentColor" stroke="currentColor" stroke-width="4.08" stroke-linejoin="round" stroke-linecap="round"/><path d="M53.4 32L45.96 35.9L45.96 28.1Z" fill="currentColor" stroke="currentColor" stroke-width="1.6" stroke-linejoin="round" stroke-linecap="round"/><path d="M32 53.4L28.1 45.96L35.9 45.96Z" fill="currentColor" stroke="currentColor" stroke-width="1.6" stroke-linejoin="round" stroke-linecap="round"/><path d="M10.6 32L18.04 28.1L18.04 35.9Z" fill="currentColor" stroke="currentColor" stroke-width="1.6" stroke-linejoin="round" stroke-linecap="round"/><path d="M32 10.6L35.9 18.04L28.1 18.04Z" fill="currentColor" stroke="currentColor" stroke-width="1.6" stroke-linejoin="round" stroke-linecap="round"/>
+</svg>
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 0000000000..1971089653
--- /dev/null
+++ b/assets/icons/ui/design/svg/flat/prefs_navigation.svg
@@ -0,0 +1,4 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 64 64">
+ <title>Navigation</title>
+ <path d="M32 7A14 14 0 0 1 46 21L46 43A14 14 0 0 1 18 43L18 21A14 14 0 0 1 32 7Z" fill="none" stroke="currentColor" stroke-width="6.8" stroke-linejoin="round" stroke-linecap="round"/><path d="M18 38L46 38" fill="none" stroke="currentColor" stroke-width="6.8" stroke-linejoin="round" stroke-linecap="round"/><path d="M32 14L32 22" fill="none" stroke="currentColor" stroke-width="6.8" stroke-linejoin="round" stroke-linecap="round"/>
+</svg>
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 0000000000..9de1501d9a
--- /dev/null
+++ b/assets/icons/ui/design/svg/flat/prefs_plugins.svg
@@ -0,0 +1,4 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 64 64">
+ <title>Plugins</title>
+ <path d="M24 7L24 20M40 7L40 20M16 20L48 20L48 28A16 16 0 0 1 16 28ZM32 44L32 57" fill="none" stroke="currentColor" stroke-width="6.8" stroke-linejoin="round" stroke-linecap="round"/>
+</svg>
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 0000000000..063bc7585b
--- /dev/null
+++ b/assets/icons/ui/design/svg/flat/prefs_shortcuts.svg
@@ -0,0 +1,4 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 64 64">
+ <title>Shortcuts</title>
+ <path d="M12 13L52 13A6 6 0 0 1 58 19L58 45A6 6 0 0 1 52 51L12 51A6 6 0 0 1 6 45L6 19A6 6 0 0 1 12 13Z" fill="none" stroke="currentColor" stroke-width="6.8" stroke-linejoin="round" stroke-linecap="round"/><circle cx="18" cy="26" r="3.6" fill="currentColor"/><circle cx="28" cy="26" r="3.6" fill="currentColor"/><circle cx="38" cy="26" r="3.6" fill="currentColor"/><circle cx="48" cy="26" r="3.6" fill="currentColor"/><path d="M20 40L44 40" fill="none" stroke="currentColor" stroke-width="6.8" stroke-linejoin="round" stroke-linecap="round"/>
+</svg>
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 0000000000..3a3dc7a875
--- /dev/null
+++ b/assets/icons/ui/design/svg/flat/prefs_sketch.svg
@@ -0,0 +1,4 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 64 64">
+ <title>Sketch</title>
+ <path d="M7 57L25.53 51.48L12.52 38.47Z" fill="currentColor" stroke="currentColor" stroke-width="6.8" stroke-linejoin="round" stroke-linecap="round"/><path d="M7 57L25.53 51.48L53.81 23.2L40.8 10.19L12.52 38.47Z" fill="none" stroke="currentColor" stroke-width="6.8" stroke-linejoin="round" stroke-linecap="round"/><path d="M44.62 32.39L31.61 19.38" fill="none" stroke="currentColor" stroke-width="6.8" stroke-linejoin="round" stroke-linecap="round"/>
+</svg>
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 0000000000..41b8612a7b
--- /dev/null
+++ b/assets/icons/ui/design/svg/flat/prefs_tools.svg
@@ -0,0 +1,4 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 64 64">
+ <title>Tools</title>
+ <path d="M56.86 18.45A16.5 16.5 0 0 1 37.12 39.04L22.33 53.83A8.6 8.6 0 0 1 10.17 41.67L24.96 26.88A16.5 16.5 0 0 1 45.55 7.14L37.55 15.14L39.94 24.06L48.86 26.45Z" fill="none" stroke="currentColor" stroke-width="6.8" stroke-linejoin="round" stroke-linecap="round"/>
+</svg>
diff --git a/crates/ui-egui/src/prefs.rs b/crates/ui-egui/src/prefs.rs
index 39b2efce7f..2c97ff1d1e 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<u16> = 5..=200;
const WINDOW_PAGES: &[ui_kit::WindowPage<SolveApp>] = &[
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<SolveApp>] = &[
draw: window_page::<PAGE_GENERAL>,
},
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<SolveApp>] = &[
draw: window_page::<PAGE_APPEARANCE>,
},
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<SolveApp>] = &[
draw: window_page::<PAGE_LAYOUT>,
},
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<SolveApp>] = &[
draw: window_page::<PAGE_GRAPHICS>,
},
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<SolveApp>] = &[
draw: window_page::<PAGE_DESIGN>,
},
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<SolveApp>] = &[
draw: window_page::<PAGE_SKETCH>,
},
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<SolveApp>] = &[
draw: window_page::<PAGE_TOOLS>,
},
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<SolveApp>] = &[
draw: window_page::<PAGE_NAVIGATION>,
},
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<SolveApp>] = &[
draw: window_page::<PAGE_MOUSE3D>,
},
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<SolveApp>] = &[
draw: window_page::<PAGE_SHORTCUTS>,
},
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<SolveApp>] = &[
draw: window_page::<PAGE_ASSISTANT>,
},
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 b68f735295..14a31aa0c1 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,