diff --git a/data/locale/deutsch.locale b/data/locale/deutsch.locale index 110225d26..f57cef5c7 100644 --- a/data/locale/deutsch.locale +++ b/data/locale/deutsch.locale @@ -1179,6 +1179,7 @@ menu.hint_hdd_tools Formatieren Sie die gefundenen Datenträger bzw. überprüfe menu.hint_hdd_wakeup Schaltet die internen Aufweckfunktionen für Festplatten ein oder aus menu.hint_hdd_wakeup_msg Schaltet die Benachrichtigung über den Start der Aufweckfunktion ein oder aus menu.hint_foot_back Ändern Sie die Fußleisten-Hintergrundfarbe +menu.hint_foot_textcolor Ändern Sie die Fußleisten-Textfarbe menu.hint_head_back Ändern Sie die Titel-Hintergrundfarbe menu.hint_head_textcolor Ändern Sie die Titel-Textfarbe menu.hint_imageinfo Informationen über die installierte Software diff --git a/data/locale/english.locale b/data/locale/english.locale index 635ca8e9d..a5b555801 100644 --- a/data/locale/english.locale +++ b/data/locale/english.locale @@ -1179,6 +1179,7 @@ menu.hint_hdd_tools Initialize HDD, check filesystem menu.hint_hdd_wakeup Turns the internal wakeup functions for connected drives on or off menu.hint_hdd_wakeup_msg Turns the messages while starting the wakeup function on or off menu.hint_foot_back Change GUI footer background color +menu.hint_foot_textcolor Change GUI window footer text color menu.hint_head_back Change GUI title background color menu.hint_head_textcolor Change GUI window title text color menu.hint_imageinfo Information about installed software diff --git a/src/gui/components/cc_frm_button.h b/src/gui/components/cc_frm_button.h index ae0def4d3..9a079b427 100644 --- a/src/gui/components/cc_frm_button.h +++ b/src/gui/components/cc_frm_button.h @@ -37,8 +37,8 @@ #include #define COL_BUTTON_BODY COL_MENUFOOT_PLUS_0 -#define COL_BUTTON_TEXT_ENABLED COL_BLACK -#define COL_BUTTON_TEXT_DISABLED COL_LIGHT_GRAY +#define COL_BUTTON_TEXT_ENABLED COL_MENUCONTENTSELECTED_PLUS_0 +#define COL_BUTTON_TEXT_DISABLED COL_MENUCONTENTINACTIVE_PLUS_0 //! Sub class of CComponentsForm. /*! diff --git a/src/gui/infoviewer_bb.cpp b/src/gui/infoviewer_bb.cpp index 14ea17ae2..ef255ef15 100644 --- a/src/gui/infoviewer_bb.cpp +++ b/src/gui/infoviewer_bb.cpp @@ -449,7 +449,7 @@ void CInfoViewerBB::showBBButtons(bool paintFooter) frameBuffer->paintIcon(bbButtonInfo[i].icon, bbButtonInfo[i].x, BBarY, InfoHeightY_Info); g_Font[SNeutrinoSettings::FONT_TYPE_INFOBAR_SMALL]->RenderString(bbButtonInfo[i].x + bbButtonInfo[i].cx, BBarFontY, - bbButtonInfo[i].w - bbButtonInfo[i].cx, bbButtonInfo[i].text, COL_INFOBAR_TEXT); + bbButtonInfo[i].w - bbButtonInfo[i].cx, bbButtonInfo[i].text, COL_MENUFOOT_TEXT); } } } diff --git a/src/gui/osd_setup.cpp b/src/gui/osd_setup.cpp index 1cea05440..52b62cf80 100644 --- a/src/gui/osd_setup.cpp +++ b/src/gui/osd_setup.cpp @@ -760,6 +760,8 @@ void COsdSetup::showOsdMenueColorSetup(CMenuWidget *menu_colors) NULL, colorSetupNotifier); CColorChooser* chFootcolor = new CColorChooser(LOCALE_COLORMENU_BACKGROUND, &t.menu_Foot_red, &t.menu_Foot_green, &t.menu_Foot_blue, &t.menu_Foot_alpha, colorSetupNotifier); + CColorChooser* chFootTextcolor = new CColorChooser(LOCALE_COLORMENU_TEXTCOLOR, &t.menu_Foot_Text_red, &t.menu_Foot_Text_green, &t.menu_Foot_Text_blue, + NULL, colorSetupNotifier); menu_colors->addItem( new CMenuSeparator(CMenuSeparator::LINE | CMenuSeparator::STRING, LOCALE_COLORMENUSETUP_MENUHEAD)); @@ -822,7 +824,12 @@ void COsdSetup::showOsdMenueColorSetup(CMenuWidget *menu_colors) // footer menu_colors->addItem( new CMenuSeparator(CMenuSeparator::LINE | CMenuSeparator::STRING, LOCALE_COLORMENUSETUP_MENUFOOT)); mf = new CMenuDForwarder(LOCALE_COLORMENU_BACKGROUND, true, NULL, chFootcolor ); - mf->setHint("", LOCALE_MENU_HINT_HEAD_BACK); + mf->setHint("", LOCALE_MENU_HINT_FOOT_BACK); + menu_colors->addItem(mf); + + // footer text + mf = new CMenuDForwarder(LOCALE_COLORMENU_TEXTCOLOR, true, NULL, chFootTextcolor ); + mf->setHint("", LOCALE_MENU_HINT_FOOT_TEXTCOLOR); menu_colors->addItem(mf); // hintbox color gradient diff --git a/src/gui/themes.cpp b/src/gui/themes.cpp index bfbc83640..b97ffe25c 100644 --- a/src/gui/themes.cpp +++ b/src/gui/themes.cpp @@ -278,6 +278,10 @@ void CThemes::setTheme(CConfigFile &configfile) 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_Hint_gradient" , t.menu_Hint_gradient); configfile.setInt32( "menu_Hint_gradient_direction" , t.menu_Hint_gradient_direction); @@ -360,6 +364,10 @@ void CThemes::getTheme(CConfigFile &configfile) t.menu_Foot_red = configfile.getInt32( "menu_Foot_red", 0x10 ); t.menu_Foot_green = configfile.getInt32( "menu_Foot_green", 0x10 ); t.menu_Foot_blue = configfile.getInt32( "menu_Foot_blue", 0x10 ); + t.menu_Foot_Text_alpha = configfile.getInt32( "menu_Foot_Text_alpha", 0x00 ); + t.menu_Foot_Text_red = configfile.getInt32( "menu_Foot_Text_red", 0x28 ); + t.menu_Foot_Text_green = configfile.getInt32( "menu_Foot_Text_green", 0x28 ); + t.menu_Foot_Text_blue = configfile.getInt32( "menu_Foot_Text_blue", 0x28 ); t.menu_Hint_gradient = configfile.getInt32( "menu_Hint_gradient", CC_COLGRAD_COL_B_2_COL_A); t.menu_Hint_gradient_direction = configfile.getInt32( "menu_Hint_gradient_direction", CFrameBuffer::gradientVertical); diff --git a/src/system/locals.h b/src/system/locals.h index 22c148dcc..d7f88b9a0 100644 --- a/src/system/locals.h +++ b/src/system/locals.h @@ -1206,6 +1206,7 @@ typedef enum LOCALE_MENU_HINT_HDD_WAKEUP, LOCALE_MENU_HINT_HDD_WAKEUP_MSG, LOCALE_MENU_HINT_FOOT_BACK, + LOCALE_MENU_HINT_FOOT_TEXTCOLOR, LOCALE_MENU_HINT_HEAD_BACK, LOCALE_MENU_HINT_HEAD_TEXTCOLOR, LOCALE_MENU_HINT_IMAGEINFO, diff --git a/src/system/locals_intern.h b/src/system/locals_intern.h index 1bb32c174..6f74abcdc 100644 --- a/src/system/locals_intern.h +++ b/src/system/locals_intern.h @@ -1206,6 +1206,7 @@ const char * locale_real_names[] = "menu.hint_hdd_wakeup", "menu.hint_hdd_wakeup_msg", "menu.hint_foot_back", + "menu.hint_foot_textcolor", "menu.hint_head_back", "menu.hint_head_textcolor", "menu.hint_imageinfo", diff --git a/src/system/setting_helpers.cpp b/src/system/setting_helpers.cpp index eb35c3ad5..b27faff65 100644 --- a/src/system/setting_helpers.cpp +++ b/src/system/setting_helpers.cpp @@ -170,7 +170,7 @@ void CColorSetupNotifier::setPalette() frameBuffer->paletteGenFade(COL_MENUFOOT, convertSetupColor2RGB(t.menu_Foot_red, t.menu_Foot_green, t.menu_Foot_blue), - convertSetupColor2RGB(int(t.infobar_Text_red*0.6), int(t.infobar_Text_green*0.6), int(t.infobar_Text_blue*0.6)), /*TODO: use own color*/ + convertSetupColor2RGB(t.menu_Foot_Text_red, t.menu_Foot_Text_green, t.menu_Foot_Text_blue), 8, convertSetupAlpha2Alpha( t.menu_Foot_alpha ) ); frameBuffer->paletteGenFade(COL_INFOBAR, @@ -211,8 +211,8 @@ void CColorSetupNotifier::setPalette() // COL_MENUFOOT_TEXT frameBuffer->paletteSetColor(COL_NEUTRINO_TEXT + 2, - convertSetupColor2RGB(int(t.infobar_Text_red*0.6), int(t.infobar_Text_green*0.6), int(t.infobar_Text_blue*0.6)), - convertSetupAlpha2Alpha(t.infobar_alpha)); + convertSetupColor2RGB(t.menu_Foot_Text_red, t.menu_Foot_Text_green, t.menu_Foot_Text_blue), + convertSetupAlpha2Alpha(t.menu_Foot_alpha)); // COL_MENUHEAD_TEXT frameBuffer->paletteSetColor(COL_NEUTRINO_TEXT + 3, diff --git a/src/system/settings.h b/src/system/settings.h index 27bc1def6..4423ea7a8 100644 --- a/src/system/settings.h +++ b/src/system/settings.h @@ -99,6 +99,11 @@ struct SNeutrinoTheme unsigned char menu_Foot_green; unsigned char menu_Foot_blue; + unsigned char menu_Foot_Text_alpha; + unsigned char menu_Foot_Text_red; + unsigned char menu_Foot_Text_green; + unsigned char menu_Foot_Text_blue; + int menu_Hint_gradient; int menu_Hint_gradient_direction; int menu_ButtonBar_gradient;