From 9b6b128e59649a2a9c2668228d58ccb594b525e3 Mon Sep 17 00:00:00 2001 From: Ralf Zerres Date: Fri, 11 Jun 2021 13:38:53 +0200 Subject: [PATCH] advotracker_client: structure update consuming orbtk (#448) * orbtk 0.3.1-alpha4 including merge #448 Signed-off-by: Ralf Zerres --- advotracker_client/src/main.rs | 15 ++++++--------- .../src/widgets/menu/menu_state.rs | 19 +++++++++---------- .../src/widgets/menu/menu_view.rs | 2 +- .../widgets/policycheck/policycheck_state.rs | 2 +- .../widgets/policycheck/policycheck_view.rs | 3 +-- .../widgets/ticketdata/ticketdata_state.rs | 3 +-- .../src/widgets/ticketdata/ticketdata_view.rs | 2 +- 7 files changed, 20 insertions(+), 26 deletions(-) diff --git a/advotracker_client/src/main.rs b/advotracker_client/src/main.rs index 25f78c3..732f600 100644 --- a/advotracker_client/src/main.rs +++ b/advotracker_client/src/main.rs @@ -19,13 +19,10 @@ use tracing::{info, trace, Level}; use orbtk::{ prelude::*, - theme_default::{THEME_DEFAULT, THEME_DEFAULT_COLORS_DARK, THEME_DEFAULT_FONTS}, - theming::config::ThemeConfig, + //widgets::themes::theme_orbtk::{THEME_DEFAULT, THEME_DEFAULT_COLORS_DARK, THEME_DEFAULT_FONTS}, + widgets::themes::*, }; -#[cfg(target_os = "windows")] -use orbtk::theme_fluent::{THEME_FLUENT, THEME_FLUENT_COLORS_DARK, THEME_FLUENT_FONTS}; - // The Main view use advotracker_client::widgets::main_view; @@ -81,7 +78,7 @@ cfg_if! { if #[cfg(windows)] { /// Extend and register theme assets. fn theme() -> Theme { - register_default_fonts(Theme::from_config( + orbtk::widgets::themes::theme_orbtk::register_default_fonts(Theme::from_config( ThemeConfig::from(DEFAULT_DARK_EXT) .extend(ThemeConfig::from(THEME_DEFAULT)) .extend(ThemeConfig::from(THEME_DEFAULT_COLORS_DARK)) @@ -89,13 +86,13 @@ cfg_if! { )) } fn theme_fluent() -> Theme { - register_fluent_fonts(Theme::from_config( + orbtk::widgets::themes::theme_orbtk::register_fluent_fonts(Theme::from_config( ThemeConfig::from(FLUENT_DARK_EXT) .extend(ThemeConfig::from(THEME_FLUENT)) .extend(ThemeConfig::from(THEME_FLUENT_COLORS_DARK)) .extend(ThemeConfig::from(THEME_FLUENT_FONTS)), )) - // register_fluent_fonts(Theme::from_config( + // orbtk::widgets::themes::theme_orbtk::register_fluent_fonts(Theme::from_config( // ThemeConfig::from(FLUENT_LIGHT_EXT) // .extend(ThemeConfig::from(THEME_FLUENT)) // .extend(ThemeConfig::from(THEME_FLUENT_COLORS_DARK)) @@ -104,7 +101,7 @@ cfg_if! { } else { /// Extend and register theme assets. fn theme() -> Theme { - register_default_fonts(Theme::from_config( + orbtk::widgets::themes::theme_orbtk::register_default_fonts(Theme::from_config( ThemeConfig::from(DEFAULT_DARK_EXT) .extend(ThemeConfig::from(THEME_DEFAULT)) .extend(ThemeConfig::from(THEME_DEFAULT_COLORS_DARK)) diff --git a/advotracker_client/src/widgets/menu/menu_state.rs b/advotracker_client/src/widgets/menu/menu_state.rs index 8e429f1..2ac8ac2 100644 --- a/advotracker_client/src/widgets/menu/menu_state.rs +++ b/advotracker_client/src/widgets/menu/menu_state.rs @@ -6,8 +6,7 @@ */ use cfg_if::cfg_if; -use orbtk::prelude::*; -use orbtk::shell::event::Key; +use orbtk::{prelude::*, shell::*, widgets::themes::* }; use tracing::{info, trace}; use std::process; @@ -125,18 +124,18 @@ impl State for MenuState { cfg_if! { if #[cfg(windows)] { match theme_index { - 0 => ctx.switch_theme(theme_default_dark()), - 1 => ctx.switch_theme(theme_default_light()), - 2 => ctx.switch_theme(theme_redox()), - 3 => ctx.switch_theme(theme_fluent_dark()), - 4 => ctx.switch_theme(theme_fluent_light()), + 0 => ctx.switch_theme(Rc::new(theme_default_dark())), + 1 => ctx.switch_theme(Rc::new(theme_default_light())), + 2 => ctx.switch_theme(Rc::new(theme_redox())), + 3 => ctx.switch_theme(Rc::new(theme_fluent_dark())), + 4 => ctx.switch_theme(Rc::new(theme_fluent_light())), _ => {} } } else { match theme_index { - 0 => ctx.switch_theme(theme_default_dark()), - 1 => ctx.switch_theme(theme_default_light()), - 2 => ctx.switch_theme(theme_redox()), + 0 => ctx.switch_theme(Rc::new(theme_default_dark())), + 1 => ctx.switch_theme(Rc::new(theme_default_light())), + 2 => ctx.switch_theme(Rc::new(theme_redox())), _ => {} } } diff --git a/advotracker_client/src/widgets/menu/menu_view.rs b/advotracker_client/src/widgets/menu/menu_view.rs index b2c1dae..16c9799 100644 --- a/advotracker_client/src/widgets/menu/menu_view.rs +++ b/advotracker_client/src/widgets/menu/menu_view.rs @@ -5,7 +5,7 @@ * Copyright 2020-2021 Ralf Zerres */ -use orbtk::prelude::*; +use orbtk::{prelude::*, widgets::themes::*}; use crate::data::constants::*; use crate::widgets::menu::menu_state::{MenuAction, MenuState}; diff --git a/advotracker_client/src/widgets/policycheck/policycheck_state.rs b/advotracker_client/src/widgets/policycheck/policycheck_state.rs index be63055..a480e27 100644 --- a/advotracker_client/src/widgets/policycheck/policycheck_state.rs +++ b/advotracker_client/src/widgets/policycheck/policycheck_state.rs @@ -5,7 +5,7 @@ * Copyright 2020-2021 Ralf Zerres */ -use orbtk::prelude::*; +use orbtk::{prelude::*, widgets::themes::* }; use serde::Deserialize; use std::process; diff --git a/advotracker_client/src/widgets/policycheck/policycheck_view.rs b/advotracker_client/src/widgets/policycheck/policycheck_view.rs index b2dc641..d326ffa 100644 --- a/advotracker_client/src/widgets/policycheck/policycheck_view.rs +++ b/advotracker_client/src/widgets/policycheck/policycheck_view.rs @@ -5,8 +5,7 @@ * Copyright 2020-2021 Ralf Zerres */ -use orbtk::prelude::*; -use orbtk::shell::event::Key; +use orbtk::{prelude::*, shell::*, widgets::themes::* }; use crate::{ data::{ diff --git a/advotracker_client/src/widgets/ticketdata/ticketdata_state.rs b/advotracker_client/src/widgets/ticketdata/ticketdata_state.rs index 340eb09..01d223a 100644 --- a/advotracker_client/src/widgets/ticketdata/ticketdata_state.rs +++ b/advotracker_client/src/widgets/ticketdata/ticketdata_state.rs @@ -5,8 +5,7 @@ * Copyright 2020-2021 Ralf Zerres */ -//use locales::t; -use orbtk::prelude::*; +use orbtk::{prelude::*, widgets::themes::* }; use serde::Deserialize; //use std::process; diff --git a/advotracker_client/src/widgets/ticketdata/ticketdata_view.rs b/advotracker_client/src/widgets/ticketdata/ticketdata_view.rs index 31f7326..5db8075 100644 --- a/advotracker_client/src/widgets/ticketdata/ticketdata_view.rs +++ b/advotracker_client/src/widgets/ticketdata/ticketdata_view.rs @@ -5,7 +5,7 @@ * Copyright 2020-2021 Ralf Zerres */ -use orbtk::prelude::*; +use orbtk::{prelude::*, widgets::themes::* }; use crate::{ data::constants::*,