diff --git a/Cargo.lock b/Cargo.lock index 1949bcf..046ae82 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1227,7 +1227,7 @@ dependencies = [ [[package]] name = "cosmic-config" version = "0.1.0" -source = "git+https://github.com/pop-os/libcosmic?branch=master#ebf5c2738b98ffc68f2930354949f0b0e954d861" +source = "git+https://github.com/pop-os/libcosmic?branch=master#8d735575cd14cd5340797306e1e06c927c01159a" dependencies = [ "atomicwrites", "cosmic-config-derive", @@ -1246,7 +1246,7 @@ dependencies = [ [[package]] name = "cosmic-config-derive" version = "0.1.0" -source = "git+https://github.com/pop-os/libcosmic?branch=master#ebf5c2738b98ffc68f2930354949f0b0e954d861" +source = "git+https://github.com/pop-os/libcosmic?branch=master#8d735575cd14cd5340797306e1e06c927c01159a" dependencies = [ "quote", "syn 1.0.109", @@ -1254,8 +1254,8 @@ dependencies = [ [[package]] name = "cosmic-text" -version = "0.11.2" -source = "git+https://github.com/pop-os/cosmic-text.git#24fb2089532f6711f2edf67fadaf4b99375de2e4" +version = "0.12.0" +source = "git+https://github.com/pop-os/cosmic-text.git#a03ec6b75f0ea8fd6264d6cd05afcec3c2213f8f" dependencies = [ "bitflags 2.5.0", "fontdb", @@ -1277,7 +1277,7 @@ dependencies = [ [[package]] name = "cosmic-theme" version = "0.1.0" -source = "git+https://github.com/pop-os/libcosmic?branch=master#ebf5c2738b98ffc68f2930354949f0b0e954d861" +source = "git+https://github.com/pop-os/libcosmic?branch=master#8d735575cd14cd5340797306e1e06c927c01159a" dependencies = [ "almost", "cosmic-config", @@ -1773,9 +1773,9 @@ checksum = "a0474425d51df81997e2f90a21591180b38eccf27292d755f3e30750225c175b" [[package]] name = "etagere" -version = "0.2.12" +version = "0.2.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dff377452246a4a2e0ef3a7e85ce78ed77c7f93c3a4771e1c93d0cc0c69eb411" +checksum = "0e2f1e3be19fb10f549be8c1bf013e8675b4066c445e36eb76d2ebb2f54ee495" dependencies = [ "euclid", "svg_fmt", @@ -2587,7 +2587,7 @@ dependencies = [ [[package]] name = "iced" version = "0.12.0" -source = "git+https://github.com/pop-os/libcosmic?branch=master#ebf5c2738b98ffc68f2930354949f0b0e954d861" +source = "git+https://github.com/pop-os/libcosmic?branch=master#8d735575cd14cd5340797306e1e06c927c01159a" dependencies = [ "dnd", "iced_accessibility", @@ -2605,7 +2605,7 @@ dependencies = [ [[package]] name = "iced_accessibility" version = "0.1.0" -source = "git+https://github.com/pop-os/libcosmic?branch=master#ebf5c2738b98ffc68f2930354949f0b0e954d861" +source = "git+https://github.com/pop-os/libcosmic?branch=master#8d735575cd14cd5340797306e1e06c927c01159a" dependencies = [ "accesskit", "accesskit_winit", @@ -2614,7 +2614,7 @@ dependencies = [ [[package]] name = "iced_core" version = "0.12.0" -source = "git+https://github.com/pop-os/libcosmic?branch=master#ebf5c2738b98ffc68f2930354949f0b0e954d861" +source = "git+https://github.com/pop-os/libcosmic?branch=master#8d735575cd14cd5340797306e1e06c927c01159a" dependencies = [ "bitflags 2.5.0", "dnd", @@ -2634,7 +2634,7 @@ dependencies = [ [[package]] name = "iced_futures" version = "0.12.0" -source = "git+https://github.com/pop-os/libcosmic?branch=master#ebf5c2738b98ffc68f2930354949f0b0e954d861" +source = "git+https://github.com/pop-os/libcosmic?branch=master#8d735575cd14cd5340797306e1e06c927c01159a" dependencies = [ "futures", "iced_core", @@ -2647,7 +2647,7 @@ dependencies = [ [[package]] name = "iced_graphics" version = "0.12.0" -source = "git+https://github.com/pop-os/libcosmic?branch=master#ebf5c2738b98ffc68f2930354949f0b0e954d861" +source = "git+https://github.com/pop-os/libcosmic?branch=master#8d735575cd14cd5340797306e1e06c927c01159a" dependencies = [ "bitflags 2.5.0", "bytemuck", @@ -2671,7 +2671,7 @@ dependencies = [ [[package]] name = "iced_renderer" version = "0.12.0" -source = "git+https://github.com/pop-os/libcosmic?branch=master#ebf5c2738b98ffc68f2930354949f0b0e954d861" +source = "git+https://github.com/pop-os/libcosmic?branch=master#8d735575cd14cd5340797306e1e06c927c01159a" dependencies = [ "iced_graphics", "iced_tiny_skia", @@ -2683,7 +2683,7 @@ dependencies = [ [[package]] name = "iced_runtime" version = "0.12.0" -source = "git+https://github.com/pop-os/libcosmic?branch=master#ebf5c2738b98ffc68f2930354949f0b0e954d861" +source = "git+https://github.com/pop-os/libcosmic?branch=master#8d735575cd14cd5340797306e1e06c927c01159a" dependencies = [ "dnd", "iced_core", @@ -2695,7 +2695,7 @@ dependencies = [ [[package]] name = "iced_style" version = "0.12.0" -source = "git+https://github.com/pop-os/libcosmic?branch=master#ebf5c2738b98ffc68f2930354949f0b0e954d861" +source = "git+https://github.com/pop-os/libcosmic?branch=master#8d735575cd14cd5340797306e1e06c927c01159a" dependencies = [ "iced_core", "once_cell", @@ -2705,7 +2705,7 @@ dependencies = [ [[package]] name = "iced_tiny_skia" version = "0.12.0" -source = "git+https://github.com/pop-os/libcosmic?branch=master#ebf5c2738b98ffc68f2930354949f0b0e954d861" +source = "git+https://github.com/pop-os/libcosmic?branch=master#8d735575cd14cd5340797306e1e06c927c01159a" dependencies = [ "bytemuck", "cosmic-text", @@ -2722,7 +2722,7 @@ dependencies = [ [[package]] name = "iced_wgpu" version = "0.12.0" -source = "git+https://github.com/pop-os/libcosmic?branch=master#ebf5c2738b98ffc68f2930354949f0b0e954d861" +source = "git+https://github.com/pop-os/libcosmic?branch=master#8d735575cd14cd5340797306e1e06c927c01159a" dependencies = [ "bitflags 2.5.0", "bytemuck", @@ -2748,7 +2748,7 @@ dependencies = [ [[package]] name = "iced_widget" version = "0.12.0" -source = "git+https://github.com/pop-os/libcosmic?branch=master#ebf5c2738b98ffc68f2930354949f0b0e954d861" +source = "git+https://github.com/pop-os/libcosmic?branch=master#8d735575cd14cd5340797306e1e06c927c01159a" dependencies = [ "dnd", "iced_renderer", @@ -2764,7 +2764,7 @@ dependencies = [ [[package]] name = "iced_winit" version = "0.12.0" -source = "git+https://github.com/pop-os/libcosmic?branch=master#ebf5c2738b98ffc68f2930354949f0b0e954d861" +source = "git+https://github.com/pop-os/libcosmic?branch=master#8d735575cd14cd5340797306e1e06c927c01159a" dependencies = [ "dnd", "iced_graphics", @@ -2800,124 +2800,6 @@ dependencies = [ "objc2 0.5.2", ] -[[package]] -name = "icu_collections" -version = "1.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "db2fa452206ebee18c4b5c2274dbf1de17008e874b4dc4f0aea9d01ca79e4526" -dependencies = [ - "displaydoc", - "yoke", - "zerofrom", - "zerovec", -] - -[[package]] -name = "icu_locid" -version = "1.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "13acbb8371917fc971be86fc8057c41a64b521c184808a698c02acc242dbf637" -dependencies = [ - "displaydoc", - "litemap", - "tinystr", - "writeable", - "zerovec", -] - -[[package]] -name = "icu_locid_transform" -version = "1.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "01d11ac35de8e40fdeda00d9e1e9d92525f3f9d887cdd7aa81d727596788b54e" -dependencies = [ - "displaydoc", - "icu_locid", - "icu_locid_transform_data", - "icu_provider", - "tinystr", - "zerovec", -] - -[[package]] -name = "icu_locid_transform_data" -version = "1.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fdc8ff3388f852bede6b579ad4e978ab004f139284d7b28715f773507b946f6e" - -[[package]] -name = "icu_normalizer" -version = "1.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "19ce3e0da2ec68599d193c93d088142efd7f9c5d6fc9b803774855747dc6a84f" -dependencies = [ - "displaydoc", - "icu_collections", - "icu_normalizer_data", - "icu_properties", - "icu_provider", - "smallvec", - "utf16_iter", - "utf8_iter", - "write16", - "zerovec", -] - -[[package]] -name = "icu_normalizer_data" -version = "1.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f8cafbf7aa791e9b22bec55a167906f9e1215fd475cd22adfcf660e03e989516" - -[[package]] -name = "icu_properties" -version = "1.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1f8ac670d7422d7f76b32e17a5db556510825b29ec9154f235977c9caba61036" -dependencies = [ - "displaydoc", - "icu_collections", - "icu_locid_transform", - "icu_properties_data", - "icu_provider", - "tinystr", - "zerovec", -] - -[[package]] -name = "icu_properties_data" -version = "1.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "67a8effbc3dd3e4ba1afa8ad918d5684b8868b3b26500753effea8d2eed19569" - -[[package]] -name = "icu_provider" -version = "1.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6ed421c8a8ef78d3e2dbc98a973be2f3770cb42b606e3ab18d6237c4dfde68d9" -dependencies = [ - "displaydoc", - "icu_locid", - "icu_provider_macros", - "stable_deref_trait", - "tinystr", - "writeable", - "yoke", - "zerofrom", - "zerovec", -] - -[[package]] -name = "icu_provider_macros" -version = "1.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1ec89e9337638ecdc08744df490b221a7399bf8d164eb52a665454e60e075ad6" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.66", -] - [[package]] name = "ident_case" version = "1.0.1" @@ -2926,14 +2808,12 @@ checksum = "b9e0384b61958566e926dc50660321d12159025e767c18e043daf26b70104c39" [[package]] name = "idna" -version = "1.0.0" +version = "0.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4716a3a0933a1d01c2f72450e89596eb51dd34ef3c211ccd875acdf1f8fe47ed" +checksum = "634d9b1461af396cad843f47fdba5597a4f9e6ddd4bfb6ff5d85028c25cb12f6" dependencies = [ - "icu_normalizer", - "icu_properties", - "smallvec", - "utf8_iter", + "unicode-bidi", + "unicode-normalization", ] [[package]] @@ -3199,7 +3079,7 @@ checksum = "97b3888a4aecf77e811145cadf6eef5901f4782c53886191b2f693f24761847c" [[package]] name = "libcosmic" version = "0.1.0" -source = "git+https://github.com/pop-os/libcosmic?branch=master#ebf5c2738b98ffc68f2930354949f0b0e954d861" +source = "git+https://github.com/pop-os/libcosmic?branch=master#8d735575cd14cd5340797306e1e06c927c01159a" dependencies = [ "apply", "ashpd", @@ -3310,12 +3190,6 @@ version = "0.6.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f0b5399f6804fbab912acbd8878ed3532d506b7c951b8f9f164ef90fef39e3f4" -[[package]] -name = "litemap" -version = "0.7.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "643cb0b8d4fcc284004d5fd0d67ccf61dfffadb7f75e1e71bc420f4688a3a704" - [[package]] name = "lm-sensors" version = "0.2.0" @@ -3500,9 +3374,9 @@ checksum = "68354c5c6bd36d73ff3feceb05efa59b6acb7626617f4962be322a825e61f79a" [[package]] name = "miniz_oxide" -version = "0.7.3" +version = "0.7.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "87dfd01fe195c66b572b37921ad8803d010623c0aca821bea2302239d155cdae" +checksum = "b8a240ddb74feaf34a79a7add65a741f3167852fba007066dcac1ca548d89c08" dependencies = [ "adler", "simd-adler32", @@ -5020,12 +4894,6 @@ dependencies = [ "bitflags 2.5.0", ] -[[package]] -name = "stable_deref_trait" -version = "1.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a8f112729512f8e442d81f95a8a7ddf2b7c6b8a1a6f509a95864142b30cab2d3" - [[package]] name = "static_assertions" version = "1.1.0" @@ -5102,17 +4970,6 @@ dependencies = [ "unicode-ident", ] -[[package]] -name = "synstructure" -version = "0.13.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c8af7666ab7b6390ab78131fb5b0fce11d6b7a6951602017c35fa82800708971" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.66", -] - [[package]] name = "sys-locale" version = "0.3.1" @@ -5240,7 +5097,6 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9117f5d4db391c1cf6927e7bea3db74b9a1c1add8f7eda9ffd5364f40f57b82f" dependencies = [ "displaydoc", - "zerovec", ] [[package]] @@ -5489,6 +5345,15 @@ version = "0.1.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3b09c83c3c29d37506a3e260c08c03743a6bb66a9cd432c6934ab501a190571f" +[[package]] +name = "unicode-normalization" +version = "0.1.23" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a56d1686db2308d901306f92a263857ef59ea39678a5458e7cb17f01415101f5" +dependencies = [ + "tinyvec", +] + [[package]] name = "unicode-properties" version = "0.1.1" @@ -5527,9 +5392,9 @@ checksum = "f962df74c8c05a667b5ee8bcf162993134c104e96440b663c8daa176dc772d8c" [[package]] name = "url" -version = "2.5.1" +version = "2.5.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f7c25da092f0a868cdf09e8674cd3b7ef3a7d92a24253e663a2fb85e2496de56" +checksum = "22784dbdf76fdde8af1aeda5622b546b422b6fc585325248a2bf9f5e41e94d6c" dependencies = [ "form_urlencoded", "idna", @@ -5604,18 +5469,6 @@ dependencies = [ "tiny-skia-path", ] -[[package]] -name = "utf16_iter" -version = "1.0.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c8232dd3cdaed5356e0f716d285e4b40b932ac434100fe9b7e0e8e935b9e6246" - -[[package]] -name = "utf8_iter" -version = "1.0.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b6c140620e7ffbb22c2dee59cafe6084a59b5ffc27a8859a5f0d494b5d52b6be" - [[package]] name = "utf8parse" version = "0.2.2" @@ -6397,18 +6250,6 @@ dependencies = [ "toml 0.5.11", ] -[[package]] -name = "write16" -version = "1.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d1890f4022759daae28ed4fe62859b1236caebfc61ede2f63ed4e695f3f6d936" - -[[package]] -name = "writeable" -version = "0.5.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1e9df38ee2d2c3c5948ea468a8406ff0db0b29ae1ffde1bcf20ef305bcc95c51" - [[package]] name = "x11-dl" version = "2.21.0" @@ -6526,30 +6367,6 @@ version = "0.1.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c94451ac9513335b5e23d7a8a2b61a7102398b8cca5160829d313e84c9d98be1" -[[package]] -name = "yoke" -version = "0.7.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6c5b1314b079b0930c31e3af543d8ee1757b1951ae1e1565ec704403a7240ca5" -dependencies = [ - "serde", - "stable_deref_trait", - "yoke-derive", - "zerofrom", -] - -[[package]] -name = "yoke-derive" -version = "0.7.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "28cc31741b18cb6f1d5ff12f5b7523e3d6eb0852bbbad19d73905511d9849b95" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.66", - "synstructure", -] - [[package]] name = "zbus" version = "3.15.2" @@ -6705,49 +6522,6 @@ dependencies = [ "syn 2.0.66", ] -[[package]] -name = "zerofrom" -version = "0.1.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "91ec111ce797d0e0784a1116d0ddcdbea84322cd79e5d5ad173daeba4f93ab55" -dependencies = [ - "zerofrom-derive", -] - -[[package]] -name = "zerofrom-derive" -version = "0.1.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0ea7b4a3637ea8669cedf0f1fd5c286a17f3de97b8dd5a70a6c167a1730e63a5" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.66", - "synstructure", -] - -[[package]] -name = "zerovec" -version = "0.10.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bb2cc8827d6c0994478a15c53f374f46fbd41bea663d809b14744bc42e6b109c" -dependencies = [ - "yoke", - "zerofrom", - "zerovec-derive", -] - -[[package]] -name = "zerovec-derive" -version = "0.10.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "97cf56601ee5052b4417d90c8755c6683473c926039908196cf35d99f893ebe7" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.66", -] - [[package]] name = "zune-inflate" version = "0.2.54" diff --git a/DEV.md b/DEV.md index 424dcfa..ffa8cfd 100644 --- a/DEV.md +++ b/DEV.md @@ -1,9 +1,3 @@ -## run specific test: - -``` -clear && cargo test --package hardware test_time -- --nocapture -``` - ## Making a new release - get the version: `date +"%y.%m"` @@ -12,4 +6,10 @@ clear && cargo test --package hardware test_time -- --nocapture - change the version in [VERSION](./VERSION) - change the version in [Cargo.toml](./Cargo.toml) - make a pull request in [here](https://github.com/flathub/io.github.wiiznokes.fan-control) -- launch the release workflow [here](https://github.com/wiiznokes/fan-control/actions/workflows/release.yml) +- launch the release workflow [here](https://github.com/wiiznokes/fan-control/actions/workflows/release.yml) + +## run specific test: + +``` +clear && cargo test --package hardware test_time -- --nocapture +``` diff --git a/README.md b/README.md index 8ef5d39..94da8f9 100644 --- a/README.md +++ b/README.md @@ -25,15 +25,15 @@ ### Windows 1. Install fan-control from [the release section](https://github.com/wiiznokes/fan-control/releases/latest) - -*The configuration files will be in [`C:\Users\wiiz\AppData\Roaming\wiiznokes\fan-control\config`](file:///C:\Users\wiiz\AppData\Roaming\wiiznokes\fan-control\config).* + +_The configuration files will be in [`C:\Users\wiiz\AppData\Roaming\wiiznokes\fan-control\config`](file:///C:\Users\wiiz\AppData\Roaming\wiiznokes\fan-control\config)._ ### Flatpak (Linux) 1. [Install the required udev rules](./res/linux/udev_rules.md) 2. Install fan-control from [Flathub](https://flathub.org/apps/io.github.wiiznokes.fan-control) -*The configuration files will be in [`~/.var/app/io.github.wiiznokes.fan-control/config/fan-control/`](file://~/.var/app/io.github.wiiznokes.fan-control/config/fan-control/).* +_The configuration files will be in [`~/.var/app/io.github.wiiznokes.fan-control/config/fan-control/`](file://~/.var/app/io.github.wiiznokes.fan-control/config/fan-control/)._ To ensure the application detects the maximum number of sensors, follow these steps diff --git a/src/fake_integrated_test.rs b/src/fake_integrated_test.rs index c7f3c87..324dc07 100644 --- a/src/fake_integrated_test.rs +++ b/src/fake_integrated_test.rs @@ -14,7 +14,7 @@ fn test_config() { init_test_logging(); let args = Args { - config_dir_path: Some(PathBuf::from("./.config")), + config_dir_path: Some(PathBuf::from("./configs-examples")), config_name: Some("fake".into()), ..Default::default() }; diff --git a/ui/src/message.rs b/ui/src/message.rs index 0079869..cc91afc 100644 --- a/ui/src/message.rs +++ b/ui/src/message.rs @@ -100,7 +100,11 @@ pub enum TargetMsg { pub enum GraphMsg { RemoveCoord(Coord), AddCoord(Coord), - ReplaceCoord { previous: Coord, new: Coord }, + #[allow(dead_code)] + ReplaceCoord { + previous: Coord, + new: Coord, + }, } impl From for AppMsg { diff --git a/ui/src/node_cache.rs b/ui/src/node_cache.rs index be14af8..ca0abc5 100644 --- a/ui/src/node_cache.rs +++ b/ui/src/node_cache.rs @@ -1,6 +1,5 @@ use std::collections::HashMap; -use cosmic::iced_core::window; use data::{ id::Id, node::{Node, NodeType}, @@ -45,9 +44,7 @@ pub struct TempC {} pub struct CustomTempC {} #[derive(Debug, Clone)] -pub struct GraphC { - pub new_window_id: Option, -} +pub struct GraphC {} #[derive(Debug, Clone)] pub struct FlatC {} @@ -118,9 +115,7 @@ impl NodeTypeC { data::node::NodeType::Fan(_) => NodeTypeC::Fan(FanC {}), data::node::NodeType::Temp(_) => NodeTypeC::Temp(TempC {}), data::node::NodeType::CustomTemp(_) => NodeTypeC::CustomTemp(CustomTempC {}), - data::node::NodeType::Graph(_) => NodeTypeC::Graph(GraphC { - new_window_id: None, - }), + data::node::NodeType::Graph(_) => NodeTypeC::Graph(GraphC {}), data::node::NodeType::Flat(_) => NodeTypeC::Flat(FlatC {}), data::node::NodeType::Linear(linear) => NodeTypeC::Linear(LinearC { min_temp: linear.min_temp.to_string(),