diff --git a/src/gui/osd_setup.cpp b/src/gui/osd_setup.cpp index c62b6da5e..5302d504c 100644 --- a/src/gui/osd_setup.cpp +++ b/src/gui/osd_setup.cpp @@ -598,13 +598,6 @@ int COsdSetup::showOsdSetup() mfWindowSize->setHint("", LOCALE_MENU_HINT_WINDOW_SIZE); osd_menu->addItem(mfWindowSize); -#ifdef CHECK_MERGE - // color progress bar - int pb_color = g_settings.progressbar_color ? g_settings.progressbar_design : -1; - mc = new CMenuOptionChooser(LOCALE_MISCSETTINGS_PROGRESSBAR_DESIGN_LONG, &pb_color, PROGRESSBAR_COLOR_OPTIONS, PROGRESSBAR_COLOR_OPTION_COUNT, true); - mc->setHint("", LOCALE_MENU_HINT_PROGRESSBAR_COLOR); - osd_menu->addItem(mc); -#endif // color gradient mc = new CMenuOptionChooser(LOCALE_COLOR_GRADIENT, &g_settings.gradiant, MESSAGEBOX_NO_YES_OPTIONS, MESSAGEBOX_NO_YES_OPTION_COUNT, true, this ); mc->setHint("", LOCALE_MENU_HINT_COLOR_GRADIENT); @@ -627,12 +620,6 @@ int COsdSetup::showOsdSetup() int res = osd_menu->exec(NULL, ""); - if (pb_color == -1) - g_settings.progressbar_color = 0; - else { - g_settings.progressbar_color = 1; - g_settings.progressbar_design = pb_color; - } if (oldVolumeSize != g_settings.volume_size) CVolumeHelper::getInstance()->refresh(); diff --git a/src/neutrino.cpp b/src/neutrino.cpp index 11b24c08a..148c13822 100644 --- a/src/neutrino.cpp +++ b/src/neutrino.cpp @@ -475,9 +475,6 @@ int CNeutrinoApp::loadSetup(const char * fname) g_settings.infobar_subchan_disp_pos = configfile.getInt32("infobar_subchan_disp_pos" , 0 ); g_settings.progressbar_gradient = configfile.getBool("progressbar_gradient", true ); g_settings.progressbar_design = configfile.getInt32("progressbar_design", CProgressBar::PB_COLOR); - bool pb_color = configfile.getBool("progressbar_color", true ); - if (!pb_color) - g_settings.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);