Skip to content

PdfCraft: An open-source PDF reader and editor written by scratch in pure Rust

Merge origin/main into fix/document-properties-layout

alehel4283936293e8
diff --cc crates/ui-egui/src/dialogs.rs
index e18011583,086dd2346..a6f247757
--- a/crates/ui-egui/src/dialogs.rs
+++ b/crates/ui-egui/src/dialogs.rs
@@@ -124,8 -116,8 +126,9 @@@ fn dialogs(app: &mut PdfCraftApp, ctx:
(PropsTab::InitialView, tl!("Initial View")),
(PropsTab::Security, tl!("Security")),
(PropsTab::Fonts, tl!("Fonts")),
+ (PropsTab::Custom, tl!("Custom")),
(PropsTab::Advanced, tl!("Advanced")),
+ (PropsTab::SpaceAudit, tl!("Space Audit")),
] {
if widgets::mode_tab(ui, label, tab == tb).clicked() {
next = Dialog::Properties(tb);
diff --cc crates/ui-egui/src/lib.rs
index 62398a676,e50145f8c..676a3cd1d
--- a/crates/ui-egui/src/lib.rs
+++ b/crates/ui-egui/src/lib.rs
@@@ -371,10 -374,19 +374,20 @@@ pub enum PropsTab
InitialView,
Security,
Fonts,
+ Custom,
Advanced,
+ SpaceAudit,
}
+ /// Document Properties ▸ Custom being edited: the properties as they will be after OK, in order,
+ /// and the Name and Value fields.
+ #[derive(Clone, Debug, Default, PartialEq)]
+ pub struct CustomDraft {
+ pub props: Vec<(String, String)>,
+ pub name: String,
+ pub value: String,
+ }
+
/// Duplicate Field: the field and the pages (all, or a range, 1-based).
#[derive(Clone, Debug, PartialEq)]
pub struct DuplicateDraft {
@@@ -2683,8 -2902,8 +2906,9 @@@ impl PdfCraftApp
"properties" => Some(Dialog::Properties(PropsTab::Description)),
"security" => Some(Dialog::Properties(PropsTab::Security)),
"fonts" => Some(Dialog::Properties(PropsTab::Fonts)),
+ "custom" => Some(Dialog::Properties(PropsTab::Custom)),
"advanced" => Some(Dialog::Properties(PropsTab::Advanced)),
+ "space-audit" => Some(Dialog::Properties(PropsTab::SpaceAudit)),
"shortcuts" => Some(Dialog::Shortcuts),
"split" => Some(Dialog::Split),
"protect" => Some(Dialog::Protect),
diff --cc crates/ui-egui/src/optimize_ui.rs
index 5fc19606d,6662bf997..d46d7ae59
--- a/crates/ui-egui/src/optimize_ui.rs
+++ b/crates/ui-egui/src/optimize_ui.rs
@@@ -7,8 -7,8 +7,8 @@@
use std::sync::{Arc, Mutex};
-use egui::{Align, Layout};
+use egui::{Align, Layout, RichText};
- use pdfcraft_engine::optimize::{Compression, ImageSettings, Preset, QUALITIES, Settings};
+ use pdfcraft_engine::optimize::{Compatibility, Compression, ImageSettings, Preset, QUALITIES, Settings};
use pdfcraft_engine::optimizer::{OptimizeStage, Optimized};
use pdfcraft_engine::{DocId, EditError, Hidden, OptimizeReport};
diff --cc parity/acrobat-features.toml
index b296ee2b4,2c9cf1719..60e2c4738
--- a/parity/acrobat-features.toml
+++ b/parity/acrobat-features.toml
@@@ -3448,8 -3471,8 +3471,8 @@@ milestone = "M3
status = "shipped"
commands = ["file.properties"]
tools = ["doc_info"]
- evidence = ["crates/ui-egui/tests/it/editing.rs::document_properties_edit_is_one_undoable_step", "crates/ui-egui/tests/it/editing.rs::cancelling_properties_discards_the_draft", "crates/ui-egui/tests/it/dialog_chrome.rs::document_properties_values_line_up_and_long_fields_wrap", "crates/ui-egui/tests/it/dialog_chrome.rs::space_audit_tab_measures_the_file_and_stays_in_the_card"]
- notes = "Description, Initial View, Security, Fonts and Advanced, plus a Space Audit tab Acrobat does not have (its audit is only in the PDF Optimizer); the audit runs when the tab opens and again after an edit. No Custom tab (organize.custom-properties)"
-evidence = ["crates/ui-egui/tests/it/editing.rs::document_properties_edit_is_one_undoable_step", "crates/ui-egui/tests/it/editing.rs::cancelling_properties_discards_the_draft", "crates/organize/src/tests.rs::document_info_falls_back_to_the_xmp_packet", "crates/engine/src/tests.rs::document_information_stated_only_in_xmp_is_shown"]
-notes = "Title, Author, Subject and Keywords (and Creator, Producer in doc_info) come from /Info, else from the XMP packet (dc:title, dc:creator, dc:description, pdf:Keywords, xmp:CreatorTool, pdf:Producer) for files that state them only there; edits write both. Missing: a UTF-16 XMP packet isn't read, and /Info kept only in an older revision's trailer isn't looked up"
++evidence = ["crates/ui-egui/tests/it/editing.rs::document_properties_edit_is_one_undoable_step", "crates/ui-egui/tests/it/editing.rs::cancelling_properties_discards_the_draft", "crates/organize/src/tests.rs::document_info_falls_back_to_the_xmp_packet", "crates/engine/src/tests.rs::document_information_stated_only_in_xmp_is_shown", "crates/ui-egui/tests/it/dialog_chrome.rs::document_properties_values_line_up_and_long_fields_wrap", "crates/ui-egui/tests/it/dialog_chrome.rs::space_audit_tab_measures_the_file_and_stays_in_the_card"]
++notes = "Description, Initial View, Security, Fonts, Custom (organize.custom-properties) and Advanced, plus a Space Audit tab Acrobat does not have (its audit is only in the PDF Optimizer); the audit runs when the tab opens and again after an edit. Title, Author, Subject and Keywords (and Creator, Producer in doc_info) come from /Info, else from the XMP packet (dc:title, dc:creator, dc:description, pdf:Keywords, xmp:CreatorTool, pdf:Producer) for files that state them only there; edits write both. Missing: a UTF-16 XMP packet isn't read, and /Info kept only in an older revision's trailer isn't looked up"
[[feature]]
id = "organize.edit-metadata"