mirror of
https://github.com/tuxbox-fork-migrations/recycled-ni-neutrino.git
synced 2025-09-06 13:18:27 +02:00
Merge branch 'cst-next' of git://coolstreamtech.de/cst-public-gui-neutrino into ni/cst-next
Conflicts:
data/locale/deutsch.locale
data/locale/english.locale
src/gui/themes.cpp
src/system/locals.h
src/system/locals_intern.h
Origin commit data
------------------
Commit: fd5029560e
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-08-15 (Mon, 15 Aug 2016)
This commit is contained in:
@@ -274,6 +274,10 @@ 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_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_Hint_gradient" , t.menu_Hint_gradient);
|
||||
configfile.setInt32( "menu_Hint_gradient_direction" , t.menu_Hint_gradient_direction);
|
||||
@@ -352,6 +356,10 @@ void CThemes::getTheme(CConfigFile &configfile)
|
||||
t.menu_Content_inactive_Text_red = configfile.getInt32( "menu_Content_inactive_Text_red", 50 );
|
||||
t.menu_Content_inactive_Text_green = configfile.getInt32( "menu_Content_inactive_Text_green", 50 );
|
||||
t.menu_Content_inactive_Text_blue = configfile.getInt32( "menu_Content_inactive_Text_blue", 50 );
|
||||
t.menu_Foot_alpha = configfile.getInt32( "menu_Foot_alpha", 0x08 );
|
||||
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_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);
|
||||
|
Reference in New Issue
Block a user