forked from 1b-agent/opencadstudio-upstream
Merge remote-tracking branch 'origin/main' into codex/pdf-attach-parity
# Conflicts: # locales/ar-SA/opencadstudio.ftl # locales/bg-BG/opencadstudio.ftl # locales/cs-CZ/opencadstudio.ftl # locales/de-DE/opencadstudio.ftl # locales/el-GR/opencadstudio.ftl # locales/en-US/opencadstudio.ftl # locales/es-ES/opencadstudio.ftl # locales/fi-FI/opencadstudio.ftl # locales/fr-FR/opencadstudio.ftl # locales/hi-IN/opencadstudio.ftl # locales/hu-HU/opencadstudio.ftl # locales/it-IT/opencadstudio.ftl # locales/ja-JP/opencadstudio.ftl # locales/ko-KR/opencadstudio.ftl # locales/nl-NL/opencadstudio.ftl # locales/pl-PL/opencadstudio.ftl # locales/pt-BR/opencadstudio.ftl # locales/ru-RU/opencadstudio.ftl # locales/tr-TR/opencadstudio.ftl # locales/zh-CN/opencadstudio.ftl # locales/zh-TW/opencadstudio.ftl # src/app/control/actions.rs # src/app/mod.rs # src/app/update/mod.rs # src/app/view/modal.rs # src/io/xref.rs # src/ui/window/mod.rs
This commit is contained in:
ramox81 committed
commit
c1ecb0edaf
77 files changed
+5695
-606
No files matched your search
+378
-14
@@ -219,6 +219,8 @@ impl OpenCADStudio {
|
||||
Some(UnderlayLayers) => self.underlay_layers = None,
|
||||
Some(PdfImportSettings) => self.pdf_import_settings = None,
|
||||
Some(PdfImportFile) => self.pdf_import_file = None,
|
||||
Some(XrefAttach) => self.xref_attach = None,
|
||||
Some(WriteBlock) => self.wblock = None,
|
||||
Some(Hyperlink) => {
|
||||
self.hyperlink_editor_handles.clear();
|
||||
self.hyperlink_editor_url.clear();
|
||||
@@ -356,6 +358,14 @@ impl OpenCADStudio {
|
||||
}
|
||||
}
|
||||
}
|
||||
if self.active_modal == Some(super::ModalKind::WriteBlock) {
|
||||
if let Some(ref mut state) = self.wblock {
|
||||
if state.error_message.is_some() {
|
||||
state.error_message = None;
|
||||
return Task::none();
|
||||
}
|
||||
}
|
||||
}
|
||||
return self.update(Message::CloseModal);
|
||||
}
|
||||
if self.active_modal == Some(super::ModalKind::BlockDefinition) {
|
||||
@@ -372,6 +382,13 @@ impl OpenCADStudio {
|
||||
}
|
||||
}
|
||||
}
|
||||
if self.active_modal == Some(super::ModalKind::WriteBlock) {
|
||||
if matches!(msg, Message::CommandFinalize)
|
||||
|| matches!(&msg, Message::ShortcutPressed(key) if key.rsplit('+').next() == Some("ENTER") || key.rsplit('+').next() == Some("RETURN"))
|
||||
{
|
||||
return self.update(Message::WblockApply);
|
||||
}
|
||||
}
|
||||
if is_modal_blocked_key_msg(&msg) {
|
||||
return Task::none();
|
||||
}
|
||||
@@ -1191,13 +1208,20 @@ impl OpenCADStudio {
|
||||
Task::none()
|
||||
}
|
||||
Message::MissingFontsDownload => {
|
||||
if self.missing_fonts_downloading {
|
||||
return Task::none();
|
||||
}
|
||||
// Remember the source across sessions — and across drawings.
|
||||
let source = self.font_source_input.trim().to_string();
|
||||
if self.font_source_url != source {
|
||||
self.font_source_url = source.clone();
|
||||
self.save_config();
|
||||
}
|
||||
let fonts = self.missing_fonts.take().unwrap_or_default();
|
||||
let fonts = self.missing_fonts.clone().unwrap_or_default();
|
||||
if fonts.is_empty() {
|
||||
return Task::none();
|
||||
}
|
||||
self.missing_fonts_downloading = true;
|
||||
Task::perform(
|
||||
async move {
|
||||
let source = crate::io::font_repo::FontSource::from_url(&source);
|
||||
@@ -1207,31 +1231,66 @@ impl OpenCADStudio {
|
||||
)
|
||||
}
|
||||
Message::MissingFontsDismiss => {
|
||||
self.missing_fonts = None;
|
||||
if self.missing_fonts_downloading {
|
||||
return Task::none();
|
||||
}
|
||||
for name in self.missing_fonts.take().unwrap_or_default() {
|
||||
self.suppressed_missing_fonts
|
||||
.insert(crate::io::font_repo::font_key(&name));
|
||||
}
|
||||
self.missing_fonts_path = None;
|
||||
self.close_active_modal();
|
||||
Task::none()
|
||||
}
|
||||
Message::MissingFontsResult(result) => {
|
||||
self.missing_fonts = None;
|
||||
self.close_active_modal();
|
||||
self.missing_fonts_downloading = false;
|
||||
match result {
|
||||
Ok(pairs) if pairs.is_empty() => {
|
||||
let unavailable = self.missing_fonts.take().unwrap_or_default();
|
||||
for name in &unavailable {
|
||||
self.suppressed_missing_fonts
|
||||
.insert(crate::io::font_repo::font_key(name));
|
||||
}
|
||||
self.missing_fonts_path = None;
|
||||
self.close_active_modal();
|
||||
self.command_line.push_error(crate::t!(
|
||||
"None of the missing fonts are in the community repository yet. Contribute them at github.com/huaninstratech/OpenCADStudio/tree/main/fonts."
|
||||
"None of the requested fonts are available from the selected source. Substitute fonts remain active; this notice will not repeat during this session."
|
||||
).as_ref());
|
||||
}
|
||||
Ok(pairs) => {
|
||||
let requested = self.missing_fonts.take().unwrap_or_default();
|
||||
let downloaded: rustc_hash::FxHashSet<String> = pairs
|
||||
.iter()
|
||||
.map(|(name, _)| crate::io::font_repo::font_key(name))
|
||||
.collect();
|
||||
let unavailable: Vec<String> = requested
|
||||
.into_iter()
|
||||
.filter(|name| {
|
||||
!downloaded.contains(&crate::io::font_repo::font_key(name))
|
||||
})
|
||||
.collect();
|
||||
for name in &unavailable {
|
||||
self.suppressed_missing_fonts
|
||||
.insert(crate::io::font_repo::font_key(name));
|
||||
}
|
||||
for (name, path) in &pairs {
|
||||
self.command_line.push_output(crate::tf!(
|
||||
"FONT Downloaded {name} → {path}",
|
||||
path = path.display()
|
||||
).as_ref());
|
||||
}
|
||||
if !unavailable.is_empty() {
|
||||
self.command_line.push_info(crate::tf!(
|
||||
"FONT Not available from the selected source: {fonts}. Substitute fonts remain active.",
|
||||
fonts = unavailable.join(", ")
|
||||
).as_ref());
|
||||
}
|
||||
// The downloaded files change glyph resolution for the
|
||||
// whole drawing — reload it through the standard open
|
||||
// pipeline so every wire is rebuilt with the real fonts.
|
||||
let i = self.active_tab;
|
||||
if let Some(path) = self.tabs[i].current_path.clone() {
|
||||
let path = self.missing_fonts_path.take();
|
||||
self.close_active_modal();
|
||||
if let Some(path) = path {
|
||||
return Task::done(Message::OpenExternal(path));
|
||||
}
|
||||
self.command_line.push_info(crate::t!(
|
||||
@@ -1239,6 +1298,8 @@ impl OpenCADStudio {
|
||||
).as_ref());
|
||||
}
|
||||
Err(e) => {
|
||||
// Keep the prompt open: the user can correct a custom
|
||||
// source or retry a transient network failure.
|
||||
self.command_line.push_error(crate::tf!("Font download failed: {e}").as_ref());
|
||||
}
|
||||
}
|
||||
@@ -1332,15 +1393,13 @@ impl OpenCADStudio {
|
||||
),
|
||||
|
||||
Message::XAttachPickResult(Ok(path)) => {
|
||||
use crate::command::CadCommand;
|
||||
use crate::modules::insert::xattach::XAttachCommand;
|
||||
let path_str = path.to_string_lossy().into_owned();
|
||||
let cmd = XAttachCommand::with_path(path_str);
|
||||
let i = self.active_tab;
|
||||
self.command_line.push_info(&cmd.prompt());
|
||||
self.tabs[i].active_cmd = Some(Box::new(cmd));
|
||||
self.open_xref_attach_dialog(path);
|
||||
Task::none()
|
||||
}
|
||||
message @ (Message::AttachPick
|
||||
| Message::AttachPickResult(_)
|
||||
| Message::XrefAttach(_)
|
||||
| Message::XrefAttachBrowseResult(_)) => self.update_xref_attach(message),
|
||||
|
||||
Message::XAttachPickResult(Err(e)) => {
|
||||
if e != "Cancelled" {
|
||||
@@ -4935,6 +4994,294 @@ impl OpenCADStudio {
|
||||
}
|
||||
self.commit_block_definition(false)
|
||||
}
|
||||
Message::WblockSourceMode(mode) => {
|
||||
if let Some(state) = self.wblock.as_mut() {
|
||||
state.source_mode = mode;
|
||||
}
|
||||
Task::none()
|
||||
}
|
||||
Message::WblockBlockName(name) => {
|
||||
if let Some(state) = self.wblock.as_mut() {
|
||||
state.block_name = name;
|
||||
}
|
||||
Task::none()
|
||||
}
|
||||
Message::WblockBlockSelect(name) => {
|
||||
if let Some(state) = self.wblock.as_mut() {
|
||||
state.block_name = name.clone();
|
||||
let trimmed = name.trim();
|
||||
if !trimmed.is_empty() {
|
||||
let current_path = std::path::Path::new(&state.file_path);
|
||||
let file_stem = current_path.file_stem().and_then(|s| s.to_str());
|
||||
let is_default_or_block = file_stem == Some("new_block")
|
||||
|| state.existing_blocks.iter().any(|b| Some(b.as_str()) == file_stem);
|
||||
if is_default_or_block {
|
||||
let new_file_name = format!("{}.dwg", trimmed);
|
||||
if let Some(parent) = current_path.parent() {
|
||||
if !parent.as_os_str().is_empty() {
|
||||
state.file_path = parent.join(new_file_name).to_string_lossy().to_string();
|
||||
} else {
|
||||
state.file_path = new_file_name;
|
||||
}
|
||||
} else {
|
||||
state.file_path = new_file_name;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
Task::none()
|
||||
}
|
||||
Message::WblockPickPoint => {
|
||||
self.active_modal = None;
|
||||
let cmd = crate::modules::insert::wblock::WblockPickBasePointCommand;
|
||||
self.command_line.push_info(&cmd.prompt());
|
||||
self.tabs[self.active_tab].active_cmd = Some(Box::new(cmd));
|
||||
Task::none()
|
||||
}
|
||||
Message::WblockBaseX(val) => {
|
||||
if let Some(state) = self.wblock.as_mut() {
|
||||
state.base_point_x = val;
|
||||
}
|
||||
Task::none()
|
||||
}
|
||||
Message::WblockBaseY(val) => {
|
||||
if let Some(state) = self.wblock.as_mut() {
|
||||
state.base_point_y = val;
|
||||
}
|
||||
Task::none()
|
||||
}
|
||||
Message::WblockBaseZ(val) => {
|
||||
if let Some(state) = self.wblock.as_mut() {
|
||||
state.base_point_z = val;
|
||||
}
|
||||
Task::none()
|
||||
}
|
||||
Message::WblockSelectObjects => {
|
||||
self.active_modal = None;
|
||||
use crate::modules::draw::select::SelectObjectsCommand;
|
||||
let cmd = SelectObjectsCommand::plain("WBLOCK", "WBLOCK_OBJECTS_GATHERED");
|
||||
self.command_line.push_info(&cmd.prompt());
|
||||
self.tabs[self.active_tab].active_cmd = Some(Box::new(cmd));
|
||||
Task::none()
|
||||
}
|
||||
Message::WblockQuickSelect => {
|
||||
self.active_modal = None;
|
||||
self.on_qselect_open()
|
||||
}
|
||||
Message::WblockObjectMode(mode) => {
|
||||
if let Some(state) = self.wblock.as_mut() {
|
||||
state.object_mode = mode;
|
||||
}
|
||||
Task::none()
|
||||
}
|
||||
Message::WblockFilePath(path) => {
|
||||
if let Some(state) = self.wblock.as_mut() {
|
||||
state.file_path = path;
|
||||
}
|
||||
Task::none()
|
||||
}
|
||||
Message::WblockBrowsePath => {
|
||||
let default_name = if let Some(state) = self.wblock.as_ref() {
|
||||
let p = std::path::Path::new(&state.file_path);
|
||||
p.file_name()
|
||||
.and_then(|f| f.to_str())
|
||||
.unwrap_or("new_block.dwg")
|
||||
.to_string()
|
||||
} else {
|
||||
"new_block.dwg".to_string()
|
||||
};
|
||||
Task::perform(
|
||||
async move {
|
||||
let path = crate::sys::file_dialog()
|
||||
.set_title(crate::t!("Save Block As").as_ref())
|
||||
.set_file_name(&default_name)
|
||||
.add_filter(crate::t!("DWG Files").as_ref(), &["dwg"])
|
||||
.add_filter(crate::t!("DXF Files").as_ref(), &["dxf"])
|
||||
.save_file()
|
||||
.await
|
||||
.map(|h| crate::sys::handle_path(&h));
|
||||
path
|
||||
},
|
||||
|path| Message::WblockBrowsePathResult(path),
|
||||
)
|
||||
}
|
||||
Message::WblockBrowsePathResult(opt_path) => {
|
||||
if let Some(path) = opt_path {
|
||||
if let Some(state) = self.wblock.as_mut() {
|
||||
state.file_path = path.to_string_lossy().to_string();
|
||||
}
|
||||
}
|
||||
Task::none()
|
||||
}
|
||||
Message::WblockUnit(unit) => {
|
||||
if let Some(state) = self.wblock.as_mut() {
|
||||
state.unit = unit;
|
||||
}
|
||||
Task::none()
|
||||
}
|
||||
Message::WblockDismissError => {
|
||||
if let Some(state) = self.wblock.as_mut() {
|
||||
state.error_message = None;
|
||||
}
|
||||
Task::none()
|
||||
}
|
||||
Message::WblockHelp => {
|
||||
self.command_line.push_info(
|
||||
crate::t!("WBLOCK writes objects, a block, or the entire drawing to a new drawing file.").as_ref(),
|
||||
);
|
||||
Task::none()
|
||||
}
|
||||
Message::WblockApply => {
|
||||
let Some(state) = self.wblock.as_mut() else {
|
||||
return Task::none();
|
||||
};
|
||||
use crate::ui::window::wblock::{WblockObjectMode, WblockSourceMode};
|
||||
match state.source_mode {
|
||||
WblockSourceMode::Block => {
|
||||
let name = state.block_name.trim();
|
||||
if name.is_empty() {
|
||||
state.error_message =
|
||||
Some(crate::t!("Please select or enter a block name.").into_owned());
|
||||
return Task::none();
|
||||
}
|
||||
let i = self.active_tab;
|
||||
if self.tabs[i].scene.document.block_records.get(name).is_none() {
|
||||
state.error_message = Some(
|
||||
crate::tf!("Block \"{}\" does not exist in drawing.", name)
|
||||
.into_owned(),
|
||||
);
|
||||
return Task::none();
|
||||
}
|
||||
}
|
||||
WblockSourceMode::Objects => {
|
||||
if state.selected_handles.is_empty() {
|
||||
state.error_message = Some(
|
||||
crate::t!("No objects selected. You must select objects to define a block.")
|
||||
.into_owned(),
|
||||
);
|
||||
return Task::none();
|
||||
}
|
||||
}
|
||||
WblockSourceMode::EntireDrawing => {}
|
||||
}
|
||||
|
||||
let path_str = state.file_path.trim().to_string();
|
||||
if path_str.is_empty() {
|
||||
state.error_message =
|
||||
Some(crate::t!("Please specify a file name and path.").into_owned());
|
||||
return Task::none();
|
||||
}
|
||||
|
||||
let mut path = std::path::PathBuf::from(path_str);
|
||||
if path.extension().is_none() {
|
||||
path.set_extension("dwg");
|
||||
}
|
||||
|
||||
let i = self.active_tab;
|
||||
if let Some(current_path) = self.tabs[i].current_path.as_ref() {
|
||||
if current_path == &path {
|
||||
state.error_message = Some(
|
||||
crate::t!("Cannot write to the current drawing file.").into_owned(),
|
||||
);
|
||||
return Task::none();
|
||||
}
|
||||
}
|
||||
|
||||
let state = self.wblock.take().unwrap();
|
||||
self.active_modal = None;
|
||||
let document = self.tabs[i].scene.document_for_save();
|
||||
let source_mode = state.source_mode;
|
||||
let block_name = state.block_name.trim().to_string();
|
||||
let handles = state.selected_handles.clone();
|
||||
let base_point = state.parse_base_point();
|
||||
let unit = state.unit;
|
||||
let object_mode = state.object_mode;
|
||||
|
||||
if source_mode == WblockSourceMode::Objects {
|
||||
match object_mode {
|
||||
WblockObjectMode::Retain => {}
|
||||
WblockObjectMode::Delete => {
|
||||
self.push_undo_snapshot(i, "WBLOCK");
|
||||
self.tabs[i].scene.erase_entities(&handles);
|
||||
self.tabs[i].dirty = true;
|
||||
self.tabs[i].scene.bump_geometry();
|
||||
self.refresh_properties();
|
||||
}
|
||||
WblockObjectMode::Convert => {
|
||||
let block_name_for_conv = path
|
||||
.file_stem()
|
||||
.and_then(|s| s.to_str())
|
||||
.unwrap_or("WBLOCK")
|
||||
.to_string();
|
||||
self.push_undo_snapshot(i, "WBLOCK");
|
||||
let ucs = self.tabs[i].ucs_xform();
|
||||
let world_to_block = ucs.to_ucs_transform_at(base_point);
|
||||
let block_to_world = ucs.to_wcs_transform_at(base_point);
|
||||
let options = crate::scene::CreateBlockOptions {
|
||||
name: block_name_for_conv,
|
||||
handles: handles.clone(),
|
||||
base_point,
|
||||
world_to_block,
|
||||
block_to_world,
|
||||
mode: crate::ui::window::block_definition::BlockObjectMode::Convert,
|
||||
annotative: false,
|
||||
match_orientation: false,
|
||||
scale_uniformly: false,
|
||||
allow_exploding: true,
|
||||
unit,
|
||||
description: String::new(),
|
||||
hyperlink_url: String::new(),
|
||||
hyperlink_desc: String::new(),
|
||||
redefine: true,
|
||||
};
|
||||
let _ = self.tabs[i].scene.create_block_with_options(options);
|
||||
self.tabs[i].dirty = true;
|
||||
self.tabs[i].scene.bump_geometry();
|
||||
self.refresh_properties();
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
let worker_path = path.clone();
|
||||
let display_name = match source_mode {
|
||||
WblockSourceMode::Block => block_name.clone(),
|
||||
WblockSourceMode::EntireDrawing => "*".to_string(),
|
||||
WblockSourceMode::Objects => "*".to_string(),
|
||||
};
|
||||
let worker_display = display_name.clone();
|
||||
|
||||
file::background_task(
|
||||
move || {
|
||||
let out_doc = match source_mode {
|
||||
WblockSourceMode::Block => {
|
||||
let mut d = crate::modules::insert::wblock::extract_block_to_doc(
|
||||
&document,
|
||||
&block_name,
|
||||
)
|
||||
.map_err(|e| e.to_string())?;
|
||||
d.header.insertion_units = unit;
|
||||
d
|
||||
}
|
||||
WblockSourceMode::EntireDrawing => {
|
||||
let mut d = document.clone();
|
||||
d.header.insertion_units = unit;
|
||||
d
|
||||
}
|
||||
WblockSourceMode::Objects => {
|
||||
crate::modules::insert::wblock::extract_entities_to_doc_with_base(
|
||||
&document,
|
||||
&handles,
|
||||
base_point,
|
||||
unit,
|
||||
)
|
||||
.map_err(|e| e.to_string())?
|
||||
}
|
||||
};
|
||||
crate::io::save(&out_doc, &worker_path).map_err(|e| e.to_string())
|
||||
},
|
||||
move |result| Message::WblockWriteFinished(worker_display, path, result),
|
||||
)
|
||||
}
|
||||
Message::ToleranceDialogField(field) => {
|
||||
if let Some(state) = self.geometric_tolerance.as_mut() {
|
||||
state.apply_field(field);
|
||||
@@ -5889,6 +6236,8 @@ impl OpenCADStudio {
|
||||
self.reset_modal_geometry();
|
||||
if self.block_definition.is_some() {
|
||||
self.active_modal = Some(super::ModalKind::BlockDefinition);
|
||||
} else if self.wblock.is_some() {
|
||||
self.active_modal = Some(super::ModalKind::WriteBlock);
|
||||
}
|
||||
Task::none()
|
||||
}
|
||||
@@ -6095,6 +6444,15 @@ impl OpenCADStudio {
|
||||
.collect();
|
||||
block_def.error_message = None;
|
||||
self.active_modal = Some(super::ModalKind::BlockDefinition);
|
||||
} else if let Some(ref mut wblock) = self.wblock {
|
||||
wblock.selected_handles = self.tabs[i]
|
||||
.scene
|
||||
.selected_entities()
|
||||
.into_iter()
|
||||
.map(|(h, _)| h)
|
||||
.collect();
|
||||
wblock.error_message = None;
|
||||
self.active_modal = Some(super::ModalKind::WriteBlock);
|
||||
}
|
||||
Task::none()
|
||||
}
|
||||
@@ -8071,6 +8429,12 @@ impl OpenCADStudio {
|
||||
if self.active_modal == Some(super::ModalKind::RecoveryPrompt) {
|
||||
return self.update(Message::RecoveryDecline);
|
||||
}
|
||||
// The title-bar X, Escape, and MCP `close_modal` action mean
|
||||
// the same thing as Skip for this prompt. Record that choice
|
||||
// so reopening the drawing does not immediately nag again.
|
||||
if self.active_modal == Some(super::ModalKind::MissingFonts) {
|
||||
return self.update(Message::MissingFontsDismiss);
|
||||
}
|
||||
// The Options window's × and Esc behave like its Close button.
|
||||
if self.active_modal == Some(super::ModalKind::Options) {
|
||||
return self.update(Message::OptionsClose);
|
||||
|
||||
Reference in new issue
Block a user