rzerres/advotracker
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

advotracker_client: structure update consuming orbtk (#448)

Browse Source 
* orbtk 0.3.1-alpha4 including merge #448

Signed-off-by: Ralf Zerres <ralf.zerres@networkx.de>
This commit is contained in:
Ralf Zerres
2021-06-11 13:38:53 +02:00
parent 541e516099
commit 9b6b128e59
7 changed files with 20 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
advotracker_client/src/main.rs
View File

@@ -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))

19
advotracker_client/src/widgets/menu/menu_state.rs
View File

@@ -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())),
_ => {}
}
}

2
advotracker_client/src/widgets/menu/menu_view.rs
View File

@@ -5,7 +5,7 @@
* Copyright 2020-2021 Ralf Zerres <ralf.zerres@networkx.de>
*/
use orbtk::prelude::*;
use orbtk::{prelude::*, widgets::themes::*};
use crate::data::constants::*;
use crate::widgets::menu::menu_state::{MenuAction, MenuState};

2
advotracker_client/src/widgets/policycheck/policycheck_state.rs
View File

@@ -5,7 +5,7 @@
* Copyright 2020-2021 Ralf Zerres <ralf.zerres@networkx.de>
*/
use orbtk::prelude::*;
use orbtk::{prelude::*, widgets::themes::* };
use serde::Deserialize;
use std::process;

3
advotracker_client/src/widgets/policycheck/policycheck_view.rs
View File

@@ -5,8 +5,7 @@
* Copyright 2020-2021 Ralf Zerres <ralf.zerres@networkx.de>
*/
use orbtk::prelude::*;
use orbtk::shell::event::Key;
use orbtk::{prelude::*, shell::*, widgets::themes::* };
use crate::{
data::{

3
advotracker_client/src/widgets/ticketdata/ticketdata_state.rs
View File

@@ -5,8 +5,7 @@
* Copyright 2020-2021 Ralf Zerres <ralf.zerres@networkx.de>
*/
//use locales::t;
use orbtk::prelude::*;
use orbtk::{prelude::*, widgets::themes::* };
use serde::Deserialize;
//use std::process;

2
advotracker_client/src/widgets/ticketdata/ticketdata_view.rs
View File

@@ -5,7 +5,7 @@
* Copyright 2020-2021 Ralf Zerres <ralf.zerres@networkx.de>
*/
use orbtk::prelude::*;
use orbtk::{prelude::*, widgets::themes::* };
use crate::{
data::constants::*,