diff --git a/Cargo.lock b/Cargo.lock
index fa823d5..b634c8a 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -22,15 +22,15 @@ checksum = "c08606f8c3cbf4ce6ec8e28fb0014a2c086708fe954eaa885384a6165172e7e8"
[[package]]
name = "bitflags"
-version = "2.10.0"
+version = "2.9.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "812e12b5285cc515a9c72a5c1d3b6d46a19dac5acfef5265968c166106e31dd3"
+checksum = "6a65b545ab31d687cff52899d4890855fec459eb6afe0da6417b8a18da87aa29"
[[package]]
name = "cairo-rs"
-version = "0.21.5"
+version = "0.21.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b01fe135c0bd16afe262b6dea349bd5ea30e6de50708cec639aae7c5c14cc7e4"
+checksum = "1158f326d7b755a9ae2b36c5b5391400e3431f3b77418cedb6d7130126628f10"
dependencies = [
"bitflags",
"cairo-sys-rs",
@@ -40,9 +40,9 @@ dependencies = [
[[package]]
name = "cairo-sys-rs"
-version = "0.21.5"
+version = "0.21.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "06c28280c6b12055b5e39e4554271ae4e6630b27c0da9148c4cf6485fc6d245c"
+checksum = "b963177900ec8e783927e5ed99e16c0ec1b723f1f125dff8992db28ef35c62c3"
dependencies = [
"glib-sys",
"libc",
@@ -51,9 +51,9 @@ dependencies = [
[[package]]
name = "cfg-expr"
-version = "0.20.5"
+version = "0.20.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "21be0e1ce6cdb2ee7fff840f922fb04ead349e5cfb1e750b769132d44ce04720"
+checksum = "c8d458d63f0f0f482c8da9b7c8b76c21bd885a02056cc94c6404d861ca2b8206"
dependencies = [
"smallvec",
"target-lexicon",
@@ -199,9 +199,9 @@ dependencies = [
[[package]]
name = "gdk-pixbuf"
-version = "0.21.5"
+version = "0.21.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "debb0d39e3cdd84626edfd54d6e4a6ba2da9a0ef2e796e691c4e9f8646fda00c"
+checksum = "3c7330cdbbc653df431331ae3d9d59e985a0fecaf33d74c7c1c5d13ab0245f6c"
dependencies = [
"gdk-pixbuf-sys",
"gio",
@@ -211,9 +211,9 @@ dependencies = [
[[package]]
name = "gdk-pixbuf-sys"
-version = "0.21.5"
+version = "0.21.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bd95ad50b9a3d2551e25dd4f6892aff0b772fe5372d84514e9d0583af60a0ce7"
+checksum = "e25899cc931dc28cba912ebec793b730f53d2d419f90a562fcb29b53bd10aa82"
dependencies = [
"gio-sys",
"glib-sys",
@@ -224,9 +224,9 @@ dependencies = [
[[package]]
name = "gdk4"
-version = "0.10.3"
+version = "0.10.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "756564212bbe4a4ce05d88ffbd2582581ac6003832d0d32822d0825cca84bfbf"
+checksum = "0a67b064d2f35e649232455c7724f56f977555d2608c43300eabc530eaa4e359"
dependencies = [
"cairo-rs",
"gdk-pixbuf",
@@ -239,9 +239,9 @@ dependencies = [
[[package]]
name = "gdk4-sys"
-version = "0.10.3"
+version = "0.10.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a6d4e5b3ccf591826a4adcc83f5f57b4e59d1925cb4bf620b0d645f79498b034"
+checksum = "2edbda0d879eb85317bdb49a3da591ed70a804a10776e358ef416be38c6db2c5"
dependencies = [
"cairo-sys-rs",
"gdk-pixbuf-sys",
@@ -256,9 +256,9 @@ dependencies = [
[[package]]
name = "gio"
-version = "0.21.5"
+version = "0.21.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c5ff48bf600c68b476e61dc6b7c762f2f4eb91deef66583ba8bb815c30b5811a"
+checksum = "52b5e3f390d01b79e30da451dd00e27cd1ac2de81658e3abf6c1fc3229b24c5f"
dependencies = [
"futures-channel",
"futures-core",
@@ -273,9 +273,9 @@ dependencies = [
[[package]]
name = "gio-sys"
-version = "0.21.5"
+version = "0.21.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0071fe88dba8e40086c8ff9bbb62622999f49628344b1d1bf490a48a29d80f22"
+checksum = "a03f2234671e5a588cfe1f59c2b22c103f5772ea351be9cc824a9ce0d06d99fd"
dependencies = [
"glib-sys",
"gobject-sys",
@@ -286,9 +286,9 @@ dependencies = [
[[package]]
name = "glib"
-version = "0.21.5"
+version = "0.21.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "16de123c2e6c90ce3b573b7330de19be649080ec612033d397d72da265f1bd8b"
+checksum = "60bdc26493257b5794ba9301f7cbaf7ab0d69a570bfbefa4d7d360e781cb5205"
dependencies = [
"bitflags",
"futures-channel",
@@ -307,9 +307,9 @@ dependencies = [
[[package]]
name = "glib-macros"
-version = "0.21.5"
+version = "0.21.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cf59b675301228a696fe01c3073974643365080a76cc3ed5bc2cbc466ad87f17"
+checksum = "e772291ebea14c28eb11bb75741f62f4a4894f25e60ce80100797b6b010ef0f9"
dependencies = [
"heck",
"proc-macro-crate",
@@ -320,9 +320,9 @@ dependencies = [
[[package]]
name = "glib-sys"
-version = "0.21.5"
+version = "0.21.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2d95e1a3a19ae464a7286e14af9a90683c64d70c02532d88d87ce95056af3e6c"
+checksum = "dc7c43cff6a7dc43821e45ebf172399437acd6716fa2186b6852d2b397bf622d"
dependencies = [
"libc",
"system-deps",
@@ -330,9 +330,9 @@ dependencies = [
[[package]]
name = "gobject-sys"
-version = "0.21.5"
+version = "0.21.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2dca35da0d19a18f4575f3cb99fe1c9e029a2941af5662f326f738a21edaf294"
+checksum = "3e9a190eef2bce144a6aa8434e306974c6062c398e0a33a146d60238f9062d5c"
dependencies = [
"glib-sys",
"libc",
@@ -341,9 +341,9 @@ dependencies = [
[[package]]
name = "graphene-rs"
-version = "0.21.5"
+version = "0.21.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2730030ac9db663fd8bfe1e7093742c1cafb92db9c315c9417c29032341fe2f9"
+checksum = "d96914394464c04df8279c23976293afd53b2588e03c9d8d9662ef6528654a85"
dependencies = [
"glib",
"graphene-sys",
@@ -352,9 +352,9 @@ dependencies = [
[[package]]
name = "graphene-sys"
-version = "0.21.5"
+version = "0.21.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "915e32091ea9ad241e4b044af62b7351c2d68aeb24f489a0d7f37a0fc484fd93"
+checksum = "cf8205bb19b7a041cf059be3c94d6b23b3f2c6c96362c44311dcf184e4a9422a"
dependencies = [
"glib-sys",
"libc",
@@ -364,9 +364,9 @@ dependencies = [
[[package]]
name = "gsk4"
-version = "0.10.3"
+version = "0.10.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e755de9d8c5896c5beaa028b89e1969d067f1b9bf1511384ede971f5983aa153"
+checksum = "d5dbe33ceed6fc20def67c03d36e532f5a4a569ae437ae015a7146094f31e10c"
dependencies = [
"cairo-rs",
"gdk4",
@@ -379,9 +379,9 @@ dependencies = [
[[package]]
name = "gsk4-sys"
-version = "0.10.3"
+version = "0.10.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7ce91472391146f482065f1041876d8f869057b195b95399414caa163d72f4f7"
+checksum = "8d76011d55dd19fde16ffdedee08877ae6ec942818cfa7bc08a91259bc0b9fc9"
dependencies = [
"cairo-sys-rs",
"gdk4-sys",
@@ -395,9 +395,9 @@ dependencies = [
[[package]]
name = "gtk4"
-version = "0.10.3"
+version = "0.10.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "acb21d53cfc6f7bfaf43549731c43b67ca47d87348d81c8cfc4dcdd44828e1a4"
+checksum = "938d68ad43080ad5ee710c30d467c1bc022ee5947856f593855691d726305b3e"
dependencies = [
"cairo-rs",
"field-offset",
@@ -416,9 +416,9 @@ dependencies = [
[[package]]
name = "gtk4-macros"
-version = "0.10.3"
+version = "0.10.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3ccfb5a14a3d941244815d5f8101fa12d4577b59cc47245778d8d907b0003e42"
+checksum = "0912d2068695633002b92c5966edc108b2e4f54b58c509d1eeddd4cbceb7315c"
dependencies = [
"proc-macro-crate",
"proc-macro2",
@@ -428,9 +428,9 @@ dependencies = [
[[package]]
name = "gtk4-sys"
-version = "0.10.3"
+version = "0.10.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "842577fe5a1ee15d166cd3afe804ce0cab6173bc789ca32e21308834f20088dd"
+checksum = "a923bdcf00e46723801162de24432cbce38a6810e0178a2d0b6dd4ecc26a1c74"
dependencies = [
"cairo-sys-rs",
"gdk-pixbuf-sys",
@@ -454,19 +454,13 @@ dependencies = [
"foldhash",
]
-[[package]]
-name = "hashbrown"
-version = "0.16.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "841d1cc9bed7f9236f321df977030373f4a4163ae1a7dbfe1a51a2c1a51d9100"
-
[[package]]
name = "hashlink"
version = "0.10.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "7382cf6263419f2d8df38c55d7da83da5c18aef87fc7a7fc1fb1e344edfe14c1"
dependencies = [
- "hashbrown 0.15.5",
+ "hashbrown",
]
[[package]]
@@ -477,19 +471,19 @@ checksum = "2304e00983f87ffb38b55b444b5e3b60a884b5d30c0fca7d82fe33449bbe55ea"
[[package]]
name = "indexmap"
-version = "2.12.1"
+version = "2.10.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0ad4bb2b565bca0645f4d68c5c9af97fba094e9791da685bf83cb5f3ce74acf2"
+checksum = "fe4cd85333e22411419a0bcae1297d25e58c9443848b11dc6a86fefe8c78a661"
dependencies = [
"equivalent",
- "hashbrown 0.16.1",
+ "hashbrown",
]
[[package]]
name = "libadwaita"
-version = "0.8.1"
+version = "0.8.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fb09e12bf8f73342b3315c839d0a7668cc0ccebd78490c49fec48bab15d5484b"
+checksum = "4df6715d1257bd8c093295b77a276ed129d73543b10304fec5829ced5d5b7c41"
dependencies = [
"gdk4",
"gio",
@@ -502,9 +496,9 @@ dependencies = [
[[package]]
name = "libadwaita-sys"
-version = "0.8.1"
+version = "0.8.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6d7f94227ba87eb596fecada2491f04e357d507324142f77bf76d9e6be4a3e31"
+checksum = "fdf8950090cc180250cdb1ff859a39748feeda7a53a9f28ead3a17a14cc37ae2"
dependencies = [
"gdk4-sys",
"gio-sys",
@@ -518,9 +512,9 @@ dependencies = [
[[package]]
name = "libc"
-version = "0.2.178"
+version = "0.2.175"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "37c93d8daa9d8a012fd8ab92f088405fb202ea0b6ab73ee2482ae66af4f42091"
+checksum = "6a82ae493e598baaea5209805c49bbf2ea7de956d50d7da0da1164f9c6d28543"
[[package]]
name = "libsqlite3-sys"
@@ -534,9 +528,9 @@ dependencies = [
[[package]]
name = "memchr"
-version = "2.7.6"
+version = "2.7.5"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f52b00d39961fc5b2736ea853c9cc86238e165017a493d1d5c8eac6bdc4cc273"
+checksum = "32a282da65faaf38286cf3be983213fcf1d2e2a58700e808f83f4ea9a4804bc0"
[[package]]
name = "memoffset"
@@ -549,9 +543,9 @@ dependencies = [
[[package]]
name = "pango"
-version = "0.21.5"
+version = "0.21.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "52d1d85e2078077a065bb7fc072783d5bcd4e51b379f22d67107d0a16937eb69"
+checksum = "ab47feb3403aa564edaeb68620c5b9159f8814733a7dd45f0b1a27d19de362fe"
dependencies = [
"gio",
"glib",
@@ -561,9 +555,9 @@ dependencies = [
[[package]]
name = "pango-sys"
-version = "0.21.5"
+version = "0.21.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b4f06627d36ed5ff303d2df65211fc2e52ba5b17bf18dd80ff3d9628d6e06cfd"
+checksum = "1f855bccb447644e149fae79086e1f81514c30fe5e9b8bd257d9d3c941116c86"
dependencies = [
"glib-sys",
"gobject-sys",
@@ -591,27 +585,27 @@ checksum = "7edddbd0b52d732b21ad9a5fab5c704c14cd949e5e9a1ec5929a24fded1b904c"
[[package]]
name = "proc-macro-crate"
-version = "3.4.0"
+version = "3.3.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "219cb19e96be00ab2e37d6e299658a0cfa83e52429179969b0f0121b4ac46983"
+checksum = "edce586971a4dfaa28950c6f18ed55e0406c1ab88bbce2c6f6293a7aaba73d35"
dependencies = [
"toml_edit",
]
[[package]]
name = "proc-macro2"
-version = "1.0.104"
+version = "1.0.101"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9695f8df41bb4f3d222c95a67532365f569318332d03d5f3f67f37b20e6ebdf0"
+checksum = "89ae43fd86e4158d6db51ad8e2b80f313af9cc74f5c0e03ccb87de09998732de"
dependencies = [
"unicode-ident",
]
[[package]]
name = "quote"
-version = "1.0.42"
+version = "1.0.40"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a338cc41d27e6cc6dce6cefc13a0729dfbb81c262b1f519331575dd80ef3067f"
+checksum = "1885c039570dc00dcb4ff087a89e185fd56bae234ddc7f056a945bf36467248d"
dependencies = [
"proc-macro2",
]
@@ -641,24 +635,24 @@ dependencies = [
[[package]]
name = "semver"
-version = "1.0.27"
+version = "1.0.26"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d767eb0aabc880b29956c35734170f26ed551a859dbd361d140cdbeca61ab1e2"
+checksum = "56e6fa9c48d24d85fb3de5ad847117517440f6beceb7798af16b4a87d616b8d0"
[[package]]
-name = "serde_core"
-version = "1.0.228"
+name = "serde"
+version = "1.0.219"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "41d385c7d4ca58e59fc732af25c3983b67ac852c1a25000afe1175de458b67ad"
+checksum = "5f0e2c6ed6606019b4e29e69dbaba95b11854410e5347d525002456dbbb786b6"
dependencies = [
"serde_derive",
]
[[package]]
name = "serde_derive"
-version = "1.0.228"
+version = "1.0.219"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d540f220d3187173da220f885ab66608367b6574e925011a9353e4badda91d79"
+checksum = "5b0276cf7f2c73365f7157c8123c21cd9a50fbbd844757af28ca1f5925fc2a00"
dependencies = [
"proc-macro2",
"quote",
@@ -667,11 +661,11 @@ dependencies = [
[[package]]
name = "serde_spanned"
-version = "1.0.4"
+version = "0.6.9"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f8bbf91e5a4d6315eee45e704372590b30e260ee83af6639d64557f51b067776"
+checksum = "bf41e0cfaf7226dca15e8197172c295a782857fcb97fad1808a166870dee75a3"
dependencies = [
- "serde_core",
+ "serde",
]
[[package]]
@@ -688,9 +682,9 @@ checksum = "67b1b7a3b5fe4f1376887184045fcf45c69e92af734b7aaddc05fb777b6fbd03"
[[package]]
name = "syn"
-version = "2.0.112"
+version = "2.0.106"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "21f182278bf2d2bcb3c88b1b08a37df029d71ce3d3ae26168e3c653b213b99d4"
+checksum = "ede7c438028d4436d71104916910f5bb611972c5cfd7f89b8300a8186e6fada6"
dependencies = [
"proc-macro2",
"quote",
@@ -699,9 +693,9 @@ dependencies = [
[[package]]
name = "system-deps"
-version = "7.0.7"
+version = "7.0.5"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "48c8f33736f986f16d69b6cb8b03f55ddcad5c41acc4ccc39dd88e84aa805e7f"
+checksum = "e4be53aa0cba896d2dc615bd42bbc130acdcffa239e0a2d965ea5b3b2a86ffdb"
dependencies = [
"cfg-expr",
"heck",
@@ -712,66 +706,49 @@ dependencies = [
[[package]]
name = "target-lexicon"
-version = "0.13.3"
+version = "0.13.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "df7f62577c25e07834649fc3b39fafdc597c0a3527dc1c60129201ccfcbaa50c"
+checksum = "e502f78cdbb8ba4718f566c418c52bc729126ffd16baee5baa718cf25dd5a69a"
[[package]]
name = "toml"
-version = "0.9.10+spec-1.1.0"
+version = "0.8.23"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0825052159284a1a8b4d6c0c86cbc801f2da5afd2b225fa548c72f2e74002f48"
+checksum = "dc1beb996b9d83529a9e75c17a1686767d148d70663143c7854d8b4a09ced362"
dependencies = [
- "indexmap",
- "serde_core",
+ "serde",
"serde_spanned",
"toml_datetime",
- "toml_parser",
- "toml_writer",
- "winnow",
+ "toml_edit",
]
[[package]]
name = "toml_datetime"
-version = "0.7.5+spec-1.1.0"
+version = "0.6.11"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "92e1cfed4a3038bc5a127e35a2d360f145e1f4b971b551a2ba5fd7aedf7e1347"
+checksum = "22cddaf88f4fbc13c51aebbf5f8eceb5c7c5a9da2ac40a13519eb5b0a0e8f11c"
dependencies = [
- "serde_core",
+ "serde",
]
[[package]]
name = "toml_edit"
-version = "0.23.10+spec-1.0.0"
+version = "0.22.27"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "84c8b9f757e028cee9fa244aea147aab2a9ec09d5325a9b01e0a49730c2b5269"
+checksum = "41fe8c660ae4257887cf66394862d21dbca4a6ddd26f04a3560410406a2f819a"
dependencies = [
"indexmap",
+ "serde",
+ "serde_spanned",
"toml_datetime",
- "toml_parser",
"winnow",
]
-[[package]]
-name = "toml_parser"
-version = "1.0.6+spec-1.1.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a3198b4b0a8e11f09dd03e133c0280504d0801269e9afa46362ffde1cbeebf44"
-dependencies = [
- "winnow",
-]
-
-[[package]]
-name = "toml_writer"
-version = "1.0.6+spec-1.1.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ab16f14aed21ee8bfd8ec22513f7287cd4a91aa92e44edfe2c17ddd004e92607"
-
[[package]]
name = "unicode-ident"
-version = "1.0.22"
+version = "1.0.18"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9312f7c4f6ff9069b165498234ce8be658059c6728633667c526e27dc2cf1df5"
+checksum = "5a5f39404a5da50712a4c1eecf25e90dd62b613502b7e925fd4e4d19b5c96512"
[[package]]
name = "vcpkg"
@@ -781,30 +758,95 @@ checksum = "accd4ea62f7bb7a82fe23066fb0957d48ef677f6eeb8215f372f52e48bb32426"
[[package]]
name = "version-compare"
-version = "0.2.1"
+version = "0.2.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "03c2856837ef78f57382f06b2b8563a2f512f7185d732608fd9176cb3b8edf0e"
+checksum = "852e951cb7832cb45cb1169900d19760cfa39b82bc0ea9c0e5a14ae88411c98b"
[[package]]
name = "windows-link"
-version = "0.2.1"
+version = "0.1.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f0805222e57f7521d6a62e36fa9163bc891acd422f971defe97d64e70d0a4fe5"
+checksum = "5e6ad25900d524eaabdbbb96d20b4311e1e7ae1699af4fb28c17ae66c80d798a"
[[package]]
name = "windows-sys"
-version = "0.61.2"
+version = "0.60.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ae137229bcbd6cdf0f7b80a31df61766145077ddf49416a728b02cb3921ff3fc"
+checksum = "f2f500e4d28234f72040990ec9d39e3a6b950f9f22d3dba18416c35882612bcb"
dependencies = [
- "windows-link",
+ "windows-targets",
]
[[package]]
-name = "winnow"
-version = "0.7.14"
+name = "windows-targets"
+version = "0.53.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5a5364e9d77fcdeeaa6062ced926ee3381faa2ee02d3eb83a5c27a8825540829"
+checksum = "d5fe6031c4041849d7c496a8ded650796e7b6ecc19df1a431c1a363342e5dc91"
+dependencies = [
+ "windows-link",
+ "windows_aarch64_gnullvm",
+ "windows_aarch64_msvc",
+ "windows_i686_gnu",
+ "windows_i686_gnullvm",
+ "windows_i686_msvc",
+ "windows_x86_64_gnu",
+ "windows_x86_64_gnullvm",
+ "windows_x86_64_msvc",
+]
+
+[[package]]
+name = "windows_aarch64_gnullvm"
+version = "0.53.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "86b8d5f90ddd19cb4a147a5fa63ca848db3df085e25fee3cc10b39b6eebae764"
+
+[[package]]
+name = "windows_aarch64_msvc"
+version = "0.53.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c7651a1f62a11b8cbd5e0d42526e55f2c99886c77e007179efff86c2b137e66c"
+
+[[package]]
+name = "windows_i686_gnu"
+version = "0.53.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c1dc67659d35f387f5f6c479dc4e28f1d4bb90ddd1a5d3da2e5d97b42d6272c3"
+
+[[package]]
+name = "windows_i686_gnullvm"
+version = "0.53.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9ce6ccbdedbf6d6354471319e781c0dfef054c81fbc7cf83f338a4296c0cae11"
+
+[[package]]
+name = "windows_i686_msvc"
+version = "0.53.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "581fee95406bb13382d2f65cd4a908ca7b1e4c2f1917f143ba16efe98a589b5d"
+
+[[package]]
+name = "windows_x86_64_gnu"
+version = "0.53.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2e55b5ac9ea33f2fc1716d1742db15574fd6fc8dadc51caab1c16a3d3b4190ba"
+
+[[package]]
+name = "windows_x86_64_gnullvm"
+version = "0.53.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0a6e035dd0599267ce1ee132e51c27dd29437f63325753051e71dd9e42406c57"
+
+[[package]]
+name = "windows_x86_64_msvc"
+version = "0.53.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "271414315aff87387382ec3d271b52d7ae78726f5d44ac98b4f4030c91880486"
+
+[[package]]
+name = "winnow"
+version = "0.7.12"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f3edebf492c8125044983378ecb5766203ad3b4c2f7a922bd7dd207f6d443e95"
dependencies = [
"memchr",
]
diff --git a/Cargo.toml b/Cargo.toml
index 4c9251d..f0f6573 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -13,5 +13,5 @@ lto = true
async-sqlite = { version = "0.5.3" , default-features = false }
fallible-iterator = "0.3.0" # Must match version used by async-sqlite
futures = "0.3.31"
-gtk4 = { version = "0.10.3" , features = [ "v4_20" ] }
-libadwaita = { version = "0.8.1" , features = [ "v1_8" ] }
+gtk4 = { version = "0.10.0" , features = [ "v4_18" ] }
+libadwaita = { version = "0.8.0" , features = [ "v1_7" ] }
diff --git a/src/application.css b/src/application.css
index 48e26c2..a0ae4fa 100644
--- a/src/application.css
+++ b/src/application.css
@@ -7,10 +7,6 @@
opacity : 0 ;
}
-.collatable-container flowboxchild {
- padding : 0 ;
-}
-
.open-collection-item-button {
font-weight : normal ; /* No bold text by default for this kind of button */
}
diff --git a/src/main.rs b/src/main.rs
index ad0dfca..417e095 100644
--- a/src/main.rs
+++ b/src/main.rs
@@ -44,8 +44,6 @@ fn show_window ( application : & Application ) {
spawn_future_local ( async move {
async_result_context ! (
async {
- // TODO: Move non-UI async tasks to non-local context
-
let data_manager = leak ( DataManager :: new () . await ? ) ;
let ui = UI :: new (
diff --git a/src/ui/collatable_container/collated_grid.rs b/src/ui/collatable_container/collated_grid.rs
index c30e2d9..c461563 100644
--- a/src/ui/collatable_container/collated_grid.rs
+++ b/src/ui/collatable_container/collated_grid.rs
@@ -27,7 +27,6 @@ impl < A : MediaAdapter > CollatedMediaGrid {
let grid_widget = flow_box ! (
@ orientation : Horizontal ;
@ homogeneous : true ;
- @ css_classes : & [ "collatable-container" ] ;
@ selection_mode : SelectionMode :: None ;
) ;
let media_widget_pairs = RefCell :: new ( Vec :: new () ) ;
@@ -61,7 +60,6 @@ impl < A : MediaAdapter > CollatedMediaGrid {
& g_box ! (
@ option_children ;
@ orientation : Vertical ;
- @ valign : Center ; // I.e. do not fill parent vertically
@ margin_top : 20 ;
@ margin_bottom : 20 ;
@@ -82,9 +80,10 @@ impl < A : MediaAdapter > CollatedMediaGrid {
match poster_texture {
Ok (poster_texture) => Some ( image ! (
- @ margin_bottom : 10 ;
- @ pixel_size : 300 ;
@ paintable : & poster_texture ;
+ @ width_request : 300 ;
+ @ height_request : 300 ;
+ @ margin_bottom : 10 ;
) ) ,
Err (error) => {
if error . matches ( IOErrorEnum :: NotFound ) {
diff --git a/src/ui/utility.rs b/src/ui/utility.rs
index 8dbffaf..4f5e210 100644
--- a/src/ui/utility.rs
+++ b/src/ui/utility.rs
@@ -7,19 +7,11 @@ macro_rules ! bin { ( $ ( @ vexpand : $ vexpand : expr ; ) ? ) => { {
} } }
macro_rules ! button { (
- $ ( @ halign : $ halign : expr ; ) ?
- $ ( @ valign : $ valign : expr ; ) ?
- $ ( @ hexpand : $ hexpand : expr ; ) ?
- $ ( @ vexpand : $ vexpand : expr ; ) ?
$ ( @ css_classes : $ css_classes : expr ; ) ?
$ ( @ connect_clicked : $ connect_clicked : expr ; ) ?
$ ( $ child : expr ) ? $ (,) ?
) => { {
let button = gtk4 :: Button :: new () ;
- $ ( button . set_halign ( $ halign ) ; ) ?
- $ ( button . set_valign ( $ valign ) ; ) ?
- $ ( button . set_hexpand ( $ hexpand ) ; ) ?
- $ ( button . set_vexpand ( $ vexpand ) ; ) ?
$ ( button . set_css_classes ( $ css_classes ) ; ) ?
$ ( button . connect_clicked ( $ connect_clicked ) ; ) ?
$ ( button . set_child ( Some ( $ child ) ) ; ) ?
@@ -39,13 +31,11 @@ macro_rules ! dialog { (
macro_rules ! flow_box { (
$ ( @ orientation : $ orientation : expr ; ) ?
$ ( @ homogeneous : $ homogeneous : expr ; ) ?
- $ ( @ css_classes : $ css_classes : expr ; ) ?
$ ( @ selection_mode : $ selection_mode : expr ; ) ?
) => { {
let widget = gtk4 :: FlowBox :: new () ;
$ ( widget . set_orientation ( $ orientation ) ; ) ?
$ ( widget . set_homogeneous ( $ homogeneous ) ; ) ?
- $ ( widget . set_css_classes ( $ css_classes ) ; ) ?
$ ( widget . set_selection_mode ( $ selection_mode ) ; ) ?
widget
} } }
@@ -58,8 +48,6 @@ macro_rules ! g_box {
$ ( @ spacing : $ spacing : expr ; ) ?
$ ( @ margin_top : $ margin_top : expr ; ) ?
$ ( @ margin_bottom : $ margin_bottom : expr ; ) ?
- $ ( @ hexpand : $ hexpand : expr ; ) ?
- $ ( @ vexpand : $ vexpand : expr ; ) ?
$ ( @ widget_name : $ widget_name : expr ; ) ?
$ ( @ css_classes : $ css_classes : expr ; ) ?
$ ( $ child : expr ) , * $ (,) ?
@@ -71,8 +59,6 @@ macro_rules ! g_box {
$ ( container . set_spacing ( $ spacing ) ; ) ?
$ ( container . set_margin_top ( $ margin_top ) ; ) ?
$ ( container . set_margin_bottom ( $ margin_bottom ) ; ) ?
- $ ( container . set_hexpand ( $ hexpand ) ; ) ?
- $ ( container . set_vexpand ( $ vexpand ) ; ) ?
$ ( container . set_widget_name ( $ widget_name ) ; ) ?
$ ( container . set_css_classes ( $ css_classes ) ; ) ?
$ ( container . append ( $ child ) ; ) *
@@ -86,8 +72,6 @@ macro_rules ! g_box {
$ ( @ spacing : $ spacing : expr ; ) ?
$ ( @ margin_top : $ margin_top : expr ; ) ?
$ ( @ margin_bottom : $ margin_bottom : expr ; ) ?
- $ ( @ hexpand : $ hexpand : expr ; ) ?
- $ ( @ vexpand : $ vexpand : expr ; ) ?
$ ( @ widget_name : $ widget_name : expr ; ) ?
$ ( @ css_classes : $ css_classes : expr ; ) ?
$ ( $ child : expr ) , * $ (,) ?
@@ -99,8 +83,6 @@ macro_rules ! g_box {
$ ( container . set_spacing ( $ spacing ) ; ) ?
$ ( container . set_margin_top ( $ margin_top ) ; ) ?
$ ( container . set_margin_bottom ( $ margin_bottom ) ; ) ?
- $ ( container . set_hexpand ( $ hexpand ) ; ) ?
- $ ( container . set_vexpand ( $ vexpand ) ; ) ?
$ ( container . set_widget_name ( $ widget_name ) ; ) ?
$ ( container . set_css_classes ( $ css_classes ) ; ) ?
$ ( if let Some (child) = $ child { container . append (child) ; } ) *
@@ -115,26 +97,20 @@ macro_rules ! header_bar { ( $ title_widget : expr $ (,) ? ) => { {
} } }
macro_rules ! image { (
- $ ( @ halign : $ halign : expr ; ) ?
- $ ( @ valign : $ valign : expr ; ) ?
+ $ ( @ icon_name : $ icon_name : expr ; ) ?
+ $ ( @ paintable : $ paintable : expr ; ) ?
$ ( @ width_request : $ width_request : expr ; ) ?
$ ( @ height_request : $ height_request : expr ; ) ?
$ ( @ margin_top : $ margin_top : expr ; ) ?
$ ( @ margin_bottom : $ margin_bottom : expr ; ) ?
- $ ( @ pixel_size : $ pixel_size : expr ; ) ?
- $ ( @ icon_name : $ icon_name : expr ; ) ?
- $ ( @ paintable : $ paintable : expr ; ) ?
) => { {
let image = gtk4 :: Image :: new () ;
- $ ( image . set_halign ( $ halign ) ; ) ?
- $ ( image . set_valign ( $ valign ) ; ) ?
+ $ ( image . set_icon_name ( Some ( $ icon_name ) ) ; ) ?
+ $ ( image . set_paintable ( Some ( $ paintable ) ) ; ) ?
$ ( image . set_width_request ( $ width_request ) ; ) ?
$ ( image . set_height_request ( $ height_request ) ; ) ?
$ ( image . set_margin_top ( $ margin_top ) ; ) ?
$ ( image . set_margin_bottom ( $ margin_bottom ) ; ) ?
- $ ( image . set_pixel_size ( $ pixel_size ) ; ) ?
- $ ( image . set_icon_name ( Some ( $ icon_name ) ) ; ) ?
- $ ( image . set_paintable ( Some ( $ paintable ) ) ; ) ?
image
} } }