From c511bdd62f155244068fe7268b1ebb2a31bc310e Mon Sep 17 00:00:00 2001 From: Ralf Zerres Date: Sat, 31 Oct 2020 14:39:41 +0100 Subject: [PATCH] main: reflect new module structure * include from assets * get widgets into place * introduce style extensions (theme_fluent) Signed-off-by: Ralf Zerres --- advotracker/src/main.rs | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/advotracker/src/main.rs b/advotracker/src/main.rs index 26616ff..5afc14e 100644 --- a/advotracker/src/main.rs +++ b/advotracker/src/main.rs @@ -23,8 +23,10 @@ use orbtk::prelude::*; // The Main view use advotracker::{ - callbacks::policycheck_state::PolicyCheckState, - widgets::main_view, + widgets::{ + main_view, + policycheck::policycheck_state::PolicyCheckState, + } }; mod parse_args; @@ -39,8 +41,12 @@ struct Environment { rust_log: String, } +// Style extension +static FLUENT_DARK_EXT: &str = include_str!("../assets/advotracker/advotracker_dark.ron"); +static FLUENT_LIGHT_EXT: &str = include_str!("../assets/advotracker/advotracker_light.ron"); + // German localization file. -static ADVOTRACKER_DE_DE: &str = include_str!("../resources/advotracker/advotracker_de_DE.ron"); +static ADVOTRACKER_DE_DE: &str = include_str!("../assets/advotracker/advotracker_de_DE.ron"); /// Get the active language environment. fn get_lang() -> String {