From 6361424123ffceb51db109df59d25f1f79cb904f Mon Sep 17 00:00:00 2001 From: imgurbot12 Date: Sat, 2 Mar 2024 12:33:00 -0700 Subject: [PATCH] feat: balena broke network plugin, fixed dioxus dependency issue --- Cargo.toml | 2 +- Makefile | 4 ++-- rmenu/Cargo.toml | 5 +++-- rmenu/src/config.rs | 2 +- rmenu/src/gui.rs | 2 +- 5 files changed, 8 insertions(+), 7 deletions(-) diff --git a/Cargo.toml b/Cargo.toml index f0654d9..11210a3 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 3d58cc6..df7ee17 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/rmenu/Cargo.toml b/rmenu/Cargo.toml index 28c3e48..2a1a7ed 100644 --- a/rmenu/Cargo.toml +++ b/rmenu/Cargo.toml @@ -8,8 +8,9 @@ edition = "2021" [dependencies] cached = "0.44.0" clap = { version = "4.3.15", features = ["derive"] } -dioxus = "0.4.0" -dioxus-desktop = "0.4.0" +dioxus = "0.4.3" +dioxus-desktop = "0.4.3" +dioxus-html = "0.4.3" env_logger = "0.10.0" heck = "0.4.1" keyboard-types = "0.6.2" diff --git a/rmenu/src/config.rs b/rmenu/src/config.rs index d36a9b3..69bac5e 100644 --- a/rmenu/src/config.rs +++ b/rmenu/src/config.rs @@ -1,6 +1,5 @@ //! RMENU Configuration Implementations use heck::AsPascalCase; -use keyboard_types::{Code, Modifiers}; use rmenu_plugin::Options; use serde::{de::Error, Deserialize}; use std::collections::BTreeMap; @@ -10,6 +9,7 @@ use dioxus_desktop::tao::{ dpi::{LogicalPosition, LogicalSize}, window::Fullscreen, }; +use dioxus_html::input_data::keyboard_types::{Code, Modifiers}; // parse supported modifiers from string fn mod_from_str(s: &str) -> Option { diff --git a/rmenu/src/gui.rs b/rmenu/src/gui.rs index 02a9e9a..43ce8b1 100644 --- a/rmenu/src/gui.rs +++ b/rmenu/src/gui.rs @@ -3,7 +3,7 @@ use std::fmt::Display; use dioxus::prelude::*; -use keyboard_types::{Code, Modifiers}; +use dioxus_html::input_data::keyboard_types::{Code, Modifiers}; use rmenu_plugin::Entry; use crate::config::Keybind;