Implement cargo and clippy fixes

This commit is contained in:
Julian Mutter 2024-01-16 22:58:02 +01:00
parent 015e40c187
commit f4bbbc330c
2 changed files with 5 additions and 14 deletions

View File

@ -5,7 +5,7 @@ use std::{env, path::PathBuf, process};
use gtk::prelude::*; use gtk::prelude::*;
use mcdu::McduModel; use mcdu::McduModel;
use relm4::{gtk::PolicyType, prelude::*}; use relm4::prelude::*;
use sheet_listing::SheetListingModel; use sheet_listing::SheetListingModel;
struct AppModel { struct AppModel {

View File

@ -1,10 +1,10 @@
use std::path::PathBuf; use std::path::PathBuf;
use gtk::prelude::*; use gtk::prelude::*;
use relm4::prelude::*;
use relm4::{ use relm4::{
gtk, Component, ComponentController, ComponentParts, ComponentSender, SimpleComponent, gtk, Component, ComponentController, ComponentParts, ComponentSender, SimpleComponent,
}; };
use relm4::{gtk::PolicyType, prelude::*};
use walkdir::WalkDir; use walkdir::WalkDir;
pub struct SheetModel { pub struct SheetModel {
@ -32,7 +32,7 @@ impl SimpleComponent for SheetModel {
fn init( fn init(
path: Self::Init, path: Self::Init,
root: &Self::Root, root: &Self::Root,
sender: ComponentSender<Self>, _sender: ComponentSender<Self>,
) -> ComponentParts<Self> { ) -> ComponentParts<Self> {
let model = SheetModel { path }; let model = SheetModel { path };
let widgets = view_output!(); let widgets = view_output!();
@ -42,30 +42,23 @@ impl SimpleComponent for SheetModel {
pub struct SheetListingModel; pub struct SheetListingModel;
#[derive(Debug)]
pub enum SheetListingOutput {
ButtonPress(char),
}
#[relm4::component(pub)] #[relm4::component(pub)]
impl SimpleComponent for SheetListingModel { impl SimpleComponent for SheetListingModel {
type Init = PathBuf; type Init = PathBuf;
type Input = (); type Input = ();
type Output = SheetListingOutput; type Output = ();
view! { view! {
#[root] #[root]
gtk::Box { gtk::Box {
set_orientation: gtk::Orientation::Vertical, set_orientation: gtk::Orientation::Vertical,
// set_column_spacing: 5,
// set_row_spacing: 5,
} }
} }
fn init( fn init(
dir: Self::Init, dir: Self::Init,
root: &Self::Root, root: &Self::Root,
sender: ComponentSender<Self>, _sender: ComponentSender<Self>,
) -> ComponentParts<Self> { ) -> ComponentParts<Self> {
for entry in WalkDir::new(dir) for entry in WalkDir::new(dir)
.into_iter() .into_iter()
@ -78,8 +71,6 @@ impl SimpleComponent for SheetListingModel {
.unwrap_or(false) .unwrap_or(false)
}) })
{ {
// println!("{}", entry.display());
let sheet_model = SheetModel::builder().launch(entry); let sheet_model = SheetModel::builder().launch(entry);
root.append(sheet_model.widget()); root.append(sheet_model.widget());
} }