LightCraft: An open-source non-destructive photo editor written by scratch in pure Rust
Merge upstream main into title-bar-movable; craft-window at craft-libs main 1e6f127
aiongg003779ce51b5
diff --cc Cargo.lockindex 20ff672be,a9a326ab8..492fef141--- a/Cargo.lock+++ b/Cargo.lock@@@ -1091,22 -1186,36 +1186,47 @@@ dependencies ="serde",]+ [[package]]+ name = "craft-update"+ version = "0.1.0"+ source = "git+https://github.com/storytold/craft-libs?rev=495e5971bc024aa96e6ed318cb6e7cd3a0103184#495e5971bc024aa96e6ed318cb6e7cd3a0103184"+ dependencies = [+ "chrono",+ "dunce",+ "egui",+ "flate2",+ "getrandom 0.3.4",+ "log",+ "plist",+ "semver",+ "serde",+ "serde_json",+ "sha2",+ "tar",+ "tempfile",+ "ureq",+ "verifysign",+ "winreg",+ "winsafe",+ "zip 9.1.0",+ ]++[[package]]+name = "craft-window"+version = "0.1.0"- source = "git+https://github.com/storytold/craft-libs?rev=a0916808f7d78bed8c7b90cdf937176015454a7f#a0916808f7d78bed8c7b90cdf937176015454a7f"++source = "git+https://github.com/storytold/craft-libs?rev=1e6f127844ec61b3b8afdcc2bb76e7cfe470153f#1e6f127844ec61b3b8afdcc2bb76e7cfe470153f"+dependencies = [+ "egui",- "objc2 0.6.4",++ "objc2 0.6.5",+ "objc2-app-kit 0.3.2",+ "wayland-client",+]+[[package]]name = "crc32fast"- version = "1.5.2"+ version = "1.5.3"source = "registry+https://github.com/rust-lang/crates.io-index"- checksum = "01a7799fd6b852db0e61728dde9a204c423b44d689dbd432522543614b490e78"+ checksum = "0ba106e844045ddc02c20768ac4b0b7cb45f2cc2ecbd833ac9f5dacb183c2055"dependencies = ["cfg-if",]@@@ -1678,7 -1799,7 +1810,7 @@@ source = "registry+https://github.com/rchecksum = "39cab71617ae0d63f51a36d69f866391735b51691dbda63cf6f96d042b63efeb"dependencies = ["libc",- "windows-sys 0.60.2",- "windows-sys 0.59.0",++ "windows-sys 0.61.2",][[package]]@@@ -3548,7 -3713,7 +3724,8 @@@ name = "lightcraft-ui-eguiversion = "0.14.0"dependencies = ["craft-ui",+ "craft-update",+ "craft-window","egui","egui_kittest","lightcraft-catalog",@@@ -5306,7 -5550,7 +5562,7 @@@ dependencies ="errno","libc","linux-raw-sys 0.12.1",- "windows-sys 0.60.2",- "windows-sys 0.59.0",++ "windows-sys 0.61.2",][[package]]@@@ -5331,6 -5589,33 +5601,33 @@@ dependencies ="zeroize",]+ [[package]]+ name = "rustls-platform-verifier"+ version = "0.7.1"+ source = "registry+https://github.com/rust-lang/crates.io-index"+ checksum = "1167586491e2b18b8bfbb293e8180ec17c201c4f076d7cb3070ca964e7598f98"+ dependencies = [+ "core-foundation 0.10.1",+ "core-foundation-sys",+ "jni",+ "log",+ "once_cell",+ "rustls",+ "rustls-native-certs",+ "rustls-platform-verifier-android",+ "rustls-webpki 0.103.15",+ "security-framework",+ "security-framework-sys",+ "webpki-root-certs",- "windows-sys 0.59.0",++ "windows-sys 0.61.2",+ ]++ [[package]]+ name = "rustls-platform-verifier-android"+ version = "0.2.0"+ source = "registry+https://github.com/rust-lang/crates.io-index"+ checksum = "eec689c0bc40ff2458a5977b6619cb718087084a18e02a131c599b62d05e1a5f"+[[package]]name = "rustls-rustcrypto"version = "0.0.2-alpha"@@@ -5843,10 -6174,10 +6186,10 @@@ source = "registry+https://github.com/rchecksum = "32497e9a4c7b38532efcdebeef879707aa9f794296a4f0244f6f69e9bc8574bd"dependencies = ["fastrand",- "getrandom 0.3.4",+ "getrandom 0.4.3","once_cell","rustix 1.1.5",- "windows-sys 0.60.2",- "windows-sys 0.59.0",++ "windows-sys 0.61.2",][[package]]@@@ -6656,7 -7077,7 +7089,7 @@@ version = "0.1.11source = "registry+https://github.com/rust-lang/crates.io-index"checksum = "c2a7b1c03c876122aa43f3020e6c3c3ee5c05081c9a00739faf7503aeba10d22"dependencies = [- "windows-sys 0.60.2",- "windows-sys 0.59.0",++ "windows-sys 0.61.2",][[package]]diff --cc Cargo.tomlindex f61b3b868,71fd2566c..b68c6e6ba--- a/Cargo.toml+++ b/Cargo.toml@@@ -12,7 -12,7 +12,8 @@@ repository = "https://github.com/storyt[workspace.dependencies]craft-ui = { git = "https://github.com/storytold/craft-libs", rev = "25da1314d443171b4adeaad2cd9454b273f35c6f", features = ["serde"] }craft-docpath = { version = "0.1.0", git = "https://github.com/storytold/craft-libs", rev = "82a24b006eefa036b43c09a67fb9a3fbd17ffe63" }- craft-window = { git = "https://github.com/storytold/craft-libs", rev = "a0916808f7d78bed8c7b90cdf937176015454a7f", features = ["egui"] }++craft-window = { git = "https://github.com/storytold/craft-libs", rev = "1e6f127844ec61b3b8afdcc2bb76e7cfe470153f", features = ["egui"] }+ craft-update = { git = "https://github.com/storytold/craft-libs", version = "=0.1.0", rev = "495e5971bc024aa96e6ed318cb6e7cd3a0103184", features = ["egui"] }# internallightcraft-denoise-core = { path = "crates/denoise-core" }lightcraft-denoise = { path = "crates/denoise", default-features = false }diff --cc crates/ui-egui/src/lib.rsindex a39fdda5c,be1a9e879..e53989fca--- a/crates/ui-egui/src/lib.rs+++ b/crates/ui-egui/src/lib.rs@@@ -49,6 -49,8 +49,7 @@@ pub mod syncpub mod tasks;pub mod text_field;pub mod theme;-pub mod titlebar;+ pub mod updates_ui;pub mod widgets;pub mod window_place;