Merge pull request #7850 from el-j/fix/pdfx-export-feedback-6861

Part of #6861: Save PDF says in its dialog why a save failed
This commit is contained in:
BFlat
2026-11-18 12:59:34 +07:00
committed by GitHub
2 changed files with 49 additions and 3 deletions
+28 -3
View File
@@ -152,10 +152,31 @@ fn params(d: &Dialog) -> Value {
p
}
/// Save PDF: write the file (a PDF copy, or the PDF a Save As / Save a Copy asked for, `__save`);
/// the dialog stays open when that fails (bad range, cancelled save…). While Save Preset… asks for
/// a name, OK (and Enter) saves the preset instead.
/// The field that holds why the last Save PDF failed, shown in the dialog (the status bar sits
/// behind it, #6861).
const ERROR: &str = "__error";
/// Save PDF: write the file (see [`write`]). When that fails the dialog stays open and says why,
/// under its sections, as well as in the status bar the dialog covers.
fn confirm(app: &mut VectorcraftApp, d: &Dialog) -> Result<Value, String> {
let r = write(app, d);
if let Some(open) = app.ui.dialog.as_mut().filter(|o| o.kind == d.kind) {
match &r {
Err(e) => {
open.fields.insert(ERROR.into(), json!(e));
}
Ok(_) => {
open.fields.remove(ERROR);
}
}
}
r
}
/// Write the file (a PDF copy, or the PDF a Save As / Save a Copy asked for, `__save`); the
/// dialog stays open when that fails (bad range, cancelled save…). While Save Preset… asks for a
/// name, OK (and Enter) saves the preset instead.
fn write(app: &mut VectorcraftApp, d: &Dialog) -> Result<Value, String> {
if d.fields.contains_key(SAVE_AS) {
let mut d = d.clone();
let r = save_preset(app, &mut d);
@@ -417,6 +438,10 @@ fn body(app: &mut VectorcraftApp, ui: &mut egui::Ui, d: &mut Dialog) -> bool {
"Summary" => summary(app, ui, d),
_ => general(ui, d, editor),
});
if let Some(e) = d.fields.get(ERROR).and_then(Value::as_str) {
ui.add_space(6.0);
ui.label(egui::RichText::new(crate::i18n::message(crate::i18n::current(), e)).color(t.error));
}
});
});
false
@@ -92,6 +92,27 @@ fn confirm_runs_export_pdf_with_the_dialog_options() {
assert!(app.ui.status.starts_with("Saved /tmp/out.pdf"), "{}", app.ui.status);
}
/// A Save PDF that fails keeps the dialog open and says why inside it (#6861): the status bar is
/// behind the dialog. Saving again, once it works, clears the message.
#[test]
fn a_failed_save_says_why_in_the_dialog() {
let (mut app, written, _) = app();
app.run("ui.savePdfDialog", json!({"path": "/tmp/out.pdf"})).unwrap();
set_field(&mut app, "__allArtboards", json!(false));
set_field(&mut app, "range", json!("9"));
let e = super::super::confirm(&mut app).unwrap_err();
assert!(written.borrow().is_empty(), "nothing was written");
let d = app.ui.dialog.as_ref().expect("the dialog stays open");
assert_eq!(d.str(ERROR), e, "the dialog holds the reason");
assert!(!e.is_empty());
assert!(params(d).get(ERROR).is_none(), "the message is not an option of the export");
frame(&mut app);
set_field(&mut app, "range", json!("1"));
super::super::confirm(&mut app).unwrap();
assert!(app.ui.dialog.is_none());
assert_eq!(written.borrow().len(), 1);
}
/// Opened for a page of the art's bounds (Export As with Use Artboards off), the dialog has no
/// Artboards section, and OK writes one page of the art's bounds with its options, a saved preset
/// and View PDF after Saving included.