From d288806773ec6bdb5774cd014747ac1e0400bcc3 Mon Sep 17 00:00:00 2001 From: Thilo Graf Date: Sun, 20 Feb 2022 20:33:26 +0100 Subject: [PATCH] theme settings: resort codelines, remove unused 'menu_ButtonBar_gradient* Origin commit data ------------------ Commit: https://github.com/neutrino-images/ni-neutrino/commit/f7b55eb56a226813cd6254ad54eda34c8b82c574 Author: Thilo Graf Date: 2022-02-20 (Sun, 20 Feb 2022) --- src/gui/themes.cpp | 103 +++++++++++++++++++++++++++++------------- src/system/settings.h | 29 +++++++++--- 2 files changed, 93 insertions(+), 39 deletions(-) diff --git a/src/gui/themes.cpp b/src/gui/themes.cpp index 6e6e920c0..30173a2c6 100644 --- a/src/gui/themes.cpp +++ b/src/gui/themes.cpp @@ -301,10 +301,12 @@ void CThemes::setupDefaultColors() void CThemes::setTheme(CConfigFile &configfile) { + // head configfile.setInt32("menu_Head_alpha", t.menu_Head_alpha); configfile.setInt32("menu_Head_red", t.menu_Head_red); configfile.setInt32("menu_Head_green", t.menu_Head_green); configfile.setInt32("menu_Head_blue", t.menu_Head_blue); + configfile.setInt32("menu_Head_Text_alpha", t.menu_Head_Text_alpha); configfile.setInt32("menu_Head_Text_red", t.menu_Head_Text_red); configfile.setInt32("menu_Head_Text_green", t.menu_Head_Text_green); @@ -313,19 +315,24 @@ void CThemes::setTheme(CConfigFile &configfile) configfile.setInt32("menu_Head_gradient", t.menu_Head_gradient); configfile.setInt32("menu_Head_gradient_direction", t.menu_Head_gradient_direction); + // subhead configfile.setInt32("menu_SubHead_gradient", t.menu_SubHead_gradient); configfile.setInt32("menu_SubHead_gradient_direction", t.menu_SubHead_gradient_direction); + // separator configfile.setInt32("menu_Separator_gradient_enable", t.menu_Separator_gradient_enable); + // menu content configfile.setInt32("menu_Content_alpha", t.menu_Content_alpha); configfile.setInt32("menu_Content_red", t.menu_Content_red); configfile.setInt32("menu_Content_green", t.menu_Content_green); configfile.setInt32("menu_Content_blue", t.menu_Content_blue); + configfile.setInt32("menu_Content_Text_alpha", t.menu_Content_Text_alpha); configfile.setInt32("menu_Content_Text_red", t.menu_Content_Text_red); configfile.setInt32("menu_Content_Text_green", t.menu_Content_Text_green); configfile.setInt32("menu_Content_Text_blue", t.menu_Content_Text_blue); + configfile.setInt32("menu_Content_Selected_alpha", t.menu_Content_Selected_alpha); configfile.setInt32("menu_Content_Selected_red", t.menu_Content_Selected_red); configfile.setInt32("menu_Content_Selected_green", t.menu_Content_Selected_green); @@ -334,6 +341,7 @@ void CThemes::setTheme(CConfigFile &configfile) configfile.setInt32("menu_Content_Selected_Text_red", t.menu_Content_Selected_Text_red); configfile.setInt32("menu_Content_Selected_Text_green", t.menu_Content_Selected_Text_green); configfile.setInt32("menu_Content_Selected_Text_blue", t.menu_Content_Selected_Text_blue); + configfile.setInt32("menu_Content_inactive_alpha", t.menu_Content_inactive_alpha); configfile.setInt32("menu_Content_inactive_red", t.menu_Content_inactive_red); configfile.setInt32("menu_Content_inactive_green", t.menu_Content_inactive_green); @@ -342,28 +350,31 @@ void CThemes::setTheme(CConfigFile &configfile) configfile.setInt32("menu_Content_inactive_Text_red", t.menu_Content_inactive_Text_red); configfile.setInt32("menu_Content_inactive_Text_green", t.menu_Content_inactive_Text_green); configfile.setInt32("menu_Content_inactive_Text_blue", t.menu_Content_inactive_Text_blue); + + // menu foot configfile.setInt32("menu_Foot_alpha", t.menu_Foot_alpha); configfile.setInt32("menu_Foot_red", t.menu_Foot_red); configfile.setInt32("menu_Foot_green", t.menu_Foot_green); configfile.setInt32("menu_Foot_blue", t.menu_Foot_blue); + configfile.setInt32("menu_Foot_Text_alpha", t.menu_Foot_Text_alpha); configfile.setInt32("menu_Foot_Text_red", t.menu_Foot_Text_red); configfile.setInt32("menu_Foot_Text_green", t.menu_Foot_Text_green); configfile.setInt32("menu_Foot_Text_blue", t.menu_Foot_Text_blue); + configfile.setInt32("menu_Foot_gradient", t.menu_Foot_gradient); + configfile.setInt32("menu_Foot_gradient_direction", t.menu_Foot_gradient_direction); + + // menu hint configfile.setInt32("menu_Hint_gradient", t.menu_Hint_gradient); configfile.setInt32("menu_Hint_gradient_direction", t.menu_Hint_gradient_direction); - configfile.setInt32("menu_ButtonBar_gradient", t.menu_ButtonBar_gradient); - configfile.setInt32("menu_ButtonBar_gradient_direction", t.menu_ButtonBar_gradient_direction); + // infobar configfile.setInt32("infobar_alpha", t.infobar_alpha); configfile.setInt32("infobar_red", t.infobar_red); configfile.setInt32("infobar_green", t.infobar_green); configfile.setInt32("infobar_blue", t.infobar_blue); - configfile.setInt32("infobar_casystem_alpha", t.infobar_casystem_alpha); - configfile.setInt32("infobar_casystem_red", t.infobar_casystem_red); - configfile.setInt32("infobar_casystem_green", t.infobar_casystem_green); - configfile.setInt32("infobar_casystem_blue", t.infobar_casystem_blue); + configfile.setInt32("infobar_Text_alpha", t.infobar_Text_alpha); configfile.setInt32("infobar_Text_red", t.infobar_Text_red); configfile.setInt32("infobar_Text_green", t.infobar_Text_green); @@ -376,6 +387,12 @@ void CThemes::setTheme(CConfigFile &configfile) configfile.setInt32("infobar_gradient_bottom", t.infobar_gradient_bottom); configfile.setInt32("infobar_gradient_bottom_direction", t.infobar_gradient_bottom_direction); + configfile.setInt32("infobar_casystem_alpha", t.infobar_casystem_alpha); + configfile.setInt32("infobar_casystem_red", t.infobar_casystem_red); + configfile.setInt32("infobar_casystem_green", t.infobar_casystem_green); + configfile.setInt32("infobar_casystem_blue", t.infobar_casystem_blue); + + // event text configfile.setInt32("colored_events_alpha", t.colored_events_alpha); configfile.setInt32("colored_events_red", t.colored_events_red); configfile.setInt32("colored_events_green", t.colored_events_green); @@ -383,25 +400,23 @@ void CThemes::setTheme(CConfigFile &configfile) configfile.setInt32("colored_events_channellist", t.colored_events_channellist); configfile.setInt32("colored_events_infobar", t.colored_events_infobar); + // osd clock configfile.setInt32("clock_Digit_alpha", t.clock_Digit_alpha); configfile.setInt32("clock_Digit_red", t.clock_Digit_red); configfile.setInt32("clock_Digit_green", t.clock_Digit_green); configfile.setInt32("clock_Digit_blue", t.clock_Digit_blue); + // progressbars configfile.setInt32("progressbar_design", t.progressbar_design); - configfile.setInt32("progressbar_design_channellist", t.progressbar_design_channellist); configfile.setInt32("progressbar_gradient", t.progressbar_gradient); + + configfile.setInt32("progressbar_design_channellist", t.progressbar_design_channellist); + configfile.setInt32("progressbar_timescale_red", t.progressbar_timescale_red); configfile.setInt32("progressbar_timescale_green", t.progressbar_timescale_green); configfile.setInt32("progressbar_timescale_yellow", t.progressbar_timescale_yellow); configfile.setInt32("progressbar_timescale_invert", t.progressbar_timescale_invert); - configfile.setInt32("shadow_alpha", t.shadow_alpha); - configfile.setInt32("shadow_red", t.shadow_red); - configfile.setInt32("shadow_green", t.shadow_green); - configfile.setInt32("shadow_blue", t.shadow_blue); - - // progressbar configfile.setInt32("progressbar_active_red", t.progressbar_active_red); configfile.setInt32("progressbar_active_green", t.progressbar_active_green); configfile.setInt32("progressbar_active_blue", t.progressbar_active_blue); @@ -409,6 +424,12 @@ void CThemes::setTheme(CConfigFile &configfile) configfile.setInt32("progressbar_passive_green", t.progressbar_passive_green); configfile.setInt32("progressbar_passive_blue", t.progressbar_passive_blue); + // shadow + configfile.setInt32("shadow_alpha", t.shadow_alpha); + configfile.setInt32("shadow_red", t.shadow_red); + configfile.setInt32("shadow_green", t.shadow_green); + configfile.setInt32("shadow_blue", t.shadow_blue); + // corners configfile.setInt32("rounded_corners", t.rounded_corners); @@ -418,10 +439,12 @@ void CThemes::setTheme(CConfigFile &configfile) void CThemes::getTheme(CConfigFile &configfile) { + // head t.menu_Head_alpha = configfile.getInt32("menu_Head_alpha", 10); t.menu_Head_red = configfile.getInt32("menu_Head_red", 0); t.menu_Head_green = configfile.getInt32("menu_Head_green", 0); t.menu_Head_blue = configfile.getInt32("menu_Head_blue", 0); + t.menu_Head_Text_alpha = configfile.getInt32("menu_Head_Text_alpha", 0); t.menu_Head_Text_red = configfile.getInt32("menu_Head_Text_red", 99); t.menu_Head_Text_green = configfile.getInt32("menu_Head_Text_green", 43); @@ -430,19 +453,24 @@ void CThemes::getTheme(CConfigFile &configfile) t.menu_Head_gradient = configfile.getInt32("menu_Head_gradient", CC_COLGRAD_OFF); t.menu_Head_gradient_direction = configfile.getInt32("menu_Head_gradient_direction", CFrameBuffer::gradientVertical); + // subhead t.menu_SubHead_gradient = configfile.getInt32("menu_SubHead_gradient", CC_COLGRAD_OFF); t.menu_SubHead_gradient_direction = configfile.getInt32("menu_SubHead_gradient_direction", CFrameBuffer::gradientVertical); + // separator t.menu_Separator_gradient_enable = configfile.getInt32("menu_Separator_gradient_enable", 0); + // menu content t.menu_Content_alpha = configfile.getInt32("menu_Content_alpha", 10); t.menu_Content_red = configfile.getInt32("menu_Content_red", 13); t.menu_Content_green = configfile.getInt32("menu_Content_green", 13); t.menu_Content_blue = configfile.getInt32("menu_Content_blue", 13); + t.menu_Content_Text_alpha = configfile.getInt32("menu_Content_Text_alpha", 0); t.menu_Content_Text_red = configfile.getInt32("menu_Content_Text_red", 98); t.menu_Content_Text_green = configfile.getInt32("menu_Content_Text_green", 98); t.menu_Content_Text_blue = configfile.getInt32("menu_Content_Text_blue", 98); + t.menu_Content_Selected_alpha = configfile.getInt32("menu_Content_Selected_alpha", 10); t.menu_Content_Selected_red = configfile.getInt32("menu_Content_Selected_red", 99); t.menu_Content_Selected_green = configfile.getInt32("menu_Content_Selected_green", 43); @@ -451,6 +479,7 @@ void CThemes::getTheme(CConfigFile &configfile) t.menu_Content_Selected_Text_red = configfile.getInt32("menu_Content_Selected_Text_red", 0); t.menu_Content_Selected_Text_green = configfile.getInt32("menu_Content_Selected_Text_green", 0); t.menu_Content_Selected_Text_blue = configfile.getInt32("menu_Content_Selected_Text_blue", 0); + t.menu_Content_inactive_alpha = configfile.getInt32("menu_Content_inactive_alpha", 10); t.menu_Content_inactive_red = configfile.getInt32("menu_Content_inactive_red", 13); t.menu_Content_inactive_green = configfile.getInt32("menu_Content_inactive_green", 13); @@ -460,21 +489,20 @@ void CThemes::getTheme(CConfigFile &configfile) t.menu_Content_inactive_Text_green = configfile.getInt32("menu_Content_inactive_Text_green", 62); t.menu_Content_inactive_Text_blue = configfile.getInt32("menu_Content_inactive_Text_blue", 62); + // hints t.menu_Hint_gradient = configfile.getInt32("menu_Hint_gradient", CC_COLGRAD_OFF); t.menu_Hint_gradient_direction = configfile.getInt32("menu_Hint_gradient_direction", CFrameBuffer::gradientVertical); - t.menu_ButtonBar_gradient = configfile.getInt32("menu_ButtonBar_gradient", CC_COLGRAD_OFF); - t.menu_ButtonBar_gradient_direction = configfile.getInt32("menu_ButtonBar_gradient_direction", CFrameBuffer::gradientVertical); + // infobar t.infobar_alpha = configfile.getInt32("infobar_alpha", 10); t.infobar_red = configfile.getInt32("infobar_red", 13); t.infobar_green = configfile.getInt32("infobar_green", 13); t.infobar_blue = configfile.getInt32("infobar_blue", 13); - //t.menu_Foot default historically depends on t.infobar - t.menu_Foot_alpha = configfile.getInt32("menu_Foot_alpha", 10); - t.menu_Foot_red = configfile.getInt32("menu_Foot_red", 0); - t.menu_Foot_green = configfile.getInt32("menu_Foot_green", 0); - t.menu_Foot_blue = configfile.getInt32("menu_Foot_blue", 0); + t.infobar_Text_alpha = configfile.getInt32("infobar_Text_alpha", 0); + t.infobar_Text_red = configfile.getInt32("infobar_Text_red", 98); + t.infobar_Text_green = configfile.getInt32("infobar_Text_green", 98); + t.infobar_Text_blue = configfile.getInt32("infobar_Text_blue", 98); t.infobar_gradient_top = configfile.getInt32("infobar_gradient_top", CC_COLGRAD_OFF); t.infobar_gradient_top_direction = configfile.getInt32("infobar_gradient_top_direction", CFrameBuffer::gradientVertical); @@ -487,10 +515,13 @@ void CThemes::getTheme(CConfigFile &configfile) t.infobar_casystem_red = configfile.getInt32("infobar_casystem_red", 13); t.infobar_casystem_green = configfile.getInt32("infobar_casystem_green", 13); t.infobar_casystem_blue = configfile.getInt32("infobar_casystem_blue", 13); - t.infobar_Text_alpha = configfile.getInt32("infobar_Text_alpha", 0); - t.infobar_Text_red = configfile.getInt32("infobar_Text_red", 98); - t.infobar_Text_green = configfile.getInt32("infobar_Text_green", 98); - t.infobar_Text_blue = configfile.getInt32("infobar_Text_blue", 98); + + // foot + //t.menu_Foot default historically depends on t.infobar + t.menu_Foot_alpha = configfile.getInt32("menu_Foot_alpha", 10); + t.menu_Foot_red = configfile.getInt32("menu_Foot_red", 0); + t.menu_Foot_green = configfile.getInt32("menu_Foot_green", 0); + t.menu_Foot_blue = configfile.getInt32("menu_Foot_blue", 0); //t.menu_Foot_Text default historically depends on t.infobar_Text t.menu_Foot_Text_alpha = configfile.getInt32("menu_Foot_Text_alpha", 0); @@ -498,32 +529,34 @@ void CThemes::getTheme(CConfigFile &configfile) t.menu_Foot_Text_green = configfile.getInt32("menu_Foot_Text_green", 98); t.menu_Foot_Text_blue = configfile.getInt32("menu_Foot_Text_blue", 98); + t.menu_Foot_gradient = configfile.getInt32( "menu_Foot_gradient", CC_COLGRAD_OFF); + t.menu_Foot_gradient_direction = configfile.getInt32( "menu_Foot_gradient_direction", CFrameBuffer::gradientVertical); + + // event text t.colored_events_alpha = configfile.getInt32("colored_events_alpha", 0); t.colored_events_red = configfile.getInt32("colored_events_red", 99); t.colored_events_green = configfile.getInt32("colored_events_green", 43); t.colored_events_blue = configfile.getInt32("colored_events_blue", 7); t.colored_events_channellist = configfile.getInt32("colored_events_channellist", 1); - t.colored_events_infobar = configfile.getInt32("colored_events_infobar", 1); + + // clock t.clock_Digit_alpha = configfile.getInt32("clock_Digit_alpha", 0); t.clock_Digit_red = configfile.getInt32("clock_Digit_red", 62); t.clock_Digit_green = configfile.getInt32("clock_Digit_green", 62); t.clock_Digit_blue = configfile.getInt32("clock_Digit_blue", 62); + // progressbar t.progressbar_design = configfile.getInt32("progressbar_design", CProgressBar::PB_MONO); - t.progressbar_design_channellist = configfile.getInt32("progressbar_design_channellist", t.progressbar_design); t.progressbar_gradient = configfile.getInt32("progressbar_gradient", 1); + + t.progressbar_design_channellist = configfile.getInt32("progressbar_design_channellist", t.progressbar_design); + t.progressbar_timescale_red = configfile.getInt32("progressbar_timescale_red", 0); t.progressbar_timescale_green = configfile.getInt32("progressbar_timescale_green", 100); t.progressbar_timescale_yellow = configfile.getInt32("progressbar_timescale_yellow", 70); t.progressbar_timescale_invert = configfile.getInt32("progressbar_timescale_invert", 0); - t.shadow_alpha = configfile.getInt32("shadow_alpha", 25); - t.shadow_red = configfile.getInt32("shadow_red", 0); - t.shadow_green = configfile.getInt32("shadow_green", 0); - t.shadow_blue = configfile.getInt32("shadow_blue", 0); - - // progressbar t.progressbar_active_red = configfile.getInt32("progressbar_active_red", 62); t.progressbar_active_green = configfile.getInt32("progressbar_active_green", 62); t.progressbar_active_blue = configfile.getInt32("progressbar_active_blue", 62); @@ -531,6 +564,12 @@ void CThemes::getTheme(CConfigFile &configfile) t.progressbar_passive_green = configfile.getInt32("progressbar_passive_green", 26); t.progressbar_passive_blue = configfile.getInt32("progressbar_passive_blue", 26); + // shadow + t.shadow_alpha = configfile.getInt32("shadow_alpha", 25); + t.shadow_red = configfile.getInt32("shadow_red", 0); + t.shadow_green = configfile.getInt32("shadow_green", 0); + t.shadow_blue = configfile.getInt32("shadow_blue", 0); + // corners t.rounded_corners = configfile.getInt32("rounded_corners", 0); diff --git a/src/system/settings.h b/src/system/settings.h index 8b2ec0eff..8dbc969cf 100644 --- a/src/system/settings.h +++ b/src/system/settings.h @@ -50,6 +50,7 @@ struct SNeutrinoTheme { + // head unsigned char menu_Head_alpha; unsigned char menu_Head_red; unsigned char menu_Head_green; @@ -63,11 +64,14 @@ struct SNeutrinoTheme int menu_Head_gradient; int menu_Head_gradient_direction; + // subhead int menu_SubHead_gradient; int menu_SubHead_gradient_direction; + // separator int menu_Separator_gradient_enable; + // menu content unsigned char menu_Content_alpha; unsigned char menu_Content_red; unsigned char menu_Content_green; @@ -98,6 +102,7 @@ struct SNeutrinoTheme unsigned char menu_Content_inactive_Text_green; unsigned char menu_Content_inactive_Text_blue; + // foot unsigned char menu_Foot_alpha; unsigned char menu_Foot_red; unsigned char menu_Foot_green; @@ -108,11 +113,13 @@ struct SNeutrinoTheme unsigned char menu_Foot_Text_green; unsigned char menu_Foot_Text_blue; + int menu_Foot_gradient; + int menu_Foot_gradient_direction; + int menu_Hint_gradient; int menu_Hint_gradient_direction; - int menu_ButtonBar_gradient; - int menu_ButtonBar_gradient_direction; + // infobar unsigned char infobar_alpha; unsigned char infobar_red; unsigned char infobar_green; @@ -135,6 +142,7 @@ struct SNeutrinoTheme int infobar_gradient_bottom; int infobar_gradient_bottom_direction; + // event text unsigned char colored_events_alpha; unsigned char colored_events_red; unsigned char colored_events_green; @@ -143,24 +151,22 @@ struct SNeutrinoTheme int colored_events_channellist; int colored_events_infobar; + // clock unsigned char clock_Digit_alpha; unsigned char clock_Digit_red; unsigned char clock_Digit_green; unsigned char clock_Digit_blue; + // progressbar int progressbar_design; int progressbar_design_channellist; int progressbar_gradient; + int progressbar_timescale_red; int progressbar_timescale_green; int progressbar_timescale_yellow; int progressbar_timescale_invert; - unsigned char shadow_alpha; - unsigned char shadow_red; - unsigned char shadow_green; - unsigned char shadow_blue; - unsigned char progressbar_active_red; unsigned char progressbar_active_green; unsigned char progressbar_active_blue; @@ -168,7 +174,16 @@ struct SNeutrinoTheme unsigned char progressbar_passive_green; unsigned char progressbar_passive_blue; + // shadow + unsigned char shadow_alpha; + unsigned char shadow_red; + unsigned char shadow_green; + unsigned char shadow_blue; + + // corners int rounded_corners; + + // message frames int message_frame_enable; };