Merge remote-tracking branch 'uncool/cst-next'

This commit is contained in:
Stefan Seyfried
2015-12-28 16:15:14 +01:00
122 changed files with 5543 additions and 2589 deletions

View File

@@ -65,6 +65,8 @@ struct SNeutrinoTheme
unsigned char menu_Head_Text_blue;
int menu_Head_gradient;
int menu_Head_gradient_direction;
int menu_Separator_gradient_enable;
unsigned char menu_Content_alpha;
unsigned char menu_Content_red;
@@ -97,6 +99,9 @@ struct SNeutrinoTheme
unsigned char menu_Content_inactive_Text_blue;
int menu_Hint_gradient;
int menu_Hint_gradient_direction;
int menu_ButtonBar_gradient;
int menu_ButtonBar_gradient_direction;
unsigned char infobar_alpha;
unsigned char infobar_red;
@@ -114,7 +119,11 @@ struct SNeutrinoTheme
unsigned char infobar_Text_blue;
int infobar_gradient_top;
int infobar_gradient_top_direction;
int infobar_gradient_body;
int infobar_gradient_body_direction;
int infobar_gradient_bottom;
int infobar_gradient_bottom_direction;
unsigned char colored_events_alpha;
unsigned char colored_events_red;
@@ -128,7 +137,6 @@ struct SNeutrinoTheme
unsigned char clock_Digit_red;
unsigned char clock_Digit_green;
unsigned char clock_Digit_blue;
int gradient_c2c;
};
struct SNeutrinoSettings
@@ -175,9 +183,9 @@ struct SNeutrinoSettings
int progressbar_timescale_green;
int progressbar_timescale_yellow;
int progressbar_timescale_invert;
int casystem_display;
int casystem_dotmatrix;
int casystem_frame;
int infobar_casystem_display;
int infobar_casystem_dotmatrix;
int infobar_casystem_frame;
int scrambled_message;
int volume_pos;
int volume_digits;
@@ -236,6 +244,8 @@ struct SNeutrinoSettings
int screensaver_delay;
std::string screensaver_dir;
int screensaver_timeout;
int screensaver_random;
int screensaver_mode;
//vcr
int vcr_AutoSwitch;
@@ -386,7 +396,9 @@ struct SNeutrinoSettings
//widget settings
int widget_fade;
//theme/color options
SNeutrinoTheme theme;
bool osd_colorsettings_advanced_mode;
int contrast_fonts;
@@ -600,6 +612,9 @@ struct SNeutrinoSettings
int flashupdate_createimage_add_spare;
int flashupdate_createimage_add_kernel;
std::string update_dir;
std::string update_dir_opkg;
//BouquetHandling
int bouquetlist_mode;
@@ -717,7 +732,7 @@ struct SNeutrinoSettings
int sms_channel;
std::string font_file;
std::string ttx_font_file;
std::string update_dir;
// USERMENU
typedef enum
{