mirror of
https://github.com/tuxbox-fork-migrations/recycled-ni-neutrino.git
synced 2025-08-28 16:01:10 +02:00
colors: make footer text color configurable
Origin commit data
------------------
Branch: ni/coolstream
Commit: 8c7952011e
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-08-15 (Mon, 15 Aug 2016)
Origin message was:
------------------
- colors: make footer text color configurable
------------------
No further description and justification available within origin commit message!
------------------
This commit was generated by Migit
This commit is contained in:
@@ -1064,6 +1064,7 @@ menu.hint_hdd_sleep Dieser Wert definiert, nach wieviel Minuten die Festplatte b
|
|||||||
menu.hint_hdd_statfs Legen Sie fest, wann die Aufnahmeverzeichnis-Füllstandsanzeige im InfoViewer (und ggf. am VFD-Display) aktualisiert werden darf
|
menu.hint_hdd_statfs Legen Sie fest, wann die Aufnahmeverzeichnis-Füllstandsanzeige im InfoViewer (und ggf. am VFD-Display) aktualisiert werden darf
|
||||||
menu.hint_hdd_tools Formatieren Sie die gefundenen Datenträger bzw. überprüfen Sie deren Dateisystem
|
menu.hint_hdd_tools Formatieren Sie die gefundenen Datenträger bzw. überprüfen Sie deren Dateisystem
|
||||||
menu.hint_foot_back Ändern Sie die Fußleisten-Hintergrundfarbe
|
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_back Ändern Sie die Titel-Hintergrundfarbe
|
||||||
menu.hint_head_textcolor Ändern Sie die Titel-Textfarbe
|
menu.hint_head_textcolor Ändern Sie die Titel-Textfarbe
|
||||||
menu.hint_imageinfo Informationen über die installierte Software
|
menu.hint_imageinfo Informationen über die installierte Software
|
||||||
|
@@ -1064,6 +1064,7 @@ menu.hint_hdd_sleep Select time to stop hdd on inactivity
|
|||||||
menu.hint_hdd_statfs Specify when the recording directory fill level in infoviewer and, if available, on VFD, may be updated
|
menu.hint_hdd_statfs Specify when the recording directory fill level in infoviewer and, if available, on VFD, may be updated
|
||||||
menu.hint_hdd_tools Initialize HDD, check filesystem
|
menu.hint_hdd_tools Initialize HDD, check filesystem
|
||||||
menu.hint_foot_back Change GUI footer background color
|
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_back Change GUI title background color
|
||||||
menu.hint_head_textcolor Change GUI window title text color
|
menu.hint_head_textcolor Change GUI window title text color
|
||||||
menu.hint_imageinfo Information about installed software
|
menu.hint_imageinfo Information about installed software
|
||||||
|
@@ -695,6 +695,8 @@ void COsdSetup::showOsdMenueColorSetup(CMenuWidget *menu_colors)
|
|||||||
NULL, colorSetupNotifier);
|
NULL, colorSetupNotifier);
|
||||||
CColorChooser* chFootcolor = new CColorChooser(LOCALE_COLORMENU_BACKGROUND, &t.menu_Foot_red, &t.menu_Foot_green, &t.menu_Foot_blue,
|
CColorChooser* chFootcolor = new CColorChooser(LOCALE_COLORMENU_BACKGROUND, &t.menu_Foot_red, &t.menu_Foot_green, &t.menu_Foot_blue,
|
||||||
&t.menu_Foot_alpha, colorSetupNotifier);
|
&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));
|
menu_colors->addItem( new CMenuSeparator(CMenuSeparator::LINE | CMenuSeparator::STRING, LOCALE_COLORMENUSETUP_MENUHEAD));
|
||||||
|
|
||||||
@@ -757,7 +759,12 @@ void COsdSetup::showOsdMenueColorSetup(CMenuWidget *menu_colors)
|
|||||||
// footer
|
// footer
|
||||||
menu_colors->addItem( new CMenuSeparator(CMenuSeparator::LINE | CMenuSeparator::STRING, LOCALE_COLORMENUSETUP_MENUFOOT));
|
menu_colors->addItem( new CMenuSeparator(CMenuSeparator::LINE | CMenuSeparator::STRING, LOCALE_COLORMENUSETUP_MENUFOOT));
|
||||||
mf = new CMenuDForwarder(LOCALE_COLORMENU_BACKGROUND, true, NULL, chFootcolor );
|
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);
|
menu_colors->addItem(mf);
|
||||||
|
|
||||||
// hintbox color gradient
|
// hintbox color gradient
|
||||||
|
@@ -278,6 +278,10 @@ void CThemes::setTheme(CConfigFile &configfile)
|
|||||||
configfile.setInt32( "menu_Foot_red", t.menu_Foot_red );
|
configfile.setInt32( "menu_Foot_red", t.menu_Foot_red );
|
||||||
configfile.setInt32( "menu_Foot_green", t.menu_Foot_green );
|
configfile.setInt32( "menu_Foot_green", t.menu_Foot_green );
|
||||||
configfile.setInt32( "menu_Foot_blue", t.menu_Foot_blue );
|
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" , t.menu_Hint_gradient);
|
||||||
configfile.setInt32( "menu_Hint_gradient_direction" , t.menu_Hint_gradient_direction);
|
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_red = configfile.getInt32( "menu_Foot_red", 0x10 );
|
||||||
t.menu_Foot_green = configfile.getInt32( "menu_Foot_green", 0x10 );
|
t.menu_Foot_green = configfile.getInt32( "menu_Foot_green", 0x10 );
|
||||||
t.menu_Foot_blue = configfile.getInt32( "menu_Foot_blue", 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_OFF);
|
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_Hint_gradient_direction = configfile.getInt32( "menu_Hint_gradient_direction", CFrameBuffer::gradientVertical);
|
||||||
|
@@ -1091,6 +1091,7 @@ typedef enum
|
|||||||
LOCALE_MENU_HINT_HDD_STATFS,
|
LOCALE_MENU_HINT_HDD_STATFS,
|
||||||
LOCALE_MENU_HINT_HDD_TOOLS,
|
LOCALE_MENU_HINT_HDD_TOOLS,
|
||||||
LOCALE_MENU_HINT_FOOT_BACK,
|
LOCALE_MENU_HINT_FOOT_BACK,
|
||||||
|
LOCALE_MENU_HINT_FOOT_TEXTCOLOR,
|
||||||
LOCALE_MENU_HINT_HEAD_BACK,
|
LOCALE_MENU_HINT_HEAD_BACK,
|
||||||
LOCALE_MENU_HINT_HEAD_TEXTCOLOR,
|
LOCALE_MENU_HINT_HEAD_TEXTCOLOR,
|
||||||
LOCALE_MENU_HINT_IMAGEINFO,
|
LOCALE_MENU_HINT_IMAGEINFO,
|
||||||
|
@@ -1091,6 +1091,7 @@ const char * locale_real_names[] =
|
|||||||
"menu.hint_hdd_statfs",
|
"menu.hint_hdd_statfs",
|
||||||
"menu.hint_hdd_tools",
|
"menu.hint_hdd_tools",
|
||||||
"menu.hint_foot_back",
|
"menu.hint_foot_back",
|
||||||
|
"menu.hint_foot_textcolor",
|
||||||
"menu.hint_head_back",
|
"menu.hint_head_back",
|
||||||
"menu.hint_head_textcolor",
|
"menu.hint_head_textcolor",
|
||||||
"menu.hint_imageinfo",
|
"menu.hint_imageinfo",
|
||||||
|
@@ -170,7 +170,7 @@ void CColorSetupNotifier::setPalette()
|
|||||||
|
|
||||||
frameBuffer->paletteGenFade(COL_MENUFOOT,
|
frameBuffer->paletteGenFade(COL_MENUFOOT,
|
||||||
convertSetupColor2RGB(t.menu_Foot_red, t.menu_Foot_green, t.menu_Foot_blue),
|
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 ) );
|
8, convertSetupAlpha2Alpha( t.menu_Foot_alpha ) );
|
||||||
|
|
||||||
frameBuffer->paletteGenFade(COL_INFOBAR,
|
frameBuffer->paletteGenFade(COL_INFOBAR,
|
||||||
@@ -211,8 +211,8 @@ void CColorSetupNotifier::setPalette()
|
|||||||
|
|
||||||
// COL_MENUFOOT_TEXT
|
// COL_MENUFOOT_TEXT
|
||||||
frameBuffer->paletteSetColor(COL_NEUTRINO_TEXT + 2,
|
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)),
|
convertSetupColor2RGB(t.menu_Foot_Text_red, t.menu_Foot_Text_green, t.menu_Foot_Text_blue),
|
||||||
convertSetupAlpha2Alpha(t.infobar_alpha));
|
convertSetupAlpha2Alpha(t.menu_Foot_alpha));
|
||||||
|
|
||||||
// COL_MENUHEAD_TEXT
|
// COL_MENUHEAD_TEXT
|
||||||
frameBuffer->paletteSetColor(COL_NEUTRINO_TEXT + 3,
|
frameBuffer->paletteSetColor(COL_NEUTRINO_TEXT + 3,
|
||||||
|
@@ -99,6 +99,11 @@ struct SNeutrinoTheme
|
|||||||
unsigned char menu_Foot_green;
|
unsigned char menu_Foot_green;
|
||||||
unsigned char menu_Foot_blue;
|
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;
|
||||||
int menu_Hint_gradient_direction;
|
int menu_Hint_gradient_direction;
|
||||||
int menu_ButtonBar_gradient;
|
int menu_ButtonBar_gradient;
|
||||||
|
Reference in New Issue
Block a user