From 29bb6b5924a2b5771d19f817dd09ee07ed1e485e Mon Sep 17 00:00:00 2001 From: imgurbot12 Date: Sat, 2 Mar 2024 13:20:07 -0700 Subject: [PATCH] fix: recovered network-plugin --- Cargo.toml | 2 +- Makefile | 4 ++-- plugin-network/Cargo.toml | 9 +++++---- plugin-network/src/gui.rs | 2 +- 4 files changed, 9 insertions(+), 8 deletions(-) diff --git a/Cargo.toml b/Cargo.toml index 11210a3..f0654d9 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -5,6 +5,6 @@ members = [ "rmenu-plugin", "plugin-run", "plugin-desktop", - # "plugin-network", + "plugin-network", "plugin-window", ] diff --git a/Makefile b/Makefile index df7ee17..3d58cc6 100644 --- a/Makefile +++ b/Makefile @@ -38,7 +38,7 @@ deploy: cp -vf ./target/release/rmenu-build ${INSTALL}/rmenu-build cp -vf ./target/release/desktop ${DEST}/rmenu-desktop cp -vf ./target/release/run ${DEST}/rmenu-run - # cp -vf ./target/release/network ${DEST}/rmenu-network + cp -vf ./target/release/network ${DEST}/rmenu-network cp -vf ./target/release/window ${DEST}/rmenu-window cp -vf ./rmenu/public/config.yaml ${DEST}/config.yaml ln -sf ${DEST}/themes/dark.css ${DEST}/style.css @@ -55,5 +55,5 @@ build-rmenu: build-plugins: ${CARGO} build -p run ${FLAGS} ${CARGO} build -p desktop ${FLAGS} - # ${CARGO} build -p network ${FLAGS} + ${CARGO} build -p network ${FLAGS} ${CARGO} build -p window ${FLAGS} diff --git a/plugin-network/Cargo.toml b/plugin-network/Cargo.toml index 601be15..f6bccde 100644 --- a/plugin-network/Cargo.toml +++ b/plugin-network/Cargo.toml @@ -9,15 +9,16 @@ edition = "2021" anyhow = "1.0.72" async-std = "1.12.0" clap = { version = "4.3.21", features = ["derive"] } -dioxus = "0.4.0" -dioxus-desktop = "0.4.0" +dioxus = "0.4.3" +dioxus-desktop = "0.4.3" dioxus-free-icons = { version = "0.7.0", features = ["font-awesome-regular"] } +dioxus-html = "0.4.3" env_logger = "0.10.0" futures-channel = "0.3.28" -glib = { git = "https://github.com/gtk-rs/gtk-rs-core", version = "0.19.0" } +glib = { git = "https://github.com/gtk-rs/gtk-rs-core", rev = 'cab7e1c549675cbe98af461ebbcc04c33c8f1295' } keyboard-types = "0.6.2" log = "0.4.20" -nm = { git = "https://github.com/balena-io-modules/libnm-rs.git", version = "0.4.0" } +nm = { git = "https://github.com/imgurbot12/libnm-rs.git", version = "0.4.0" } once_cell = "1.18.0" rmenu-plugin = { version = "0.0.1", path = "../rmenu-plugin" } serde_json = "1.0.104" diff --git a/plugin-network/src/gui.rs b/plugin-network/src/gui.rs index 307a7c0..61ab1bf 100644 --- a/plugin-network/src/gui.rs +++ b/plugin-network/src/gui.rs @@ -6,7 +6,7 @@ use dioxus::prelude::*; use dioxus_desktop::LogicalSize; use dioxus_free_icons::icons::fa_regular_icons::{FaEye, FaEyeSlash}; use dioxus_free_icons::Icon; -use keyboard_types::Code; +use dioxus_html::input_data::keyboard_types::Code; use crate::network::Manager;