Merge main into codex/graphic-attributes-cleanup

Conflicts were additions on both sides, kept together: the Count palette
and Sheet Set toggles next to the Graphic Attributes toggle in the ribbon,
main's new locale groups and catalog entries next to graphic-attributes,
and module declarations. The palette code follows main's crate renames
(acadrust -> codec, cadkernel -> kernel).

Co-Authored-By: Claude Opus 5.5 <[email protected]>
Claude-Session: https://claude.ai/code/session_01VgkJN8DEojuPTumAXLHotu
This commit is contained in:
Claude committed 2026-10-07 20:11:05 +00:00
commit 7a03e1c43c
625 files changed
+104397 -28053

No files matched your search

+11
View File
@@ -0,0 +1,11 @@
use crate::modules::{IconKind, ModuleEvent, ToolDef};
pub const ICON: IconKind = IconKind::Svg(include_bytes!("../../../assets/icons/data_extract.svg"));
/// View › Palettes › Count: opens or closes the Count palette.
pub fn tool() -> ToolDef {
ToolDef {
id: "COUNTLIST",
label: "Count",
icon: ICON,
event: ModuleEvent::Command("_COUNTLISTTOGGLE".to_string()),
}
}
+2
View File
@@ -13,6 +13,7 @@ pub mod plot_window;
pub mod quick_print;
mod properties_palette;
mod sheetset;
mod count_palette;
mod tile_horiz;
mod tile_vert;
pub mod visual_style;
@@ -121,6 +122,7 @@ impl CadModule for ViewModule {
tools: vec![
RibbonItem::LargeTool(tool_palettes::tool()),
RibbonItem::LargeTool(properties_palette::tool()),
RibbonItem::LargeTool(count_palette::tool()),
RibbonItem::LargeTool(graphic_attributes_palette::tool()),
RibbonItem::LargeTool(sheetset::tool()),
],
+4 -1
View File
@@ -61,6 +61,7 @@ impl CadCommand for PlotWindowCommand {
world_width: 0.0,
depth_override: None,
display_visible: true,
snap_only: false,
plot_visible: true,
fill_is_3d: false,
fill_is_2d_solid: false,
@@ -95,7 +96,9 @@ impl CadCommand for PlotWindowCommand {
plinegen: true,
fill_tris: vec![],
fill_tris_low: Vec::new(),
})
..Default::default()
})
}
}
+1 -1
View File
@@ -2,7 +2,7 @@
// selection's bounding box to a PDF (handled by the host). No dialog. (#325)
use crate::command::{CadCommand, CmdResult};
use acadrust::Handle;
use codec::Handle;
use glam::DVec3;
use crate::t;
+1 -1
View File
@@ -5,6 +5,6 @@ pub fn tool() -> ToolDef {
id: "SHEETSET",
label: "Sheet Set\nManager",
icon: ICON,
event: ModuleEvent::Command("SHEETSET".to_string()),
event: ModuleEvent::Command("_SSMTOGGLE".to_string()),
}
}
+1 -1
View File
@@ -8,7 +8,7 @@
// command at all). Naming each style once, next to the command that applies it,
// is what keeps the three in step. (#621)
use acadrust::entities::ViewportRenderMode as Mode;
use codec::entities::ViewportRenderMode as Mode;
use crate::modules::IconKind;
+11 -1
View File
@@ -97,6 +97,13 @@ impl CadCommand for ZoomWindowCommand {
self.scale_prompt = true;
return Some(CmdResult::NeedPoint);
}
// A scale factor straight at the first prompt: n, nX or nXP.
upper if upper.ends_with('X')
|| upper.ends_with("XP")
|| crate::app::expr_eval::eval_number(&upper).is_some() =>
{
return Some(CmdResult::Dispatch(format!("ZOOM SCALE {text}")));
}
_ => return None,
};
Some(CmdResult::Dispatch(command.to_string()))
@@ -143,6 +150,7 @@ impl CadCommand for ZoomWindowCommand {
world_width: 0.0,
depth_override: None,
display_visible: true,
snap_only: false,
plot_visible: true,
fill_is_3d: false,
fill_is_2d_solid: false,
@@ -174,6 +182,8 @@ impl CadCommand for ZoomWindowCommand {
plinegen: true,
fill_tris: vec![],
fill_tris_low: Vec::new(),
})
..Default::default()
})
}
}