forked from 1b-agent/opencadstudio-upstream
feat: add style selector comboboxes to Annotate ribbon tab
New StyleComboGroup RibbonItem renders a dropdown combobox for selecting text style, dimension style, multileader style, or table style. Ribbon groups in the Annotate tab now match the reference layout: each group has a large tool on the left and a style combobox with tool rows on the right. Each combobox shows the active style name, opens a scrollable item list on click, and has an optional "Manage…" row that fires the style manager command (STYLE / DIMSTYLE / MLEADERSTYLE / TABLESTYLE). Style state is synced from the document on every layer refresh via sync_ribbon_styles(). RibbonStyleChanged message propagates selections back to the acadrust document header and the active_mleader_style field. Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
This commit is contained in:
Hakan SevenandClaude Sonnet 4.6 committed
1 parent
08b9a21d31
commit
bd68114bde
7 files changed
+431
-36
No files matched your search
+58
-32
@@ -23,7 +23,7 @@ pub mod table_cmd;
|
||||
pub mod text;
|
||||
pub mod tolerance_cmd;
|
||||
|
||||
use crate::modules::{CadModule, RibbonGroup, RibbonItem};
|
||||
use crate::modules::{CadModule, RibbonGroup, RibbonItem, StyleKey};
|
||||
|
||||
pub struct AnnotateModule;
|
||||
|
||||
@@ -45,7 +45,7 @@ impl CadModule for AnnotateModule {
|
||||
tools: vec![
|
||||
RibbonItem::LargeDropdown {
|
||||
id: "ANNOTATE_TEXT",
|
||||
label: "Text",
|
||||
label: "Multiline\nText",
|
||||
icon: mtext::ICON,
|
||||
items: vec![
|
||||
(mtext::tool().id, mtext::tool().label, mtext::tool().icon),
|
||||
@@ -54,18 +54,21 @@ impl CadModule for AnnotateModule {
|
||||
],
|
||||
default: "MTEXT",
|
||||
},
|
||||
RibbonItem::Tool(crate::modules::ToolDef {
|
||||
id: "STYLE",
|
||||
label: "Text Style",
|
||||
icon: crate::modules::IconKind::Svg(include_bytes!("../../../assets/icons/text_style.svg")),
|
||||
event: crate::modules::ModuleEvent::Command("STYLE".to_string()),
|
||||
}),
|
||||
RibbonItem::Tool(crate::modules::ToolDef {
|
||||
id: "FIND",
|
||||
label: "Find",
|
||||
icon: crate::modules::IconKind::Svg(include_bytes!("../../../assets/icons/find.svg")),
|
||||
event: crate::modules::ModuleEvent::Command("FIND".to_string()),
|
||||
}),
|
||||
RibbonItem::StyleComboGroup {
|
||||
style_key: StyleKey::TextStyle,
|
||||
combo_id: "TEXT_STYLE_COMBO",
|
||||
manager_cmd: Some("STYLE"),
|
||||
rows: vec![
|
||||
vec![
|
||||
crate::modules::ToolDef {
|
||||
id: "FIND",
|
||||
label: "Find",
|
||||
icon: crate::modules::IconKind::Svg(include_bytes!("../../../assets/icons/find.svg")),
|
||||
event: crate::modules::ModuleEvent::Command("FIND".to_string()),
|
||||
},
|
||||
],
|
||||
],
|
||||
},
|
||||
],
|
||||
},
|
||||
// ── Dimensions ───────────────────────────────────────────────
|
||||
@@ -87,20 +90,26 @@ impl CadModule for AnnotateModule {
|
||||
],
|
||||
default: "DIMLINEAR",
|
||||
},
|
||||
RibbonItem::Tool(dim_continue::tool()),
|
||||
RibbonItem::Tool(dim_baseline::tool()),
|
||||
RibbonItem::Tool(tolerance_cmd::tool()),
|
||||
RibbonItem::Tool(dimedit::tool()),
|
||||
RibbonItem::Tool(dimtedit::tool()),
|
||||
RibbonItem::Tool(dimbreak::tool()),
|
||||
RibbonItem::Tool(dimspace::tool()),
|
||||
RibbonItem::Tool(dimjogline::tool()),
|
||||
RibbonItem::Tool(crate::modules::ToolDef {
|
||||
id: "DIMSTYLE",
|
||||
label: "Dim Style",
|
||||
icon: crate::modules::IconKind::Svg(include_bytes!("../../../assets/icons/dim_style.svg")),
|
||||
event: crate::modules::ModuleEvent::Command("DIMSTYLE".to_string()),
|
||||
}),
|
||||
RibbonItem::StyleComboGroup {
|
||||
style_key: StyleKey::DimStyle,
|
||||
combo_id: "DIM_STYLE_COMBO",
|
||||
manager_cmd: Some("DIMSTYLE"),
|
||||
rows: vec![
|
||||
vec![
|
||||
qdim::tool(),
|
||||
dim_continue::tool(),
|
||||
dim_baseline::tool(),
|
||||
],
|
||||
vec![
|
||||
tolerance_cmd::tool(),
|
||||
dimedit::tool(),
|
||||
dimtedit::tool(),
|
||||
dimbreak::tool(),
|
||||
dimspace::tool(),
|
||||
dimjogline::tool(),
|
||||
],
|
||||
],
|
||||
},
|
||||
],
|
||||
},
|
||||
// ── Leaders ──────────────────────────────────────────────────
|
||||
@@ -117,10 +126,21 @@ impl CadModule for AnnotateModule {
|
||||
],
|
||||
default: "MLEADER",
|
||||
},
|
||||
RibbonItem::Tool(mleader_edit::tool_add()),
|
||||
RibbonItem::Tool(mleader_edit::tool_remove()),
|
||||
RibbonItem::Tool(mleader_edit::tool_align()),
|
||||
RibbonItem::Tool(mleader_edit::tool_collect()),
|
||||
RibbonItem::StyleComboGroup {
|
||||
style_key: StyleKey::MLeaderStyle,
|
||||
combo_id: "MLEADER_STYLE_COMBO",
|
||||
manager_cmd: Some("MLEADERSTYLE"),
|
||||
rows: vec![
|
||||
vec![
|
||||
mleader_edit::tool_add(),
|
||||
mleader_edit::tool_remove(),
|
||||
],
|
||||
vec![
|
||||
mleader_edit::tool_align(),
|
||||
mleader_edit::tool_collect(),
|
||||
],
|
||||
],
|
||||
},
|
||||
],
|
||||
},
|
||||
// ── Tables ───────────────────────────────────────────────────
|
||||
@@ -128,6 +148,12 @@ impl CadModule for AnnotateModule {
|
||||
title: "Tables",
|
||||
tools: vec![
|
||||
RibbonItem::LargeTool(table_cmd::tool()),
|
||||
RibbonItem::StyleComboGroup {
|
||||
style_key: StyleKey::TableStyle,
|
||||
combo_id: "TABLE_STYLE_COMBO",
|
||||
manager_cmd: Some("TABLESTYLE"),
|
||||
rows: vec![],
|
||||
},
|
||||
],
|
||||
},
|
||||
// ── Markup ───────────────────────────────────────────────────
|
||||
|
||||
Reference in new issue
Block a user