From 39c787bacb945ccc27a2f72466dd2e339f6a056e Mon Sep 17 00:00:00 2001 From: ochibani <11yzyv86j@relay.firefox.com> Date: Sun, 25 Sep 2022 01:45:15 +0200 Subject: [PATCH] Initial gtk4 migration --- Cargo.lock | 1251 ++++++++++++++++++++++++++++++-------- Cargo.toml | 24 +- interfaces/main.ui | 1027 +++++++++++++------------------ po/tr.po | 143 ----- src/config_management.rs | 4 +- src/ffmpeg_interface.rs | 64 +- src/main.rs | 268 ++++---- 7 files changed, 1606 insertions(+), 1175 deletions(-) delete mode 100644 po/tr.po mode change 100644 => 100755 src/config_management.rs diff --git a/Cargo.lock b/Cargo.lock index ee2e19e..ab2757e 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -10,34 +10,44 @@ checksum = "739f4a8db6605981345c5654f3a85b056ce52f37a39d34da03f25bf2151ea16e" [[package]] name = "aho-corasick" -version = "0.7.18" +version = "0.7.19" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1e37cfd5e7657ada45f742d6e99ca5788580b5c529dc78faf11ece6dc702656f" +checksum = "b4f55bd91a0978cbfd91c457a164bab8b4001c833b7f323132c0a4e1922dd44e" dependencies = [ "memchr", ] [[package]] -name = "ansi_term" -version = "0.11.0" +name = "android_system_properties" +version = "0.1.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ee49baf6cb617b853aa8d93bf420db2383fab46d314482ca2803b40d5fde979b" +checksum = "819e7219dbd41043ac279b19830f2efc897156490d7fd6ea916720117ee66311" +dependencies = [ + "libc", +] + +[[package]] +name = "ansi_term" +version = "0.12.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d52a9bb7ec0cf484c551830a7ce27bd20d67eac647e1befb56b0be4ee39a55d2" dependencies = [ "winapi", ] [[package]] name = "anyhow" -version = "1.0.42" +version = "1.0.65" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "595d3cfa7a60d4555cb5067b99f07142a08ea778de5cf993f7b75c7d8fabc486" +checksum = "98161a4e3e2184da77bb14f02184cdd111e83bbbcc9979dfee3c44b9a85f5602" [[package]] name = "async-io" -version = "1.6.0" +version = "1.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a811e6a479f2439f0c04038796b5cfb3d2ad56c230e0f2d3f7b04d68cfee607b" +checksum = "83e21f3a490c72b3b0cf44962180e60045de2925d8dff97918f7ee43c8f637c7" dependencies = [ + "autocfg", "concurrent-queue", "futures-lite", "libc", @@ -57,11 +67,11 @@ version = "0.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "812b4911e210bd51b24596244523c856ca749e6223c50a7fbbba3f89ee37c426" dependencies = [ - "atk-sys", + "atk-sys 0.10.0", "bitflags", - "glib", - "glib-sys", - "gobject-sys", + "glib 0.10.3", + "glib-sys 0.10.1", + "gobject-sys 0.10.0", "libc", ] @@ -71,10 +81,22 @@ version = "0.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f530e4af131d94cc4fa15c5c9d0348f0ef28bac64ba660b6b2a1cf2605dedfce" dependencies = [ - "glib-sys", - "gobject-sys", + "glib-sys 0.10.1", + "gobject-sys 0.10.0", "libc", - "system-deps", + "system-deps 1.3.2", +] + +[[package]] +name = "atk-sys" +version = "0.15.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "58aeb089fb698e06db8089971c7ee317ab9644bade33383f63631437b03aafb6" +dependencies = [ + "glib-sys 0.15.10", + "gobject-sys 0.15.10", + "libc", + "system-deps 6.0.2", ] [[package]] @@ -90,9 +112,9 @@ dependencies = [ [[package]] name = "autocfg" -version = "1.0.1" +version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cdb031dd78e28731d87d56cc8ffef4a8f36ca26c38fe2de700543e627f8a464a" +checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa" [[package]] name = "bindgen" @@ -120,9 +142,9 @@ dependencies = [ [[package]] name = "bitflags" -version = "1.2.1" +version = "1.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cf1de2fe8c75bc145a2f577add951f8134889b4795d47466a54a5c846d691693" +checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a" [[package]] name = "block" @@ -132,15 +154,16 @@ checksum = "0d8c1fef690941d3e7788d328517591fecc684c084084702d6ff1641e993699a" [[package]] name = "blue-recorder" -version = "0.1.5" +version = "0.1.0" dependencies = [ "chrono", - "gdk", - "gdk-pixbuf", + "gdk-pixbuf 0.9.0", + "gdk4 0.5.0", "gettext-rs", - "gio", - "glib", - "gtk", + "gio 0.15.12", + "glib 0.10.3", + "gtk-sys 0.15.3", + "gtk4", "libappindicator", "regex", "rust-ini", @@ -149,6 +172,12 @@ dependencies = [ "zvariant", ] +[[package]] +name = "bumpalo" +version = "3.11.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c1ad822118d20d2c234f427000d5acc36eabe1e29a348c89b63dd60b13f28e5d" + [[package]] name = "byteorder" version = "1.4.3" @@ -157,9 +186,9 @@ checksum = "14c189c53d098945499cdfa7ecc63567cf3886b3332b312a5b4585d8d3a6a610" [[package]] name = "cache-padded" -version = "1.1.1" +version = "1.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "631ae5198c9be5e753e5cc215e1bd73c2b466a3565173db433f52bb9d3e66dba" +checksum = "c1db59621ec70f09c5e9b597b220c7a2b43611f4710dc03ceb8748637775692c" [[package]] name = "cairo-rs" @@ -168,30 +197,77 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c5c0f2e047e8ca53d0ff249c54ae047931d7a6ebe05d00af73e0ffeb6e34bdb8" dependencies = [ "bitflags", - "cairo-sys-rs", - "glib", - "glib-sys", - "gobject-sys", + "cairo-sys-rs 0.10.0", + "glib 0.10.3", + "glib-sys 0.10.1", + "gobject-sys 0.10.0", "libc", "thiserror", ] +[[package]] +name = "cairo-rs" +version = "0.15.12" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c76ee391b03d35510d9fa917357c7f1855bd9a6659c95a1b392e33f49b3369bc" +dependencies = [ + "bitflags", + "cairo-sys-rs 0.15.1", + "glib 0.15.12", + "libc", + "thiserror", +] + +[[package]] +name = "cairo-rs" +version = "0.16.0" +source = "git+https://github.com/gtk-rs/gtk-rs-core#61a082e6fb3cb50af8c936dc8858b7a67db4ac9a" +dependencies = [ + "bitflags", + "cairo-sys-rs 0.16.0", + "glib 0.16.0", + "libc", + "once_cell", + "thiserror", +] + [[package]] name = "cairo-sys-rs" version = "0.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "2ed2639b9ad5f1d6efa76de95558e11339e7318426d84ac4890b86c03e828ca7" dependencies = [ - "glib-sys", + "glib-sys 0.10.1", "libc", - "system-deps", + "system-deps 1.3.2", +] + +[[package]] +name = "cairo-sys-rs" +version = "0.15.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3c55d429bef56ac9172d25fecb85dc8068307d17acd74b377866b7a1ef25d3c8" +dependencies = [ + "glib-sys 0.15.10", + "libc", + "system-deps 6.0.2", +] + +[[package]] +name = "cairo-sys-rs" +version = "0.16.0" +source = "git+https://github.com/gtk-rs/gtk-rs-core#61a082e6fb3cb50af8c936dc8858b7a67db4ac9a" +dependencies = [ + "glib-sys 0.16.0", + "libc", + "system-deps 6.0.2", ] [[package]] name = "cc" -version = "1.0.69" +version = "1.0.73" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e70cc2f62c6ce1868963827bd677764c62d07c3d9a3e1fb1177ee1a9ab199eb2" +checksum = "2fff2a6927b3bb87f9595d67196a70493f627687a71d87a0d692242c33f58c11" [[package]] name = "cexpr" @@ -202,6 +278,15 @@ dependencies = [ "nom", ] +[[package]] +name = "cfg-expr" +version = "0.10.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0aacacf4d96c24b2ad6eb8ee6df040e4f27b0d0b39a5710c30091baa830485db" +dependencies = [ + "smallvec", +] + [[package]] name = "cfg-if" version = "0.1.10" @@ -216,14 +301,16 @@ checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" [[package]] name = "chrono" -version = "0.4.19" +version = "0.4.22" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "670ad68c9088c2a963aaa298cb369688cf3f9465ce5e2d4ca10e6e0098a1ce73" +checksum = "bfd4d1b31faaa3a89d7934dbded3111da0d2ef28e3ebccdb4f0179f5929d1ef1" dependencies = [ - "libc", + "iana-time-zone", + "js-sys", "num-integer", "num-traits", "time", + "wasm-bindgen", "winapi", ] @@ -240,9 +327,9 @@ dependencies = [ [[package]] name = "clap" -version = "2.33.3" +version = "2.34.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "37e58ac78573c40708d45522f0d80fa2f01cc4f9b4e2bf749807255454312002" +checksum = "a0610544180c38b88101fecf2dd634b174a62eef6946f84dfc6a7127512b381c" dependencies = [ "ansi_term", "atty", @@ -255,13 +342,19 @@ dependencies = [ [[package]] name = "concurrent-queue" -version = "1.2.2" +version = "1.2.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "30ed07550be01594c6026cff2a1d7fe9c8f683caa798e12b68694ac9e88286a3" +checksum = "af4780a44ab5696ea9e28294517f1fffb421a83a25af521333c838635509db9c" dependencies = [ "cache-padded", ] +[[package]] +name = "core-foundation-sys" +version = "0.8.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5827cebf4670468b8772dd191856768aedcb1b0278a04f989f7766351917b9dc" + [[package]] name = "derivative" version = "2.2.0" @@ -284,9 +377,9 @@ dependencies = [ [[package]] name = "either" -version = "1.6.1" +version = "1.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e78d4f1cc4ae33bbfc157ed5d5a5ef3bc29227303d595861deb238fcec4e9457" +checksum = "90e5c1c8368803113bf0c9584fc495a58b86dc8a29edbf8fe877d21d9507e797" [[package]] name = "enumflags2" @@ -324,18 +417,28 @@ dependencies = [ [[package]] name = "fastrand" -version = "1.5.0" +version = "1.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b394ed3d285a429378d3b384b9eb1285267e7df4b166df24b7a6939a04dc392e" +checksum = "a7a407cfaa3385c4ae6b23e84623d48c2798d06e3e6a1878f7f59f17b3f86499" dependencies = [ "instant", ] [[package]] -name = "futures" -version = "0.3.16" +name = "field-offset" +version = "0.3.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1adc00f486adfc9ce99f77d717836f0c5aa84965eb0b4f051f4e83f7cab53f8b" +checksum = "1e1c54951450cbd39f3dbcf1005ac413b49487dabf18a720ad2383eccfeffb92" +dependencies = [ + "memoffset", + "rustc_version", +] + +[[package]] +name = "futures" +version = "0.3.24" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7f21eda599937fba36daeb58a22e8f5cee2d14c4a17b5b7739c7c8e5e3b8230c" dependencies = [ "futures-channel", "futures-core", @@ -348,9 +451,9 @@ dependencies = [ [[package]] name = "futures-channel" -version = "0.3.16" +version = "0.3.24" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "74ed2411805f6e4e3d9bc904c95d5d423b89b3b25dc0250aa74729de20629ff9" +checksum = "30bdd20c28fadd505d0fd6712cdfcb0d4b5648baf45faef7f852afb2399bb050" dependencies = [ "futures-core", "futures-sink", @@ -358,15 +461,15 @@ dependencies = [ [[package]] name = "futures-core" -version = "0.3.16" +version = "0.3.24" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "af51b1b4a7fdff033703db39de8802c673eb91855f2e0d47dcf3bf2c0ef01f99" +checksum = "4e5aa3de05362c3fb88de6531e6296e85cde7739cccad4b9dfeeb7f6ebce56bf" [[package]] name = "futures-executor" -version = "0.3.16" +version = "0.3.24" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4d0d535a57b87e1ae31437b892713aee90cd2d7b0ee48727cd11fc72ef54761c" +checksum = "9ff63c23854bee61b6e9cd331d523909f238fc7636290b96826e9cfa5faa00ab" dependencies = [ "futures-core", "futures-task", @@ -375,9 +478,9 @@ dependencies = [ [[package]] name = "futures-io" -version = "0.3.16" +version = "0.3.24" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0b0e06c393068f3a6ef246c75cdca793d6a46347e75286933e5e75fd2fd11582" +checksum = "bbf4d2a7a308fd4578637c0b17c7e1c7ba127b8f6ba00b29f717e9655d85eb68" [[package]] name = "futures-lite" @@ -396,12 +499,10 @@ dependencies = [ [[package]] name = "futures-macro" -version = "0.3.16" +version = "0.3.24" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c54913bae956fb8df7f4dc6fc90362aa72e69148e3f39041fbe8742d21e0ac57" +checksum = "42cd15d1c7456c04dbdf7e88bcd69760d74f3a798d6444e16974b505b0e62f17" dependencies = [ - "autocfg", - "proc-macro-hack", "proc-macro2", "quote", "syn", @@ -409,23 +510,22 @@ dependencies = [ [[package]] name = "futures-sink" -version = "0.3.16" +version = "0.3.24" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c0f30aaa67363d119812743aa5f33c201a7a66329f97d1a887022971feea4b53" +checksum = "21b20ba5a92e727ba30e72834706623d94ac93a725410b6a6b6fbc1b07f7ba56" [[package]] name = "futures-task" -version = "0.3.16" +version = "0.3.24" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bbe54a98670017f3be909561f6ad13e810d9a51f3f061b902062ca3da80799f2" +checksum = "a6508c467c73851293f390476d4491cf4d227dbabcd4170f3bb6044959b294f1" [[package]] name = "futures-util" -version = "0.3.16" +version = "0.3.24" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "67eb846bfd58e44a8481a00049e82c43e0ccb5d61f8dc071057cb19249dd4d78" +checksum = "44fb6cb1be61cc1d2e43b262516aafcf63b241cffdb1d3fa115f91d9c7b09c90" dependencies = [ - "autocfg", "futures-channel", "futures-core", "futures-io", @@ -435,8 +535,6 @@ dependencies = [ "memchr", "pin-project-lite", "pin-utils", - "proc-macro-hack", - "proc-macro-nested", "slab", ] @@ -447,17 +545,17 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "db00839b2a68a7a10af3fa28dfb3febaba3a20c3a9ac2425a33b7df1f84a6b7d" dependencies = [ "bitflags", - "cairo-rs", - "cairo-sys-rs", - "gdk-pixbuf", - "gdk-sys", - "gio", - "gio-sys", - "glib", - "glib-sys", - "gobject-sys", + "cairo-rs 0.9.1", + "cairo-sys-rs 0.10.0", + "gdk-pixbuf 0.9.0", + "gdk-sys 0.10.0", + "gio 0.9.1", + "gio-sys 0.10.1", + "glib 0.10.3", + "glib-sys 0.10.1", + "gobject-sys 0.10.0", "libc", - "pango", + "pango 0.9.1", ] [[package]] @@ -466,12 +564,37 @@ version = "0.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8f6dae3cb99dd49b758b88f0132f8d401108e63ae8edd45f432d42cdff99998a" dependencies = [ - "gdk-pixbuf-sys", - "gio", - "gio-sys", - "glib", - "glib-sys", - "gobject-sys", + "gdk-pixbuf-sys 0.10.0", + "gio 0.9.1", + "gio-sys 0.10.1", + "glib 0.10.3", + "glib-sys 0.10.1", + "gobject-sys 0.10.0", + "libc", +] + +[[package]] +name = "gdk-pixbuf" +version = "0.15.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ad38dd9cc8b099cceecdf41375bb6d481b1b5a7cd5cd603e10a69a9383f8619a" +dependencies = [ + "bitflags", + "gdk-pixbuf-sys 0.15.10", + "gio 0.15.12", + "glib 0.15.12", + "libc", +] + +[[package]] +name = "gdk-pixbuf" +version = "0.16.0" +source = "git+https://github.com/gtk-rs/gtk-rs-core#61a082e6fb3cb50af8c936dc8858b7a67db4ac9a" +dependencies = [ + "bitflags", + "gdk-pixbuf-sys 0.16.0", + "gio 0.16.0", + "glib 0.16.0", "libc", ] @@ -481,11 +604,36 @@ version = "0.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3bfe468a7f43e97b8d193a762b6c5cf67a7d36cacbc0b9291dbcae24bfea1e8f" dependencies = [ - "gio-sys", - "glib-sys", - "gobject-sys", + "gio-sys 0.10.1", + "glib-sys 0.10.1", + "gobject-sys 0.10.0", "libc", - "system-deps", + "system-deps 1.3.2", +] + +[[package]] +name = "gdk-pixbuf-sys" +version = "0.15.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "140b2f5378256527150350a8346dbdb08fadc13453a7a2d73aecd5fab3c402a7" +dependencies = [ + "gio-sys 0.15.10", + "glib-sys 0.15.10", + "gobject-sys 0.15.10", + "libc", + "system-deps 6.0.2", +] + +[[package]] +name = "gdk-pixbuf-sys" +version = "0.16.0" +source = "git+https://github.com/gtk-rs/gtk-rs-core#61a082e6fb3cb50af8c936dc8858b7a67db4ac9a" +dependencies = [ + "gio-sys 0.16.0", + "glib-sys 0.16.0", + "gobject-sys 0.16.0", + "libc", + "system-deps 6.0.2", ] [[package]] @@ -494,26 +642,107 @@ version = "0.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0a9653cfc500fd268015b1ac055ddbc3df7a5c9ea3f4ccef147b3957bd140d69" dependencies = [ - "cairo-sys-rs", - "gdk-pixbuf-sys", - "gio-sys", - "glib-sys", - "gobject-sys", + "cairo-sys-rs 0.10.0", + "gdk-pixbuf-sys 0.10.0", + "gio-sys 0.10.1", + "glib-sys 0.10.1", + "gobject-sys 0.10.0", "libc", - "pango-sys", + "pango-sys 0.10.0", "pkg-config", - "system-deps", + "system-deps 1.3.2", +] + +[[package]] +name = "gdk-sys" +version = "0.15.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "32e7a08c1e8f06f4177fb7e51a777b8c1689f743a7bc11ea91d44d2226073a88" +dependencies = [ + "cairo-sys-rs 0.15.1", + "gdk-pixbuf-sys 0.15.10", + "gio-sys 0.15.10", + "glib-sys 0.15.10", + "gobject-sys 0.15.10", + "libc", + "pango-sys 0.15.10", + "pkg-config", + "system-deps 6.0.2", +] + +[[package]] +name = "gdk4" +version = "0.4.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4fabb7cf843c26b085a5d68abb95d0c0bf27a9ae2eeff9c4adb503a1eb580876" +dependencies = [ + "bitflags", + "cairo-rs 0.15.12", + "gdk-pixbuf 0.15.11", + "gdk4-sys 0.4.8", + "gio 0.15.12", + "glib 0.15.12", + "libc", + "pango 0.15.10", +] + +[[package]] +name = "gdk4" +version = "0.5.0" +source = "git+https://github.com/gtk-rs/gtk4-rs.git#58c7187169ae74fac6a68d9454c33ad15da761b7" +dependencies = [ + "bitflags", + "cairo-rs 0.16.0", + "gdk-pixbuf 0.16.0", + "gdk4-sys 0.5.0", + "gio 0.16.0", + "glib 0.16.0", + "libc", + "pango 0.16.0", +] + +[[package]] +name = "gdk4-sys" +version = "0.4.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "efe7dcb44f5c00aeabff3f69abfc5673de46559070f89bd3fbb7b66485d9cef2" +dependencies = [ + "cairo-sys-rs 0.15.1", + "gdk-pixbuf-sys 0.15.10", + "gio-sys 0.15.10", + "glib-sys 0.15.10", + "gobject-sys 0.15.10", + "libc", + "pango-sys 0.15.10", + "pkg-config", + "system-deps 6.0.2", +] + +[[package]] +name = "gdk4-sys" +version = "0.5.0" +source = "git+https://github.com/gtk-rs/gtk4-rs.git#58c7187169ae74fac6a68d9454c33ad15da761b7" +dependencies = [ + "cairo-sys-rs 0.16.0", + "gdk-pixbuf-sys 0.16.0", + "gio-sys 0.16.0", + "glib-sys 0.16.0", + "gobject-sys 0.16.0", + "libc", + "pango-sys 0.16.0", + "pkg-config", + "system-deps 6.0.2", ] [[package]] name = "getrandom" -version = "0.2.3" +version = "0.2.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7fcd999463524c52659517fe2cea98493cfe485d10565e7b0fb07dbba7ad2753" +checksum = "4eb1a864a501629691edf6c15a593b7a51eebaa1e8468e9ddc623de7c9b58ec6" dependencies = [ "cfg-if 1.0.0", "libc", - "wasi", + "wasi 0.11.0+wasi-snapshot-preview1", ] [[package]] @@ -528,9 +757,9 @@ dependencies = [ [[package]] name = "gettext-sys" -version = "0.21.2" +version = "0.21.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "afa9e06ab9e7514cc9ae668ea3b71ea1536259d767dff0289ac23ad134f99929" +checksum = "c63ce2e00f56a206778276704bbe38564c8695249fdc8f354b4ef71c57c3839d" dependencies = [ "cc", "temp-dir", @@ -548,10 +777,44 @@ dependencies = [ "futures-core", "futures-io", "futures-util", - "gio-sys", - "glib", - "glib-sys", - "gobject-sys", + "gio-sys 0.10.1", + "glib 0.10.3", + "glib-sys 0.10.1", + "gobject-sys 0.10.0", + "libc", + "once_cell", + "thiserror", +] + +[[package]] +name = "gio" +version = "0.15.12" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "68fdbc90312d462781a395f7a16d96a2b379bb6ef8cd6310a2df272771c4283b" +dependencies = [ + "bitflags", + "futures-channel", + "futures-core", + "futures-io", + "gio-sys 0.15.10", + "glib 0.15.12", + "libc", + "once_cell", + "thiserror", +] + +[[package]] +name = "gio" +version = "0.16.0" +source = "git+https://github.com/gtk-rs/gtk-rs-core#61a082e6fb3cb50af8c936dc8858b7a67db4ac9a" +dependencies = [ + "bitflags", + "futures-channel", + "futures-core", + "futures-io", + "futures-util", + "gio-sys 0.16.0", + "glib 0.16.0", "libc", "once_cell", "thiserror", @@ -563,10 +826,35 @@ version = "0.10.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "5e24fb752f8f5d2cf6bbc2c606fd2bc989c81c5e2fe321ab974d54f8b6344eac" dependencies = [ - "glib-sys", - "gobject-sys", + "glib-sys 0.10.1", + "gobject-sys 0.10.0", "libc", - "system-deps", + "system-deps 1.3.2", + "winapi", +] + +[[package]] +name = "gio-sys" +version = "0.15.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "32157a475271e2c4a023382e9cab31c4584ee30a97da41d3c4e9fdd605abcf8d" +dependencies = [ + "glib-sys 0.15.10", + "gobject-sys 0.15.10", + "libc", + "system-deps 6.0.2", + "winapi", +] + +[[package]] +name = "gio-sys" +version = "0.16.0" +source = "git+https://github.com/gtk-rs/gtk-rs-core#61a082e6fb3cb50af8c936dc8858b7a67db4ac9a" +dependencies = [ + "glib-sys 0.16.0", + "gobject-sys 0.16.0", + "libc", + "system-deps 6.0.2", "winapi", ] @@ -582,13 +870,53 @@ dependencies = [ "futures-executor", "futures-task", "futures-util", - "glib-macros", - "glib-sys", - "gobject-sys", + "glib-macros 0.10.1", + "glib-sys 0.10.1", + "gobject-sys 0.10.0", "libc", "once_cell", ] +[[package]] +name = "glib" +version = "0.15.12" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "edb0306fbad0ab5428b0ca674a23893db909a98582969c9b537be4ced78c505d" +dependencies = [ + "bitflags", + "futures-channel", + "futures-core", + "futures-executor", + "futures-task", + "glib-macros 0.15.11", + "glib-sys 0.15.10", + "gobject-sys 0.15.10", + "libc", + "once_cell", + "smallvec", + "thiserror", +] + +[[package]] +name = "glib" +version = "0.16.0" +source = "git+https://github.com/gtk-rs/gtk-rs-core#61a082e6fb3cb50af8c936dc8858b7a67db4ac9a" +dependencies = [ + "bitflags", + "futures-channel", + "futures-core", + "futures-executor", + "futures-task", + "futures-util", + "glib-macros 0.16.0", + "glib-sys 0.16.0", + "gobject-sys 0.16.0", + "libc", + "once_cell", + "smallvec", + "thiserror", +] + [[package]] name = "glib-macros" version = "0.10.1" @@ -596,7 +924,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "41486a26d1366a8032b160b59065a59fb528530a46a49f627e7048fb8c064039" dependencies = [ "anyhow", - "heck", + "heck 0.3.3", "itertools", "proc-macro-crate 0.1.5", "proc-macro-error", @@ -605,6 +933,35 @@ dependencies = [ "syn", ] +[[package]] +name = "glib-macros" +version = "0.15.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "25a68131a662b04931e71891fb14aaf65ee4b44d08e8abc10f49e77418c86c64" +dependencies = [ + "anyhow", + "heck 0.4.0", + "proc-macro-crate 1.2.1", + "proc-macro-error", + "proc-macro2", + "quote", + "syn", +] + +[[package]] +name = "glib-macros" +version = "0.16.0" +source = "git+https://github.com/gtk-rs/gtk-rs-core#61a082e6fb3cb50af8c936dc8858b7a67db4ac9a" +dependencies = [ + "anyhow", + "heck 0.4.0", + "proc-macro-crate 1.2.1", + "proc-macro-error", + "proc-macro2", + "quote", + "syn", +] + [[package]] name = "glib-sys" version = "0.10.1" @@ -612,7 +969,26 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c7e9b997a66e9a23d073f2b1abb4dbfc3925e0b8952f67efd8d9b6e168e4cdc1" dependencies = [ "libc", - "system-deps", + "system-deps 1.3.2", +] + +[[package]] +name = "glib-sys" +version = "0.15.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ef4b192f8e65e9cf76cbf4ea71fa8e3be4a0e18ffe3d68b8da6836974cc5bad4" +dependencies = [ + "libc", + "system-deps 6.0.2", +] + +[[package]] +name = "glib-sys" +version = "0.16.0" +source = "git+https://github.com/gtk-rs/gtk-rs-core#61a082e6fb3cb50af8c936dc8858b7a67db4ac9a" +dependencies = [ + "libc", + "system-deps 6.0.2", ] [[package]] @@ -627,9 +1003,85 @@ version = "0.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "952133b60c318a62bf82ee75b93acc7e84028a093e06b9e27981c2b6fe68218c" dependencies = [ - "glib-sys", + "glib-sys 0.10.1", "libc", - "system-deps", + "system-deps 1.3.2", +] + +[[package]] +name = "gobject-sys" +version = "0.15.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0d57ce44246becd17153bd035ab4d32cfee096a657fc01f2231c9278378d1e0a" +dependencies = [ + "glib-sys 0.15.10", + "libc", + "system-deps 6.0.2", +] + +[[package]] +name = "gobject-sys" +version = "0.16.0" +source = "git+https://github.com/gtk-rs/gtk-rs-core#61a082e6fb3cb50af8c936dc8858b7a67db4ac9a" +dependencies = [ + "glib-sys 0.16.0", + "libc", + "system-deps 6.0.2", +] + +[[package]] +name = "graphene-rs" +version = "0.15.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7c54f9fbbeefdb62c99f892dfca35f83991e2cb5b46a8dc2a715e58612f85570" +dependencies = [ + "glib 0.15.12", + "graphene-sys", + "libc", +] + +[[package]] +name = "graphene-sys" +version = "0.15.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fa691fc7337ba1df599afb55c3bcb85c04f1b3f17362570e9bb0ff0d1bc3028a" +dependencies = [ + "glib-sys 0.15.10", + "libc", + "pkg-config", + "system-deps 6.0.2", +] + +[[package]] +name = "gsk4" +version = "0.4.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "05e9020d333280b3aa38d496495bfa9b50712eebf1ad63f0ec5bcddb5eb61be4" +dependencies = [ + "bitflags", + "cairo-rs 0.15.12", + "gdk4 0.4.8", + "glib 0.15.12", + "graphene-rs", + "gsk4-sys", + "libc", + "pango 0.15.10", +] + +[[package]] +name = "gsk4-sys" +version = "0.4.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7add39ccf60078508c838643a2dcc91f045c46ed63b5ea6ab701b2e25bda3fea" +dependencies = [ + "cairo-sys-rs 0.15.1", + "gdk4-sys 0.4.8", + "glib-sys 0.15.10", + "gobject-sys 0.15.10", + "graphene-sys", + "libc", + "pango-sys 0.15.10", + "system-deps 6.0.2", ] [[package]] @@ -640,23 +1092,23 @@ checksum = "2f022f2054072b3af07666341984562c8e626a79daa8be27b955d12d06a5ad6a" dependencies = [ "atk", "bitflags", - "cairo-rs", - "cairo-sys-rs", + "cairo-rs 0.9.1", + "cairo-sys-rs 0.10.0", "cc", "gdk", - "gdk-pixbuf", - "gdk-pixbuf-sys", - "gdk-sys", - "gio", - "gio-sys", - "glib", - "glib-sys", - "gobject-sys", - "gtk-sys", + "gdk-pixbuf 0.9.0", + "gdk-pixbuf-sys 0.10.0", + "gdk-sys 0.10.0", + "gio 0.9.1", + "gio-sys 0.10.1", + "glib 0.10.3", + "glib-sys 0.10.1", + "gobject-sys 0.10.0", + "gtk-sys 0.10.0", "libc", "once_cell", - "pango", - "pango-sys", + "pango 0.9.1", + "pango-sys 0.10.0", "pkg-config", ] @@ -666,16 +1118,91 @@ version = "0.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "89acda6f084863307d948ba64a4b1ef674e8527dddab147ee4cdcc194c880457" dependencies = [ - "atk-sys", - "cairo-sys-rs", - "gdk-pixbuf-sys", - "gdk-sys", - "gio-sys", - "glib-sys", - "gobject-sys", + "atk-sys 0.10.0", + "cairo-sys-rs 0.10.0", + "gdk-pixbuf-sys 0.10.0", + "gdk-sys 0.10.0", + "gio-sys 0.10.1", + "glib-sys 0.10.1", + "gobject-sys 0.10.0", "libc", - "pango-sys", - "system-deps", + "pango-sys 0.10.0", + "system-deps 1.3.2", +] + +[[package]] +name = "gtk-sys" +version = "0.15.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d5bc2f0587cba247f60246a0ca11fe25fb733eabc3de12d1965fc07efab87c84" +dependencies = [ + "atk-sys 0.15.1", + "cairo-sys-rs 0.15.1", + "gdk-pixbuf-sys 0.15.10", + "gdk-sys 0.15.1", + "gio-sys 0.15.10", + "glib-sys 0.15.10", + "gobject-sys 0.15.10", + "libc", + "pango-sys 0.15.10", + "system-deps 6.0.2", +] + +[[package]] +name = "gtk4" +version = "0.4.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c64f0c2a3d80e899dc3febddad5bac193ffcf74a0fd7e31037f30dd34d6f7396" +dependencies = [ + "bitflags", + "cairo-rs 0.15.12", + "field-offset", + "futures-channel", + "gdk-pixbuf 0.15.11", + "gdk4 0.4.8", + "gio 0.15.12", + "glib 0.15.12", + "graphene-rs", + "gsk4", + "gtk4-macros", + "gtk4-sys", + "libc", + "once_cell", + "pango 0.15.10", +] + +[[package]] +name = "gtk4-macros" +version = "0.4.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fafbcc920af4eb677d7d164853e7040b9de5a22379c596f570190c675d45f7a7" +dependencies = [ + "anyhow", + "proc-macro-crate 1.2.1", + "proc-macro-error", + "proc-macro2", + "quick-xml", + "quote", + "syn", +] + +[[package]] +name = "gtk4-sys" +version = "0.4.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5bc8006eea634b7c72da3ff79e24606e45f21b3b832a3c5a1f543f5f97eb0f63" +dependencies = [ + "cairo-sys-rs 0.15.1", + "gdk-pixbuf-sys 0.15.10", + "gdk4-sys 0.4.8", + "gio-sys 0.15.10", + "glib-sys 0.15.10", + "gobject-sys 0.15.10", + "graphene-sys", + "gsk4-sys", + "libc", + "pango-sys 0.15.10", + "system-deps 6.0.2", ] [[package]] @@ -696,6 +1223,12 @@ dependencies = [ "unicode-segmentation", ] +[[package]] +name = "heck" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2540771e65fc8cb83cd6e8a237f70c319bd5c29f78ed1084ba5d50eeac86f7f9" + [[package]] name = "hermit-abi" version = "0.1.19" @@ -715,10 +1248,24 @@ dependencies = [ ] [[package]] -name = "instant" -version = "0.1.10" +name = "iana-time-zone" +version = "0.1.48" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bee0328b1209d157ef001c94dd85b4f8f64139adb0eac2659f4b08382b2f474d" +checksum = "237a0714f28b1ee39ccec0770ccb544eb02c9ef2c82bb096230eefcffa6468b0" +dependencies = [ + "android_system_properties", + "core-foundation-sys", + "js-sys", + "once_cell", + "wasm-bindgen", + "winapi", +] + +[[package]] +name = "instant" +version = "0.1.12" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7a5bbe824c507c5da5956355e86a746d82e0e1464f65d862cc5e71da70e94b2c" dependencies = [ "cfg-if 1.0.0", ] @@ -732,6 +1279,15 @@ dependencies = [ "either", ] +[[package]] +name = "js-sys" +version = "0.3.60" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "49409df3e3bf0856b916e2ceaca09ee28e6871cf7d9ce97a692cacfdb2a25a47" +dependencies = [ + "wasm-bindgen", +] + [[package]] name = "lazy_static" version = "1.4.0" @@ -750,9 +1306,9 @@ version = "0.5.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "52d3fc57353f50e2faf5741438df9d2b628d896e2c5bb31156306b015f59d037" dependencies = [ - "glib", + "glib 0.10.3", "gtk", - "gtk-sys", + "gtk-sys 0.10.0", "libappindicator-sys", "log", ] @@ -764,15 +1320,15 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9719ba201a6cb121f59a36bae0bd2bd91762c4af6fbdaaffe804cfe2f9c8651d" dependencies = [ "bindgen", - "gtk-sys", + "gtk-sys 0.10.0", "pkg-config", ] [[package]] name = "libc" -version = "0.2.99" +version = "0.2.133" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a7f823d141fe0a24df1e23b4af4e3c7ba9e5966ec514ea068c93024aa7deb765" +checksum = "c0f80d65747a3e43d1596c7c5492d95d5edddaabd45a7fcdb02b95f644164966" [[package]] name = "libloading" @@ -799,9 +1355,9 @@ dependencies = [ [[package]] name = "log" -version = "0.4.14" +version = "0.4.17" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "51b9bbe6c47d51fc3e1a9b945965946b4c44142ab8792c50835a980d362c2710" +checksum = "abb12e687cfb44aa40f41fc3978ef76448f9b6038cad6aef4259d3c095a2382e" dependencies = [ "cfg-if 1.0.0", ] @@ -817,15 +1373,15 @@ dependencies = [ [[package]] name = "memchr" -version = "2.4.0" +version = "2.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b16bd47d9e329435e309c58469fe0791c2d0d1ba96ec0954152a5ae2b04387dc" +checksum = "2dffe52ecf27772e601905b7522cb4ef790d2cc203488bbd0e2fe85fcb74566d" [[package]] name = "memoffset" -version = "0.6.4" +version = "0.6.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "59accc507f1338036a0477ef61afdae33cde60840f4dfe481319ce3ad116ddf9" +checksum = "5aa361d4faea93603064a027415f07bd8e1d5c88c9fbf68bf56a285428fd79ce" dependencies = [ "autocfg", ] @@ -842,9 +1398,9 @@ dependencies = [ [[package]] name = "nix" -version = "0.20.2" +version = "0.22.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f5e06129fb611568ef4e868c14b326274959aa70ff7776e9d55323531c374945" +checksum = "e4916f159ed8e5de0082076562152a76b7a1f64a01fd9d1e0fea002c37624faf" dependencies = [ "bitflags", "cc", @@ -865,9 +1421,9 @@ dependencies = [ [[package]] name = "num-integer" -version = "0.1.44" +version = "0.1.45" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d2cc698a63b549a70bc047073d2949cce27cd1c7b0a4a862d08a8031bc2801db" +checksum = "225d3389fb3509a24c93f5c29eb6bde2586b98d9f016636dff58d7c6f7569cd9" dependencies = [ "autocfg", "num-traits", @@ -875,9 +1431,9 @@ dependencies = [ [[package]] name = "num-traits" -version = "0.2.14" +version = "0.2.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9a64b1ec5cda2586e284722486d802acf1f7dbdc623e2bfc57e65ca1cd099290" +checksum = "578ede34cf02f8924ab9447f50c28075b4d3e5b269972345e7e0372b38c6cdcd" dependencies = [ "autocfg", ] @@ -913,9 +1469,9 @@ dependencies = [ [[package]] name = "once_cell" -version = "1.8.0" +version = "1.15.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "692fcb63b64b1758029e0a96ee63e049ce8c5948587f2f7208df04625e5f6b56" +checksum = "e82dad04139b71a90c080c8463fe0dc7902db5192d939bd0950f074d014339e1" [[package]] name = "ordered-multimap" @@ -934,12 +1490,38 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9937068580bebd8ced19975938573803273ccbcbd598c58d4906efd4ac87c438" dependencies = [ "bitflags", - "glib", - "glib-sys", - "gobject-sys", + "glib 0.10.3", + "glib-sys 0.10.1", + "gobject-sys 0.10.0", "libc", "once_cell", - "pango-sys", + "pango-sys 0.10.0", +] + +[[package]] +name = "pango" +version = "0.15.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "22e4045548659aee5313bde6c582b0d83a627b7904dd20dc2d9ef0895d414e4f" +dependencies = [ + "bitflags", + "glib 0.15.12", + "libc", + "once_cell", + "pango-sys 0.15.10", +] + +[[package]] +name = "pango" +version = "0.16.0" +source = "git+https://github.com/gtk-rs/gtk-rs-core#61a082e6fb3cb50af8c936dc8858b7a67db4ac9a" +dependencies = [ + "bitflags", + "gio 0.16.0", + "glib 0.16.0", + "libc", + "once_cell", + "pango-sys 0.16.0", ] [[package]] @@ -948,10 +1530,33 @@ version = "0.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "24d2650c8b62d116c020abd0cea26a4ed96526afda89b1c4ea567131fdefc890" dependencies = [ - "glib-sys", - "gobject-sys", + "glib-sys 0.10.1", + "gobject-sys 0.10.0", "libc", - "system-deps", + "system-deps 1.3.2", +] + +[[package]] +name = "pango-sys" +version = "0.15.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d2a00081cde4661982ed91d80ef437c20eacaf6aa1a5962c0279ae194662c3aa" +dependencies = [ + "glib-sys 0.15.10", + "gobject-sys 0.15.10", + "libc", + "system-deps 6.0.2", +] + +[[package]] +name = "pango-sys" +version = "0.16.0" +source = "git+https://github.com/gtk-rs/gtk-rs-core#61a082e6fb3cb50af8c936dc8858b7a67db4ac9a" +dependencies = [ + "glib-sys 0.16.0", + "gobject-sys 0.16.0", + "libc", + "system-deps 6.0.2", ] [[package]] @@ -967,10 +1572,20 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "19b17cddbe7ec3f8bc800887bab5e717348c95ea2ca0b1bf0837fb964dc67099" [[package]] -name = "pin-project-lite" -version = "0.2.7" +name = "pest" +version = "2.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8d31d11c69a6b52a174b42bdc0c30e5e11670f90788b2c471c31c1d17d449443" +checksum = "cb779fcf4bb850fbbb0edc96ff6cf34fd90c4b1a112ce042653280d9a7364048" +dependencies = [ + "thiserror", + "ucd-trie", +] + +[[package]] +name = "pin-project-lite" +version = "0.2.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e0a7ae3ac2f1173085d398531c705756c94a4c56843785df85a60c1a0afac116" [[package]] name = "pin-utils" @@ -980,16 +1595,17 @@ checksum = "8b870d8c151b6f2fb93e84a13146138f05d02ed11c7e7c54f8826aaaf7c9f184" [[package]] name = "pkg-config" -version = "0.3.19" +version = "0.3.25" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3831453b3449ceb48b6d9c7ad7c96d5ea673e9b470a1dc578c2ce6521230884c" +checksum = "1df8c4ec4b0627e53bdf214615ad287367e482558cf84b109250b37464dc03ae" [[package]] name = "polling" -version = "2.1.0" +version = "2.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "92341d779fa34ea8437ef4d82d440d5e1ce3f3ff7f824aa64424cd481f9a1f25" +checksum = "899b00b9c8ab553c743b3e11e87c5c7d423b2a2de229ba95b24a756344748011" dependencies = [ + "autocfg", "cfg-if 1.0.0", "libc", "log", @@ -999,9 +1615,9 @@ dependencies = [ [[package]] name = "ppv-lite86" -version = "0.2.10" +version = "0.2.16" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ac74c624d6b2d21f425f752262f42188365d7b8ff1aff74c82e45136510a4857" +checksum = "eb9f9e6e233e5c4a35559a617bf40a4ec447db2e84c20b55a6f83167b7e57872" [[package]] name = "proc-macro-crate" @@ -1014,10 +1630,11 @@ dependencies = [ [[package]] name = "proc-macro-crate" -version = "1.0.0" +version = "1.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "41fdbd1df62156fbc5945f4762632564d7d038153091c3fcf1067f6aef7cff92" +checksum = "eda0fc3b0fb7c975631757e14d9049da17374063edb6ebbcbc54d880d4fe94e9" dependencies = [ + "once_cell", "thiserror", "toml", ] @@ -1032,7 +1649,7 @@ dependencies = [ "proc-macro2", "quote", "syn", - "version_check 0.9.3", + "version_check 0.9.4", ] [[package]] @@ -1043,28 +1660,16 @@ checksum = "a1be40180e52ecc98ad80b184934baf3d0d29f979574e439af5a55274b35f869" dependencies = [ "proc-macro2", "quote", - "version_check 0.9.3", + "version_check 0.9.4", ] -[[package]] -name = "proc-macro-hack" -version = "0.5.19" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dbf0c48bc1d91375ae5c3cd81e3722dff1abcf81a30960240640d223f59fe0e5" - -[[package]] -name = "proc-macro-nested" -version = "0.1.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bc881b2c22681370c6a780e47af9840ef841837bc98118431d4e1868bd0c1086" - [[package]] name = "proc-macro2" -version = "1.0.28" +version = "1.0.43" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5c7ed8b8c7b886ea3ed7dde405212185f423ab44682667c8c6dd14aa1d9f6612" +checksum = "0a2ca2c61bc9f3d74d2886294ab7b9853abd9c1ad903a3ac7815c58989bb7bab" dependencies = [ - "unicode-xid", + "unicode-ident", ] [[package]] @@ -1074,24 +1679,32 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a1d01941d82fa2ab50be1e79e6714289dd7cde78eba4c074bc5a4374f650dfe0" [[package]] -name = "quote" -version = "1.0.9" +name = "quick-xml" +version = "0.22.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c3d0b9745dc2debf507c8422de05d7226cc1f0644216dfdfead988f9b1ab32a7" +checksum = "8533f14c8382aaad0d592c812ac3b826162128b65662331e1127b45c3d18536b" +dependencies = [ + "memchr", +] + +[[package]] +name = "quote" +version = "1.0.21" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bbe448f377a7d6961e30f5955f9b8d106c3f5e449d493ee1b125c1d43c2b5179" dependencies = [ "proc-macro2", ] [[package]] name = "rand" -version = "0.8.4" +version = "0.8.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2e7573632e6454cf6b99d7aac4ccca54be06da05aca2ef7423d22d27d4d4bcd8" +checksum = "34af8d1a0e25924bc5b7c43c079c942339d8f0a8b57c39049bef581b46327404" dependencies = [ "libc", "rand_chacha", "rand_core", - "rand_hc", ] [[package]] @@ -1106,27 +1719,18 @@ dependencies = [ [[package]] name = "rand_core" -version = "0.6.3" +version = "0.6.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d34f1408f55294453790c48b2f1ebbb1c5b4b7563eb1f418bcfcfdbb06ebb4e7" +checksum = "ec0be4795e2f6a28069bec0b5ff3e2ac9bafc99e6a9a7dc3547996c5c816922c" dependencies = [ "getrandom", ] -[[package]] -name = "rand_hc" -version = "0.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d51e9f596de227fda2ea6c84607f5558e196eeaf43c986b724ba4fb8fdf497e7" -dependencies = [ - "rand_core", -] - [[package]] name = "regex" -version = "1.5.4" +version = "1.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d07a8629359eb56f1e2fb1652bb04212c072a87ba68546a04065d525673ac461" +checksum = "4c4eb3267174b8c6c2f654116623910a0fef09c4753f8dd83db29c48a0df988b" dependencies = [ "aho-corasick", "memchr", @@ -1135,9 +1739,9 @@ dependencies = [ [[package]] name = "regex-syntax" -version = "0.6.25" +version = "0.6.27" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f497285884f3fcff424ffc933e56d7cbca511def0c9831a7f9b5f6153e3cc89b" +checksum = "a3f87b73ce11b1619a3c6332f45341e0047173771e8b8b73f87bfeefb7b56244" [[package]] name = "rust-ini" @@ -1155,6 +1759,15 @@ version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "08d43f7aa6b08d49f382cde6a7982047c3426db949b1424bc4b7ec9ae12c6ce2" +[[package]] +name = "rustc_version" +version = "0.3.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f0dfe2087c51c460008730de8b57e6a320782fbfb312e1f4d520e6c6fae155ee" +dependencies = [ + "semver", +] + [[package]] name = "scoped-tls" version = "1.0.0" @@ -1162,19 +1775,37 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ea6a9290e3c9cf0f18145ef7ffa62d68ee0bf5fcd651017e586dc7fd5da448c2" [[package]] -name = "serde" -version = "1.0.127" +name = "semver" +version = "0.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f03b9878abf6d14e6779d3f24f07b2cfa90352cfec4acc5aab8f1ac7f146fae8" +checksum = "f301af10236f6df4160f7c3f04eec6dbc70ace82d23326abad5edee88801c6b6" +dependencies = [ + "semver-parser", +] + +[[package]] +name = "semver-parser" +version = "0.10.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "00b0bef5b7f9e0df16536d3961cfb6e84331c065b4066afb39768d0e319411f7" +dependencies = [ + "pest", +] + +[[package]] +name = "serde" +version = "1.0.144" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0f747710de3dcd43b88c9168773254e809d8ddbdf9653b84e2554ab219f17860" dependencies = [ "serde_derive", ] [[package]] name = "serde_derive" -version = "1.0.127" +version = "1.0.144" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a024926d3432516606328597e0f224a51355a493b49fdd67e9209187cbe55ecc" +checksum = "94ed3a816fb1d101812f83e789f888322c34e291f894f19590dc310963e87a00" dependencies = [ "proc-macro2", "quote", @@ -1183,9 +1814,9 @@ dependencies = [ [[package]] name = "serde_repr" -version = "0.1.7" +version = "0.1.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "98d0516900518c29efa217c298fa1f4e6c6ffc85ae29fd7f4ee48f176e1a9ed5" +checksum = "1fe39d9fbb0ebf5eb2c7cb7e2a47e4f462fad1379f1166b8ae49ad9eae89a7ca" dependencies = [ "proc-macro2", "quote", @@ -1200,15 +1831,24 @@ checksum = "7fdf1b9db47230893d76faad238fd6097fd6d6a9245cd7a4d90dbd639536bbd2" [[package]] name = "slab" -version = "0.4.4" +version = "0.4.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c307a32c1c5c437f38c7fd45d753050587732ba8628319fbdf12a7e289ccc590" +checksum = "4614a76b2a8be0058caa9dbbaf66d988527d86d003c11a94fbd335d7661edcef" +dependencies = [ + "autocfg", +] + +[[package]] +name = "smallvec" +version = "1.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2fd0db749597d91ff862fd1d55ea87f7855a744a8425a64695b6fca237d1dad1" [[package]] name = "socket2" -version = "0.4.1" +version = "0.4.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "765f090f0e423d2b55843402a07915add955e7d60657db13707a159727326cad" +checksum = "02e2d2db9033d13a1567121ddd7a095ee144db4e1ca1b1bda3419bc0da294ebd" dependencies = [ "libc", "winapi", @@ -1238,7 +1878,7 @@ version = "0.18.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "87c85aa3f8ea653bfd3ddf25f7ee357ee4d204731f6aa9ad04002306f6e2774c" dependencies = [ - "heck", + "heck 0.3.3", "proc-macro2", "quote", "syn", @@ -1246,9 +1886,9 @@ dependencies = [ [[package]] name = "subprocess" -version = "0.2.7" +version = "0.2.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "334b801f9ca2529ba9605109f1d2835f15aff94cd6cfe5afe6ce8cf71e5fd3c4" +checksum = "0c2e86926081dda636c546d8c5e641661049d7562a68f5488be4a1f7f66f6086" dependencies = [ "libc", "winapi", @@ -1256,13 +1896,13 @@ dependencies = [ [[package]] name = "syn" -version = "1.0.74" +version = "1.0.100" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1873d832550d4588c3dbc20f01361ab00bfe741048f71e3fecf145a7cc18b29c" +checksum = "52205623b1b0f064a4e71182c3b18ae902267282930c6d5462c91b859668426e" dependencies = [ "proc-macro2", "quote", - "unicode-xid", + "unicode-ident", ] [[package]] @@ -1271,13 +1911,26 @@ version = "1.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0f3ecc17269a19353b3558b313bba738b25d82993e30d62a18406a24aba4649b" dependencies = [ - "heck", + "heck 0.3.3", "pkg-config", "strum", "strum_macros", "thiserror", "toml", - "version-compare", + "version-compare 0.0.10", +] + +[[package]] +name = "system-deps" +version = "6.0.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a1a45a1c4c9015217e12347f2a411b57ce2c4fc543913b14b6fe40483328e709" +dependencies = [ + "cfg-expr", + "heck 0.4.0", + "pkg-config", + "toml", + "version-compare 0.1.0", ] [[package]] @@ -1288,9 +1941,9 @@ checksum = "af547b166dd1ea4b472165569fc456cfb6818116f854690b0ff205e636523dab" [[package]] name = "termcolor" -version = "1.1.2" +version = "1.1.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2dfed899f0eb03f32ee8c6a0aabdb8a7949659e3466561fc0adf54e26d88c5f4" +checksum = "bab24d30b911b2376f3a13cc2cd443142f0c81dda04c118693e35b3835757755" dependencies = [ "winapi-util", ] @@ -1306,18 +1959,18 @@ dependencies = [ [[package]] name = "thiserror" -version = "1.0.26" +version = "1.0.35" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "93119e4feac1cbe6c798c34d3a53ea0026b0b1de6a120deef895137c0529bfe2" +checksum = "c53f98874615aea268107765aa1ed8f6116782501d18e53d08b471733bea6c85" dependencies = [ "thiserror-impl", ] [[package]] name = "thiserror-impl" -version = "1.0.26" +version = "1.0.35" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "060d69a0afe7796bf42e9e2ff91f5ee691fb15c53d38b4b62a9a53eb23164745" +checksum = "f8b463991b4eab2d801e724172285ec4195c650e8ec79b149e6c2a8e6dd3f783" dependencies = [ "proc-macro2", "quote", @@ -1331,36 +1984,42 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6db9e6914ab8b1ae1c260a4ae7a49b6c5611b40328a735b21862567685e73255" dependencies = [ "libc", - "wasi", + "wasi 0.10.0+wasi-snapshot-preview1", "winapi", ] [[package]] name = "toml" -version = "0.5.8" +version = "0.5.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a31142970826733df8241ef35dc040ef98c679ab14d7c3e54d827099b3acecaa" +checksum = "8d82e1a7758622a465f8cee077614c73484dac5b836c02ff6a40d5d1010324d7" dependencies = [ "serde", ] [[package]] -name = "unicode-segmentation" -version = "1.8.0" +name = "ucd-trie" +version = "0.1.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8895849a949e7845e06bd6dc1aa51731a103c42707010a5b591c0038fb73385b" +checksum = "9e79c4d996edb816c91e4308506774452e55e95c3c9de07b6729e17e15a5ef81" + +[[package]] +name = "unicode-ident" +version = "1.0.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dcc811dc4066ac62f84f11307873c4850cb653bfa9b1719cee2bd2204a4bc5dd" + +[[package]] +name = "unicode-segmentation" +version = "1.10.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0fdbf052a0783de01e944a6ce7a8cb939e295b1e7be835a1112c3b9a7f047a5a" [[package]] name = "unicode-width" -version = "0.1.8" +version = "0.1.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9337591893a19b88d8d87f2cec1e73fad5cdfd10e5a6f349f498ad6ea2ffb1e3" - -[[package]] -name = "unicode-xid" -version = "0.2.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8ccb82d61f80a663efe1f787a51b16b5a51e3314d6ac365b08639f52387b33f3" +checksum = "c0edd1e5b14653f783770bce4a4dabb4a5108a5370a5f5d8cfe8710c361f6c8b" [[package]] name = "vec_map" @@ -1374,6 +2033,12 @@ version = "0.0.10" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d63556a25bae6ea31b52e640d7c41d1ab27faba4ccb600013837a3d0b3994ca1" +[[package]] +name = "version-compare" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fe88247b92c1df6b6de80ddc290f3976dbdf2f5f5d3fd049a9fb598c6dd5ca73" + [[package]] name = "version_check" version = "0.1.5" @@ -1382,9 +2047,9 @@ checksum = "914b1a6776c4c929a602fafd8bc742e06365d4bcbe48c30f9cca5824f70dc9dd" [[package]] name = "version_check" -version = "0.9.3" +version = "0.9.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5fecdca9a5291cc2b8dcf7dc02453fee791a280f3743cb0905f8822ae463b3fe" +checksum = "49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f" [[package]] name = "waker-fn" @@ -1398,6 +2063,66 @@ version = "0.10.0+wasi-snapshot-preview1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1a143597ca7c7793eff794def352d41792a93c481eb1042423ff7ff72ba2c31f" +[[package]] +name = "wasi" +version = "0.11.0+wasi-snapshot-preview1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423" + +[[package]] +name = "wasm-bindgen" +version = "0.2.83" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "eaf9f5aceeec8be17c128b2e93e031fb8a4d469bb9c4ae2d7dc1888b26887268" +dependencies = [ + "cfg-if 1.0.0", + "wasm-bindgen-macro", +] + +[[package]] +name = "wasm-bindgen-backend" +version = "0.2.83" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4c8ffb332579b0557b52d268b91feab8df3615f265d5270fec2a8c95b17c1142" +dependencies = [ + "bumpalo", + "log", + "once_cell", + "proc-macro2", + "quote", + "syn", + "wasm-bindgen-shared", +] + +[[package]] +name = "wasm-bindgen-macro" +version = "0.2.83" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "052be0f94026e6cbc75cdefc9bae13fd6052cdcaf532fa6c45e7ae33a1e6c810" +dependencies = [ + "quote", + "wasm-bindgen-macro-support", +] + +[[package]] +name = "wasm-bindgen-macro-support" +version = "0.2.83" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "07bc0c051dc5f23e307b13285f9d75df86bfdf816c5721e573dec1f9b8aa193c" +dependencies = [ + "proc-macro2", + "quote", + "syn", + "wasm-bindgen-backend", + "wasm-bindgen-shared", +] + +[[package]] +name = "wasm-bindgen-shared" +version = "0.2.83" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1c38c045535d93ec4f0b4defec448e4291638ee608530863b1e2ba115d4fff7f" + [[package]] name = "wepoll-ffi" version = "0.1.2" @@ -1449,9 +2174,9 @@ checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f" [[package]] name = "zbus" -version = "1.9.2" +version = "1.9.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e5983c3d035549ab80db67c844ec83ed271f7c1f2546fd9577c594d34c1b6c85" +checksum = "9cbeb2291cd7267a94489b71376eda33496c1b9881adf6b36f26cc2779f3fc49" dependencies = [ "async-io", "byteorder", @@ -1472,9 +2197,9 @@ dependencies = [ [[package]] name = "zbus_macros" -version = "1.9.2" +version = "1.9.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bce54ac7b2150a2fa21ad5842a7470ce2288158d7da1f9bfda8ad455a1c59a97" +checksum = "fa3959a7847cf95e3d51e312856617c5b1b77191176c65a79a5f14d778bbe0a6" dependencies = [ "proc-macro-crate 0.1.5", "proc-macro2", @@ -1502,7 +2227,7 @@ version = "2.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e4ca5e22593eb4212382d60d26350065bf2a02c34b85bc850474a74b589a3de9" dependencies = [ - "proc-macro-crate 1.0.0", + "proc-macro-crate 1.2.1", "proc-macro2", "quote", "syn", diff --git a/Cargo.toml b/Cargo.toml index cb73451..916b69f 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -1,28 +1,24 @@ [package] name = "blue-recorder" -version = "0.1.5" -authors = ["Salem Yaslem "] -edition = "2018" +version = "0.1.0" +edition = "2021" # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html [dependencies] -gdk = "0.13.2" +chrono = "0.4.19" +gdk = { git = "https://github.com/gtk-rs/gtk4-rs.git", package = "gdk4"} +gdk-pixbuf = "0.9.0" +gettext-rs = "0.7.0" +gtk = { version = "0.4.8", package = "gtk4" } +gtk-sys = "0.15" glib = "0.10.3" +libappindicator = "0.5.2" rust-ini = "0.16" regex = "1.4.3" -chrono = "0.4.19" -libappindicator = "0.5.2" -gettext-rs = "0.7.0" subprocess = "0.2.6" zbus = "1.9.2" zvariant = "2.10.0" -gdk-pixbuf = "0.9.0" - -[dependencies.gtk] -version = "0.9.0" -features = ["v3_16"] [dependencies.gio] -version = "0.9.0" -features = ["v2_44"] +version = "0.15.0" diff --git a/interfaces/main.ui b/interfaces/main.ui index ff2461c..00f41fa 100644 --- a/interfaces/main.ui +++ b/interfaces/main.ui @@ -1,600 +1,431 @@ - - - - False - True - dialog - blue-recorder - - - False - vertical - 2 - - - False - True - end - - - True - True - 0 - - - - - - - 10000 - 1 - 2 - - - 1 - 200 - 30 - 1 - 10 - - - 100 - 1 - 10 - - - 100 - 1 - 10 - - - area_chooser_window - False - True - True - center - blue-recorder - static - - - True - False - False - True - - - True - True - True - half - True - - - - True - False - 3 - True - - - True - False - dialog-ok - - - 0 - 0 - - - - - True - False - Apply - - - 1 - 0 - - - - - - - - - - - True - False - media-playback-start - - - True - False - gtk-media-stop - - - True - False - - - True - False - - - - - True - True - False - center - center - - - True - False - vertical - - - True - False - 5 - 5 - 5 - True - - - True - True - True - True - True - 5 - 5 - 5 - 5 - - - True - True - 0 - - - - - True - True - True - 5 - 5 - 5 - 5 - select-folder - - - False - True - 1 - - - - - False - True - 0 - - - - - True - False - 10 - 10 - 5 - 5 - - - False - False - 1 - - - - - True - False - 5 - 5 - 5 - True - - - button - True - True - True - 5 - 5 - 5 - 5 - - - True - True - 1 - - - - - button - True - True - True - 5 - 5 - 5 - 5 - - - True - True - 2 - - - - - False - False - 2 - - - - - - True - False - 10 - 10 - 5 - 5 - True - True - - - - True - False - True - True - - - checkbutton - True - True - False - True - True - - - 0 - 0 - - - - - checkbutton - True - True - False - True - True - - - 1 - 0 - - - - - checkbutton - True - True - False - True - True - - - 0 - 1 - - - - - checkbutton - True - True - False - True - True - - - 1 - 1 - - - - - 0 - 0 - - - - - - True - False - 3 - True - True - - - True - False - label - - - 0 - 0 - - - - - True - True - 2 - 30 - adjustment2 - 30 - - - 1 - 0 - - - - - True - False - label - - - 0 - 1 - - - - - True - True - 2 - 0 - adjustment1 - 1 - - - 1 - 1 - - - - - 1 - 0 - - - - - True - True - 3 - - - - - - True - False - 10 - 10 - 5 - 5 - 2 - 5 - - - True - True - 5 - 5 - True - True - - - 1 - 1 - - - - - True - False - 5 - 5 - label - - - 0 - 1 - - - - - True - False - 5 - 5 - label - - - 0 - 0 - - - - - True - False - True - True - - - 1 - 0 - - - - - False - True - 6 - - - - - - - True - False - False - True - - - True - True - True - half - - - - True - False - 2 - True - - - True - False - media-record - - - 0 - 0 - - - - - True - False - Record - - - 1 - 0 - - - - - - - - - True - True - True - half - - - - True - False - 2 - True - - - True - False - media-playback-stop - - - 0 - 0 - - - - - True - False - Stop Recording - - - 1 - 0 - - - - - - - 2 - - - - - True - True - True - image3 - half - True - - - 3 - - - - - True - True - True - none - menu1 - - - True - False - view-list-symbolic - - - - - end - 5 - - - - - - + + + True + True + blue-recorder + True + + + 10000 + 1 + 2 + + + 1 + 200 + 30 + 1 + 10 + + + 100 + 1 + 10 + + + 100 + 1 + 10 + + + area_chooser_window + True + True + True + blue-recorder + + + True + True + + + True + True + True + + + + True + True + 3 + True + + + True + True + emblem-ok-symbolic + + + + + True + True + Apply + + + + + + + + + + + True + True + media-playback-start + + + True + True + gtk-media-stop + + + True + True + False + + + True + True + vertical + + + True + True + 5 + 5 + 5 + + + True + True + True + True + True + True + True + 5 + 5 + 5 + 5 + + + + + True + True + True + True + 5 + 5 + 5 + 5 + + + True + True + horizontal + 5 + + + folder + start + + + + + start + + + + + + + + + + + True + True + 10 + 10 + 5 + 5 + + + + + True + True + 5 + 5 + 5 + True + + + button + True + True + True + 5 + 5 + 5 + 5 + + + + + button + True + True + True + 5 + 5 + 5 + 5 + + + + + + + + True + True + 10 + 10 + 5 + 5 + True + True + + + + True + True + True + True + + + checkbutton + True + True + False + True + + + + + checkbutton + True + True + False + True + + + + + checkbutton + True + True + False + True + + + + + checkbutton + True + True + False + True + + + + + + + + True + True + 3 + True + True + + + True + True + label + + + + + True + True + 2 + 30 + adjustment2 + 30 + + + + + True + True + label + + + + + True + True + 2 + 0 + adjustment1 + 1 + + + + + + + + + + True + True + 10 + 10 + 5 + 5 + 2 + 5 + + + True + True + 5 + 5 + True + True + + + + + True + True + 5 + 5 + label + + + + + True + True + 5 + 5 + label + + + + + True + True + 5 + 5 + True + True + + + + + + + + + True + True + + + True + True + True + + + + True + True + 2 + True + + + True + True + media-record + + + + + True + True + Record + + + + + + + + + True + True + True + + + + True + True + 2 + True + + + True + True + media-playback-stop + + + + + True + True + Stop Recording + + + + + + + + + media-playback-start + True + True + True + + + + + About + True + True + True + + + + + + diff --git a/po/tr.po b/po/tr.po deleted file mode 100644 index a880fd9..0000000 --- a/po/tr.po +++ /dev/null @@ -1,143 +0,0 @@ -# Turkish translation for Blue Recorder. -# Copyright (C) 2022 Blue Recorder's COPYRIGHT HOLDER -# This file is distributed under the same license as the Blue Recorder package. -# -# Sabri Ünal , 2022. -# -msgid "" -msgstr "" -"Project-Id-Version: \n" -"POT-Creation-Date: 2017-08-08 10:53+0300\n" -"PO-Revision-Date: 2022-08-27 02:15+0300\n" -"Last-Translator: Sabri Ünal \n" -"Language-Team: Turkish \n" -"Language: tr\n" -"MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=UTF-8\n" -"Content-Transfer-Encoding: 8bit\n" -"Plural-Forms: nplurals=2; plural=(n != 1);\n" -"Generated-By: pygettext.py 1.5\n" -"X-Generator: Poedit 3.1.1\n" - -msgid "" -"There seems to be a problem in recording. Try running 'blue-recorder' from " -"the command line to see the issue." -msgstr "" -"Kayıtta bir sorun var gibi görünüyor. Sorunu görmek için 'blue-recorder' " -"uygulamasını komut satırından çalıştırmayı deneyin." - -msgid "Stop Recording" -msgstr "Kaydetmeyi Durdur" - -msgid "Recording has started!" -msgstr "Kayıt başlatıldı!" - -msgid "Recording has stopped!" -msgstr "Kayıt durduruldu!" - -msgid "" -"Your GIF image is currently being processed, this may take a while according " -"to your PC's resources." -msgstr "" -"GIF resminiz şu anda işleniyor. Bilgisayarınızın kaynaklarına göre bu işlem " -"biraz sürebilir." - -msgid "File already exists!" -msgstr "Dosya zaten var!" - -msgid "Would you like to overwrite this file?" -msgstr "Bu dosyanın üzerine yazmak ister misiniz?" - -msgid "Sorry Jim, looks like you are using something we don't support" -msgstr "Üzgünüm. Desteklemediğimiz bir şey kullanıyor gibisiniz" - -msgid "About" -msgstr "Hakkında" - -msgid "Blue Recorder" -msgstr "Blue Recorder" - -msgid "AreaChooser" -msgstr "Alan Seçici" - -msgid "File Name.." -msgstr "Dosya Adı.." - -msgid "Enter your command here.." -msgstr "Komutu buraya girin.." - -msgid "MKV (Matroska multimedia container format)" -msgstr "MKV" - -msgid "AVI (Audio Video Interleaved)" -msgstr "AVI" - -msgid "MP4 (MPEG-4 Part 14)" -msgstr "MP4" - -msgid "WMV (Windows Media Video)" -msgstr "WMV (Windows Media Videosu)" - -msgid "GIF (Graphics Interchange Format)" -msgstr "GIF" - -msgid "NUT (NUT Recording Format)" -msgstr "NUT (NUT Kayıt Biçimi)" - -msgid "Record Video" -msgstr "Video Kaydet" - -msgid "Record Audio" -msgstr "Ses Kaydet" - -msgid "Show Mouse" -msgstr "Fareyi Göster" - -msgid "Follow Mouse" -msgstr "Fareyi Takip Et" - -msgid "A simple screen recorder for Linux desktop. Supports Wayland & Xorg." -msgstr "" -"Linux masaüstü için basit bir ekran kaydedici. Wayland ve Xorg'u destekler." - -msgid "Select a Window" -msgstr "Pencere Seç" - -msgid "Select an Area" -msgstr "Alan Seç" - -msgid "Frames:" -msgstr "Kare:" - -msgid "Delay:" -msgstr "Gecikme:" - -msgid "Run Command After Recording:" -msgstr "Kayıttan Sonra Komut Çalıştır:" - -msgid "Audio Input Source:" -msgstr "Ses Girdi Kaynağı:" - -msgid "Default PulseAudio Input Source" -msgstr "Öntanımlı PulseAudio Girdi Kaynağı" - -msgid "" -"You didn't run the program using the application icon (desktop file). This " -"will cause the program not to work. Run it using the icon from the menus " -"only. (Need to export GDK_BACKEND=x11 first)" -msgstr "" -"Programı uygulama simgesini (desktop dosyası) kullanarak çalıştırmadınız. " -"Bu, programın çalışmamasına neden olacaktır. Yalnızca menülerdeki simgeyi " -"kullanarak çalıştırın. (Önce GDK_BACKEND=x11'i dışa aktarmanız gerekir)" - -msgid "Your window position has been saved!" -msgstr "Pencere konumunuz kaydedildi!" - -msgid "Area Chooser" -msgstr "Alan Seçici" - -msgid "Your area position has been saved!" -msgstr "Alan konumunuz kaydedildi!" - -msgid "stop recording" -msgstr "kaydı durdur" diff --git a/src/config_management.rs b/src/config_management.rs old mode 100644 new mode 100755 index 2805b24..0b32764 --- a/src/config_management.rs +++ b/src/config_management.rs @@ -28,9 +28,7 @@ pub fn initialize() -> PathBuf { fn default() { set("default", "frame", "60"); set("default", "delay", "0"); - set( - "default", - "folder", + set("default", "folder", String::from("file://") .add( glib::get_user_special_dir(glib::UserDirectory::Videos) diff --git a/src/ffmpeg_interface.rs b/src/ffmpeg_interface.rs index 7ebaf4d..329f1d8 100644 --- a/src/ffmpeg_interface.rs +++ b/src/ffmpeg_interface.rs @@ -1,12 +1,11 @@ extern crate subprocess; use chrono::prelude::*; use gettextrs::gettext; +use gio::File; use gtk::prelude::*; use gtk::{ButtonsType, DialogFlags, MessageDialog, MessageType, ResponseType}; use gtk::{ - CheckButton, ComboBoxText, Entry, FileChooser, ProgressBar, SpinButton, Window, WindowPosition, - WindowType, -}; + CheckButton, ComboBoxText, Entry, ProgressBar, SpinButton, Window}; use std::collections::HashMap; use std::path::PathBuf; use std::process::Command; @@ -27,14 +26,14 @@ pub struct ProgressWidget { impl ProgressWidget { pub fn new(window: &Window) -> ProgressWidget { ProgressWidget { - window: Window::new(WindowType::Toplevel), + window: Window::new(), progress: ProgressBar::new(), } .init(&window) } pub fn init(self, window: &Window) -> ProgressWidget { - self.window.set_title("Progress"); + self.window.set_title(Some("Progress")); self.window.set_transient_for(Some(window)); self.progress.set_fraction(0.0); self.progress.set_show_text(true); @@ -42,11 +41,10 @@ impl ProgressWidget { self.progress.set_margin_top(10); self.progress.set_margin_end(10); self.progress.set_margin_bottom(10); - self.window.add(&self.progress); + self.window.set_child(Some(&self.progress)); self.window.set_deletable(false); - self.window.set_position(WindowPosition::CenterOnParent); self.window.set_modal(true); - self.window.resize(200, 50); + self.window.set_default_size(200, 50); self } @@ -59,7 +57,6 @@ impl ProgressWidget { pub fn show(&self) { self.progress.set_fraction(0.0); self.window.show(); - self.window.show_all(); } pub fn hide(&self) { @@ -92,7 +89,7 @@ trait GnomeScreencast { #[derive(Clone)] pub struct Ffmpeg { - pub filename: (FileChooser, Entry, ComboBoxText), + pub filename: (File, Entry, ComboBoxText), pub record_video: CheckButton, pub record_audio: CheckButton, pub audio_id: ComboBoxText, @@ -123,16 +120,16 @@ impl Ffmpeg { self.saved_filename = Some( self.filename .0 - .get_filename() + .path() .unwrap() .join(PathBuf::from(format!( "{}.{}", - if self.filename.1.get_text().to_string().trim().eq("") { + if self.filename.1.text().to_string().trim().eq("") { Utc::now().to_string().replace(" UTC", "").replace(" ", "-") } else { - self.filename.1.get_text().to_string().trim().to_string() + self.filename.1.text().to_string().trim().to_string() }, - self.filename.2.get_active_id().unwrap().to_string() + self.filename.2.active_id().unwrap().to_string() ))) .as_path() .display() @@ -152,19 +149,22 @@ impl Ffmpeg { &gettext("Would you like to overwrite this file?"), ); - if message_dialog.run() != ResponseType::Ok { + message_dialog.connect_response(glib::clone!(@strong message_dialog => move |_, response| { + message_dialog.show(); + if response != ResponseType::Ok { message_dialog.hide(); - return (None, None); + return; } message_dialog.hide(); + })); } - if self.record_audio.get_active() { + if self.record_audio.is_active() { let mut ffmpeg_command = Command::new("ffmpeg"); ffmpeg_command.arg("-f"); ffmpeg_command.arg("pulse"); ffmpeg_command.arg("-i"); - ffmpeg_command.arg(self.audio_id.get_active_id().unwrap().to_string()); + ffmpeg_command.arg(self.audio_id.active_id().unwrap().to_string()); ffmpeg_command.arg("-f"); ffmpeg_command.arg("ogg"); ffmpeg_command.arg(format!( @@ -176,7 +176,7 @@ impl Ffmpeg { } if is_wayland() { - if self.record_video.get_active() { + if self.record_video.is_active() { if self.unbound.is_some() { self.clone() .unbound @@ -196,14 +196,14 @@ impl Ffmpeg { return (None, self.audio_process_id); } - if self.record_video.get_active() { + if self.record_video.is_active() { let mut ffmpeg_command: Command = Command::new("ffmpeg"); // record video with specified width and hight ffmpeg_command.arg("-video_size"); ffmpeg_command.arg(format!("{}x{}", width, height)); ffmpeg_command.arg("-framerate"); - ffmpeg_command.arg(format!("{}", self.record_frames.get_value())); + ffmpeg_command.arg(format!("{}", self.record_frames.value())); ffmpeg_command.arg("-f"); ffmpeg_command.arg("x11grab"); ffmpeg_command.arg("-i"); @@ -218,14 +218,14 @@ impl Ffmpeg { // if show mouse switch is enabled, draw the mouse to video ffmpeg_command.arg("-draw_mouse"); - if self.record_mouse.get_active() { + if self.record_mouse.is_active() { ffmpeg_command.arg("1"); } else { ffmpeg_command.arg("0"); } // if follow mouse switch is enabled, follow the mouse - if self.follow_mouse.get_active() { + if self.follow_mouse.is_active() { ffmpeg_command.arg("-follow_mouse"); ffmpeg_command.arg("centered"); } @@ -234,7 +234,7 @@ impl Ffmpeg { ffmpeg_command.arg(self.saved_filename.as_ref().unwrap().to_string()); ffmpeg_command.arg("-y"); // sleep for delay - sleep(Duration::from_secs(self.record_delay.get_value() as u64)); + sleep(Duration::from_secs(self.record_delay.value() as u64)); // start recording and return the process id self.video_process_id = Some(ffmpeg_command.spawn().unwrap().id()); return (self.video_process_id, self.audio_process_id); @@ -316,7 +316,7 @@ impl Ffmpeg { if is_audio_record { format!( ".temp.without.audio.{}", - self.filename.2.get_active_id().unwrap().to_string() + self.filename.2.active_id().unwrap().to_string() ) } else { "".to_string() @@ -343,7 +343,7 @@ impl Ffmpeg { if is_audio_record { format!( ".temp.without.audio.{}", - self.filename.2.get_active_id().unwrap().to_string() + self.filename.2.active_id().unwrap().to_string() ) } else { "".to_string() @@ -362,7 +362,7 @@ impl Ffmpeg { ffmpeg_audio_merge_command.arg(format!( "{}.temp.without.audio.{}", self.saved_filename.as_ref().unwrap(), - self.filename.2.get_active_id().unwrap().to_string() + self.filename.2.active_id().unwrap().to_string() )); ffmpeg_audio_merge_command.arg("-i"); ffmpeg_audio_merge_command.arg(format!( @@ -385,7 +385,7 @@ impl Ffmpeg { std::fs::remove_file(format!( "{}.temp.without.audio.{}", self.saved_filename.as_ref().unwrap(), - self.filename.2.get_active_id().unwrap().to_string() + self.filename.2.active_id().unwrap().to_string() )) .unwrap(); } @@ -415,13 +415,13 @@ impl Ffmpeg { } // execute command after finish recording - if !(self.command.get_text().trim() == "") { + if !(self.command.text().trim() == "") { &self.progress_widget.set_progress( "execute custom command after finish".to_string(), 5, 6, ); - Exec::shell(self.command.get_text().trim()).popen().unwrap(); + Exec::shell(self.command.text().trim()).popen().unwrap(); } &self @@ -438,8 +438,8 @@ impl Ffmpeg { let gnome_screencast_proxy = GnomeScreencastProxy::new(&connection).unwrap(); // options for gnome screencast let mut screencast_options: HashMap<&str, Value> = HashMap::new(); - screencast_options.insert("framerate", Value::new(self.record_frames.get_value())); - screencast_options.insert("draw-cursor", Value::new(self.record_mouse.get_active())); + screencast_options.insert("framerate", Value::new(self.record_frames.value())); + screencast_options.insert("draw-cursor", Value::new(self.record_mouse.is_active())); screencast_options.insert("pipeline", Value::new("vp8enc min_quantizer=10 max_quantizer=50 cq_level=13 cpu-used=5 deadline=1000000 threads=%T ! queue ! webmmux")); // make unbound channel for communication with record thread let (tx, tr): (Sender, Receiver) = mpsc::channel(); diff --git a/src/main.rs b/src/main.rs index 3fa0a65..e8f4d4d 100644 --- a/src/main.rs +++ b/src/main.rs @@ -1,25 +1,16 @@ -extern crate gdk; -extern crate gdk_pixbuf; -extern crate gettextrs; extern crate gio; +extern crate gdk; +extern crate gettextrs; extern crate gtk; -extern crate libappindicator; mod area_capture; mod config_management; mod ffmpeg_interface; -// use gio::prelude::*; use ffmpeg_interface::{Ffmpeg, ProgressWidget}; -use gdk_pixbuf::Pixbuf; -use gettextrs::{bindtextdomain, gettext, setlocale, textdomain, LocaleCategory}; -use glib::signal::Inhibit; -use gtk::prelude::*; -use gtk::ComboBoxText; -use gtk::{ - AboutDialog, Builder, Button, CheckButton, CssProvider, Entry, FileChooser, Label, MenuItem, - SpinButton, Window, -}; -use libappindicator::{AppIndicator, AppIndicatorStatus}; +use gettextrs::{bindtextdomain, gettext, LocaleCategory, setlocale, textdomain}; +use gtk::{prelude::*, Application}; +use gtk::{AboutDialog, Builder, Button, CheckButton, ComboBoxText, CssProvider, Entry, FileChooserNative, FileChooserAction, Image, Label, SpinButton, Window}; +//use libappindicator::{AppIndicator, AppIndicatorStatus}; use std::cell::RefCell; use std::ops::Add; use std::path::Path; @@ -27,16 +18,24 @@ use std::process::{Command, Stdio}; use std::rc::Rc; fn main() { + //create new application + let application = Application::new(Some("sa.sy.blue-recorder"), Default::default(),); + application.connect_activate(build_ui); + application.run(); +} + +pub fn build_ui(application: &Application) { // use "GDK_BACKEND=x11" to make xwininfo work in Wayland by using XWayland std::env::set_var("GDK_BACKEND", "x11"); if gtk::init().is_err() { println!("Failed to initialize GTK."); return; } + let ui_src = include_str!("../interfaces/main.ui").to_string(); let builder: Builder = Builder::from_string(ui_src.as_str()); - // translate + // translate let mut po_path_abs = { let mut current_exec_dir = std::env::current_exe().unwrap(); current_exec_dir.pop(); @@ -59,41 +58,44 @@ fn main() { config_management::initialize(); // get Objects from UI - let main_window: Window = builder.get_object("main_window").unwrap(); - let about_dialog: AboutDialog = builder.get_object("about_dialog").unwrap(); - let area_chooser_window: Window = builder.get_object("area_chooser_window").unwrap(); - let folder_chooser: FileChooser = builder.get_object("filechooser").unwrap(); - let filename_entry: Entry = builder.get_object("filename").unwrap(); - let command_entry: Entry = builder.get_object("command").unwrap(); - let format_chooser_combobox: ComboBoxText = builder.get_object("comboboxtext1").unwrap(); - let audio_source_combobox: ComboBoxText = builder.get_object("audiosource").unwrap(); - let record_button: Button = builder.get_object("recordbutton").unwrap(); - let stop_button: Button = builder.get_object("stopbutton").unwrap(); - let play_button: Button = builder.get_object("playbutton").unwrap(); - let window_grab_button: Button = builder.get_object("window_grab_button").unwrap(); - let area_grab_button: Button = builder.get_object("area_grab_button").unwrap(); - let area_set_button: Button = builder.get_object("area_set_button").unwrap(); - let frames_label: Label = builder.get_object("frames_label").unwrap(); - let delay_label: Label = builder.get_object("delay_label").unwrap(); - let command_label: Label = builder.get_object("command_label").unwrap(); - let frames_spin: SpinButton = builder.get_object("frames").unwrap(); - let delay_spin: SpinButton = builder.get_object("delay").unwrap(); - let audio_source_label: Label = builder.get_object("audio_source_label").unwrap(); - let video_switch: CheckButton = builder.get_object("videoswitch").unwrap(); - let audio_switch: CheckButton = builder.get_object("audioswitch").unwrap(); - let mouse_switch: CheckButton = builder.get_object("mouseswitch").unwrap(); - let follow_mouse_switch: CheckButton = builder.get_object("followmouseswitch").unwrap(); - let about_menu_item: MenuItem = builder.get_object("about_menu_item").unwrap(); + let main_window: Window = builder.object("main_window").unwrap(); + let area_chooser_window: Window = builder.object("area_chooser_window").unwrap(); + let area_grab_button: Button = builder.object("area_grab_button").unwrap(); + let area_set_button: Button = builder.object("area_set_button").unwrap(); + let about_menu_item: Button = builder.object("about_menu_item").unwrap(); + let about_dialog: AboutDialog = builder.object("about_dialog").unwrap(); + let audio_source_combobox: ComboBoxText = builder.object("audiosource").unwrap(); + let audio_source_label: Label = builder.object("audio_source_label").unwrap(); + let audio_switch: CheckButton = builder.object("audioswitch").unwrap(); + let command_entry: Entry = builder.object("command").unwrap(); + let command_label: Label = builder.object("command_label").unwrap(); + let delay_label: Label = builder.object("delay_label").unwrap(); + let delay_spin: SpinButton = builder.object("delay").unwrap(); + let filename_entry: Entry = builder.object("filename").unwrap(); + let folder_chooser_button: Button = builder.object("folderchooser").unwrap(); + let folder_chooser_label: Label = builder.object("folderchooserlabel").unwrap(); + let follow_mouse_switch: CheckButton = builder.object("followmouseswitch").unwrap(); + let format_chooser_combobox: ComboBoxText = builder.object("comboboxtext1").unwrap(); + let frames_label: Label = builder.object("frames_label").unwrap(); + let frames_spin: SpinButton = builder.object("frames").unwrap(); + let mouse_switch: CheckButton = builder.object("mouseswitch").unwrap(); + let play_button: Button = builder.object("playbutton").unwrap(); + let record_button: Button = builder.object("recordbutton").unwrap(); + let stop_button: Button = builder.object("stopbutton").unwrap(); + let video_switch: CheckButton = builder.object("videoswitch").unwrap(); + let window_grab_button: Button = builder.object("window_grab_button").unwrap(); + // TODO: add recording mode indicator + // TODO: add timer + // --- default properties // Windows - main_window.set_title(&gettext("Blue Recorder")); + main_window.set_title(Some(&gettext("Blue Recorder"))); + main_window.set_application(Some(application)); // TODO: make area chooser window transparent // NOTICE: it work as snap package - area_chooser_window.set_title(&gettext("Area Chooser")); - area_chooser_window.set_visual(Some( - &gdk::Screen::get_rgba_visual(&gdk::Screen::get_default().unwrap()).unwrap(), - )); + area_chooser_window.set_title(Some(&gettext("Area Chooser"))); + //hide stop & play buttons stop_button.hide(); play_button.hide(); @@ -114,6 +116,7 @@ fn main() { format_chooser_combobox.append(Some("gif"), &gettext("GIF (Graphics Interchange Format)")); format_chooser_combobox.append(Some("nut"), &gettext("NUT (NUT Recording Format)")); format_chooser_combobox.set_active(Some(0)); + // TODO: add support for webm format // get audio sources let sources_descriptions: Vec = { @@ -158,10 +161,10 @@ fn main() { audio_source_combobox.set_active(Some(0)); // Switchs - video_switch.set_label(&gettext("Record Video")); - audio_switch.set_label(&gettext("Record Audio")); - mouse_switch.set_label(&gettext("Show Mouse")); - follow_mouse_switch.set_label(&gettext("Follow Mouse")); + video_switch.set_label(Some(&gettext("Record Video"))); + audio_switch.set_label(Some(&gettext("Record Audio"))); + mouse_switch.set_label(Some(&gettext("Show Mouse"))); + follow_mouse_switch.set_label(Some(&gettext("Follow Mouse"))); video_switch.set_active(config_management::get_bool("default", "videocheck")); audio_switch.set_active(config_management::get_bool("default", "audiocheck")); mouse_switch.set_active(config_management::get_bool("default", "mousecheck")); @@ -170,8 +173,8 @@ fn main() { let _mouse_switch = mouse_switch.clone(); let _follow_mouse_switch = follow_mouse_switch.clone(); video_switch.connect_toggled(move |switch: &CheckButton| { - config_management::set_bool("default", "videocheck", switch.get_active()); - if switch.get_active() { + config_management::set_bool("default", "videocheck", switch.is_active()); + if switch.is_active() { _mouse_switch.set_sensitive(true); _follow_mouse_switch.set_sensitive(true); } else { @@ -181,18 +184,18 @@ fn main() { }); let _follow_mouse_switch = follow_mouse_switch.clone(); mouse_switch.connect_toggled(move |switch: &CheckButton| { - config_management::set_bool("default", "mousecheck", switch.get_active()); - if switch.get_active() { + config_management::set_bool("default", "mousecheck", switch.is_active()); + if switch.is_active() { _follow_mouse_switch.set_sensitive(true); } else { _follow_mouse_switch.set_sensitive(false); } }); audio_switch.connect_toggled(|switch: &CheckButton| { - config_management::set_bool("default", "audiocheck", switch.get_active()); + config_management::set_bool("default", "audiocheck", switch.is_active()); }); follow_mouse_switch.connect_toggled(|switch: &CheckButton| { - config_management::set_bool("default", "followmousecheck", switch.get_active()); + config_management::set_bool("default", "followmousecheck", switch.is_active()); }); // Buttons @@ -223,7 +226,7 @@ fn main() { config_management::set( "default", "frame", - _frames_spin.get_value().to_string().as_str(), + _frames_spin.value().to_string().as_str(), ); }); let _delay_spin = delay_spin.to_owned(); @@ -231,19 +234,42 @@ fn main() { config_management::set( "default", "delay", - _delay_spin.get_value().to_string().as_str(), + _delay_spin.value().to_string().as_str(), ); }); - // Other - folder_chooser.set_uri(&config_management::get("default", "folder")); + // FileChooser + let folder_chooser_native = FileChooserNative::new( + Some("Select Folder"), + Some(&main_window), + FileChooserAction::SelectFolder, + Some("Select"), + Some("Cancel"), + ); + folder_chooser_native.set_modal(true); + let mut folder_chooser = Some(gio::File::for_uri(&config_management::get("default", "folder"))).unwrap(); + let mut folder_chooser_name = folder_chooser.basename().unwrap(); + folder_chooser_label.set_label(&folder_chooser_name.to_string_lossy()); + // show file chooser dialog + folder_chooser_button.connect_clicked(glib::clone!(@strong folder_chooser_native => move |_| { + folder_chooser_native.connect_response(glib::clone!(@strong folder_chooser_native, @strong folder_chooser_label => move |_, response| { + if response == gtk::ResponseType::Accept { + let folder_chooser = folder_chooser_native.file().unwrap(); + let folder_chooser_name = folder_chooser.basename().unwrap(); + folder_chooser_label.set_label(&folder_chooser_name.to_string_lossy()); + // TODO: change folder icon + }; + folder_chooser_native.destroy(); + })); + folder_chooser_native.show(); + })); // --- connections // show dialog window when about button clicked then hide it after close let _about_dialog: AboutDialog = about_dialog.to_owned(); - about_menu_item.connect_activate(move |_| { - _about_dialog.run(); - _about_dialog.hide(); + about_menu_item.connect_clicked(move |_| { + _about_dialog.show(); + _about_dialog.set_hide_on_close(true); }); // Buttons @@ -304,39 +330,39 @@ fn main() { .unwrap(); } - let indicator = Rc::new(RefCell::new(AppIndicator::new( - "Blue Recorder", - indicator_icon_path.to_str().unwrap(), - ))); - indicator - .clone() - .borrow_mut() - .set_status(AppIndicatorStatus::Passive); - let mut menu = gtk::Menu::new(); - let indicator_stop_recording = gtk::MenuItem::with_label(&gettext("stop recording")); - menu.append(&indicator_stop_recording); - menu.show_all(); - indicator.clone().borrow_mut().set_menu(&mut menu); + //let indicator = Rc::new(RefCell::new(AppIndicator::new( + //"Blue Recorder", + //indicator_icon_path.to_str().unwrap(), + //))); + //indicator + //.clone() + //.borrow_mut() + //.set_status(AppIndicatorStatus::Passive); + //let mut menu = gtk::Popover::new(); + //let indicator_stop_recording = Label::new(Some(&gettext("stop recording"))); + //menu.set_child(Some(&indicator_stop_recording)); + //menu.show(); + //indicator.clone().borrow_mut().set_menu(&mut menu); // indicator support GtkMenu from Gtk3 // when indictor stop recording button clicked - let mut _ffmpeg_record_interface = ffmpeg_record_interface.clone(); - let mut _indicator = indicator.clone(); - let _stop_button = stop_button.clone(); - let _play_button = play_button.clone(); - let _record_button = record_button.clone(); - indicator_stop_recording.connect_activate(move |_| { - _ffmpeg_record_interface.borrow_mut().clone().stop_record(); - _indicator - .borrow_mut() - .set_status(AppIndicatorStatus::Passive); + //let mut _ffmpeg_record_interface = ffmpeg_record_interface.clone(); + //let mut _indicator = indicator.clone(); + //let _stop_button = stop_button.clone(); + //let _play_button = play_button.clone(); + //let _record_button = record_button.clone(); + //indicator_stop_recording.connect_activate_current_link(move |_| { + //_ffmpeg_record_interface.borrow_mut().clone().stop_record(); + //_indicator + //.borrow_mut() + //.set_status(AppIndicatorStatus::Passive); - _record_button.show(); - _stop_button.hide(); - _play_button.show(); - }); + //_record_button.show(); + //_stop_button.hide(); + //_play_button.show(); + //}); let mut _ffmpeg_record_interface = ffmpeg_record_interface.clone(); let mut _area_capture = area_capture.clone(); - let mut _indicator = indicator.clone(); + //let mut _indicator = indicator.clone(); let _stop_button = stop_button.clone(); let _record_button = record_button.clone(); record_button.connect_clicked(move |_| { @@ -351,10 +377,10 @@ fn main() { // do nothing if the start_record function return nothing } _ => { - _indicator - .borrow_mut() - .set_status(AppIndicatorStatus::Active); - + //_indicator + //.borrow_mut() + //.set_status(AppIndicatorStatus::Active); + _record_button.hide(); _stop_button.show(); } @@ -362,15 +388,15 @@ fn main() { }); let mut _ffmpeg_record_interface = ffmpeg_record_interface.clone(); - let mut _indicator = indicator.clone(); + //let mut _indicator = indicator.clone(); let _stop_button = stop_button.clone(); let _play_button = play_button.clone(); let _record_button = record_button.clone(); stop_button.connect_clicked(move |_| { _ffmpeg_record_interface.borrow_mut().clone().stop_record(); - _indicator - .borrow_mut() - .set_status(AppIndicatorStatus::Passive); + //_indicator + //.borrow_mut() + //.set_status(AppIndicatorStatus::Passive); _record_button.show(); _stop_button.hide(); @@ -383,61 +409,59 @@ fn main() { }); // About Dialog - about_menu_item.set_label("about"); + let logo = Image::from_file(&indicator_icon_path.to_str().unwrap()); about_dialog.set_transient_for(Some(&main_window)); - about_dialog.set_program_name(&gettext("Blue Recorder")); - about_dialog.set_version(Some("0.1.5")); + about_dialog.set_program_name(Some(&gettext("Blue Recorder"))); + about_dialog.set_version(Some("0.2.0")); about_dialog.set_copyright(Some("© 2021 Salem Yaslem")); about_dialog.set_wrap_license(true); about_dialog.set_license(Some("Blue Recorder is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version.\n\nBlue Recorder is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.\n\nSee the GNU General Public License for more details. You should have received a copy of the GNU General Public License along with Blue Recorder. If not, see .")); about_dialog.set_comments(Some(&gettext( - "A simple screen recorder for Linux desktop. Supports Wayland & Xorg.", + "A simple screen recorder for Linux desktop. Supports Waylan_windowd & Xorg.", ))); about_dialog.set_authors(&[ "Salem Yaslem ", "M.Hanny Sabbagh ", "Alessandro Toia ", "Suliman Altassan ", + "O.Chibani <11yzyv86j@relay.firefox.com>", "Patreon Supporters: Ahmad Gharib, Medium,\nWilliam Grunow, Alex Benishek.", ]); about_dialog.set_artists(&["Mustapha Assabar", "Abdullah Al-Baroty "]); about_dialog.set_website(Some("https://github.com/xlmnxp/blue-recorder/")); about_dialog.set_logo_icon_name(Some("blue-recorder")); - about_dialog.set_logo(Some( - &Pixbuf::from_file(&indicator_icon_path.to_str().unwrap()).unwrap(), - )); - about_dialog.set_transient_for(Some(&main_window)); + about_dialog.set_logo(logo.paintable().as_ref()); + about_dialog.set_modal(true); // Windows // hide area chooser after it deleted. let _area_chooser_window = area_chooser_window.clone(); - area_chooser_window.connect_delete_event(move |_, _event: &gdk::Event| { + area_chooser_window.connect_close_request (move |_| { _area_chooser_window.hide(); - Inhibit(true) + gtk::Inhibit(true) }); - // close the application when main window destroy + // close the application when main window destroy let mut _ffmpeg_record_interface = ffmpeg_record_interface.clone(); - let mut _indicator = indicator.clone(); - main_window.connect_destroy(move |_| { - // stop recording before close the application + //let mut _indicator = indicator.clone(); + main_window.connect_destroy(move |main_window| { + // stop recording before close the application _ffmpeg_record_interface.borrow_mut().clone().stop_record(); - _indicator - .borrow_mut() - .set_status(AppIndicatorStatus::Passive); - gtk::main_quit(); + //_indicator + //.borrow_mut() + //.set_status(AppIndicatorStatus::Passive); + main_window.close(); }); // apply css let provider = CssProvider::new(); provider - .load_from_data(include_str!("styles/global.css").as_bytes()) - .unwrap(); - gtk::StyleContext::add_provider_for_screen( - &gdk::Screen::get_default().unwrap(), + .load_from_data(include_str!("styles/global.css").as_bytes()); + gtk::StyleContext::add_provider_for_display( + &area_chooser_window.display(), &provider, gtk::STYLE_PROVIDER_PRIORITY_APPLICATION, ); - gtk::main(); + main_window.show(); }