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

This commit is contained in:
Stefan Seyfried
2016-01-01 14:10:48 +01:00
36 changed files with 249 additions and 144 deletions

View File

@@ -1,5 +1,5 @@
/*
Neutrino-GUI - DBoxII-Project
Neutrino-GUI - DBoxII-Project
Copyright (C) 2001 Steffen Hehn 'McClean'
and some other guys
@@ -488,6 +488,7 @@ 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_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_timescale_red = configfile.getInt32("progressbar_timescale_red", 0);
@@ -1042,6 +1043,7 @@ void CNeutrinoApp::saveSetup(const char * fname)
configfile.setBool("infobar_sat_display" , g_settings.infobar_sat_display );
configfile.setBool("infobar_show_channeldesc" , g_settings.infobar_show_channeldesc );
configfile.setInt32("infobar_subchan_disp_pos" , g_settings.infobar_subchan_disp_pos );
configfile.setBool("infobar_buttons_usertitle", g_settings.infobar_buttons_usertitle);
configfile.setBool("progressbar_gradient", g_settings.progressbar_gradient);
configfile.setInt32("progressbar_design", g_settings.progressbar_design);
configfile.setInt32("progressbar_timescale_red", g_settings.progressbar_timescale_red);