From f4bbbc330cb01888927a955e9db696306a8a763e Mon Sep 17 00:00:00 2001 From: Julian Mutter Date: Tue, 16 Jan 2024 22:58:02 +0100 Subject: [PATCH] Implement cargo and clippy fixes --- src/main.rs | 2 +- src/sheet_listing.rs | 17 ++++------------- 2 files changed, 5 insertions(+), 14 deletions(-) diff --git a/src/main.rs b/src/main.rs index 00036a2..90af93c 100644 --- a/src/main.rs +++ b/src/main.rs @@ -5,7 +5,7 @@ use std::{env, path::PathBuf, process}; use gtk::prelude::*; use mcdu::McduModel; -use relm4::{gtk::PolicyType, prelude::*}; +use relm4::prelude::*; use sheet_listing::SheetListingModel; struct AppModel { diff --git a/src/sheet_listing.rs b/src/sheet_listing.rs index 0c73146..f7facfa 100644 --- a/src/sheet_listing.rs +++ b/src/sheet_listing.rs @@ -1,10 +1,10 @@ use std::path::PathBuf; use gtk::prelude::*; +use relm4::prelude::*; use relm4::{ gtk, Component, ComponentController, ComponentParts, ComponentSender, SimpleComponent, }; -use relm4::{gtk::PolicyType, prelude::*}; use walkdir::WalkDir; pub struct SheetModel { @@ -32,7 +32,7 @@ impl SimpleComponent for SheetModel { fn init( path: Self::Init, root: &Self::Root, - sender: ComponentSender, + _sender: ComponentSender, ) -> ComponentParts { let model = SheetModel { path }; let widgets = view_output!(); @@ -42,30 +42,23 @@ impl SimpleComponent for SheetModel { pub struct SheetListingModel; -#[derive(Debug)] -pub enum SheetListingOutput { - ButtonPress(char), -} - #[relm4::component(pub)] impl SimpleComponent for SheetListingModel { type Init = PathBuf; type Input = (); - type Output = SheetListingOutput; + type Output = (); view! { #[root] gtk::Box { set_orientation: gtk::Orientation::Vertical, - // set_column_spacing: 5, - // set_row_spacing: 5, } } fn init( dir: Self::Init, root: &Self::Root, - sender: ComponentSender, + _sender: ComponentSender, ) -> ComponentParts { for entry in WalkDir::new(dir) .into_iter() @@ -78,8 +71,6 @@ impl SimpleComponent for SheetListingModel { .unwrap_or(false) }) { - // println!("{}", entry.display()); - let sheet_model = SheetModel::builder().launch(entry); root.append(sheet_model.widget()); }