From 7f77e3cb7c6950f77301128dbca7af53d88f2b3d Mon Sep 17 00:00:00 2001 From: aiongg Date: Tue, 20 Oct 2026 18:37:20 +0000 Subject: [PATCH] Shortcuts: craft-keymap d9b1a89 with the ui feature (craft-libs#186) --- Cargo.lock | 65 ++++++++++++++++++++++++++++++++++++++++++++++++++++-- Cargo.toml | 4 ++-- 2 files changed, 65 insertions(+), 4 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 2ceb0c2e6..71ae28db9 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -829,11 +829,23 @@ name = "craft-docpath" version = "0.1.0" source = "git+https://github.com/storytold/craft-libs?rev=82a24b006eefa036b43c09a67fb9a3fbd17ffe63#82a24b006eefa036b43c09a67fb9a3fbd17ffe63" +[[package]] +name = "craft-i18n" +version = "0.1.0" +source = "git+https://github.com/aiongg/craft-libs?rev=d9b1a89950c65685488da5807a2023dda31e1135#d9b1a89950c65685488da5807a2023dda31e1135" +dependencies = [ + "intl_pluralrules", + "sys-locale", + "unic-langid", +] + [[package]] name = "craft-keymap" version = "0.1.0" -source = "git+https://github.com/aiongg/craft-libs?rev=9aaf9dfd3882c12b6aab5604cc2567fc3b64127b#9aaf9dfd3882c12b6aab5604cc2567fc3b64127b" +source = "git+https://github.com/aiongg/craft-libs?rev=d9b1a89950c65685488da5807a2023dda31e1135#d9b1a89950c65685488da5807a2023dda31e1135" dependencies = [ + "craft-i18n", + "craft-ui 0.1.0 (git+https://github.com/aiongg/craft-libs?rev=d9b1a89950c65685488da5807a2023dda31e1135)", "egui", "serde", "serde_json", @@ -865,6 +877,14 @@ dependencies = [ "serde", ] +[[package]] +name = "craft-ui" +version = "0.1.0" +source = "git+https://github.com/aiongg/craft-libs?rev=d9b1a89950c65685488da5807a2023dda31e1135#d9b1a89950c65685488da5807a2023dda31e1135" +dependencies = [ + "egui", +] + [[package]] name = "crc32fast" version = "1.5.2" @@ -1231,7 +1251,7 @@ name = "designcraft-ui-egui" version = "0.9.0" dependencies = [ "craft-keymap", - "craft-ui", + "craft-ui 0.1.0 (git+https://github.com/storytold/craft-libs?rev=5c874d51eeb3de70e735c8ce87a59a7dedd47675)", "designcraft-color", "designcraft-compose", "designcraft-doc", @@ -2390,6 +2410,15 @@ dependencies = [ "hashbrown 0.17.1", ] +[[package]] +name = "intl_pluralrules" +version = "7.0.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "078ea7b7c29a2b4df841a7f6ac8775ff6074020c6776d48491ce2268e068f972" +dependencies = [ + "unic-langid", +] + [[package]] name = "is-docker" version = "0.2.0" @@ -4370,6 +4399,18 @@ dependencies = [ "syn 3.0.6", ] +[[package]] +name = "sys-locale" +version = "0.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8eab9a99a024a169fe8a903cf9d4a3b3601109bcc13bd9e3c6fff259138626c4" +dependencies = [ + "js-sys", + "libc", + "wasm-bindgen", + "web-sys", +] + [[package]] name = "tempfile" version = "3.27.0" @@ -4488,6 +4529,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b1e27c91459209c2986af3dcf603a5a74a4368754ce37414f59acc971167f643" dependencies = [ "displaydoc", + "serde_core", "zerovec", ] @@ -4624,6 +4666,24 @@ version = "0.1.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "eaea85b334db583fe3274d12b4cd1880032beab409c0d774be044d4480ab9a94" +[[package]] +name = "unic-langid" +version = "0.9.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a28ba52c9b05311f4f6e62d5d9d46f094bd6e84cb8df7b3ef952748d752a7d05" +dependencies = [ + "unic-langid-impl", +] + +[[package]] +name = "unic-langid-impl" +version = "0.9.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dce1bf08044d4b7a94028c93786f8566047edc11110595914de93362559bc658" +dependencies = [ + "tinystr", +] + [[package]] name = "unicode-bidi" version = "0.3.18" @@ -6005,6 +6065,7 @@ version = "0.11.8" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "bb0464e17806c1d976d5cba29399c7f08e516e279e2ba493f63123b5fca67dd8" dependencies = [ + "serde", "yoke", "zerofrom", "zerovec-derive", diff --git a/Cargo.toml b/Cargo.toml index eb2ee13c2..e7b90dd4b 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -13,8 +13,8 @@ repository = "https://github.com/storytold/designcraft" [workspace.dependencies] # Shared writer; the immutable revision must be published before this consumer. craft-pdf = { git = "https://github.com/storytold/craft-libs", rev = "c3487320b2d1de657b860b3c8abb44e1f2b32bd8", version = "=0.1.0", default-features = false } -# Shared keyboard bindings: chords, overrides, conflicts, egui dispatch. -craft-keymap = { git = "https://github.com/aiongg/craft-libs", rev = "9aaf9dfd3882c12b6aab5604cc2567fc3b64127b", version = "=0.1.0", features = ["egui"] } +# Shared keyboard bindings: chords, overrides, conflicts, egui dispatch, the Keyboard Shortcuts dialog. +craft-keymap = { git = "https://github.com/aiongg/craft-libs", rev = "d9b1a89950c65685488da5807a2023dda31e1135", version = "=0.1.0", features = ["egui", "ui"] } # internal designcraft-geom = { path = "crates/geom" } designcraft-color = { path = "crates/color" }