diff --git a/src/gui/themes.cpp b/src/gui/themes.cpp index 13cfc8f1b..78a2cc972 100644 --- a/src/gui/themes.cpp +++ b/src/gui/themes.cpp @@ -324,8 +324,7 @@ void CThemes::getTheme(CConfigFile &configfile) 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", CC_COLGRAD_LIGHT_2_DARK); - t.menu_Head_gradient = configfile.getInt32( "menu_Head_gradient", 0); + t.menu_Head_gradient = configfile.getInt32("menu_Head_gradient", CC_COLGRAD_OFF); /* no bling */ t.menu_Head_gradient_direction = configfile.getInt32( "menu_Head_gradient_direction", CFrameBuffer::gradientVertical); t.menu_Separator_gradient_enable = configfile.getInt32( "menu_Separator_gradient_enable", 0); @@ -386,7 +385,7 @@ void CThemes::getTheme(CConfigFile &configfile) t.colored_events_blue = configfile.getInt32( "colored_events_blue", 0 ); t.colored_events_channellist = configfile.getInt32( "colored_events_channellist", 0 ); - t.colored_events_infobar = configfile.getInt32( "colored_events_infobar", 2 ); + t.colored_events_infobar = configfile.getInt32("colored_events_infobar", 0); /* no bling bling */ t.clock_Digit_alpha = configfile.getInt32( "clock_Digit_alpha", t.menu_Content_Text_alpha ); t.clock_Digit_red = configfile.getInt32( "clock_Digit_red", t.menu_Content_Text_red ); t.clock_Digit_green = configfile.getInt32( "clock_Digit_green", t.menu_Content_Text_green ); diff --git a/src/neutrino.cpp b/src/neutrino.cpp index 22809b8d0..8f4eedfd9 100644 --- a/src/neutrino.cpp +++ b/src/neutrino.cpp @@ -387,10 +387,10 @@ int CNeutrinoApp::loadSetup(const char * fname) g_settings.audio_volume_percent_ac3 = configfile.getInt32("audio_volume_percent_ac3", 100); g_settings.audio_volume_percent_pcm = configfile.getInt32("audio_volume_percent_pcm", 100); - g_settings.channel_mode = configfile.getInt32("channel_mode", LIST_MODE_PROV); - g_settings.channel_mode_radio = configfile.getInt32("channel_mode_radio", LIST_MODE_PROV); - g_settings.channel_mode_initial = configfile.getInt32("channel_mode_initial", -1); - g_settings.channel_mode_initial_radio = configfile.getInt32("channel_mode_initial_radio", -1); + g_settings.channel_mode = configfile.getInt32("channel_mode", LIST_MODE_FAV); + g_settings.channel_mode_radio = configfile.getInt32("channel_mode_radio", LIST_MODE_FAV); + g_settings.channel_mode_initial = configfile.getInt32("channel_mode_initial", LIST_MODE_FAV); + g_settings.channel_mode_initial_radio = configfile.getInt32("channel_mode_initial_radio", LIST_MODE_FAV); if (g_settings.channel_mode_initial > -1) g_settings.channel_mode = g_settings.channel_mode_initial; if (g_settings.channel_mode_initial_radio > -1) @@ -476,10 +476,10 @@ int CNeutrinoApp::loadSetup(const char * fname) g_settings.infobar_sat_display = configfile.getBool("infobar_sat_display" , true ); g_settings.infobar_show_channeldesc = configfile.getBool("infobar_show_channeldesc" , false ); - g_settings.infobar_subchan_disp_pos = configfile.getInt32("infobar_subchan_disp_pos" , 0 ); + g_settings.infobar_subchan_disp_pos = configfile.getInt32("infobar_subchan_disp_pos", 4); // subchan display in infobar g_settings.infobar_buttons_usertitle = configfile.getBool("infobar_buttons_usertitle", false ); - g_settings.progressbar_gradient = configfile.getBool("progressbar_gradient", true ); - g_settings.progressbar_design = configfile.getInt32("progressbar_design", CProgressBar::PB_COLOR); + g_settings.progressbar_gradient = configfile.getBool("progressbar_gradient", false); + g_settings.progressbar_design = configfile.getInt32("progressbar_design", CProgressBar::PB_MONO); g_settings.progressbar_timescale_red = configfile.getInt32("progressbar_timescale_red", 0); g_settings.progressbar_timescale_green = configfile.getInt32("progressbar_timescale_green", 100); g_settings.progressbar_timescale_yellow = configfile.getInt32("progressbar_timescale_yellow", 70); @@ -487,15 +487,15 @@ int CNeutrinoApp::loadSetup(const char * fname) g_settings.infobar_show = configfile.getInt32("infobar_show", configfile.getInt32("infobar_cn", 1)); g_settings.infobar_show_channellogo = configfile.getInt32("infobar_show_channellogo" , 3 ); g_settings.infobar_progressbar = configfile.getInt32("infobar_progressbar" , 1 ); // below channel name - g_settings.infobar_casystem_display = configfile.getInt32("infobar_casystem_display", 1 );//discreet ca mode default + g_settings.infobar_casystem_display = configfile.getInt32("infobar_casystem_display", 2); //mini ca mode default g_settings.infobar_casystem_dotmatrix = configfile.getInt32("infobar_casystem_dotmatrix", 0 ); g_settings.infobar_casystem_frame = configfile.getInt32("infobar_casystem_frame", 1 ); g_settings.scrambled_message = configfile.getBool("scrambled_message", true ); - g_settings.volume_pos = configfile.getInt32("volume_pos", CVolumeBar::VOLUMEBAR_POS_TOP_RIGHT ); + g_settings.volume_pos = configfile.getInt32("volume_pos", CVolumeBar::VOLUMEBAR_POS_BOTTOM_CENTER); g_settings.volume_digits = configfile.getBool("volume_digits", true); g_settings.volume_size = configfile.getInt32("volume_size", 26 ); g_settings.menu_pos = configfile.getInt32("menu_pos", CMenuWidget::MENU_POS_CENTER); - g_settings.show_menu_hints = configfile.getBool("show_menu_hints", false); + g_settings.show_menu_hints = configfile.getBool("show_menu_hints", true); g_settings.infobar_show_sysfs_hdd = configfile.getBool("infobar_show_sysfs_hdd" , true ); g_settings.show_mute_icon = configfile.getInt32("show_mute_icon" ,0); g_settings.infobar_show_res = configfile.getInt32("infobar_show_res", 0 ); @@ -518,7 +518,7 @@ int CNeutrinoApp::loadSetup(const char * fname) g_settings.pref_subs[i] = configfile.getString(cfg_key, "none"); } g_settings.subs_charset = configfile.getString("subs_charset", "CP1252"); - g_settings.zap_cycle = configfile.getInt32( "zap_cycle", 0 ); + g_settings.zap_cycle = configfile.getInt32("zap_cycle", 1); /* stay in bouquet by default */ //screen saver g_settings.screensaver_delay = configfile.getInt32("screensaver_delay", 1); @@ -703,12 +703,12 @@ int CNeutrinoApp::loadSetup(const char * fname) g_settings.mode_clock = configfile.getInt32( "mode_clock", 0); g_settings.zapto_pre_time = configfile.getInt32( "zapto_pre_time", 0); g_settings.spectrum = configfile.getBool("spectrum" , false); - g_settings.channellist_additional = configfile.getInt32("channellist_additional", 2); //default minitv + g_settings.channellist_additional = configfile.getInt32("channellist_additional", 1); //default no minitv g_settings.eventlist_additional = configfile.getInt32("eventlist_additional", 0); g_settings.channellist_epgtext_align_right = configfile.getBool("channellist_epgtext_align_right" , false); g_settings.channellist_progressbar_design = configfile.getInt32("channellist_progressbar_design", g_settings.progressbar_design); - g_settings.channellist_foot = configfile.getInt32("channellist_foot" , 1);//default next Event - g_settings.channellist_new_zap_mode = configfile.getInt32("channellist_new_zap_mode", 1); + g_settings.channellist_foot = configfile.getInt32("channellist_foot", 0); //default transponder data + g_settings.channellist_new_zap_mode = configfile.getInt32("channellist_new_zap_mode", 0); g_settings.channellist_sort_mode = configfile.getInt32("channellist_sort_mode", 0);//sort mode: alpha, freq, sat g_settings.channellist_numeric_adjust = configfile.getInt32("channellist_numeric_adjust", 0); g_settings.channellist_show_channellogo = configfile.getInt32("channellist_show_channellogo", 1); @@ -741,7 +741,7 @@ int CNeutrinoApp::loadSetup(const char * fname) g_settings.screen_width = configfile.getInt32("screen_width", 0); g_settings.screen_height = configfile.getInt32("screen_height", 0); - g_settings.bigFonts = configfile.getInt32("bigFonts", 0); + g_settings.bigFonts = configfile.getInt32("bigFonts", 1); g_settings.window_size = configfile.getInt32("window_size", 100); g_settings.window_width = configfile.getInt32("window_width", g_settings.window_size); g_settings.window_height = configfile.getInt32("window_height", g_settings.window_size); diff --git a/src/system/settings.cpp b/src/system/settings.cpp index 4ee846df1..8546a2f8c 100644 --- a/src/system/settings.cpp +++ b/src/system/settings.cpp @@ -40,9 +40,9 @@ const struct personalize_settings_t personalize_settings[SNeutrinoSettings::P_SE {"personalize_redbutton" , CPersonalizeGui::PERSONALIZE_ACTIVE_MODE_ENABLED}, // epg/info //main menu - {"personalize_tv_mode" , CPersonalizeGui::PERSONALIZE_MODE_VISIBLE}, - {"personalize_tv_radio_mode" , CPersonalizeGui::PERSONALIZE_MODE_NOTVISIBLE}, //toggle - {"personalize_radio_mode" , CPersonalizeGui::PERSONALIZE_MODE_VISIBLE}, + {"personalize_tv_mode" , CPersonalizeGui::PERSONALIZE_MODE_NOTVISIBLE}, + {"personalize_tv_radio_mode" , CPersonalizeGui::PERSONALIZE_MODE_VISIBLE}, //toggle + {"personalize_radio_mode" , CPersonalizeGui::PERSONALIZE_MODE_NOTVISIBLE}, {"personalize_timer" , CPersonalizeGui::PERSONALIZE_MODE_VISIBLE}, {"personalize_media" , CPersonalizeGui::PERSONALIZE_MODE_VISIBLE}, diff --git a/src/system/settings.h b/src/system/settings.h index 94b43c66f..c6776d231 100644 --- a/src/system/settings.h +++ b/src/system/settings.h @@ -817,7 +817,7 @@ typedef struct time_settings_t const time_settings_struct_t timing_setting[SNeutrinoSettings::TIMING_SETTING_COUNT] = { - { 0, LOCALE_TIMING_MENU }, + { 240, LOCALE_TIMING_MENU }, { 60, LOCALE_TIMING_CHANLIST }, { 240, LOCALE_TIMING_EPG }, { 6, LOCALE_TIMING_INFOBAR },