Merge remote-tracking branch 'origin/main' into codex/block-definition-command-line

# Conflicts:
#	src/app/commands/inquiry.rs
#	src/modules/draw/modify/block_edit.rs
This commit is contained in:
ramox81 committed 2026-10-14 17:51:56 +03:00
commit 99e30f1548
33 files changed
+1660 -199

No files matched your search

+27
View File
@@ -150,6 +150,33 @@ impl OpenCADStudio {
};
let resolved = self.resolve_alias(cmd);
let cmd = resolved.as_deref().unwrap_or(cmd);
if self.tabs[i].block_test.is_some() {
let name = cmd.split([' ', ':']).next().unwrap_or(cmd);
if matches!(
name,
"BEDIT"
| "BEDIT_BEGIN"
| "BEDIT_OPEN"
| "REFEDIT"
| "REFEDIT_BEGIN"
| "BSAVE"
| "BSAVEAS"
| "SAVE"
| "QSAVE"
| "SAVEAS"
| "SAVEALL"
| "WBLOCK"
| "EXPORT"
| "ETRANSMIT"
| "ARCHIVE"
) {
self.command_line.push_error(
crate::t!("Close Test Block before saving or opening another block editor.")
.as_ref(),
);
return Task::none();
}
}
if is_spacemouse_command(cmd) {
return self.run_action(cmd);
}