Xetibo/ReSet
1
0
Fork 0
mirror of https://github.com/Xetibo/ReSet.git synced 2025-04-17 10:18:32 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity

chore: Fix clippy warnings

Browse source
This commit is contained in:
Fabio Lenherr / DashieTM 2024-04-01 14:49:59 +02:00
parent d72f916e8a
commit f2e833eae5
3 changed files with 17 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
src/components/plugin/function.rs
View file

@ -3,18 +3,17 @@ use std::rc::Rc;
use std::sync::Arc; use std::sync::Arc;
use gtk::FlowBox; use gtk::FlowBox;
use re_set_lib::utils::plugin::SidebarInfo;
use crate::components::base::utils::{Listeners, Position}; use crate::components::base::utils::{Listeners, Position};
extern "C" { // extern "C" {
pub fn startup() -> SidebarInfo; // pub fn startup() -> SidebarInfo;
pub fn shutdown(); // pub fn shutdown();
pub fn run_test(); // pub fn run_test();
} // }
type RegularClickEvent = fn(Arc<Listeners>, FlowBox, Rc<RefCell<Position>>); pub type RegularClickEvent = fn(Arc<Listeners>, FlowBox, Rc<RefCell<Position>>);
type PluginClickEvent = Rc<dyn Fn(FlowBox, Rc<RefCell<Position>>, Vec<gtk::Box>)>; pub type PluginClickEvent = Rc<dyn Fn(FlowBox, Rc<RefCell<Position>>, Vec<gtk::Box>)>;
pub trait TSideBarInfo { pub trait TSideBarInfo {
fn name(&self) -> &'static str; fn name(&self) -> &'static str;

4
src/components/window/sidebar_entry.rs
View file

@ -1,13 +1,11 @@
use std::rc::Rc;
use crate::components::plugin::function::{PluginSidebarInfo, ReSetSidebarInfo, TSideBarInfo}; use crate::components::plugin::function::{TSideBarInfo};
use crate::components::window::sidebar_entry_impl; use crate::components::window::sidebar_entry_impl;
use crate::components::window::sidebar_entry_impl::SidebarAction; use crate::components::window::sidebar_entry_impl::SidebarAction;
use adw::subclass::prelude::ObjectSubclassIsExt; use adw::subclass::prelude::ObjectSubclassIsExt;
use glib::Object; use glib::Object;
use gtk::prelude::*; use gtk::prelude::*;
use super::handle_sidebar_click::HANDLE_HOME;
glib::wrapper! { glib::wrapper! {
pub struct SidebarEntry(ObjectSubclass<sidebar_entry_impl::SidebarEntry>) pub struct SidebarEntry(ObjectSubclass<sidebar_entry_impl::SidebarEntry>)

18
src/components/window/sidebar_entry_impl.rs
View file

@ -1,20 +1,20 @@
use std::cell::{Cell, RefCell}; use std::cell::RefCell;
use std::rc::Rc; use std::rc::Rc;
use std::sync::Arc;
use glib::subclass::InitializingObject; use glib::subclass::InitializingObject;
use gtk::subclass::prelude::*; use gtk::subclass::prelude::*;
use gtk::{CompositeTemplate, FlowBox, Image, Label, ListBoxRow}; use gtk::{CompositeTemplate, Image, Label, ListBoxRow};
use crate::components::base::utils::{Listeners, Position}; use crate::components::plugin::function::{PluginClickEvent, RegularClickEvent};
use crate::components::window::handle_sidebar_click::HANDLE_HOME; use crate::components::window::handle_sidebar_click::HANDLE_HOME;
use crate::components::window::sidebar_entry; use crate::components::window::sidebar_entry;
#[derive(Default)] #[derive(Default)]
pub enum Categories { pub enum Categories {
Connectivity, // TODO: are these ever used ?
Audio, // Connectivity,
Peripherals, // Audio,
// Peripherals,
#[default] #[default]
Misc, Misc,
} }
@ -33,8 +33,8 @@ pub struct SidebarEntry {
} }
pub struct SidebarAction { pub struct SidebarAction {
pub on_click_event: Option<fn(Arc<Listeners>, FlowBox, Rc<RefCell<Position>>)>, pub on_click_event: Option<RegularClickEvent>,
pub on_plugin_click_event: Rc<dyn Fn(FlowBox, Rc<RefCell<Position>>, Vec<gtk::Box>)>, pub on_plugin_click_event: PluginClickEvent,
} }
impl Default for SidebarAction { impl Default for SidebarAction {