mirrors/rmenu
2
0
Fork 1
mirror of https://github.com/imgurbot12/rmenu.git synced 2024-11-10 11:33:48 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #4 from imgurbot12/fix/maintenance

Browse Source 
feat: balena broke network plugin, fixed dioxus dependency issue
This commit is contained in:
Andrew Scott 2024-03-02 12:36:05 -07:00 committed by GitHub
commit ed3a264e01
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
5 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Cargo.toml
View File

@ -5,6 +5,6 @@ members = [
"rmenu-plugin", "rmenu-plugin",
"plugin-run", "plugin-run",
"plugin-desktop", "plugin-desktop",
"plugin-network", # "plugin-network",
"plugin-window", "plugin-window",
] ]

4
Makefile
View File

@ -38,7 +38,7 @@ deploy:
cp -vf ./target/release/rmenu-build ${INSTALL}/rmenu-build cp -vf ./target/release/rmenu-build ${INSTALL}/rmenu-build
cp -vf ./target/release/desktop ${DEST}/rmenu-desktop cp -vf ./target/release/desktop ${DEST}/rmenu-desktop
cp -vf ./target/release/run ${DEST}/rmenu-run 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 ./target/release/window ${DEST}/rmenu-window
cp -vf ./rmenu/public/config.yaml ${DEST}/config.yaml cp -vf ./rmenu/public/config.yaml ${DEST}/config.yaml
ln -sf ${DEST}/themes/dark.css ${DEST}/style.css ln -sf ${DEST}/themes/dark.css ${DEST}/style.css
@ -55,5 +55,5 @@ build-rmenu:
build-plugins: build-plugins:
${CARGO} build -p run ${FLAGS} ${CARGO} build -p run ${FLAGS}
${CARGO} build -p desktop ${FLAGS} ${CARGO} build -p desktop ${FLAGS}
${CARGO} build -p network ${FLAGS} # ${CARGO} build -p network ${FLAGS}
${CARGO} build -p window ${FLAGS} ${CARGO} build -p window ${FLAGS}

5
rmenu/Cargo.toml
View File

@ -8,8 +8,9 @@ edition = "2021"
[dependencies] [dependencies]
cached = "0.44.0" cached = "0.44.0"
clap = { version = "4.3.15", features = ["derive"] } clap = { version = "4.3.15", features = ["derive"] }
dioxus = "0.4.0" dioxus = "0.4.3"
dioxus-desktop = "0.4.0" dioxus-desktop = "0.4.3"
dioxus-html = "0.4.3"
env_logger = "0.10.0" env_logger = "0.10.0"
heck = "0.4.1" heck = "0.4.1"
keyboard-types = "0.6.2" keyboard-types = "0.6.2"

2
rmenu/src/config.rs
View File

@ -1,6 +1,5 @@
//! RMENU Configuration Implementations //! RMENU Configuration Implementations
use heck::AsPascalCase; use heck::AsPascalCase;
use keyboard_types::{Code, Modifiers};
use rmenu_plugin::Options; use rmenu_plugin::Options;
use serde::{de::Error, Deserialize}; use serde::{de::Error, Deserialize};
use std::collections::BTreeMap; use std::collections::BTreeMap;
@ -10,6 +9,7 @@ use dioxus_desktop::tao::{
dpi::{LogicalPosition, LogicalSize}, dpi::{LogicalPosition, LogicalSize},
window::Fullscreen, window::Fullscreen,
}; };
use dioxus_html::input_data::keyboard_types::{Code, Modifiers};
// parse supported modifiers from string // parse supported modifiers from string
fn mod_from_str(s: &str) -> Option<Modifiers> { fn mod_from_str(s: &str) -> Option<Modifiers> {

2
rmenu/src/gui.rs
View File

@ -3,7 +3,7 @@
use std::fmt::Display; use std::fmt::Display;
use dioxus::prelude::*; use dioxus::prelude::*;
use keyboard_types::{Code, Modifiers}; use dioxus_html::input_data::keyboard_types::{Code, Modifiers};
use rmenu_plugin::Entry; use rmenu_plugin::Entry;
use crate::config::Keybind; use crate::config::Keybind;