run cargo fmt on code

This commit is contained in:
2022-04-21 20:01:29 +02:00
parent 94c38ee221
commit cab28345d7
8 changed files with 30 additions and 29 deletions

View File

@@ -1,7 +1,5 @@
use relm4::{factory::FactoryVec, RelmApp}; use relm4::{factory::FactoryVec, RelmApp};
use ui::app::{ use ui::app::model::{AppModel, ToolboxContainer, ToolboxStatus};
model::{AppModel, ToolboxStatus, ToolboxContainer},
};
mod ui; mod ui;

View File

@@ -1,8 +1,9 @@
use relm4::{AppUpdate, Sender}; use relm4::{AppUpdate, Sender};
use crate::ui::components::{toolbox_settings::{ use crate::ui::components::{
messages::ToolboxSettingsDialogMsg, toolbox_apps::messages::ToolboxAppDialogMsg,
}, toolbox_apps::messages::ToolboxAppDialogMsg, AppComponents}; toolbox_settings::messages::ToolboxSettingsDialogMsg, AppComponents,
};
use super::{messages::AppMsg, model::AppModel}; use super::{messages::AppMsg, model::AppModel};
@@ -14,11 +15,12 @@ impl AppUpdate for AppModel {
.toolbox_settings_dialog .toolbox_settings_dialog
.send(ToolboxSettingsDialogMsg::Show) .send(ToolboxSettingsDialogMsg::Show)
.unwrap(); .unwrap();
}, }
AppMsg::ShowToolboxAppsRequest => { AppMsg::ShowToolboxAppsRequest => {
components.toolbox_apps_dialog components
.send(ToolboxAppDialogMsg::Show) .toolbox_apps_dialog
.unwrap(); .send(ToolboxAppDialogMsg::Show)
.unwrap();
} }
} }
true true

View File

@@ -1,15 +1,17 @@
use relm4::Sender;
use relm4::RelmComponent; use relm4::RelmComponent;
use relm4::Sender;
use self::{toolbox_settings::model::ToolboxSettingsDialogModel, toolbox_apps::model::ToolboxAppDialogModel}; use self::{
toolbox_apps::model::ToolboxAppDialogModel, toolbox_settings::model::ToolboxSettingsDialogModel,
};
use super::app::model::AppModel; use super::app::model::AppModel;
pub mod toolbox_settings;
pub mod toolbox_apps; pub mod toolbox_apps;
pub mod toolbox_settings;
#[derive(relm4::Components)] #[derive(relm4::Components)]
pub struct AppComponents { pub struct AppComponents {
pub toolbox_settings_dialog: RelmComponent<ToolboxSettingsDialogModel, AppModel>, pub toolbox_settings_dialog: RelmComponent<ToolboxSettingsDialogModel, AppModel>,
pub toolbox_apps_dialog: RelmComponent<ToolboxAppDialogModel, AppModel>, pub toolbox_apps_dialog: RelmComponent<ToolboxAppDialogModel, AppModel>,
} }

View File

@@ -1,5 +1,5 @@
pub mod factory;
pub mod messages; pub mod messages;
pub mod model; pub mod model;
pub mod update; pub mod update;
pub mod widgets; pub mod widgets;
pub mod factory;

View File

@@ -1,7 +1,6 @@
use relm4::{Model, factory::{FactoryVec}}; use relm4::{factory::FactoryVec, Model};
use super::{messages::ToolboxAppDialogMsg, widgets::ToolboxAppDialogWidgets};
use super::{messages::ToolboxAppDialogMsg, widgets::{ToolboxAppDialogWidgets}};
#[derive(Default)] #[derive(Default)]
pub struct DotDesktopApplication { pub struct DotDesktopApplication {

View File

@@ -1,8 +1,11 @@
use relm4::{ComponentUpdate, Sender, factory::FactoryVec}; use relm4::{factory::FactoryVec, ComponentUpdate, Sender};
use crate::ui::app::{messages::AppMsg, model::AppModel}; use crate::ui::app::{messages::AppMsg, model::AppModel};
use super::{messages::ToolboxAppDialogMsg, model::{ToolboxAppDialogModel, DotDesktopApplication}}; use super::{
messages::ToolboxAppDialogMsg,
model::{DotDesktopApplication, ToolboxAppDialogModel},
};
impl ComponentUpdate<AppModel> for ToolboxAppDialogModel { impl ComponentUpdate<AppModel> for ToolboxAppDialogModel {
fn init_model(_parent_model: &AppModel) -> Self { fn init_model(_parent_model: &AppModel) -> Self {
@@ -27,7 +30,10 @@ impl ComponentUpdate<AppModel> for ToolboxAppDialogModel {
selected: false, selected: false,
icon_path: "".to_string(), icon_path: "".to_string(),
}); });
ToolboxAppDialogModel { hidden: true, apps: factory_vec } ToolboxAppDialogModel {
hidden: true,
apps: factory_vec,
}
} }
fn update( fn update(

View File

@@ -13,8 +13,6 @@ use relm4::Widgets;
use gtk::prelude::*; use gtk::prelude::*;
use crate::ui::app::model::AppModel; use crate::ui::app::model::AppModel;
use crate::ui::components::toolbox_apps::messages::ToolboxAppDialogMsg; use crate::ui::components::toolbox_apps::messages::ToolboxAppDialogMsg;
@@ -25,8 +23,6 @@ pub struct AppFactoryWidgets {
pub app_box: gtk::Box, pub app_box: gtk::Box,
} }
#[relm4::widget(pub)] #[relm4::widget(pub)]
impl Widgets<ToolboxAppDialogModel, AppModel> for ToolboxAppDialogWidgets { impl Widgets<ToolboxAppDialogModel, AppModel> for ToolboxAppDialogWidgets {
view! { view! {
@@ -59,7 +55,7 @@ impl Widgets<ToolboxAppDialogModel, AppModel> for ToolboxAppDialogWidgets {
factory!(model.apps), factory!(model.apps),
} }
} }
} }
} }
} }

View File

@@ -1,9 +1,7 @@
use relm4::{Model}; use relm4::Model;
use super::{messages::ToolboxSettingsDialogMsg, widgets::ToolboxSettingsDialogWidgets}; use super::{messages::ToolboxSettingsDialogMsg, widgets::ToolboxSettingsDialogWidgets};
pub struct ToolboxSettingsDialogModel { pub struct ToolboxSettingsDialogModel {
pub hidden: bool, pub hidden: bool,
} }