diff --git a/Cargo.lock b/Cargo.lock index ff9eb450c..b70877663 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1396,53 +1396,145 @@ dependencies = [ name = "craft" version = "0.1.0" dependencies = [ + "craft-aaf", + "craft-aep", + "craft-affinity", "craft-ai-core", + "craft-assuan", "craft-atomic", "craft-audio", "craft-automation", "craft-behavior", "craft-browse", + "craft-captions", + "craft-cfb", "craft-cms", + "craft-codepage", "craft-color", + "craft-crs", "craft-crw", + "craft-csv", + "craft-dav", + "craft-designcraft-format", "craft-dialogs", "craft-doc", + "craft-doc-binary", "craft-docpath", + "craft-document-bundle", + "craft-docx", + "craft-dpx", "craft-draw", + "craft-drawingml", + "craft-dwg", + "craft-dxf", "craft-ecproj-format", + "craft-eps", + "craft-epub", + "craft-ews", + "craft-exr", + "craft-fig", + "craft-figcraft-format", + "craft-figma-rest", + "craft-file-formats", + "craft-file-import", + "craft-flags", + "craft-flow", "craft-font-catalog", "craft-font-manager", "craft-font-store", "craft-font-subset", + "craft-gainmap", + "craft-gcode", + "craft-gif", + "craft-hdr", + "craft-heif", "craft-host", + "craft-html", "craft-i18n", + "craft-ical", + "craft-idml", "craft-imaging", + "craft-indd", + "craft-jmap", "craft-jpeg", "craft-keymap", + "craft-kiwi", + "craft-kra", + "craft-latex", "craft-layers", + "craft-lottie", + "craft-markdown", + "craft-materialx", + "craft-math", "craft-media", "craft-menu", + "craft-mesh", + "craft-metadata", + "craft-metafile", + "craft-midi", + "craft-mime", + "craft-odf", + "craft-ods", + "craft-offcrypto", + "craft-opc", + "craft-openpgp", + "craft-ora", "craft-pages", + "craft-pcraft-bundle", "craft-pcraft-format", "craft-pdf 0.1.0", + "craft-pdn", + "craft-penpot", + "craft-pkcs7", "craft-platform", + "craft-plotter", + "craft-pptx", + "craft-prc", "craft-prepress", "craft-print", "craft-proof", + "craft-psd", + "craft-pst", "craft-quit", + "craft-raster-codecs", + "craft-raw", "craft-review", + "craft-rtf", + "craft-scraft-format", "craft-settings", + "craft-sf2", + "craft-sheet", + "craft-silhouette-studio", + "craft-sketch", + "craft-stencilcraft-document", + "craft-stencilcraft-format", + "craft-stream-codecs", + "craft-svg", "craft-table", "craft-text", + "craft-tga", "craft-theme", "craft-theme-store", + "craft-tiff", + "craft-time", "craft-timeline", "craft-ui", "craft-update", + "craft-vcard", "craft-vectorcraft-format", + "craft-vectordrawable", + "craft-video", "craft-web-api", "craft-web-host", + "craft-webp", "craft-window", + "craft-wordmodel", + "craft-xcf", + "craft-xls", + "craft-xlsx", + "craft-xml", + "craft-y4m", + "craft-zip", "egui", "toml", ] @@ -2812,6 +2904,7 @@ version = "0.1.0" dependencies = [ "craft-atomic", "craft-host", + "craft-settings", "dirs", "serde", "serde_json", @@ -2927,6 +3020,7 @@ dependencies = [ "craft-behavior", "craft-font-manager", "craft-host", + "craft-keymap", "craft-theme", "craft-ui", "egui", diff --git a/Cargo.toml b/Cargo.toml index 4870ac7a7..9eee64525 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -138,6 +138,7 @@ craft-sheet = { path = "crates/sheet" } craft-sketch = { path = "crates/sketch" } craft-review = { path = "crates/review" } craft-settings = { path = "crates/settings" } +craft-figcraft-format = { path = "crates/figcraft-format" } craft-scraft-format = { path = "crates/scraft-format" } craft-time = { path = "crates/time" } craft-silhouette-studio = { path = "crates/silhouette-studio" } diff --git a/crates/atomic/src/lib.rs b/crates/atomic/src/lib.rs index bb418fff5..b67be9885 100644 --- a/crates/atomic/src/lib.rs +++ b/crates/atomic/src/lib.rs @@ -390,6 +390,10 @@ fn stage( .map_err(|e| permissions_error(e, path)) }) .and_then(|()| fs.sync(&file).map_err(|e| write_error(e, path, dir, existed))); + #[allow( + clippy::drop_non_drop, + reason = "File has no drop glue on wasm32-unknown-unknown; on other targets the drop closes it before the next step" + )] drop(file); if written.is_err() { let _ = fs.remove(&tmp); @@ -489,6 +493,10 @@ fn copy_new(fs: &dyn AtomicFs, tmp: &Path, target: &Path, permissions: NewFilePe } fs.sync(&to) }); + #[allow( + clippy::drop_non_drop, + reason = "File has no drop glue on wasm32-unknown-unknown; on other targets the drop closes it before the next step" + )] drop(to); if copied.is_err() { let _ = fs.remove(target); diff --git a/crates/automation/tests/it/synthetic.rs b/crates/automation/tests/it/synthetic.rs index 972bf5659..a8e99ee5e 100644 --- a/crates/automation/tests/it/synthetic.rs +++ b/crates/automation/tests/it/synthetic.rs @@ -5,7 +5,7 @@ use std::cell::{Cell, RefCell}; use std::rc::Rc; -use craft_automation::synthetic::{At, MAX_CLICKS, NOT_FINITE, MAX_SCREEN_POINT, NO_DOCUMENT, input_method}; +use craft_automation::synthetic::{At, MAX_CLICKS, MAX_SCREEN_POINT, NO_DOCUMENT, NOT_FINITE, input_method}; use craft_ui::contract::{Bind, Show as _}; use craft_ui::runtime::egui::injected::hook_without_pass; use craft_ui::runtime::windows::WindowHost; diff --git a/crates/craft/Cargo.toml b/crates/craft/Cargo.toml index f7e7412d8..803778ec1 100644 --- a/crates/craft/Cargo.toml +++ b/crates/craft/Cargo.toml @@ -61,6 +61,98 @@ craft-web-api = { workspace = true, optional = true } craft-web-host = { workspace = true, optional = true } craft-window = { workspace = true, optional = true } craft-ui = { workspace = true, optional = true } +craft-aaf = { workspace = true, optional = true } +craft-aep = { workspace = true, optional = true } +craft-affinity = { workspace = true, optional = true } +craft-assuan = { workspace = true, optional = true } +craft-captions = { workspace = true, optional = true } +craft-cfb = { workspace = true, optional = true } +craft-codepage = { workspace = true, optional = true } +craft-crs = { workspace = true, optional = true } +craft-csv = { workspace = true, optional = true } +craft-dav = { workspace = true, optional = true } +craft-designcraft-format = { workspace = true, optional = true } +craft-doc-binary = { workspace = true, optional = true } +craft-document-bundle = { workspace = true, optional = true } +craft-docx = { workspace = true, optional = true } +craft-dpx = { workspace = true, optional = true } +craft-drawingml = { workspace = true, optional = true } +craft-dwg = { workspace = true, optional = true } +craft-dxf = { workspace = true, optional = true } +craft-eps = { workspace = true, optional = true } +craft-epub = { workspace = true, optional = true } +craft-ews = { workspace = true, optional = true } +craft-exr = { workspace = true, optional = true } +craft-fig = { workspace = true, optional = true } +craft-figcraft-format = { workspace = true, optional = true } +craft-figma-rest = { workspace = true, optional = true } +craft-file-formats = { workspace = true, optional = true } +craft-file-import = { workspace = true, optional = true } +craft-flags = { workspace = true, optional = true } +craft-flow = { workspace = true, optional = true } +craft-gainmap = { workspace = true, optional = true } +craft-gcode = { workspace = true, optional = true } +craft-gif = { workspace = true, optional = true } +craft-hdr = { workspace = true, optional = true } +craft-heif = { workspace = true, optional = true } +craft-html = { workspace = true, optional = true } +craft-ical = { workspace = true, optional = true } +craft-idml = { workspace = true, optional = true } +craft-indd = { workspace = true, optional = true } +craft-jmap = { workspace = true, optional = true } +craft-kiwi = { workspace = true, optional = true } +craft-kra = { workspace = true, optional = true } +craft-latex = { workspace = true, optional = true } +craft-lottie = { workspace = true, optional = true } +craft-markdown = { workspace = true, optional = true } +craft-materialx = { workspace = true, optional = true } +craft-math = { workspace = true, optional = true } +craft-mesh = { workspace = true, optional = true } +craft-metadata = { workspace = true, optional = true } +craft-metafile = { workspace = true, optional = true } +craft-midi = { workspace = true, optional = true } +craft-mime = { workspace = true, optional = true } +craft-odf = { workspace = true, optional = true } +craft-ods = { workspace = true, optional = true } +craft-offcrypto = { workspace = true, optional = true } +craft-opc = { workspace = true, optional = true } +craft-openpgp = { workspace = true, optional = true } +craft-ora = { workspace = true, optional = true } +craft-pcraft-bundle = { workspace = true, optional = true } +craft-pdn = { workspace = true, optional = true } +craft-penpot = { workspace = true, optional = true } +craft-pkcs7 = { workspace = true, optional = true } +craft-plotter = { workspace = true, optional = true } +craft-pptx = { workspace = true, optional = true } +craft-prc = { workspace = true, optional = true } +craft-psd = { workspace = true, optional = true } +craft-pst = { workspace = true, optional = true } +craft-raster-codecs = { workspace = true, optional = true } +craft-raw = { workspace = true, optional = true } +craft-rtf = { workspace = true, optional = true } +craft-scraft-format = { workspace = true, optional = true } +craft-sf2 = { workspace = true, optional = true } +craft-sheet = { workspace = true, optional = true } +craft-silhouette-studio = { workspace = true, optional = true } +craft-sketch = { workspace = true, optional = true } +craft-stencilcraft-document = { workspace = true, optional = true } +craft-stencilcraft-format = { workspace = true, optional = true } +craft-stream-codecs = { workspace = true, optional = true } +craft-svg = { workspace = true, optional = true } +craft-tga = { workspace = true, optional = true } +craft-tiff = { workspace = true, optional = true } +craft-time = { workspace = true, optional = true } +craft-vcard = { workspace = true, optional = true } +craft-vectordrawable = { workspace = true, optional = true } +craft-video = { workspace = true, optional = true } +craft-webp = { workspace = true, optional = true } +craft-wordmodel = { workspace = true, optional = true } +craft-xcf = { workspace = true, optional = true } +craft-xls = { workspace = true, optional = true } +craft-xlsx = { workspace = true, optional = true } +craft-xml = { workspace = true, optional = true } +craft-y4m = { workspace = true, optional = true } +craft-zip = { workspace = true, optional = true } [features] ui = [ @@ -107,18 +199,39 @@ screen-testing = [ "craft-timeline?/screen-testing", "craft-update?/screen-testing", ] +aaf = ["dep:craft-aaf"] + +aep = ["dep:craft-aep"] + +affinity = ["dep:craft-affinity"] +affinity-synth = ["affinity", "craft-affinity/synth"] + ai-core = ["dep:craft-ai-core"] +assuan = ["dep:craft-assuan"] + atomic = ["dep:craft-atomic"] audio = ["dep:craft-audio"] +audio-aac-decode = ["audio", "craft-audio/aac-decode"] +audio-aac-encode = ["audio", "craft-audio/aac-encode"] +audio-ac3-decode = ["audio", "craft-audio/ac3-decode"] +audio-ac3-encode = ["audio", "craft-audio/ac3-encode"] +audio-alac-decode = ["audio", "craft-audio/alac-decode"] +audio-alac-encode = ["audio", "craft-audio/alac-encode"] audio-decode = ["audio", "craft-audio/decode"] audio-decode-native = ["audio", "craft-audio/decode-native"] +audio-eac3-encode = ["audio", "craft-audio/eac3-encode"] audio-encode = ["audio", "craft-audio/encode"] audio-flac-encode = ["audio", "craft-audio/flac-encode"] audio-lossless-encode = ["audio", "craft-audio/lossless-encode"] +audio-mp3-decode = ["audio", "craft-audio/mp3-decode"] +audio-mp3-encode = ["audio", "craft-audio/mp3-encode"] +audio-mpa-decode = ["audio", "craft-audio/mpa-decode"] +audio-opus-decode = ["audio", "craft-audio/opus-decode"] audio-pcm-encode = ["audio", "craft-audio/pcm-encode"] audio-peaks = ["audio", "craft-audio/peaks"] +audio-rayon = ["audio", "craft-audio/rayon"] audio-serde = ["audio", "craft-audio/serde"] audio-symphonia = ["audio", "craft-audio/symphonia"] @@ -126,23 +239,75 @@ automation = ["dep:craft-automation", "keymap"] browse = ["dep:craft-browse"] +captions = ["dep:craft-captions"] + +cfb = ["dep:craft-cfb"] + cms = ["dep:craft-cms"] +codepage = ["dep:craft-codepage"] + color = ["dep:craft-color", "keymap", "settings", "window", "platform"] +crs = ["dep:craft-crs"] + crw = ["dep:craft-crw"] +csv = ["dep:craft-csv"] + +dav = ["dep:craft-dav"] + +designcraft-format = ["dep:craft-designcraft-format"] + dialogs = ["dep:craft-dialogs"] # native only: rfd's folder picker and file paths doc = ["dep:craft-doc"] doc-pcraft-pixels = ["doc", "craft-doc/pcraft-pixels"] +doc-binary = ["dep:craft-doc-binary"] + docpath = ["dep:craft-docpath"] +document-bundle = ["dep:craft-document-bundle"] + +docx = ["dep:craft-docx"] + +dpx = ["dep:craft-dpx"] + draw = ["dep:craft-draw", "keymap", "color", "settings"] +drawingml = ["dep:craft-drawingml"] + +dwg = ["dep:craft-dwg"] + +dxf = ["dep:craft-dxf"] + ecproj-format = ["dep:craft-ecproj-format"] +eps = ["dep:craft-eps"] +eps-paths = ["eps", "craft-eps/paths"] + +epub = ["dep:craft-epub"] + +ews = ["dep:craft-ews"] + +exr = ["dep:craft-exr"] +exr-decode = ["exr", "craft-exr/decode"] + +fig = ["dep:craft-fig"] + +figcraft-format = ["dep:craft-figcraft-format"] + +figma-rest = ["dep:craft-figma-rest"] + +file-formats = ["dep:craft-file-formats"] + +file-import = ["dep:craft-file-import"] + +flags = ["dep:craft-flags"] + +flow = ["dep:craft-flow"] + font-catalog = ["dep:craft-font-catalog"] font-catalog-system = ["font-catalog", "craft-font-catalog/system"] @@ -153,46 +318,141 @@ font-store-bundled-index = ["font-store", "craft-font-store/bundled-index"] font-subset = ["dep:craft-font-subset"] # native only: HarfBuzz's C++ builds with the target's C++ compiler +gainmap = ["dep:craft-gainmap"] + +gcode = ["dep:craft-gcode"] + +gif = ["dep:craft-gif"] +gif-frames = ["gif", "craft-gif/frames"] + +hdr = ["dep:craft-hdr"] + +heif = ["dep:craft-heif"] +heif-decode = ["heif", "craft-heif/decode"] +heif-metadata = ["heif", "craft-heif/metadata"] +heif-testdata = ["heif", "craft-heif/testdata"] + +html = ["dep:craft-html"] +html-flow = ["html", "craft-html/flow"] + i18n-collate = ["craft-i18n/collate"] +ical = ["dep:craft-ical"] + +idml = ["dep:craft-idml"] + imaging = ["dep:craft-imaging", "keymap"] +indd = ["dep:craft-indd"] + +jmap = ["dep:craft-jmap"] + jpeg = ["dep:craft-jpeg"] keymap = ["dep:craft-keymap"] keymap-egui = ["keymap", "craft-keymap/egui"] +kiwi = ["dep:craft-kiwi"] + +kra = ["dep:craft-kra"] + +latex = ["dep:craft-latex"] + layers = ["dep:craft-layers"] +lottie = ["dep:craft-lottie"] + +markdown = ["dep:craft-markdown"] + +materialx = ["dep:craft-materialx"] + +math = ["dep:craft-math"] + media = ["dep:craft-media"] +media-avi = ["media", "craft-media/avi"] media-bitstream = ["media", "craft-media/bitstream"] media-isobmff = ["media", "craft-media/isobmff"] media-matroska = ["media", "craft-media/matroska"] +media-mpegts = ["media", "craft-media/mpegts"] +media-mxf = ["media", "craft-media/mxf"] media-ogg = ["media", "craft-media/ogg"] media-serde = ["media", "craft-media/serde"] menu = ["dep:craft-menu"] +mesh = ["dep:craft-mesh"] +mesh-fbx = ["mesh", "craft-mesh/fbx"] +mesh-gltf = ["mesh", "craft-mesh/gltf"] +mesh-obj = ["mesh", "craft-mesh/obj"] +mesh-ply = ["mesh", "craft-mesh/ply"] +mesh-stl = ["mesh", "craft-mesh/stl"] +mesh-threemf = ["mesh", "craft-mesh/threemf"] + +metadata = ["dep:craft-metadata"] + +metafile = ["dep:craft-metafile"] +metafile-write = ["metafile", "craft-metafile/write"] + +midi = ["dep:craft-midi"] +midi-serde = ["midi", "craft-midi/serde"] + +mime = ["dep:craft-mime"] +mime-detect = ["mime", "craft-mime/detect"] + +odf = ["dep:craft-odf"] +odf-text = ["odf", "craft-odf/text"] + +ods = ["dep:craft-ods"] + +offcrypto = ["dep:craft-offcrypto"] + +opc = ["dep:craft-opc"] +opc-test-support = ["opc", "craft-opc/test-support"] + +openpgp = ["dep:craft-openpgp"] + +ora = ["dep:craft-ora"] + pages = ["dep:craft-pages"] +pcraft-bundle = ["dep:craft-pcraft-bundle"] + pcraft-format = ["dep:craft-pcraft-format"] pdf = ["dep:craft-pdf"] +pdf-cos = ["pdf", "craft-pdf/cos"] +pdf-crypt = ["pdf", "craft-pdf/crypt"] +pdf-filters = ["pdf", "craft-pdf/filters"] pdf-interpret = ["pdf", "craft-pdf/interpret"] +pdf-paths = ["pdf", "craft-pdf/paths"] pdf-raster = ["pdf", "craft-pdf/raster"] pdf-read = ["pdf", "craft-pdf/read"] pdf-write = ["pdf", "craft-pdf/write"] pdf-write-pdf = ["pdf", "craft-pdf/write-pdf"] pdf-write-simple-text = ["pdf", "craft-pdf/write-simple-text"] +pdn = ["dep:craft-pdn"] + +penpot = ["dep:craft-penpot"] + +pkcs7 = ["dep:craft-pkcs7"] + platform = ["dep:craft-platform"] platform-appearance = ["platform", "craft-platform/appearance"] platform-browser = ["platform", "craft-platform/browser"] platform-clipboard = ["platform", "craft-platform/clipboard"] platform-pointer = ["platform", "craft-platform/pointer"] platform-screen = ["platform", "craft-platform/screen"] +platform-testing = ["platform", "craft-platform/testing"] platform-usage = ["platform", "craft-platform/usage"] +plotter = ["dep:craft-plotter"] +plotter-serde = ["plotter", "craft-plotter/serde"] + +pptx = ["dep:craft-pptx"] + +prc = ["dep:craft-prc"] + prepress = ["dep:craft-prepress"] prepress-flatten = ["prepress", "craft-prepress/flatten"] @@ -200,12 +460,67 @@ print = ["dep:craft-print"] proof = ["dep:craft-proof"] +psd = ["dep:craft-psd"] +psd-corpus = ["psd", "craft-psd/corpus"] +psd-serde = ["psd", "craft-psd/serde"] +psd-testgen = ["psd", "craft-psd/testgen"] + +pst = ["dep:craft-pst"] +pst-test-writer = ["pst", "craft-pst/test-writer"] + quit = ["dep:craft-quit"] +raster-codecs = ["dep:craft-raster-codecs"] + +raw = ["dep:craft-raw"] +raw-arw = ["raw", "craft-raw/arw"] +raw-cr2 = ["raw", "craft-raw/cr2"] +raw-cr3 = ["raw", "craft-raw/cr3"] +raw-crw = ["raw", "craft-raw/crw"] +raw-dng = ["raw", "craft-raw/dng"] +raw-erf = ["raw", "craft-raw/erf"] +raw-hasselblad = ["raw", "craft-raw/hasselblad"] +raw-jxl = ["raw", "craft-raw/jxl"] +raw-kodak = ["raw", "craft-raw/kodak"] +raw-mef = ["raw", "craft-raw/mef"] +raw-mrw = ["raw", "craft-raw/mrw"] +raw-nef = ["raw", "craft-raw/nef"] +raw-orf = ["raw", "craft-raw/orf"] +raw-pef = ["raw", "craft-raw/pef"] +raw-raf = ["raw", "craft-raw/raf"] +raw-rw2 = ["raw", "craft-raw/rw2"] +raw-srw = ["raw", "craft-raw/srw"] + review = ["dep:craft-review", "keymap"] +rtf = ["dep:craft-rtf"] +rtf-doc = ["rtf", "craft-rtf/doc"] +rtf-outlook = ["rtf", "craft-rtf/outlook"] + +scraft-format = ["dep:craft-scraft-format"] + settings = ["dep:craft-settings"] +sf2 = ["dep:craft-sf2"] +sf2-test-support = ["sf2", "craft-sf2/test-support"] + +sheet = ["dep:craft-sheet"] + +silhouette-studio = ["dep:craft-silhouette-studio"] + +sketch = ["dep:craft-sketch"] + +stencilcraft-document = ["dep:craft-stencilcraft-document"] + +stencilcraft-format = ["dep:craft-stencilcraft-format"] + +stream-codecs = ["dep:craft-stream-codecs"] + +svg = ["dep:craft-svg"] +svg-tree = ["svg", "craft-svg/tree"] +svg-tree-system-fonts = ["svg", "craft-svg/tree-system-fonts"] +svg-tree-text = ["svg", "craft-svg/tree-text"] + table = ["dep:craft-table", "keymap"] text = ["dep:craft-text"] @@ -270,9 +585,17 @@ text-turkish = ["text", "craft-text/turkish"] text-turkmen = ["text", "craft-text/turkmen"] text-ukrainian = ["text", "craft-text/ukrainian"] +tga = ["dep:craft-tga"] + theme-store = ["dep:craft-theme-store"] +tiff = ["dep:craft-tiff"] + +time = ["dep:craft-time"] + timeline = ["dep:craft-timeline", "keymap"] +timeline-otio = ["timeline", "craft-timeline/otio"] +timeline-xml = ["timeline", "craft-timeline/xml"] ui-app = ["ui", "craft-ui/app"] ui-color_fonts = ["ui", "craft-ui/color_fonts"] @@ -282,11 +605,63 @@ ui-testing = ["ui", "craft-ui/testing"] update = ["dep:craft-update"] # native only: downloads and installs through getrandom without wasm support +vcard = ["dep:craft-vcard"] + vectorcraft-format = ["dep:craft-vectorcraft-format"] +vectordrawable = ["dep:craft-vectordrawable"] + +video = ["dep:craft-video"] +video-apv = ["video", "craft-video/apv"] +video-apv-decode = ["video", "craft-video/apv-decode"] +video-apv-encode = ["video", "craft-video/apv-encode"] +video-av1 = ["video", "craft-video/av1"] +video-av1-decode = ["video", "craft-video/av1-decode"] +video-av1-encode = ["video", "craft-video/av1-encode"] +video-dnx = ["video", "craft-video/dnx"] +video-h264 = ["video", "craft-video/h264"] +video-h264-decode = ["video", "craft-video/h264-decode"] +video-h264-encode = ["video", "craft-video/h264-encode"] +video-hevc = ["video", "craft-video/hevc"] +video-hevc-decode = ["video", "craft-video/hevc-decode"] +video-hevc-encode = ["video", "craft-video/hevc-encode"] +video-mpeg2 = ["video", "craft-video/mpeg2"] +video-mpeg2-decode = ["video", "craft-video/mpeg2-decode"] +video-mpeg2-encode = ["video", "craft-video/mpeg2-encode"] +video-mpeg4 = ["video", "craft-video/mpeg4"] +video-mpeg4-encode = ["video", "craft-video/mpeg4-encode"] +video-prores = ["video", "craft-video/prores"] +video-threads = ["video", "craft-video/threads"] +video-vp8 = ["video", "craft-video/vp8"] +video-vp8-decode = ["video", "craft-video/vp8-decode"] +video-vp8-encode = ["video", "craft-video/vp8-encode"] +video-vp9 = ["video", "craft-video/vp9"] +video-vp9-decode = ["video", "craft-video/vp9-decode"] +video-vp9-encode = ["video", "craft-video/vp9-encode"] + web-api = ["dep:craft-web-api"] web-host = ["dep:craft-web-host"] +webp = ["dep:craft-webp"] +webp-frames = ["webp", "craft-webp/frames"] +webp-vp8 = ["webp", "craft-webp/vp8"] + window = ["dep:craft-window"] window-appkit = ["window", "craft-window/appkit"] + +wordmodel = ["dep:craft-wordmodel"] +wordmodel-test-support = ["wordmodel", "craft-wordmodel/test-support"] + +xcf = ["dep:craft-xcf"] + +xls = ["dep:craft-xls"] + +xlsx = ["dep:craft-xlsx"] + +xml = ["dep:craft-xml"] + +y4m = ["dep:craft-y4m"] + +zip = ["dep:craft-zip"] +zip-test-support = ["zip", "craft-zip/test-support"] diff --git a/crates/craft/src/lib.rs b/crates/craft/src/lib.rs index cf43819b5..c4fced353 100644 --- a/crates/craft/src/lib.rs +++ b/crates/craft/src/lib.rs @@ -6,8 +6,16 @@ pub mod egui_fork; #[cfg(all(feature = "ui-system_fonts", target_arch = "wasm32"))] compile_error!("`ui-system_fonts` is desktop-only: the system font index needs fontique, which has no web build"); +#[cfg(feature = "aaf")] +pub use craft_aaf as aaf; +#[cfg(feature = "aep")] +pub use craft_aep as aep; +#[cfg(feature = "affinity")] +pub use craft_affinity as affinity; #[cfg(feature = "ai-core")] pub use craft_ai_core as ai_core; +#[cfg(feature = "assuan")] +pub use craft_assuan as assuan; #[cfg(feature = "atomic")] pub use craft_atomic as atomic; #[cfg(feature = "audio")] @@ -17,22 +25,72 @@ pub use craft_automation as automation; pub use craft_behavior as behavior; #[cfg(feature = "browse")] pub use craft_browse as browse; +#[cfg(feature = "captions")] +pub use craft_captions as captions; +#[cfg(feature = "cfb")] +pub use craft_cfb as cfb; #[cfg(feature = "cms")] pub use craft_cms as cms; +#[cfg(feature = "codepage")] +pub use craft_codepage as codepage; #[cfg(feature = "color")] pub use craft_color as color; +#[cfg(feature = "crs")] +pub use craft_crs as crs; #[cfg(feature = "crw")] pub use craft_crw as crw; +#[cfg(feature = "csv")] +pub use craft_csv as csv; +#[cfg(feature = "dav")] +pub use craft_dav as dav; +#[cfg(feature = "designcraft-format")] +pub use craft_designcraft_format as designcraft_format; #[cfg(feature = "dialogs")] pub use craft_dialogs as dialogs; #[cfg(feature = "doc")] pub use craft_doc as doc; +#[cfg(feature = "doc-binary")] +pub use craft_doc_binary as doc_binary; #[cfg(feature = "docpath")] pub use craft_docpath as docpath; +#[cfg(feature = "document-bundle")] +pub use craft_document_bundle as document_bundle; +#[cfg(feature = "docx")] +pub use craft_docx as docx; +#[cfg(feature = "dpx")] +pub use craft_dpx as dpx; #[cfg(feature = "draw")] pub use craft_draw as draw; +#[cfg(feature = "drawingml")] +pub use craft_drawingml as drawingml; +#[cfg(feature = "dwg")] +pub use craft_dwg as dwg; +#[cfg(feature = "dxf")] +pub use craft_dxf as dxf; #[cfg(feature = "ecproj-format")] pub use craft_ecproj_format as ecproj_format; +#[cfg(feature = "eps")] +pub use craft_eps as eps; +#[cfg(feature = "epub")] +pub use craft_epub as epub; +#[cfg(feature = "ews")] +pub use craft_ews as ews; +#[cfg(feature = "exr")] +pub use craft_exr as exr; +#[cfg(feature = "fig")] +pub use craft_fig as fig; +#[cfg(feature = "figcraft-format")] +pub use craft_figcraft_format as figcraft_format; +#[cfg(feature = "figma-rest")] +pub use craft_figma_rest as figma_rest; +#[cfg(feature = "file-formats")] +pub use craft_file_formats as file_formats; +#[cfg(feature = "file-import")] +pub use craft_file_import as file_import; +#[cfg(feature = "flags")] +pub use craft_flags as flags; +#[cfg(feature = "flow")] +pub use craft_flow as flow; #[cfg(feature = "font-catalog")] pub use craft_font_catalog as font_catalog; #[cfg(feature = "font-manager")] @@ -41,61 +99,187 @@ pub use craft_font_manager as font_manager; pub use craft_font_store as font_store; #[cfg(feature = "font-subset")] pub use craft_font_subset as font_subset; +#[cfg(feature = "gainmap")] +pub use craft_gainmap as gainmap; +#[cfg(feature = "gcode")] +pub use craft_gcode as gcode; +#[cfg(feature = "gif")] +pub use craft_gif as gif; +#[cfg(feature = "hdr")] +pub use craft_hdr as hdr; +#[cfg(feature = "heif")] +pub use craft_heif as heif; pub use craft_host as host; +#[cfg(feature = "html")] +pub use craft_html as html; pub use craft_i18n as i18n; +#[cfg(feature = "ical")] +pub use craft_ical as ical; +#[cfg(feature = "idml")] +pub use craft_idml as idml; #[cfg(feature = "imaging")] pub use craft_imaging as imaging; +#[cfg(feature = "indd")] +pub use craft_indd as indd; +#[cfg(feature = "jmap")] +pub use craft_jmap as jmap; #[cfg(feature = "jpeg")] pub use craft_jpeg as jpeg; #[cfg(feature = "keymap")] pub use craft_keymap as keymap; +#[cfg(feature = "kiwi")] +pub use craft_kiwi as kiwi; +#[cfg(feature = "kra")] +pub use craft_kra as kra; +#[cfg(feature = "latex")] +pub use craft_latex as latex; #[cfg(feature = "layers")] pub use craft_layers as layers; +#[cfg(feature = "lottie")] +pub use craft_lottie as lottie; +#[cfg(feature = "markdown")] +pub use craft_markdown as markdown; +#[cfg(feature = "materialx")] +pub use craft_materialx as materialx; +#[cfg(feature = "math")] +pub use craft_math as math; #[cfg(feature = "media")] pub use craft_media as media; #[cfg(feature = "menu")] pub use craft_menu as menu; +#[cfg(feature = "mesh")] +pub use craft_mesh as mesh; +#[cfg(feature = "metadata")] +pub use craft_metadata as metadata; +#[cfg(feature = "metafile")] +pub use craft_metafile as metafile; +#[cfg(feature = "midi")] +pub use craft_midi as midi; +#[cfg(feature = "mime")] +pub use craft_mime as mime; +#[cfg(feature = "odf")] +pub use craft_odf as odf; +#[cfg(feature = "ods")] +pub use craft_ods as ods; +#[cfg(feature = "offcrypto")] +pub use craft_offcrypto as offcrypto; +#[cfg(feature = "opc")] +pub use craft_opc as opc; +#[cfg(feature = "openpgp")] +pub use craft_openpgp as openpgp; +#[cfg(feature = "ora")] +pub use craft_ora as ora; #[cfg(feature = "pages")] pub use craft_pages as pages; +#[cfg(feature = "pcraft-bundle")] +pub use craft_pcraft_bundle as pcraft_bundle; #[cfg(feature = "pcraft-format")] pub use craft_pcraft_format as pcraft_format; #[cfg(feature = "pdf")] pub use craft_pdf as pdf; +#[cfg(feature = "pdn")] +pub use craft_pdn as pdn; +#[cfg(feature = "penpot")] +pub use craft_penpot as penpot; +#[cfg(feature = "pkcs7")] +pub use craft_pkcs7 as pkcs7; #[cfg(feature = "platform")] pub use craft_platform as platform; +#[cfg(feature = "plotter")] +pub use craft_plotter as plotter; +#[cfg(feature = "pptx")] +pub use craft_pptx as pptx; +#[cfg(feature = "prc")] +pub use craft_prc as prc; #[cfg(feature = "prepress")] pub use craft_prepress as prepress; #[cfg(feature = "print")] pub use craft_print as print; #[cfg(feature = "proof")] pub use craft_proof as proof; +#[cfg(feature = "psd")] +pub use craft_psd as psd; +#[cfg(feature = "pst")] +pub use craft_pst as pst; #[cfg(feature = "quit")] pub use craft_quit as quit; +#[cfg(feature = "raster-codecs")] +pub use craft_raster_codecs as raster_codecs; +#[cfg(feature = "raw")] +pub use craft_raw as raw; #[cfg(feature = "review")] pub use craft_review as review; +#[cfg(feature = "rtf")] +pub use craft_rtf as rtf; +#[cfg(feature = "scraft-format")] +pub use craft_scraft_format as scraft_format; #[cfg(feature = "settings")] pub use craft_settings as settings; +#[cfg(feature = "sf2")] +pub use craft_sf2 as sf2; +#[cfg(feature = "sheet")] +pub use craft_sheet as sheet; +#[cfg(feature = "silhouette-studio")] +pub use craft_silhouette_studio as silhouette_studio; +#[cfg(feature = "sketch")] +pub use craft_sketch as sketch; +#[cfg(feature = "stencilcraft-document")] +pub use craft_stencilcraft_document as stencilcraft_document; +#[cfg(feature = "stencilcraft-format")] +pub use craft_stencilcraft_format as stencilcraft_format; +#[cfg(feature = "stream-codecs")] +pub use craft_stream_codecs as stream_codecs; +#[cfg(feature = "svg")] +pub use craft_svg as svg; #[cfg(feature = "table")] pub use craft_table as table; #[cfg(feature = "text")] pub use craft_text as text; +#[cfg(feature = "tga")] +pub use craft_tga as tga; pub use craft_theme as theme; #[cfg(feature = "theme-store")] pub use craft_theme_store as theme_store; +#[cfg(feature = "tiff")] +pub use craft_tiff as tiff; +#[cfg(feature = "time")] +pub use craft_time as time; #[cfg(feature = "timeline")] pub use craft_timeline as timeline; #[cfg(feature = "ui")] pub use craft_ui as ui; #[cfg(feature = "update")] pub use craft_update as update; +#[cfg(feature = "vcard")] +pub use craft_vcard as vcard; #[cfg(feature = "vectorcraft-format")] pub use craft_vectorcraft_format as vectorcraft_format; +#[cfg(feature = "vectordrawable")] +pub use craft_vectordrawable as vectordrawable; +#[cfg(feature = "video")] +pub use craft_video as video; #[cfg(feature = "web-api")] pub use craft_web_api as web_api; #[cfg(feature = "web-host")] pub use craft_web_host as web_host; +#[cfg(feature = "webp")] +pub use craft_webp as webp; #[cfg(feature = "window")] pub use craft_window as window; +#[cfg(feature = "wordmodel")] +pub use craft_wordmodel as wordmodel; +#[cfg(feature = "xcf")] +pub use craft_xcf as xcf; +#[cfg(feature = "xls")] +pub use craft_xls as xls; +#[cfg(feature = "xlsx")] +pub use craft_xlsx as xlsx; +#[cfg(feature = "xml")] +pub use craft_xml as xml; +#[cfg(feature = "y4m")] +pub use craft_y4m as y4m; +#[cfg(feature = "zip")] +pub use craft_zip as zip; #[cfg(feature = "ui")] pub use egui; diff --git a/crates/craft/tests/common/mod.rs b/crates/craft/tests/common/mod.rs index 4bd2e5858..09ef92a74 100644 --- a/crates/craft/tests/common/mod.rs +++ b/crates/craft/tests/common/mod.rs @@ -15,6 +15,14 @@ pub const NOT_IN_FACADE: &[(&str, &str)] = &[ ("ui-bench", "a tool: the release-mode benchmark of the UI library"), ("ui-gallery", "a tool: the story gallery application"), ("ui-macros", "a proc-macro crate that craft-ui re-exports"), + ("svg-paths", "the former name of craft-svg's geometry reader; re-exports it"), + ("ui-canvas", "part of craft-ui, which the facade exposes as `ui`"), + ("ui-contract", "part of craft-ui, which the facade exposes as `ui`"), + ("ui-panels", "part of craft-ui, which the facade exposes as `ui`"), + ("ui-patterns", "part of craft-ui, which the facade exposes as `ui`"), + ("ui-shell", "part of craft-ui, which the facade exposes as `ui`"), + ("ui-test-kit", "test support shared by craft-ui's integration binaries"), + ("ui-widgets", "part of craft-ui, which the facade exposes as `ui`"), ("win32", "the `unsafe` Win32 calls behind a safe API, used by craft-window"), ]; diff --git a/crates/craft/tests/features.rs b/crates/craft/tests/features.rs index fcaae91d6..a57212b1f 100644 --- a/crates/craft/tests/features.rs +++ b/crates/craft/tests/features.rs @@ -1,5 +1,6 @@ //! The facade's `[features]` table is written from the member crates' manifests. -//! `UPDATE_FACADE=1 cargo test -p craft -- integration::features` rewrites the checked-in table. +//! `UPDATE_FACADE=1 cargo test -p craft -- integration::features` rewrites the checked-in table, and +//! first adds the optional dependency line and the `pub use` line of every member the facade lacks. use super::common; @@ -114,6 +115,46 @@ fn checked_in(manifest: &str) -> (usize, usize) { (start, end) } +/// Adds `craft-x = { workspace = true, optional = true }` to the facade manifest's `[dependencies]` and +/// `pub use craft_x as x;` to `src/lib.rs` for every member that has neither, leaving the hand-written lines alone. +fn add_missing_members(members: &[Member], manifest_path: &std::path::Path) { + let manifest = std::fs::read_to_string(manifest_path).unwrap(); + let have: toml::Table = manifest.parse().unwrap(); + let deps = have["dependencies"].as_table().unwrap(); + let missing: Vec<&Member> = members.iter().filter(|m| !deps.contains_key(&format!("craft-{}", m.dir))).collect(); + if !missing.is_empty() { + let at = manifest.find("\n[features]").expect("[features] section"); + let head = manifest[..at].trim_end(); + let mut text = head.to_owned(); + for m in &missing { + text += &format!("\ncraft-{} = {{ workspace = true, optional = true }}", m.dir); + } + text += "\n"; + text += &manifest[at..]; + std::fs::write(manifest_path, text).unwrap(); + } + + let lib_path = manifest_path.with_file_name("src/lib.rs"); + let lib = std::fs::read_to_string(&lib_path).unwrap(); + let mut lines: Vec = lib.lines().map(str::to_owned).collect(); + for m in members.iter().filter(|m| !m.always_on() && m.dir != "ui") { + let ident = m.dir.replace('-', "_"); + if lines.iter().any(|l| l.starts_with(&format!("pub use craft_{ident} as "))) { + continue; + } + let name_of = |l: &String| l.strip_prefix("pub use craft_").and_then(|r| r.split(' ').next()).map(str::to_owned); + let at = lines + .iter() + .position(|l| name_of(l).is_some_and(|n| n > ident)) + .or_else(|| lines.iter().position(|l| l == "pub use egui;")) + .expect("re-export block"); + let at = if lines[at - 1].starts_with("#[cfg(") { at - 1 } else { at }; + lines.insert(at, format!("pub use craft_{ident} as {ident};")); + lines.insert(at, format!("#[cfg(feature = \"{}\")]", m.dir)); + } + std::fs::write(&lib_path, lines.join("\n") + "\n").unwrap(); +} + #[test] fn features_table_matches_member_manifests() { let members = members(); @@ -122,6 +163,9 @@ fn features_table_matches_member_manifests() { let manifest = std::fs::read_to_string(&path).unwrap(); let (start, end) = checked_in(&manifest); if std::env::var_os("UPDATE_FACADE").is_some() { + add_missing_members(&members, &path); + let manifest = std::fs::read_to_string(&path).unwrap(); + let (start, end) = checked_in(&manifest); let mut text = manifest[..start].to_owned(); text += &want; text += &manifest[end..]; diff --git a/crates/draw/src/ui/artboard/stories.rs b/crates/draw/src/ui/artboard/stories.rs index aceab6700..0c04cda36 100644 --- a/crates/draw/src/ui/artboard/stories.rs +++ b/crates/draw/src/ui/artboard/stories.rs @@ -153,8 +153,8 @@ impl Boards { let page = |(index, item): (usize, &ArtboardItem)| { let page = PageFrame::new(item.rect.abs()).name(item.name.clone()).active(self.selected.contains(&index)); match item.background { - ArtboardBackground::White => page.fill(DataColor(Color32::WHITE)), - ArtboardBackground::Black => page.fill(DataColor(Color32::BLACK)), + ArtboardBackground::White => page.fill(DataColor(Color32::WHITE)), // design: allow[raw-colour/const](the artboard background is document data) + ArtboardBackground::Black => page.fill(DataColor(Color32::BLACK)), // design: allow[raw-colour/const](the artboard background is document data) ArtboardBackground::Custom(color) => page.fill(DataColor(Color32::from(color))), _ => page, } diff --git a/crates/draw/src/ui/brush_presets/picker.rs b/crates/draw/src/ui/brush_presets/picker.rs index 0c5252eab..4fa4238e4 100644 --- a/crates/draw/src/ui/brush_presets/picker.rs +++ b/crates/draw/src/ui/brush_presets/picker.rs @@ -364,7 +364,7 @@ impl<'a, K: Value + Eq + Hash> BrushPresetPicker<'a, K> { let next_search = Cell::new(before.search); let tool_picks: RefCell>> = RefCell::new(Vec::new()); let (mut diameter, mut hardness, mut tip) = (EditEvents::new(), EditEvents::new(), EditEvents::new()); - let browser_id = ui.make_persistent_id("browser"); + let browser_id = ui.scope_id().with("browser"); let has_app_rows = gear_rows.is_some(); let head = |ui: &mut Ui, _: &mut BodyCx<'_>| { Row::new().show(ui, |ui, _| { diff --git a/crates/draw/src/ui/crop/perspective_tool.rs b/crates/draw/src/ui/crop/perspective_tool.rs index 51cb7995a..febf7e559 100644 --- a/crates/draw/src/ui/crop/perspective_tool.rs +++ b/crates/draw/src/ui/crop/perspective_tool.rs @@ -16,8 +16,8 @@ use craft_ui::primitives::{Draw, PaintShape, StrokeWidth}; use craft_ui::runtime::env::Env; use egui::Pos2; -use super::session::{CropDocKey, DocOwner}; use super::perspective_crop::{PerspectiveCropOutput, PerspectiveCropQuad, PerspectiveQuad, grid_color, grid_lines, grid_step, is_valid, ordered}; +use super::session::{CropDocKey, DocOwner}; use super::words::CropWords; /// The key of the Perspective Crop To... command form. diff --git a/crates/draw/src/ui/gradient/palette/mod.rs b/crates/draw/src/ui/gradient/palette/mod.rs index 3f87152fe..f1ada3993 100644 --- a/crates/draw/src/ui/gradient/palette/mod.rs +++ b/crates/draw/src/ui/gradient/palette/mod.rs @@ -75,11 +75,14 @@ impl GradientRef { /// ``` /// use craft_theme::Srgba; /// use craft_color::ui::gradient::{ColorStop, GradientStops}; -/// use craft_draw::ui::{GradientGroup, GradientItem, GradientPalette}; +/// use craft_draw::ui::{GradientGroup, GradientItem, GradientPalette, GradientRef}; +/// use craft_ui::contract::{Bind, Show as _}; +/// use craft_ui::patterns::presets::PresetState; /// # egui::__run_test_ui(|ui| { /// let stops = GradientStops::new(vec![ColorStop::new(0.0, Srgba::rgb(0.0, 0.0, 0.0)), ColorStop::new(1.0, Srgba::rgb(1.0, 1.0, 1.0))]); /// let groups = [GradientGroup::new("Basics", vec![GradientItem::new("Black, White", stops)])]; -/// let picked = GradientPalette::new("presets", "Gradient presets", &groups).show(ui); +/// let mut state = PresetState::::new(); +/// let picked = GradientPalette::new("Gradient presets", &groups, Bind::bound(&mut state)).show(ui); /// if let Some(pick) = picked.picked { /// // copy the preset's stops into the host's gradient /// let _ = pick; diff --git a/crates/draw/src/ui/mod.rs b/crates/draw/src/ui/mod.rs index 321997dfd..ad15fcda0 100644 --- a/crates/draw/src/ui/mod.rs +++ b/crates/draw/src/ui/mod.rs @@ -70,8 +70,8 @@ pub use connector::{ pub use corner::{CornerEdit, CornerKind, CornerRadii, CornerStyle, CornerWidgets}; pub use crop::{ CropBar, CropBarOutput, CropBarWords, CropCommit, CropDocument, CropEvent, CropFill, CropInput, CropLength, CropOptionsMenu, CropOutput, - CropOverlayMenu, CropPresetChoice, CropRatio, CropRatioChange, CropSession, CropSettings, CropSizePreset, CropShown, CropTarget, CropTool, CropToolPass, - CropUserPreset, CropWords, PerspectiveCropOutput, PerspectiveCropTool, ResolutionUnit, + CropOverlayMenu, CropPresetChoice, CropRatio, CropRatioChange, CropSession, CropSettings, CropShown, CropSizePreset, CropTarget, CropTool, + CropToolPass, CropUserPreset, CropWords, PerspectiveCropOutput, PerspectiveCropTool, ResolutionUnit, }; pub use crop::{ CropPresetList, CropPresetListOutput, CropSizeTarget, PerspectiveCropBar, PerspectiveCropBarOutput, PerspectiveCropPass, PerspectiveInput, diff --git a/crates/draw/src/ui/slice/mod.rs b/crates/draw/src/ui/slice/mod.rs index aa97bdc4f..2ecba610e 100644 --- a/crates/draw/src/ui/slice/mod.rs +++ b/crates/draw/src/ui/slice/mod.rs @@ -8,9 +8,9 @@ //! use craft_draw::ui::slice::{SliceCommand, SliceEvent, SliceItem, SliceOverlay, SliceTool}; //! use craft_ui::canvas::{Canvas, ToolHost, ToolPath}; //! use craft_ui::contract::{Show as _, ShowContainer as _}; -//! # fn demo(ui: &mut egui::Ui, tool: &mut SliceTool, slices: &[SliceItem], selected: Option, locked: bool) { +//! # fn demo(ui: &mut egui::Ui, tool: &mut SliceTool, slices: &[SliceItem], selected: usize, locked: bool) { //! let shown = Canvas::new("Document").show(ui, |ui, body| { -//! SliceOverlay::new("Slices", slices).selected(selected).pick(true).locked(locked).show_at(ui, body.rect) +//! SliceOverlay::new("Slices", slices).selected_slice(selected).pick(true).locked(locked).show_at(ui, body.rect) //! }); //! let _ = ToolHost::new().run(ui, &shown.output, tool); //! let mut events = tool.take_events(); diff --git a/crates/draw/src/ui/transform/session_overlay.rs b/crates/draw/src/ui/transform/session_overlay.rs index ca1311dba..6f09a55d8 100644 --- a/crates/draw/src/ui/transform/session_overlay.rs +++ b/crates/draw/src/ui/transform/session_overlay.rs @@ -68,7 +68,17 @@ pub struct TransformOverlay<'a, W> { impl<'a, W: TransformWarp> TransformOverlay<'a, W> { /// The overlay of `session` named `label`, with the box rules `settings` give. pub fn new(label: impl Into