From ca0d8bda4be299a99fb4c50fd64f2053f47826c7 Mon Sep 17 00:00:00 2001 From: "Luke D. Jones" Date: Fri, 5 Apr 2024 16:00:20 +1300 Subject: [PATCH] Update readme. Fix tray startup --- Cargo.lock | 207 +++++++++--------- Cargo.toml | 4 +- Makefile | 3 + README.md | 35 ++- rog-control-center/src/tray.rs | 88 ++++---- .../translations/en/rog-control-center.po | 2 +- 6 files changed, 168 insertions(+), 171 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 847228f6..9627694b 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -123,7 +123,7 @@ checksum = "175571dd1d178ced59193a6fc02dde1b972eb0bc56c892cde9beeceac5bf0f6b" [[package]] name = "asusctl" -version = "6.0.0-alpha1" +version = "6.0.0-alpha2" dependencies = [ "asusd", "cargo-husky", @@ -144,7 +144,7 @@ dependencies = [ [[package]] name = "asusd" -version = "6.0.0-alpha1" +version = "6.0.0-alpha2" dependencies = [ "cargo-husky", "concat-idents", @@ -170,7 +170,7 @@ dependencies = [ [[package]] name = "asusd-user" -version = "6.0.0-alpha1" +version = "6.0.0-alpha2" dependencies = [ "cargo-husky", "config-traits", @@ -205,7 +205,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "258b52a1aa741b9f09783b2d86cf0aeeb617bbf847f6933340a39644227acbdb" dependencies = [ "event-listener 5.2.0", - "event-listener-strategy 0.5.0", + "event-listener-strategy 0.5.1", "futures-core", "pin-project-lite", ] @@ -229,16 +229,16 @@ checksum = "f28243a43d821d11341ab73c80bed182dc015c514b951616cf79bd4af39af0c3" dependencies = [ "concurrent-queue", "event-listener 5.2.0", - "event-listener-strategy 0.5.0", + "event-listener-strategy 0.5.1", "futures-core", "pin-project-lite", ] [[package]] name = "async-executor" -version = "1.8.0" +version = "1.9.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "17ae5ebefcc48e7452b4987947920dac9450be1110cadf34d1b8c116bdbaf97c" +checksum = "10b3e585719c2358d2660232671ca8ca4ddb4be4ce8a1842d6c2dc8685303316" dependencies = [ "async-lock 3.3.0", "async-task", @@ -360,19 +360,21 @@ dependencies = [ [[package]] name = "async-process" -version = "2.1.0" +version = "2.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "451e3cf68011bd56771c79db04a9e333095ab6349f7e47592b788e9b98720cc8" +checksum = "d999d925640d51b662b7b4e404224dd81de70f4aa4a199383c2c5e5b86885fa3" dependencies = [ "async-channel 2.2.0", "async-io 2.3.2", "async-lock 3.3.0", "async-signal", + "async-task", "blocking", "cfg-if", "event-listener 5.2.0", "futures-lite 2.3.0", "rustix 0.38.32", + "tracing", "windows-sys 0.52.0", ] @@ -384,7 +386,7 @@ checksum = "30c5ef0ede93efbf733c1a727f3b6b5a1060bbedd5600183e66f6e4be4af0ec5" dependencies = [ "proc-macro2", "quote", - "syn 2.0.55", + "syn 2.0.58", ] [[package]] @@ -419,7 +421,7 @@ checksum = "a507401cad91ec6a857ed5513a2073c82a9b9048762b885bb98655b306964681" dependencies = [ "proc-macro2", "quote", - "syn 2.0.55", + "syn 2.0.58", ] [[package]] @@ -437,7 +439,7 @@ dependencies = [ "derive_utils", "proc-macro2", "quote", - "syn 2.0.55", + "syn 2.0.58", ] [[package]] @@ -511,7 +513,7 @@ dependencies = [ "regex", "rustc-hash", "shlex", - "syn 2.0.55", + "syn 2.0.58", "which", ] @@ -594,9 +596,9 @@ checksum = "7ff69b9dd49fd426c69a0db9fc04dd934cdb6645ff000864d98f7e2af8830eaa" [[package]] name = "by_address" -version = "1.2.0" +version = "1.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e7e9330396d4065c0788ac665e5ba4857c4744f5ff4239b6f06493aca55e0e08" +checksum = "64fa3c856b712db6612c019f14756e64e4bcea13337a6b33b696333a9eaa2d06" [[package]] name = "bytemuck" @@ -615,7 +617,7 @@ checksum = "4da9a32f3fed317401fa3c862968128267c3106685286e15d5aaa3d7389c2f60" dependencies = [ "proc-macro2", "quote", - "syn 2.0.55", + "syn 2.0.58", ] [[package]] @@ -716,9 +718,9 @@ dependencies = [ [[package]] name = "chrono" -version = "0.4.35" +version = "0.4.37" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8eaf5903dcbc0a39312feb77df2ff4c76387d591b9fc7b04a238dcf8bb62639a" +checksum = "8a0d04d43504c61aa6c7531f1871dd0d418d91130162063b789da00fd7057a5e" dependencies = [ "android-tzdata", "iana-time-zone", @@ -824,7 +826,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f76990911f2267d837d9d0ad060aa63aaad170af40904b29461734c339030d4d" dependencies = [ "quote", - "syn 2.0.55", + "syn 2.0.58", ] [[package]] @@ -838,7 +840,7 @@ dependencies = [ [[package]] name = "config-traits" -version = "6.0.0-alpha1" +version = "6.0.0-alpha2" dependencies = [ "cargo-husky", "log", @@ -852,7 +854,7 @@ dependencies = [ [[package]] name = "const-field-offset" version = "0.1.5" -source = "git+https://github.com/flukejones/sixtyfps.git?branch=feat/color_hsv#d73de5db8ac10b0b46a1c28c85722902dcf70d30" +source = "git+https://github.com/flukejones/sixtyfps.git?branch=feat/color_hsv#a8c3faa9a3e11766afece9b8cc3d35e6a2ca7c31" dependencies = [ "const-field-offset-macro", "field-offset", @@ -861,11 +863,11 @@ dependencies = [ [[package]] name = "const-field-offset-macro" version = "0.1.5" -source = "git+https://github.com/flukejones/sixtyfps.git?branch=feat/color_hsv#d73de5db8ac10b0b46a1c28c85722902dcf70d30" +source = "git+https://github.com/flukejones/sixtyfps.git?branch=feat/color_hsv#a8c3faa9a3e11766afece9b8cc3d35e6a2ca7c31" dependencies = [ "proc-macro2", "quote", - "syn 2.0.55", + "syn 2.0.58", ] [[package]] @@ -906,9 +908,9 @@ checksum = "06ea2b9bc92be3c2baa9334a323ebca2d6f074ff852cd1d7b11064035cd3868f" [[package]] name = "core-graphics" -version = "0.23.1" +version = "0.23.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "970a29baf4110c26fedbc7f82107d42c23f7e88e404c4577ed73fe99ff85a212" +checksum = "c07782be35f9e1140080c6b96f0d44b739e2278479f64e02fdab4e32dfd8b081" dependencies = [ "bitflags 1.3.2", "core-foundation", @@ -948,7 +950,7 @@ checksum = "7704b5fdd17b18ae31c4c1da5a2e0305a2bf17b5249300a9ee9ed7b72114c636" [[package]] name = "cpuctl" -version = "6.0.0-alpha1" +version = "6.0.0-alpha2" [[package]] name = "cpufeatures" @@ -1031,7 +1033,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ad291aa74992b9b7a7e88c38acbbf6ad7e107f1d90ee8775b7bc1fc3394f485c" dependencies = [ "quote", - "syn 2.0.55", + "syn 2.0.58", ] [[package]] @@ -1087,7 +1089,7 @@ checksum = "61bb5a1014ce6dfc2a378578509abe775a5aa06bff584a547555d9efdb81b926" dependencies = [ "proc-macro2", "quote", - "syn 2.0.55", + "syn 2.0.58", ] [[package]] @@ -1158,7 +1160,7 @@ dependencies = [ [[package]] name = "dmi_id" -version = "6.0.0-alpha1" +version = "6.0.0-alpha2" dependencies = [ "log", "udev 0.8.0", @@ -1275,7 +1277,7 @@ checksum = "5c785274071b1b420972453b306eeca06acf4633829db4223b58a2a8c5953bc4" dependencies = [ "proc-macro2", "quote", - "syn 2.0.55", + "syn 2.0.58", ] [[package]] @@ -1367,9 +1369,9 @@ dependencies = [ [[package]] name = "event-listener-strategy" -version = "0.5.0" +version = "0.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "feedafcaa9b749175d5ac357452a9d41ea2911da598fde46ce1fe02c37751291" +checksum = "332f51cb23d20b0de8458b86580878211da09bcd4503cb579c225b3d124cabb3" dependencies = [ "event-listener 5.2.0", "pin-project-lite", @@ -1553,7 +1555,7 @@ checksum = "1a5c6c585bc94aaf2c7b51dd4c2ba22680844aba4c687be581871a6f518c5742" dependencies = [ "proc-macro2", "quote", - "syn 2.0.55", + "syn 2.0.58", ] [[package]] @@ -1928,8 +1930,8 @@ checksum = "9a3a5bfb195931eeb336b2a7b4d761daec841b97f947d34394601737a7bba5e4" [[package]] name = "i-slint-backend-linuxkms" -version = "1.5.1" -source = "git+https://github.com/flukejones/sixtyfps.git?branch=feat/color_hsv#d73de5db8ac10b0b46a1c28c85722902dcf70d30" +version = "1.6.0" +source = "git+https://github.com/flukejones/sixtyfps.git?branch=feat/color_hsv#a8c3faa9a3e11766afece9b8cc3d35e6a2ca7c31" dependencies = [ "calloop", "drm", @@ -1948,8 +1950,8 @@ dependencies = [ [[package]] name = "i-slint-backend-qt" -version = "1.5.1" -source = "git+https://github.com/flukejones/sixtyfps.git?branch=feat/color_hsv#d73de5db8ac10b0b46a1c28c85722902dcf70d30" +version = "1.6.0" +source = "git+https://github.com/flukejones/sixtyfps.git?branch=feat/color_hsv#a8c3faa9a3e11766afece9b8cc3d35e6a2ca7c31" dependencies = [ "const-field-offset", "i-slint-common", @@ -1960,8 +1962,8 @@ dependencies = [ [[package]] name = "i-slint-backend-selector" -version = "1.5.1" -source = "git+https://github.com/flukejones/sixtyfps.git?branch=feat/color_hsv#d73de5db8ac10b0b46a1c28c85722902dcf70d30" +version = "1.6.0" +source = "git+https://github.com/flukejones/sixtyfps.git?branch=feat/color_hsv#a8c3faa9a3e11766afece9b8cc3d35e6a2ca7c31" dependencies = [ "cfg-if", "i-slint-backend-linuxkms", @@ -1973,8 +1975,8 @@ dependencies = [ [[package]] name = "i-slint-backend-winit" -version = "1.5.1" -source = "git+https://github.com/flukejones/sixtyfps.git?branch=feat/color_hsv#d73de5db8ac10b0b46a1c28c85722902dcf70d30" +version = "1.6.0" +source = "git+https://github.com/flukejones/sixtyfps.git?branch=feat/color_hsv#a8c3faa9a3e11766afece9b8cc3d35e6a2ca7c31" dependencies = [ "bytemuck", "cfg-if", @@ -2006,8 +2008,8 @@ dependencies = [ [[package]] name = "i-slint-common" -version = "1.5.1" -source = "git+https://github.com/flukejones/sixtyfps.git?branch=feat/color_hsv#d73de5db8ac10b0b46a1c28c85722902dcf70d30" +version = "1.6.0" +source = "git+https://github.com/flukejones/sixtyfps.git?branch=feat/color_hsv#a8c3faa9a3e11766afece9b8cc3d35e6a2ca7c31" dependencies = [ "cfg-if", "derive_more", @@ -2017,8 +2019,8 @@ dependencies = [ [[package]] name = "i-slint-compiler" -version = "1.5.1" -source = "git+https://github.com/flukejones/sixtyfps.git?branch=feat/color_hsv#d73de5db8ac10b0b46a1c28c85722902dcf70d30" +version = "1.6.0" +source = "git+https://github.com/flukejones/sixtyfps.git?branch=feat/color_hsv#a8c3faa9a3e11766afece9b8cc3d35e6a2ca7c31" dependencies = [ "by_address", "codemap", @@ -2046,8 +2048,8 @@ dependencies = [ [[package]] name = "i-slint-core" -version = "1.5.1" -source = "git+https://github.com/flukejones/sixtyfps.git?branch=feat/color_hsv#d73de5db8ac10b0b46a1c28c85722902dcf70d30" +version = "1.6.0" +source = "git+https://github.com/flukejones/sixtyfps.git?branch=feat/color_hsv#a8c3faa9a3e11766afece9b8cc3d35e6a2ca7c31" dependencies = [ "auto_enums", "bytemuck", @@ -2091,17 +2093,17 @@ dependencies = [ [[package]] name = "i-slint-core-macros" -version = "1.5.1" -source = "git+https://github.com/flukejones/sixtyfps.git?branch=feat/color_hsv#d73de5db8ac10b0b46a1c28c85722902dcf70d30" +version = "1.6.0" +source = "git+https://github.com/flukejones/sixtyfps.git?branch=feat/color_hsv#a8c3faa9a3e11766afece9b8cc3d35e6a2ca7c31" dependencies = [ "quote", - "syn 2.0.55", + "syn 2.0.58", ] [[package]] name = "i-slint-renderer-femtovg" -version = "1.5.1" -source = "git+https://github.com/flukejones/sixtyfps.git?branch=feat/color_hsv#d73de5db8ac10b0b46a1c28c85722902dcf70d30" +version = "1.6.0" +source = "git+https://github.com/flukejones/sixtyfps.git?branch=feat/color_hsv#a8c3faa9a3e11766afece9b8cc3d35e6a2ca7c31" dependencies = [ "cfg-if", "const-field-offset", @@ -2131,8 +2133,8 @@ dependencies = [ [[package]] name = "i-slint-renderer-skia" -version = "1.5.1" -source = "git+https://github.com/flukejones/sixtyfps.git?branch=feat/color_hsv#d73de5db8ac10b0b46a1c28c85722902dcf70d30" +version = "1.6.0" +source = "git+https://github.com/flukejones/sixtyfps.git?branch=feat/color_hsv#a8c3faa9a3e11766afece9b8cc3d35e6a2ca7c31" dependencies = [ "bytemuck", "cfg-if", @@ -2484,9 +2486,9 @@ checksum = "4ec2a862134d2a7d32d7983ddcdd1c4923530833c9f2ea1a44fc5fa473989058" [[package]] name = "libredox" -version = "0.0.1" +version = "0.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "85c833ca1e66078851dba29046874e38f08b2c883700aa29a03ddd3b23814ee8" +checksum = "3af92c55d7d839293953fcd0fda5ecfe93297cfde6ffbdec13b41d99c0ba6607" dependencies = [ "bitflags 2.5.0", "libc", @@ -2495,13 +2497,12 @@ dependencies = [ [[package]] name = "libredox" -version = "0.0.2" +version = "0.1.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3af92c55d7d839293953fcd0fda5ecfe93297cfde6ffbdec13b41d99c0ba6607" +checksum = "c0ff37bd590ca25063e35af745c343cb7a0271906fb7b37e4813e8f79f00268d" dependencies = [ "bitflags 2.5.0", "libc", - "redox_syscall 0.4.1", ] [[package]] @@ -2682,9 +2683,9 @@ dependencies = [ [[package]] name = "memchr" -version = "2.7.1" +version = "2.7.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "523dc4f511e55ab87b694dc30d0f820d60906ef06413f93d4d7a1385599cc149" +checksum = "6c8640c5d730cb13ebd907d8d04b52f55ac9a2eec55b440c8892f40d56c76c1d" [[package]] name = "memmap2" @@ -2911,7 +2912,7 @@ dependencies = [ "proc-macro-crate 3.1.0", "proc-macro2", "quote", - "syn 2.0.55", + "syn 2.0.58", ] [[package]] @@ -3086,14 +3087,14 @@ checksum = "2f38a4412a78282e09a2cf38d195ea5420d15ba0602cb375210efbc877243965" dependencies = [ "proc-macro2", "quote", - "syn 2.0.55", + "syn 2.0.58", ] [[package]] name = "pin-project-lite" -version = "0.2.13" +version = "0.2.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8afb450f006bf6385ca15ef45d71d2288452bc3683ce2e2cacc0d18e4be60b58" +checksum = "bda66fc9667c18cb2758a2ac84d1167245054bcf85d5d1aaa6923f45801bdd02" [[package]] name = "pin-utils" @@ -3212,7 +3213,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8d3928fb5db768cb86f891ff014f0144589297e3c6a1aba6ed7cecfdace270c7" dependencies = [ "proc-macro2", - "syn 2.0.55", + "syn 2.0.58", ] [[package]] @@ -3361,12 +3362,12 @@ dependencies = [ [[package]] name = "redox_users" -version = "0.4.4" +version = "0.4.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a18479200779601e498ada4e8c1e1f50e3ee19deb0259c25825a98b5603b2cb4" +checksum = "bd283d9651eeda4b2a83a43c1c91b266c40fd76ecd39a50a8c630ae69dc72891" dependencies = [ "getrandom", - "libredox 0.0.1", + "libredox 0.1.3", "thiserror", ] @@ -3424,7 +3425,7 @@ dependencies = [ [[package]] name = "rog-control-center" -version = "6.0.0-alpha1" +version = "6.0.0-alpha2" dependencies = [ "asusd", "betrayer", @@ -3463,7 +3464,7 @@ dependencies = [ [[package]] name = "rog_anime" -version = "6.0.0-alpha1" +version = "6.0.0-alpha2" dependencies = [ "cargo-husky", "dmi_id", @@ -3480,7 +3481,7 @@ dependencies = [ [[package]] name = "rog_aura" -version = "6.0.0-alpha1" +version = "6.0.0-alpha2" dependencies = [ "cargo-husky", "dmi_id", @@ -3494,7 +3495,7 @@ dependencies = [ [[package]] name = "rog_dbus" -version = "6.0.0-alpha1" +version = "6.0.0-alpha2" dependencies = [ "asusd", "cargo-husky", @@ -3507,7 +3508,7 @@ dependencies = [ [[package]] name = "rog_platform" -version = "6.0.0-alpha1" +version = "6.0.0-alpha2" dependencies = [ "cargo-husky", "concat-idents", @@ -3524,7 +3525,7 @@ dependencies = [ [[package]] name = "rog_profiles" -version = "6.0.0-alpha1" +version = "6.0.0-alpha2" dependencies = [ "cargo-husky", "log", @@ -3538,7 +3539,7 @@ dependencies = [ [[package]] name = "rog_simulators" -version = "6.0.0-alpha1" +version = "6.0.0-alpha2" dependencies = [ "glam", "log", @@ -3766,7 +3767,7 @@ checksum = "7eb0b34b42edc17f6b7cac84a52a1c5f0e1bb2227e997ca9011ea3dd34e8610b" dependencies = [ "proc-macro2", "quote", - "syn 2.0.55", + "syn 2.0.58", ] [[package]] @@ -3788,7 +3789,7 @@ checksum = "0b2e6b945e9d3df726b65d6ee24060aff8e3533d431f677a9695db04eff9dfdb" dependencies = [ "proc-macro2", "quote", - "syn 2.0.55", + "syn 2.0.58", ] [[package]] @@ -3887,8 +3888,8 @@ dependencies = [ [[package]] name = "slint" -version = "1.5.1" -source = "git+https://github.com/flukejones/sixtyfps.git?branch=feat/color_hsv#d73de5db8ac10b0b46a1c28c85722902dcf70d30" +version = "1.6.0" +source = "git+https://github.com/flukejones/sixtyfps.git?branch=feat/color_hsv#a8c3faa9a3e11766afece9b8cc3d35e6a2ca7c31" dependencies = [ "const-field-offset", "i-slint-backend-selector", @@ -3903,8 +3904,8 @@ dependencies = [ [[package]] name = "slint-build" -version = "1.5.1" -source = "git+https://github.com/flukejones/sixtyfps.git?branch=feat/color_hsv#d73de5db8ac10b0b46a1c28c85722902dcf70d30" +version = "1.6.0" +source = "git+https://github.com/flukejones/sixtyfps.git?branch=feat/color_hsv#a8c3faa9a3e11766afece9b8cc3d35e6a2ca7c31" dependencies = [ "i-slint-compiler", "spin_on", @@ -3914,8 +3915,8 @@ dependencies = [ [[package]] name = "slint-macros" -version = "1.5.1" -source = "git+https://github.com/flukejones/sixtyfps.git?branch=feat/color_hsv#d73de5db8ac10b0b46a1c28c85722902dcf70d30" +version = "1.6.0" +source = "git+https://github.com/flukejones/sixtyfps.git?branch=feat/color_hsv#a8c3faa9a3e11766afece9b8cc3d35e6a2ca7c31" dependencies = [ "i-slint-compiler", "proc-macro2", @@ -4108,13 +4109,13 @@ dependencies = [ "proc-macro2", "quote", "rustversion", - "syn 2.0.55", + "syn 2.0.58", ] [[package]] name = "supergfxctl" version = "5.2.2" -source = "git+https://gitlab.com/asus-linux/supergfxctl.git#68c12374d2cc20e5503b7694168afa2bf52af705" +source = "git+https://gitlab.com/asus-linux/supergfxctl.git#a645c15fdb2eee6b16c8213eebcd90df2c950cdb" dependencies = [ "log", "logind-zbus", @@ -4149,9 +4150,9 @@ dependencies = [ [[package]] name = "syn" -version = "2.0.55" +version = "2.0.58" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "002a1b3dbf967edfafc32655d0f377ab0bb7b994aa1d32c8cc7e9b8bf3ebb8f0" +checksum = "44cfb93f38070beee36b3fef7d4f5a16f27751d94b187b666a5cc5e9b0d30687" dependencies = [ "proc-macro2", "quote", @@ -4239,7 +4240,7 @@ checksum = "c61f3ba182994efc43764a46c018c347bc492c79f024e705f46567b418f6d4f7" dependencies = [ "proc-macro2", "quote", - "syn 2.0.55", + "syn 2.0.58", ] [[package]] @@ -4336,9 +4337,9 @@ checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20" [[package]] name = "tokio" -version = "1.36.0" +version = "1.37.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "61285f6515fa018fb2d1e46eb21223fff441ee8db5d0f1435e8ab4f5cdb80931" +checksum = "1adbebffeca75fcfd058afa480fb6c0b81e165a0323f9c9d39c9697e37c46787" dependencies = [ "backtrace", "libc", @@ -4358,7 +4359,7 @@ checksum = "5b8a1e28f2deaa14e508979454cb3a223b10b938b45af148bc0986de36f1923b" dependencies = [ "proc-macro2", "quote", - "syn 2.0.55", + "syn 2.0.58", ] [[package]] @@ -4445,7 +4446,7 @@ checksum = "34704c8d6ebcbc939824180af020566b01a7c01f80641264eba0999f6c2b6be7" dependencies = [ "proc-macro2", "quote", - "syn 2.0.55", + "syn 2.0.58", ] [[package]] @@ -4488,7 +4489,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ecce25dea8aeaadc44909f4c1226d22d84512fccd07d22447ecbad176bc09545" dependencies = [ "quote", - "syn 2.0.55", + "syn 2.0.58", ] [[package]] @@ -4690,7 +4691,7 @@ dependencies = [ [[package]] name = "vtable" version = "0.2.0" -source = "git+https://github.com/flukejones/sixtyfps.git?branch=feat/color_hsv#d73de5db8ac10b0b46a1c28c85722902dcf70d30" +source = "git+https://github.com/flukejones/sixtyfps.git?branch=feat/color_hsv#a8c3faa9a3e11766afece9b8cc3d35e6a2ca7c31" dependencies = [ "const-field-offset", "portable-atomic", @@ -4701,11 +4702,11 @@ dependencies = [ [[package]] name = "vtable-macro" version = "0.2.0" -source = "git+https://github.com/flukejones/sixtyfps.git?branch=feat/color_hsv#d73de5db8ac10b0b46a1c28c85722902dcf70d30" +source = "git+https://github.com/flukejones/sixtyfps.git?branch=feat/color_hsv#a8c3faa9a3e11766afece9b8cc3d35e6a2ca7c31" dependencies = [ "proc-macro2", "quote", - "syn 2.0.55", + "syn 2.0.58", ] [[package]] @@ -4751,7 +4752,7 @@ dependencies = [ "once_cell", "proc-macro2", "quote", - "syn 2.0.55", + "syn 2.0.58", "wasm-bindgen-shared", ] @@ -4785,7 +4786,7 @@ checksum = "e94f17b526d0a461a191c78ea52bbce64071ed5c04c9ffe424dcb38f74171bb7" dependencies = [ "proc-macro2", "quote", - "syn 2.0.55", + "syn 2.0.58", "wasm-bindgen-backend", "wasm-bindgen-shared", ] @@ -5461,9 +5462,9 @@ checksum = "054a8e68b76250b253f671d1268cb7f1ae089ec35e195b2efb2a4e9a836d0621" [[package]] name = "xml-rs" -version = "0.8.19" +version = "0.8.20" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0fcb9cbac069e033553e8bb871be2fbdffcab578eb25bd0f7c508cedc6dcd75a" +checksum = "791978798f0597cfc70478424c2b4fdc2b7a8024aaff78497ef00f24ef674193" [[package]] name = "xmlwriter" @@ -5523,7 +5524,7 @@ dependencies = [ "async-fs 2.1.1", "async-io 2.3.2", "async-lock 3.3.0", - "async-process 2.1.0", + "async-process 2.2.0", "async-recursion", "async-task", "async-trait", @@ -5618,7 +5619,7 @@ checksum = "9ce1b18ccd8e73a9321186f97e46f9f04b778851177567b1975109d26a08d2a6" dependencies = [ "proc-macro2", "quote", - "syn 2.0.55", + "syn 2.0.58", ] [[package]] diff --git a/Cargo.toml b/Cargo.toml index 3d7509a1..3cbeb525 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -24,7 +24,7 @@ default-members = [ resolver = "2" [workspace.package] -version = "6.0.0-alpha1" +version = "6.0.0-alpha2" rust-version = "1.76" [workspace.dependencies] @@ -76,7 +76,7 @@ lto = "fat" debug = false opt-level = 3 panic = "abort" -#codegen-units = 1 +codegen-units = 1 [profile.dev] debug = true diff --git a/Makefile b/Makefile index 8acce3b6..1c74f4c8 100644 --- a/Makefile +++ b/Makefile @@ -132,6 +132,9 @@ introspect: xmlstarlet ed -L -O -d '//interface[@name="org.freedesktop.DBus.Properties"]' bindings/dbus-xml/org-asuslinux-* xmlstarlet ed -L -O -d '//interface[@name="org.freedesktop.DBus.Peer"]' bindings/dbus-xml/org-asuslinux-* +translate: + find -name \*.slint | xargs slint-tr-extractor -o rog-control-center/translations/en/rog-control-center.po + build: ifeq ($(VENDORED),1) cargo vendor diff --git a/README.md b/README.md index abab36b6..e2d263dd 100644 --- a/README.md +++ b/README.md @@ -51,6 +51,8 @@ and AniMe parts should work regardless of your latop make. ## Implemented +The list is a bit outdated as many features have been enabled in the Linux kernel with upstream patches and then supported in asusctl suite. + - [X] System daemon - [X] GUI app (includes tray and notifications) - [X] Setting/modifying built-in LED modes @@ -70,26 +72,10 @@ A gui is now in the repo - ROG Control Center. At this time it is still a WIP, b Rust and cargo are required, they can be installed from [rustup.rs](https://rustup.rs/) or from the distro repos if newer than 1.75. -**Ubuntu (unsuported):** - - apt install libinput-dev libseat-dev libpango1.0-dev libgdk-pixbuf-2.0-dev libglib2.0-dev cmake libclang-dev libudev-dev libayatana-appindicator3-1 - curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh - source "$HOME/.cargo/env" - make - sudo make install - -**popos (unsuported):** - - sudo apt install cmake libinput-dev libseat-dev libclang-dev libudev-dev libclang-dev libglib2.0-dev libatkmm-1.6-dev libpangomm-1.4-dev librust-gdk-pixbuf-dev - curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh - source "$HOME/.cargo/env" - make - sudo make install - - **fedora:** - dnf install cmake clang-devel libinput-devel libseat-devel systemd-devel glib2-devel cairo-devel atkmm-devel pangomm-devel gdk-pixbuf2-devel libappindicator-gtk3 + dnf install cmake clang-devel libinput-devel libseat-devel libgbm-devel libxkbcommon-devel systemd-devel \ + libdrm-devel expat-devel pcre2-devel libzstd-devellibappindicator-gtk3 make sudo make install @@ -98,28 +84,33 @@ Rust and cargo are required, they can be installed from [rustup.rs](https://rust Works with KDE Plasma (without GTK packages) zypper in -t pattern devel_basis - zypper in rustup make cmake libinput-devel libseat-devel systemd-devel clang-devel llvm-devel gdk-pixbuf-devel cairo-devel pango-devel freetype-devel libexpat-devel libayatana-indicator3-7 + zypper in rustup make cmake libinput-devel libseat-devel libgbm-devel systemd-devel clang-devel llvm-devel gdk-pixbuf-devel cairo-devel pango-devel freetype-devel libexpat-devel libayatana-indicator3-7 make sudo make install +**Ubuntu, Popos (unsuported):** + +instructions removed as outdated + ## Installing - Fedora copr = https://copr.fedorainfracloud.org/coprs/lukenukem/asus-linux/ - openSUSE = https://download.opensuse.org/repositories/home:/luke_nukem:/asus/ -- Ubuntu = not supported due to packaging woes, but you can build and install on your own. ======= The default init method is to use the udev rule, this ensures that the service is started when the device is initialised and ready. +You may also need to activate the service for debian install. If running Pop!_OS, I suggest disabling `system76-power` gnome-shell extension and systemd service. + +## Upgrading + If you are upgrading from a previous installed version, you will need to restart the service or reboot. ``` $ systemctl daemon-reload && systemctl restart asusd ``` -You may also need to activate the service for debian install. If running Pop!_OS, I suggest disabling `system76-power` gnome-shell extension and systemd service. - ## Uninstalling Run `sudo make uninstall` in the source repo, and remove `/etc/asusd/`. diff --git a/rog-control-center/src/tray.rs b/rog-control-center/src/tray.rs index c3138cc5..4fa4ed61 100644 --- a/rog-control-center/src/tray.rs +++ b/rog-control-center/src/tray.rs @@ -137,59 +137,61 @@ pub fn init_tray( config: Arc>, ) { std::thread::spawn(move || { - debug!("init_tray"); - let rog_blue = read_icon(&PathBuf::from("asus_notif_blue.png")); let rog_red = read_icon(&PathBuf::from("asus_notif_red.png")); - let rog_green = read_icon(&PathBuf::from("asus_notif_green.png")); - let rog_white = read_icon(&PathBuf::from("asus_notif_white.png")); - let gpu_integrated = read_icon(&PathBuf::from("rog-control-center.png")); - ICONS.get_or_init(|| Icons { - rog_blue, - rog_red: rog_red.clone(), - rog_green, - rog_white, - gpu_integrated, - }); - let conn = zbus::blocking::Connection::system().unwrap(); - let gfx_proxy = GfxProxy::new(&conn).unwrap(); - let mut supergfx_active = false; - if gfx_proxy.mode().is_ok() { - supergfx_active = true; - if let Ok(version) = gfx_proxy.version() { - if let Some(version) = Versioning::new(&version) { - let curr_gfx = Versioning::new("5.0.3-RC4").unwrap(); - warn!("supergfxd version = {version}"); - if version < curr_gfx { - // Don't allow mode changing if too old a version - warn!("supergfxd found but is too old to use"); - // tray.gfx_proxy_is_active = false; - } - } - } - }; - - let tray = TrayIconBuilder::::new() + if let Ok(tray) = TrayIconBuilder::::new() .with_icon(rog_red.clone()) .with_tooltip(TRAY_LABEL) .with_menu(build_menu()) .build(do_action) - .unwrap(); - info!("Started ROGTray"); - loop { - // let states = states.clone(); - if let Ok(mut lock) = states.lock() { - if lock.tray_should_update { - set_tray_icon_and_tip(&lock, &tray, supergfx_active); - lock.tray_should_update = false; - if let Ok(lock) = config.try_lock() { - if !lock.enable_tray_icon { - return; + .map_err(|e| log::error!("Tray unable to be initialised: {e:?}")) + { + info!("Tray started"); + let rog_blue = read_icon(&PathBuf::from("asus_notif_blue.png")); + let rog_green = read_icon(&PathBuf::from("asus_notif_green.png")); + let rog_white = read_icon(&PathBuf::from("asus_notif_white.png")); + let gpu_integrated = read_icon(&PathBuf::from("rog-control-center.png")); + ICONS.get_or_init(|| Icons { + rog_blue, + rog_red: rog_red.clone(), + rog_green, + rog_white, + gpu_integrated, + }); + + let conn = zbus::blocking::Connection::system().unwrap(); + let gfx_proxy = GfxProxy::new(&conn).unwrap(); + let mut supergfx_active = false; + if gfx_proxy.mode().is_ok() { + supergfx_active = true; + if let Ok(version) = gfx_proxy.version() { + if let Some(version) = Versioning::new(&version) { + let curr_gfx = Versioning::new("5.0.3-RC4").unwrap(); + warn!("supergfxd version = {version}"); + if version < curr_gfx { + // Don't allow mode changing if too old a version + warn!("supergfxd found but is too old to use"); + // tray.gfx_proxy_is_active = false; } } } + }; + + info!("Started ROGTray"); + loop { + if let Ok(mut lock) = states.lock() { + if lock.tray_should_update { + set_tray_icon_and_tip(&lock, &tray, supergfx_active); + lock.tray_should_update = false; + if let Ok(lock) = config.try_lock() { + if !lock.enable_tray_icon { + return; + } + } + } + } + sleep(Duration::from_millis(50)); } - sleep(Duration::from_millis(50)); } }); } diff --git a/rog-control-center/translations/en/rog-control-center.po b/rog-control-center/translations/en/rog-control-center.po index 394fb28a..a5ac5b60 100644 --- a/rog-control-center/translations/en/rog-control-center.po +++ b/rog-control-center/translations/en/rog-control-center.po @@ -2,7 +2,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" -"POT-Creation-Date: 2024-04-03 20:51+0000\n" +"POT-Creation-Date: 2024-04-03 20:58+0000\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n"