From cefb8f95948972f941c9ef5c620a678d0437f1d7 Mon Sep 17 00:00:00 2001 From: Thilo Graf Date: Wed, 29 Apr 2015 10:16:55 +0200 Subject: [PATCH] themes: use hintbox and header gradient option in theme settings Color gradient feature was originally intended for use inside theme settings and it's not really suitable for generally use as default in all themes at the moment, so it makes more sense to have options in theme settings and let the user decide to customize this, unless enough other gui parts can use this feature. Origin commit data ------------------ Branch: ni/coolstream Commit: https://github.com/neutrino-images/ni-neutrino/commit/01516cf94379ef3aade55b785a07cda7b075675e Author: Thilo Graf Date: 2015-04-29 (Wed, 29 Apr 2015) Origin message was: ------------------ themes: use hintbox and header gradient option in theme settings Color gradient feature was originally intended for use inside theme settings and it's not really suitable for generally use as default in all themes at the moment, so it makes more sense to have options in theme settings and let the user decide to customize this, unless enough other gui parts can use this feature. ------------------ This commit was generated by Migit --- data/locale/deutsch.locale | 1 + data/locale/english.locale | 1 + data/locale/nederlands.locale | 1 + data/locale/slovak.locale | 1 + data/themes/Classic.theme | 2 ++ data/themes/Crema.theme | 2 ++ data/themes/DVB2000.theme | 2 ++ data/themes/DarkBlue.theme | 2 ++ data/themes/DarkBrown.theme | 2 ++ data/themes/Gray.theme | 2 ++ data/themes/Grey-Blue.theme | 2 ++ data/themes/MonoChrom.theme | 2 ++ data/themes/Olive.theme | 2 ++ data/themes/Red.theme | 2 ++ data/themes/VirginMedia.theme | 2 ++ src/gui/channellist.cpp | 6 +++--- src/gui/components/cc_base.cpp | 2 +- src/gui/components/cc_frm_footer.cpp | 2 +- src/gui/components/cc_frm_header.cpp | 2 +- src/gui/eventlist.cpp | 2 +- src/gui/imageinfo.cpp | 2 +- src/gui/osd_setup.cpp | 22 ++++++++++++++++------ src/gui/themes.cpp | 4 ++++ src/gui/widget/colorchooser.cpp | 4 ++-- src/gui/widget/menue.cpp | 3 ++- src/gui/widget/menue.h | 4 ++-- src/neutrino.cpp | 4 ++-- src/system/locals.h | 1 + src/system/locals_intern.h | 1 + src/system/settings.h | 5 ++++- 30 files changed, 68 insertions(+), 22 deletions(-) diff --git a/data/locale/deutsch.locale b/data/locale/deutsch.locale index 4d241fcf7..c040746b7 100644 --- a/data/locale/deutsch.locale +++ b/data/locale/deutsch.locale @@ -299,6 +299,7 @@ colormenusetup.menuhead Titelleiste colorstatusbar.text Infobar colorthememenu.head Theme auswählen colorthememenu.head2 Themes laden +colorthememenu.menu_hints Hinweisfenster colorthememenu.name Themename colorthememenu.neutrino_theme Neutrino Theme colorthememenu.question Aktuelles Theme beibehalten? diff --git a/data/locale/english.locale b/data/locale/english.locale index 2022f3db2..25346c375 100644 --- a/data/locale/english.locale +++ b/data/locale/english.locale @@ -299,6 +299,7 @@ colormenusetup.menuhead Header colorstatusbar.text Infobar colorthememenu.head Select theme colorthememenu.head2 Load themes +colorthememenu.menu_hints Hint box colorthememenu.name Theme name colorthememenu.neutrino_theme Neutrino Theme colorthememenu.question Use selected theme? diff --git a/data/locale/nederlands.locale b/data/locale/nederlands.locale index 9d05d7e13..7b1f29194 100644 --- a/data/locale/nederlands.locale +++ b/data/locale/nederlands.locale @@ -294,6 +294,7 @@ colormenusetup.menuhead Menu kop colorstatusbar.text Infobalk colorthememenu.head Selecteer thema colorthememenu.head2 Thema's laden +colorthememenu.menu_hints Hint box colorthememenu.name Naam thema colorthememenu.neutrino_theme Neutrino Thema colorthememenu.question Geselecteerde thema gebruiken? diff --git a/data/locale/slovak.locale b/data/locale/slovak.locale index b9507ce04..04a5f69f4 100644 --- a/data/locale/slovak.locale +++ b/data/locale/slovak.locale @@ -300,6 +300,7 @@ colormenusetup.menuhead Hlavička colorstatusbar.text Text stavového riadku colorthememenu.head Výber vzhľadu colorthememenu.head2 Nahraj vzhľad +colorthememenu.menu_hints Tip Box colorthememenu.name Názov vzhľadu colorthememenu.neutrino_theme Neutrino colorthememenu.question Použiť vybraný vzhľad? diff --git a/data/themes/Classic.theme b/data/themes/Classic.theme index 2d2562217..d194eb8f6 100644 --- a/data/themes/Classic.theme +++ b/data/themes/Classic.theme @@ -38,3 +38,5 @@ menu_Content_inactive_Text_alpha=0 menu_Content_inactive_Text_red=80 menu_Content_inactive_Text_green=80 menu_Content_inactive_Text_blue=80 +menu_Hint_gradient=0 +menu_Head_gradient=0 diff --git a/data/themes/Crema.theme b/data/themes/Crema.theme index 0abd780bb..5ce2ed3ad 100644 --- a/data/themes/Crema.theme +++ b/data/themes/Crema.theme @@ -38,3 +38,5 @@ menu_Head_alpha=0 menu_Head_blue=28 menu_Head_green=0 menu_Head_red=0 +menu_Hint_gradient=0 +menu_Head_gradient=0 diff --git a/data/themes/DVB2000.theme b/data/themes/DVB2000.theme index 5a9ad7ae7..1f5f73301 100644 --- a/data/themes/DVB2000.theme +++ b/data/themes/DVB2000.theme @@ -38,3 +38,5 @@ menu_Content_inactive_Text_alpha=0 menu_Content_inactive_Text_red=100 menu_Content_inactive_Text_green=100 menu_Content_inactive_Text_blue=0 +menu_Hint_gradient=0 +menu_Head_gradient=0 diff --git a/data/themes/DarkBlue.theme b/data/themes/DarkBlue.theme index 9bc2849d1..fc3a262af 100644 --- a/data/themes/DarkBlue.theme +++ b/data/themes/DarkBlue.theme @@ -38,3 +38,5 @@ menu_Content_inactive_Text_alpha=0 menu_Content_inactive_Text_red=55 menu_Content_inactive_Text_green=70 menu_Content_inactive_Text_blue=85 +menu_Hint_gradient=0 +menu_Head_gradient=0 diff --git a/data/themes/DarkBrown.theme b/data/themes/DarkBrown.theme index 903181d21..b337df705 100644 --- a/data/themes/DarkBrown.theme +++ b/data/themes/DarkBrown.theme @@ -38,3 +38,5 @@ menu_Content_inactive_Text_alpha=0 menu_Content_inactive_Text_red=60 menu_Content_inactive_Text_green=60 menu_Content_inactive_Text_blue=60 +menu_Hint_gradient=0 +menu_Head_gradient=0 diff --git a/data/themes/Gray.theme b/data/themes/Gray.theme index 6356e7d1b..245fa5e93 100644 --- a/data/themes/Gray.theme +++ b/data/themes/Gray.theme @@ -49,3 +49,5 @@ menu_Head_alpha=0 menu_Head_blue=30 menu_Head_green=20 menu_Head_red=15 +menu_Hint_gradient=0 +menu_Head_gradient=0 diff --git a/data/themes/Grey-Blue.theme b/data/themes/Grey-Blue.theme index d274fb352..9a8c9190b 100644 --- a/data/themes/Grey-Blue.theme +++ b/data/themes/Grey-Blue.theme @@ -46,3 +46,5 @@ menu_Head_alpha=4 menu_Head_blue=0 menu_Head_green=0 menu_Head_red=0 +menu_Hint_gradient=0 +menu_Head_gradient=0 diff --git a/data/themes/MonoChrom.theme b/data/themes/MonoChrom.theme index 4ed999dc0..bed644c00 100644 --- a/data/themes/MonoChrom.theme +++ b/data/themes/MonoChrom.theme @@ -38,3 +38,5 @@ menu_Head_alpha=0 menu_Head_blue=0 menu_Head_green=0 menu_Head_red=0 +menu_Hint_gradient=0 +menu_Head_gradient=0 diff --git a/data/themes/Olive.theme b/data/themes/Olive.theme index c30b4eba1..8696172e6 100644 --- a/data/themes/Olive.theme +++ b/data/themes/Olive.theme @@ -38,3 +38,5 @@ menu_Head_alpha=0 menu_Head_blue=80 menu_Head_green=80 menu_Head_red=80 +menu_Hint_gradient=0 +menu_Head_gradient=0 diff --git a/data/themes/Red.theme b/data/themes/Red.theme index 714fea08c..4b1b4ad09 100644 --- a/data/themes/Red.theme +++ b/data/themes/Red.theme @@ -49,3 +49,5 @@ menu_Head_alpha=0 menu_Head_blue=0 menu_Head_green=10 menu_Head_red=40 +menu_Hint_gradient=0 +menu_Head_gradient=0 diff --git a/data/themes/VirginMedia.theme b/data/themes/VirginMedia.theme index 23a3b8f21..9fb66a4b2 100644 --- a/data/themes/VirginMedia.theme +++ b/data/themes/VirginMedia.theme @@ -38,3 +38,5 @@ menu_Content_inactive_Text_alpha=0 menu_Content_inactive_Text_red=60 menu_Content_inactive_Text_green=60 menu_Content_inactive_Text_blue=60 +menu_Hint_gradient=0 +menu_Head_gradient=0 diff --git a/src/gui/channellist.cpp b/src/gui/channellist.cpp index 2da427a7b..b957c44ad 100644 --- a/src/gui/channellist.cpp +++ b/src/gui/channellist.cpp @@ -2049,7 +2049,7 @@ void CChannelList::paint() void CChannelList::paintHead() { - static int gradient = g_settings.gradiant; + static int gradient = g_settings.theme.menu_Head_gradient; CComponentsHeader header(x, y, full_width, theight, name /*no header icon*/); if (bouquet && bouquet->zapitBouquet && bouquet->zapitBouquet->bLocked != g_settings.parentallock_defaultlocked) @@ -2059,8 +2059,8 @@ void CChannelList::paintHead() header.paint(CC_SAVE_SCREEN_NO); - if (gradient != g_settings.gradiant && headerClock != NULL) { - gradient = g_settings.gradiant; + if (gradient != g_settings.theme.menu_Head_gradient && headerClock != NULL) { + gradient = g_settings.theme.menu_Head_gradient; headerClock->clearSavedScreen(); delete headerClock; headerClock = NULL; diff --git a/src/gui/components/cc_base.cpp b/src/gui/components/cc_base.cpp index 223db8d95..deec9ea97 100644 --- a/src/gui/components/cc_base.cpp +++ b/src/gui/components/cc_base.cpp @@ -328,5 +328,5 @@ void CComponents::setFrameThickness(const int& thickness, const int& thickness_s void CComponents::enableColBodyGradient(bool do_paint_gradient) { - col_body_gradient = g_settings.gradiant ? do_paint_gradient : false; + col_body_gradient = do_paint_gradient; } diff --git a/src/gui/components/cc_frm_footer.cpp b/src/gui/components/cc_frm_footer.cpp index ac1b1da16..cb84e182c 100644 --- a/src/gui/components/cc_frm_footer.cpp +++ b/src/gui/components/cc_frm_footer.cpp @@ -82,7 +82,7 @@ void CComponentsFooter::initVarFooter( const int& x_pos, const int& y_pos, const corner_rad = RADIUS_LARGE; corner_type = CORNER_BOTTOM; - btn_contour = g_settings.gradiant; + btn_contour = false /*g_settings.theme.Button_gradient*/; //TODO: not implemented at the moment ccf_btn_font = NULL; chain = NULL; diff --git a/src/gui/components/cc_frm_header.cpp b/src/gui/components/cc_frm_header.cpp index 6be2b8794..44c363607 100644 --- a/src/gui/components/cc_frm_header.cpp +++ b/src/gui/components/cc_frm_header.cpp @@ -98,7 +98,7 @@ void CComponentsHeader::initVarHeader( const int& x_pos, const int& y_pos, const col_body = color_body; col_shadow = color_shadow; col_body = COL_MENUHEAD_PLUS_0; - col_body_gradient = g_settings.gradiant; + col_body_gradient = g_settings.theme.menu_Head_gradient; cc_body_gradient_direction = CFrameBuffer::gradientVertical; cch_text = caption; cch_icon_name = icon_name; diff --git a/src/gui/eventlist.cpp b/src/gui/eventlist.cpp index 2845b1de5..4a0695b09 100644 --- a/src/gui/eventlist.cpp +++ b/src/gui/eventlist.cpp @@ -854,7 +854,7 @@ void CNeutrinoEventList::paintHead(t_channel_id _channel_id, std::string _channe int font_lr = SNeutrinoSettings::FONT_TYPE_EVENTLIST_ITEMLARGE; CComponentsFrmChain header(x, y, full_width, theight); - header.enableColBodyGradient(g_settings.gradiant); + header.enableColBodyGradient(g_settings.theme.menu_Head_gradient); header.setCorner(RADIUS_LARGE, CORNER_TOP); int x_off = 10; diff --git a/src/gui/imageinfo.cpp b/src/gui/imageinfo.cpp index 2b236ff5a..f657ed813 100644 --- a/src/gui/imageinfo.cpp +++ b/src/gui/imageinfo.cpp @@ -185,7 +185,7 @@ void CImageInfo::ShowWindow() cc_win->setWindowHeaderButtons(CComponentsHeader::CC_BTN_MENU | CComponentsHeader::CC_BTN_EXIT); footer = cc_win->getFooterObject(); int h_footer = footer->getHeight(); - fb_pixel_t btn_col = g_settings.gradiant ? COL_BUTTON_BODY : footer->getColorBody(); + fb_pixel_t btn_col = /*g_settings.theme.Button_gradient ? COL_BUTTON_BODY :*/ footer->getColorBody(); //TODO: Button_gradient option btn_red = new CComponentsButtonRed(10, CC_CENTERED, 250, h_footer-h_footer/4, LOCALE_BUILDINFO_MENU, footer, false , true, false, footer->getColorBody(), btn_col); } diff --git a/src/gui/osd_setup.cpp b/src/gui/osd_setup.cpp index 6172918ea..681cfc00d 100644 --- a/src/gui/osd_setup.cpp +++ b/src/gui/osd_setup.cpp @@ -603,11 +603,6 @@ int COsdSetup::showOsdSetup() mfWindowSize->setHint("", LOCALE_MENU_HINT_WINDOW_SIZE); osd_menu->addItem(mfWindowSize); - // color gradient - mc = new CMenuOptionChooser(LOCALE_COLOR_GRADIENT, &g_settings.gradiant, MESSAGEBOX_NO_YES_OPTIONS, MESSAGEBOX_NO_YES_OPTION_COUNT, true, this ); - mc->setHint("", LOCALE_MENU_HINT_COLOR_GRADIENT); - osd_menu->addItem(mc); - osd_menu->addItem(GenericMenuSeparatorLine); // scrambled @@ -653,6 +648,7 @@ void COsdSetup::showOsdMenueColorSetup(CMenuWidget *menu_colors) menu_colors->addItem(mf); SNeutrinoTheme &t = g_settings.theme; + sigc::slot0 slot_repaint = sigc::mem_fun(menu_colors, &CMenuWidget::paint); //we want to repaint after changed Option CColorChooser* chHeadcolor = new CColorChooser(LOCALE_COLORMENU_BACKGROUND, &t.menu_Head_red, &t.menu_Head_green, &t.menu_Head_blue, &t.menu_Head_alpha, colorSetupNotifier); @@ -683,6 +679,13 @@ void COsdSetup::showOsdMenueColorSetup(CMenuWidget *menu_colors) mf->setHint("", LOCALE_MENU_HINT_HEAD_TEXTCOLOR); menu_colors->addItem(mf); + // head color gradient + CMenuOptionChooser *oj; + oj = new CMenuOptionChooser(LOCALE_COLOR_GRADIENT, &g_settings.theme.menu_Head_gradient, OPTIONS_OFF0_ON1_OPTIONS, OPTIONS_OFF0_ON1_OPTION_COUNT, true ); + oj->OnAfterChangeOption.connect(slot_repaint); + oj->setHint("", LOCALE_MENU_HINT_COLOR_GRADIENT); + menu_colors->addItem(oj); + menu_colors->addItem( new CMenuSeparator(CMenuSeparator::LINE | CMenuSeparator::STRING, LOCALE_COLORMENUSETUP_MENUCONTENT)); mf = new CMenuDForwarder(LOCALE_COLORMENU_BACKGROUND, true, NULL, chContentcolor ); mf->setHint("", LOCALE_MENU_HINT_CONTENT_BACK); @@ -710,6 +713,13 @@ void COsdSetup::showOsdMenueColorSetup(CMenuWidget *menu_colors) mf->setHint("", LOCALE_MENU_HINT_SELECTED_TEXT); menu_colors->addItem(mf); + // hintbox color gradient + menu_colors->addItem( new CMenuSeparator(CMenuSeparator::LINE | CMenuSeparator::STRING, LOCALE_COLORTHEMEMENU_MENU_HINTS)); + oj = new CMenuOptionChooser(LOCALE_COLOR_GRADIENT, &t.menu_Hint_gradient, OPTIONS_OFF0_ON1_OPTIONS, OPTIONS_OFF0_ON1_OPTION_COUNT, true); + oj->OnAfterChangeOption.connect(slot_repaint); + oj->setHint("", LOCALE_MENU_HINT_COLOR_GRADIENT); + menu_colors->addItem(oj); + CColorChooser* chInfobarcolor = new CColorChooser(LOCALE_COLORMENU_BACKGROUND, &t.infobar_red, &t.infobar_green, &t.infobar_blue, &t.infobar_alpha, colorSetupNotifier); CColorChooser* chInfobarTextcolor = new CColorChooser(LOCALE_COLORMENU_TEXTCOLOR, &t.infobar_Text_red, @@ -1137,7 +1147,7 @@ bool COsdSetup::changeNotify(const neutrino_locale_t OptionName, void * data) } else if(ARE_LOCALES_EQUAL(OptionName, LOCALE_COLOR_GRADIENT)) { osd_menu->paint(); - return false; + return true; } else if(ARE_LOCALES_EQUAL(OptionName, LOCALE_COLORMENU_OSD_PRESET)) { int preset = * (int *) data; diff --git a/src/gui/themes.cpp b/src/gui/themes.cpp index 60963cc9b..425e68a33 100644 --- a/src/gui/themes.cpp +++ b/src/gui/themes.cpp @@ -245,6 +245,7 @@ void CThemes::setTheme(CConfigFile &configfile) configfile.setInt32( "menu_Head_Text_red", t.menu_Head_Text_red ); configfile.setInt32( "menu_Head_Text_green", t.menu_Head_Text_green ); configfile.setInt32( "menu_Head_Text_blue", t.menu_Head_Text_blue ); + configfile.setInt32( "menu_Head_gradient" , t.menu_Head_gradient); 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 ); @@ -269,6 +270,7 @@ 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 ); + configfile.setInt32( "menu_Hint_gradient" , t.menu_Hint_gradient); configfile.setInt32( "infobar_alpha", t.infobar_alpha ); configfile.setInt32( "infobar_red", t.infobar_red ); configfile.setInt32( "infobar_green", t.infobar_green ); @@ -298,6 +300,7 @@ void CThemes::getTheme(CConfigFile &configfile) t.menu_Head_Text_red = configfile.getInt32( "menu_Head_Text_red", 0x5f ); t.menu_Head_Text_green = configfile.getInt32( "menu_Head_Text_green", 0x46 ); t.menu_Head_Text_blue = configfile.getInt32( "menu_Head_Text_blue", 0x00 ); + t.menu_Head_gradient = configfile.getInt32( "menu_Head_gradient", 1); t.menu_Content_alpha = configfile.getInt32( "menu_Content_alpha", 0x14 ); t.menu_Content_red = configfile.getInt32( "menu_Content_red", 0x00 ); t.menu_Content_green = configfile.getInt32( "menu_Content_green", 0x0f ); @@ -322,6 +325,7 @@ void CThemes::getTheme(CConfigFile &configfile) t.menu_Content_inactive_Text_red = configfile.getInt32( "menu_Content_inactive_Text_red", 55 ); t.menu_Content_inactive_Text_green = configfile.getInt32( "menu_Content_inactive_Text_green", 70 ); t.menu_Content_inactive_Text_blue = configfile.getInt32( "menu_Content_inactive_Text_blue", 85 ); + t.menu_Hint_gradient = configfile.getInt32( "menu_Hint_gradient", 0); t.infobar_alpha = configfile.getInt32( "infobar_alpha", 0x14 ); t.infobar_red = configfile.getInt32( "infobar_red", 0x00 ); t.infobar_green = configfile.getInt32( "infobar_green", 0x0e ); diff --git a/src/gui/widget/colorchooser.cpp b/src/gui/widget/colorchooser.cpp index 8f758dc45..e2924c173 100644 --- a/src/gui/widget/colorchooser.cpp +++ b/src/gui/widget/colorchooser.cpp @@ -107,7 +107,7 @@ void CColorChooser::setColor() int w_col = mheight*4; int h_col = mheight*4-10; - if ((g_settings.gradiant) && ((chooser_gradient == gradient_head_body) || (chooser_gradient == gradient_head_text))) { + if ((g_settings.theme.menu_Head_gradient) && ((chooser_gradient == gradient_head_body) || (chooser_gradient == gradient_head_text))) { CComponentsHeader header(x_col, y_col+((h_col-hheight)/2), w_col, hheight, "Head"); if (chooser_gradient == gradient_head_body) header.setColorBody(col); @@ -270,7 +270,7 @@ void CColorChooser::paint() for (int i = 0; i < 4; i++) paintSlider(x + 10, y + hheight + mheight * i, value[i], colorchooser_names[i], iconnames[i], (i == 0)); - if ((!g_settings.gradiant) || ((chooser_gradient != gradient_head_body) && (chooser_gradient != gradient_head_text))) { + if ((!g_settings.theme.menu_Head_gradient) || ((chooser_gradient != gradient_head_body) && (chooser_gradient != gradient_head_text))) { //color preview frameBuffer->paintBoxRel(x+offset+160,y+hheight+5, mheight*4, mheight*4-10, COL_MENUHEAD_PLUS_0); frameBuffer->paintBoxRel(x+offset+162,y+hheight+2+5, mheight*4-4 ,mheight*4-4-10, 254); diff --git a/src/gui/widget/menue.cpp b/src/gui/widget/menue.cpp index 7759dfb41..1303269f1 100644 --- a/src/gui/widget/menue.cpp +++ b/src/gui/widget/menue.cpp @@ -1303,7 +1303,7 @@ void CMenuWidget::paintHint(int pos) if (pos < 0 && !hint_painted) return; - info_box->enableGradient(g_settings.gradiant != 0); //TODO: manage via themes + info_box->enableGradient(g_settings.theme.menu_Hint_gradient != 0); info_box->setColorBody(COL_MENUCONTENT_PLUS_0); if (hint_painted) { @@ -1826,6 +1826,7 @@ int CMenuOptionChooser::exec(CMenuTarget*) } } paint(true); + OnAfterChangeOption(); if(observ && !luaAction.empty()) { if (optionValname) wantsRepaint = observ->changeNotify(luaState, luaAction, luaId, optionValname); diff --git a/src/gui/widget/menue.h b/src/gui/widget/menue.h index b00079e0e..6d3c20ed4 100644 --- a/src/gui/widget/menue.h +++ b/src/gui/widget/menue.h @@ -355,7 +355,7 @@ struct CMenuOptionChooserCompareItem: public std::binary_function OnAfterChangeOption; int paint(bool selected); int exec(CMenuTarget* parent); diff --git a/src/neutrino.cpp b/src/neutrino.cpp index e045c8389..50e65b559 100644 --- a/src/neutrino.cpp +++ b/src/neutrino.cpp @@ -543,7 +543,7 @@ int CNeutrinoApp::loadSetup(const char * fname) CThemes::getTheme(configfile); - g_settings.gradiant = (configfile.getBool( "gradiant", false ))? 1 : 0; + //personalize g_settings.personalize_pincode = configfile.getString( "personalize_pincode", "0000" ); @@ -1067,7 +1067,7 @@ void CNeutrinoApp::saveSetup(const char * fname) CThemes::setTheme(configfile); - configfile.setBool( "gradiant", (g_settings.gradiant!=0)?true:false ); + //personalize configfile.setString("personalize_pincode", g_settings.personalize_pincode); diff --git a/src/system/locals.h b/src/system/locals.h index 9b768e095..2779bc17d 100644 --- a/src/system/locals.h +++ b/src/system/locals.h @@ -326,6 +326,7 @@ typedef enum LOCALE_COLORSTATUSBAR_TEXT, LOCALE_COLORTHEMEMENU_HEAD, LOCALE_COLORTHEMEMENU_HEAD2, + LOCALE_COLORTHEMEMENU_MENU_HINTS, LOCALE_COLORTHEMEMENU_NAME, LOCALE_COLORTHEMEMENU_NEUTRINO_THEME, LOCALE_COLORTHEMEMENU_QUESTION, diff --git a/src/system/locals_intern.h b/src/system/locals_intern.h index 0423c1586..af30d8339 100644 --- a/src/system/locals_intern.h +++ b/src/system/locals_intern.h @@ -326,6 +326,7 @@ const char * locale_real_names[] = "colorstatusbar.text", "colorthememenu.head", "colorthememenu.head2", + "colorthememenu.menu_hints", "colorthememenu.name", "colorthememenu.neutrino_theme", "colorthememenu.question", diff --git a/src/system/settings.h b/src/system/settings.h index 6431c2616..17bcf7848 100644 --- a/src/system/settings.h +++ b/src/system/settings.h @@ -59,6 +59,8 @@ struct SNeutrinoTheme unsigned char menu_Head_Text_green; unsigned char menu_Head_Text_blue; + int menu_Head_gradient; + unsigned char menu_Content_alpha; unsigned char menu_Content_red; unsigned char menu_Content_green; @@ -89,6 +91,8 @@ struct SNeutrinoTheme unsigned char menu_Content_inactive_Text_green; unsigned char menu_Content_inactive_Text_blue; + int menu_Hint_gradient; + unsigned char infobar_alpha; unsigned char infobar_red; unsigned char infobar_green; @@ -365,7 +369,6 @@ struct SNeutrinoSettings int colored_events_channellist; int colored_events_infobar; int contrast_fonts; - int gradiant; //network #define NETWORK_NFS_NR_OF_ENTRIES 8