diff --git a/src/gui/channellist.cpp b/src/gui/channellist.cpp index d753ec69d..d6e5d4488 100644 --- a/src/gui/channellist.cpp +++ b/src/gui/channellist.cpp @@ -1919,7 +1919,7 @@ void CChannelList::paintItem(int pos, const bool firstpaint) int prg_offset = 0; int title_offset = 0; int rec_mode; - if(g_settings.channellist_progressbar_design != CProgressBar::PB_OFF) + if(g_settings.theme.progressbar_design_channellist != CProgressBar::PB_OFF) { prg_offset = g_Font[SNeutrinoSettings::FONT_TYPE_CHANNELLIST_NUMBER]->getRenderWidth("00:00"); title_offset = OFFSET_INNER_SMALL; @@ -2041,11 +2041,11 @@ void CChannelList::paintItem(int pos, const bool firstpaint) int pb_height = g_Font[SNeutrinoSettings::FONT_TYPE_CHANNELLIST_NUMBER]->getDigitHeight(); CProgressBar pb(x + OFFSET_INNER_SMALL + numwidth + title_offset, ypos + (fheight-pb_height)/2, pb_space + 2, pb_height, COL_MENUCONTENT_PLUS_0); pb.setType(CProgressBar::PB_TIMESCALE); - pb.setDesign(g_settings.channellist_progressbar_design); + pb.setDesign(g_settings.theme.progressbar_design_channellist); pb.setCornerType(0); pb.setStatusColors(COL_PROGRESSBAR_ACTIVE_PLUS_0, COL_PROGRESSBAR_PASSIVE_PLUS_0); //NI int pb_frame = 0; - if (g_settings.channellist_progressbar_design == CProgressBar::PB_MONO && !g_settings.progressbar_gradient) + if (g_settings.theme.progressbar_design_channellist == CProgressBar::PB_MONO && !g_settings.theme.progressbar_gradient) { // add small frame to mono progressbars w/o gradient for a better visibility pb_frame = 1; @@ -2067,7 +2067,7 @@ void CChannelList::paintItem(int pos, const bool firstpaint) if ((int) ch_desc_len > max_desc_len) ch_desc_len = max_desc_len; - if(g_settings.channellist_progressbar_design != CProgressBar::PB_OFF) { + if(g_settings.theme.progressbar_design_channellist != CProgressBar::PB_OFF) { if(displayNext) { struct tm *pStartZeit = localtime(&p_event->startTime); @@ -2102,10 +2102,10 @@ void CChannelList::paintItem(int pos, const bool firstpaint) } else { - if (g_settings.channellist_progressbar_design != CProgressBar::PB_OFF) + if (g_settings.theme.progressbar_design_channellist != CProgressBar::PB_OFF) { pb.setValues(0, pb_max); - if (g_settings.progressbar_design == CProgressBar::PB_GRAPHIC) //NI graphic + if (g_settings.theme.progressbar_design == CProgressBar::PB_GRAPHIC) //NI graphic pb.setGraphic("progressbar_inactive"); pb.paint(); } diff --git a/src/gui/components/cc_item_progressbar.cpp b/src/gui/components/cc_item_progressbar.cpp index fe41988fb..b4bdabe73 100644 --- a/src/gui/components/cc_item_progressbar.cpp +++ b/src/gui/components/cc_item_progressbar.cpp @@ -78,8 +78,8 @@ CProgressBar::CProgressBar( const int x_pos, pb_active_col = active_col; pb_passive_col = passive_col; - pb_design = &g_settings.progressbar_design; - pb_gradient = &g_settings.progressbar_gradient; + pb_design = &g_settings.theme.progressbar_design; + pb_gradient = &g_settings.theme.progressbar_gradient; pb_type = PB_REDLEFT; pb_last_width = -1; @@ -448,7 +448,7 @@ void CProgressBar::paintProgress(bool do_save_bg) return; } if (pb_type == PB_TIMESCALE) - setRgb(g_settings.progressbar_timescale_red, g_settings.progressbar_timescale_green, g_settings.progressbar_timescale_yellow); + setRgb(g_settings.theme.progressbar_timescale_red, g_settings.theme.progressbar_timescale_green, g_settings.theme.progressbar_timescale_yellow); if (!pb_red && !pb_yellow && !pb_green) pb_green = 1; @@ -470,7 +470,7 @@ void CProgressBar::paintProgress(bool do_save_bg) paintInit(do_save_bg); //progress - bool pb_invert = (pb_type == PB_REDRIGHT) || ((pb_type == PB_TIMESCALE) && g_settings.progressbar_timescale_invert); + bool pb_invert = (pb_type == PB_REDRIGHT) || ((pb_type == PB_TIMESCALE) && g_settings.theme.progressbar_timescale_invert); if (cc_allow_paint){ if (!is_painted || (pb_active_width != pb_last_width)) { diff --git a/src/gui/components/cc_item_progressbar.h b/src/gui/components/cc_item_progressbar.h index 6812c2aa4..02d351c26 100644 --- a/src/gui/components/cc_item_progressbar.h +++ b/src/gui/components/cc_item_progressbar.h @@ -161,10 +161,10 @@ class CProgressBar : public CComponentsItem void setType(pb_type_t type); - //set design (overides g_settings.progressbar_design) + //set design (overides g_settings.theme.progressbar_design) void setDesign(int &design) { pb_design = &design; } - //set gradient (overides g_settings.progressbar_gradient) + //set gradient (overides g_settings.theme.progressbar_gradient) void setGradient(int &gradient) { pb_gradient = &gradient; } }; diff --git a/src/gui/moviebrowser/mb.cpp b/src/gui/moviebrowser/mb.cpp index c01c7d916..a20f84393 100644 --- a/src/gui/moviebrowser/mb.cpp +++ b/src/gui/moviebrowser/mb.cpp @@ -2824,37 +2824,24 @@ bool CMovieBrowser::onSortMovieInfoHandleList(std::vector& handl void CMovieBrowser::updateDir(void) { - struct stat info; - m_dir.clear(); - #if 0 // check if there is a movie dir and if we should use it if (g_settings.network_nfs_moviedir[0] != 0) { - if (!(stat(g_settings.network_nfs_moviedir.c_str(), &info) == 0 && S_ISDIR(info.st_mode))) - m_settings.storageDirMovieUsed = false; - std::string name = g_settings.network_nfs_moviedir; addDir(name,&m_settings.storageDirMovieUsed); } #endif - // check if there is a record dir and if we should use it if (!g_settings.network_nfs_recordingdir.empty()) { - if (!(stat(g_settings.network_nfs_recordingdir.c_str(), &info) == 0 && S_ISDIR(info.st_mode))) - m_settings.storageDirRecUsed = false; - addDir(g_settings.network_nfs_recordingdir, &m_settings.storageDirRecUsed); cHddStat::getInstance()->statOnce(); } for (int i = 0; i < MB_MAX_DIRS; i++) { - if (!(stat(m_settings.storageDir[i].c_str(), &info) == 0 && S_ISDIR(info.st_mode))) - m_settings.storageDirUsed[i] = false; - if (!m_settings.storageDir[i].empty()) addDir(m_settings.storageDir[i],&m_settings.storageDirUsed[i]); } diff --git a/src/gui/osd_progressbar_setup.cpp b/src/gui/osd_progressbar_setup.cpp index a1c2c0dce..4f8140b50 100644 --- a/src/gui/osd_progressbar_setup.cpp +++ b/src/gui/osd_progressbar_setup.cpp @@ -86,10 +86,10 @@ int CProgressbarSetup::exec(CMenuTarget* parent, const std::string &actionKey) printf("[neutrino] init progressbar menu setup...\n"); if (actionKey == "reset") { - g_settings.progressbar_timescale_red = 0; - g_settings.progressbar_timescale_green = 100; - g_settings.progressbar_timescale_yellow = 70; - g_settings.progressbar_timescale_invert = false; + g_settings.theme.progressbar_timescale_red = 0; + g_settings.theme.progressbar_timescale_green = 100; + g_settings.theme.progressbar_timescale_yellow = 70; + g_settings.theme.progressbar_timescale_invert = false; return menu_return::RETURN_REPAINT; } @@ -107,12 +107,12 @@ int CProgressbarSetup::showMenu() // general progress bar design CMenuOptionChooser *mc = new CMenuOptionChooser(LOCALE_MISCSETTINGS_PROGRESSBAR_DESIGN_LONG, - &g_settings.progressbar_design, PROGRESSBAR_COLOR_OPTIONS + 1, PROGRESSBAR_COLOR_OPTION_COUNT - 1, true, this); + &g_settings.theme.progressbar_design, PROGRESSBAR_COLOR_OPTIONS + 1, PROGRESSBAR_COLOR_OPTION_COUNT - 1, true, this); mc->setHint("", LOCALE_MENU_HINT_PROGRESSBAR_COLOR); m.addItem(mc); // progress bar gradient - mc = new CMenuOptionChooser(LOCALE_MISCSETTINGS_PROGRESSBAR_GRADIENT, &g_settings.progressbar_gradient, OPTIONS_OFF0_ON1_OPTIONS, OPTIONS_OFF0_ON1_OPTION_COUNT, true, this); + mc = new CMenuOptionChooser(LOCALE_MISCSETTINGS_PROGRESSBAR_GRADIENT, &g_settings.theme.progressbar_gradient, OPTIONS_OFF0_ON1_OPTIONS, OPTIONS_OFF0_ON1_OPTION_COUNT, true, this); mc->setHint("", LOCALE_MENU_HINT_PROGRESSBAR_GRADIENT); m.addItem(mc); @@ -124,25 +124,25 @@ int CProgressbarSetup::showMenu() CMenuOptionNumberChooser *nc; - nc = new CMenuOptionNumberChooser(LOCALE_MISCSETTINGS_PROGRESSBAR_TIMESCALE_RED, &g_settings.progressbar_timescale_red, true, 0, 100, this); + nc = new CMenuOptionNumberChooser(LOCALE_MISCSETTINGS_PROGRESSBAR_TIMESCALE_RED, &g_settings.theme.progressbar_timescale_red, true, 0, 100, this); nc->setNumericInput(true); nc->setNumberFormat("%d %%"); nc->setHint("", LOCALE_MENU_HINT_PROGRESSBAR_TIMESCALE_RED); m.addItem(nc); - nc = new CMenuOptionNumberChooser(LOCALE_MISCSETTINGS_PROGRESSBAR_TIMESCALE_YELLOW, &g_settings.progressbar_timescale_yellow, true, 0, 100, this); + nc = new CMenuOptionNumberChooser(LOCALE_MISCSETTINGS_PROGRESSBAR_TIMESCALE_YELLOW, &g_settings.theme.progressbar_timescale_yellow, true, 0, 100, this); nc->setNumericInput(true); nc->setNumberFormat("%d %%"); nc->setHint("", LOCALE_MENU_HINT_PROGRESSBAR_TIMESCALE_YELLOW); m.addItem(nc); - nc = new CMenuOptionNumberChooser(LOCALE_MISCSETTINGS_PROGRESSBAR_TIMESCALE_GREEN, &g_settings.progressbar_timescale_green, true, 0, 100, this); + nc = new CMenuOptionNumberChooser(LOCALE_MISCSETTINGS_PROGRESSBAR_TIMESCALE_GREEN, &g_settings.theme.progressbar_timescale_green, true, 0, 100, this); nc->setNumericInput(true); nc->setNumberFormat("%d %%"); nc->setHint("", LOCALE_MENU_HINT_PROGRESSBAR_TIMESCALE_GREEN); m.addItem(nc); - mc = new CMenuOptionChooser(LOCALE_MISCSETTINGS_PROGRESSBAR_TIMESCALE_INVERT, &g_settings.progressbar_timescale_invert, PROGRESSBAR_TIMESCALE_INVERT_OPTIONS, PROGRESSBAR_TIMESCALE_INVERT_OPTION_COUNT, true, this); + mc = new CMenuOptionChooser(LOCALE_MISCSETTINGS_PROGRESSBAR_TIMESCALE_INVERT, &g_settings.theme.progressbar_timescale_invert, PROGRESSBAR_TIMESCALE_INVERT_OPTIONS, PROGRESSBAR_TIMESCALE_INVERT_OPTION_COUNT, true, this); mc->setHint("", LOCALE_MENU_HINT_PROGRESSBAR_TIMESCALE_INVERT); m.addItem(mc); @@ -158,14 +158,14 @@ int CProgressbarSetup::showMenu() // extended channel list (progressbars) m.addItem(new CMenuSeparator(CMenuSeparator::LINE | CMenuSeparator::STRING, LOCALE_MAINMENU_CHANNELS)); - mc = new CMenuOptionChooser(LOCALE_CHANNELLIST_EXTENDED, &g_settings.channellist_progressbar_design, PROGRESSBAR_COLOR_OPTIONS, PROGRESSBAR_COLOR_OPTION_COUNT, true, this); + mc = new CMenuOptionChooser(LOCALE_CHANNELLIST_EXTENDED, &g_settings.theme.progressbar_design_channellist, PROGRESSBAR_COLOR_OPTIONS, PROGRESSBAR_COLOR_OPTION_COUNT, true, this); mc->setHint("", LOCALE_MENU_HINT_CHANNELLIST_EXTENDED); m.addItem(mc); mb = new CMenuProgressbar(LOCALE_MISCSETTINGS_PROGRESSBAR_PREVIEW); mb->setHint("", LOCALE_MENU_HINT_PROGRESSBAR_PREVIEW); mb->getScale()->setType(CProgressBar::PB_TIMESCALE); - mb->getScale()->setDesign(g_settings.channellist_progressbar_design); + mb->getScale()->setDesign(g_settings.theme.progressbar_design_channellist); mb->getScale()->doPaintBg(false); m.addItem(mb); diff --git a/src/gui/osd_setup.cpp b/src/gui/osd_setup.cpp index 35095e730..81f31ce8e 100644 --- a/src/gui/osd_setup.cpp +++ b/src/gui/osd_setup.cpp @@ -1311,7 +1311,7 @@ void COsdSetup::showOsdChanlistSetup(CMenuWidget *menu_chanlist) menu_chanlist->addItem(mc); // extended channel list - mc = new CMenuOptionChooser(LOCALE_CHANNELLIST_EXTENDED, &g_settings.channellist_progressbar_design, PROGRESSBAR_COLOR_OPTIONS, PROGRESSBAR_COLOR_OPTION_COUNT, true, this); + mc = new CMenuOptionChooser(LOCALE_CHANNELLIST_EXTENDED, &g_settings.theme.progressbar_design_channellist, PROGRESSBAR_COLOR_OPTIONS, PROGRESSBAR_COLOR_OPTION_COUNT, true, this); mc->setHint("", LOCALE_MENU_HINT_CHANNELLIST_EXTENDED); menu_chanlist->addItem(mc); diff --git a/src/gui/themes.cpp b/src/gui/themes.cpp index 939987d0c..2efb2b704 100644 --- a/src/gui/themes.cpp +++ b/src/gui/themes.cpp @@ -322,6 +322,14 @@ void CThemes::setTheme(CConfigFile &configfile) configfile.setInt32( "clock_Digit_green", t.clock_Digit_green ); configfile.setInt32( "clock_Digit_blue", t.clock_Digit_blue ); + configfile.setInt32( "progressbar_design", t.progressbar_design); + configfile.setInt32( "progressbar_design_channellist", t.progressbar_design_channellist); + configfile.setInt32( "progressbar_gradient", t.progressbar_gradient); + configfile.setInt32( "progressbar_timescale_red", t.progressbar_timescale_red); + configfile.setInt32( "progressbar_timescale_green", t.progressbar_timescale_green); + configfile.setInt32( "progressbar_timescale_yellow", t.progressbar_timescale_yellow); + configfile.setInt32( "progressbar_timescale_invert", t.progressbar_timescale_invert); + //NI configfile.setInt32( "progressbar_active_red", t.progressbar_active_red ); configfile.setInt32( "progressbar_active_green", t.progressbar_active_green ); @@ -421,6 +429,14 @@ void CThemes::getTheme(CConfigFile &configfile) t.clock_Digit_green = configfile.getInt32( "clock_Digit_green", 62 ); t.clock_Digit_blue = configfile.getInt32( "clock_Digit_blue", 62 ); + t.progressbar_design = configfile.getInt32("progressbar_design", CProgressBar::PB_COLOR); + t.progressbar_design_channellist = configfile.getInt32("progressbar_design_channellist", t.progressbar_design); + t.progressbar_gradient = configfile.getInt32("progressbar_gradient", 1); + t.progressbar_timescale_red = configfile.getInt32("progressbar_timescale_red", 0); + t.progressbar_timescale_green = configfile.getInt32("progressbar_timescale_green", 100); + t.progressbar_timescale_yellow = configfile.getInt32("progressbar_timescale_yellow", 70); + t.progressbar_timescale_invert = configfile.getInt32("progressbar_timescale_invert", 0); + //NI t.progressbar_active_red = configfile.getInt32( "progressbar_active_red", 98 ); t.progressbar_active_green = configfile.getInt32( "progressbar_active_green", 98 ); diff --git a/src/gui/volumebar.cpp b/src/gui/volumebar.cpp index d5551f66a..8a1d4523d 100644 --- a/src/gui/volumebar.cpp +++ b/src/gui/volumebar.cpp @@ -194,7 +194,7 @@ void CVolumeBar::initVolumeBarScale() vb_pb->setProgress(vb_pbx, vb_pby, vb_pbw, vb_pbh, *vb_vol, 100); //NI - if (g_settings.progressbar_design == CProgressBar::PB_GRAPHIC) + if (g_settings.theme.progressbar_design == CProgressBar::PB_GRAPHIC) vb_pb->setGraphic("volumebar"); //add progressbar to container diff --git a/src/neutrino.cpp b/src/neutrino.cpp index 728a97f58..bf31092a7 100644 --- a/src/neutrino.cpp +++ b/src/neutrino.cpp @@ -352,6 +352,9 @@ int CNeutrinoApp::loadSetup(const char * fname) } parentallocked = !access(NEUTRINO_PARENTALLOCKED_FILE, R_OK); + //theme/color options + CThemes::getTheme(configfile); + //NI g_settings.inetradio_autostart = configfile.getInt32("inetradio_autostart" , 0); g_settings.lcd4l_support = configfile.getInt32("lcd4l_support" , 0); @@ -531,15 +534,6 @@ int CNeutrinoApp::loadSetup(const char * fname) 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_GRAPHIC); //NI - 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); - g_settings.progressbar_timescale_invert = configfile.getBool("progressbar_timescale_invert", false); g_settings.infobar_analogclock = configfile.getInt32("infobar_analogclock", 0); //NI g_settings.infobar_show = configfile.getInt32("infobar_show", configfile.getInt32("infobar_cn", 0)); //NI g_settings.infobar_show_channellogo = configfile.getInt32("infobar_show_channellogo" , 5 ); //NI @@ -627,8 +621,6 @@ int CNeutrinoApp::loadSetup(const char * fname) g_settings.widget_fade = false; g_settings.widget_fade = configfile.getBool("widget_fade" , false ); - //theme/color options - CThemes::getTheme(configfile); g_settings.osd_colorsettings_advanced_mode = configfile.getBool("osd_colorsettings_advanced_mode", false); //personalize @@ -778,7 +770,6 @@ int CNeutrinoApp::loadSetup(const char * fname) g_settings.eventlist_additional = configfile.getInt32("eventlist_additional", 1); //NI g_settings.eventlist_epgplus = configfile.getInt32("eventlist_epgplus", 1); 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", 0); //NI g_settings.channellist_sort_mode = configfile.getInt32("channellist_sort_mode", 0);//sort mode: alpha, freq, sat @@ -1020,6 +1011,8 @@ int CNeutrinoApp::loadSetup(const char * fname) void CNeutrinoApp::upgradeSetup(const char * fname) { + dprintf(DEBUG_NORMAL, "upgrade/cleanup %s\n", fname); + if (g_settings.version_pseudo < "20160226110000") { if (g_settings.usermenu[SNeutrinoSettings::BUTTON_YELLOW]->items == "7") @@ -1052,12 +1045,35 @@ void CNeutrinoApp::upgradeSetup(const char * fname) g_settings.timer_followscreenings = 2 /*always*/; configfile.deleteKey("recording_tevents"); } + if (g_settings.version_pseudo < "20162912080000") + { + //convert and remove obsolete progressbar_* keys + + g_settings.theme.progressbar_design = configfile.getInt32("progressbar_design", CProgressBar::PB_COLOR); + bool pb_color = configfile.getBool("progressbar_color", true ); + if (!pb_color) + g_settings.theme.progressbar_design = CProgressBar::PB_MONO; + g_settings.theme.progressbar_design_channellist = configfile.getInt32("channellist_progressbar_design", g_settings.theme.progressbar_design); + g_settings.theme.progressbar_gradient = configfile.getBool("progressbar_gradient", true ); + g_settings.theme.progressbar_timescale_red = configfile.getInt32("progressbar_timescale_red", 0); + g_settings.theme.progressbar_timescale_green = configfile.getInt32("progressbar_timescale_green", 100); + g_settings.theme.progressbar_timescale_yellow = configfile.getInt32("progressbar_timescale_yellow", 70); + g_settings.theme.progressbar_timescale_invert = configfile.getBool("progressbar_timescale_invert", false); + + configfile.deleteKey("progressbar_design"); + configfile.deleteKey("channellist_progressbar_design"); + configfile.deleteKey("progressbar_color"); + configfile.deleteKey("progressbar_gradient"); + configfile.deleteKey("progressbar_timescale_red"); + configfile.deleteKey("progressbar_timescale_green"); + configfile.deleteKey("progressbar_timescale_yellow"); + configfile.deleteKey("progressbar_timescale_invert"); + } g_settings.version_pseudo = NEUTRINO_VERSION_PSEUDO; configfile.setString("version_pseudo", g_settings.version_pseudo); - if (configfile.getModifiedFlag()) - configfile.saveConfig(fname); + saveSetup(NEUTRINO_SETTINGS_FILE); } /************************************************************************************** @@ -1071,6 +1087,9 @@ void CNeutrinoApp::saveSetup(const char * fname) dprintf(DEBUG_NORMAL, "error while saving scan-settings!\n"); } + //theme/color options + CThemes::setTheme(configfile); + //NI configfile.setInt32("inetradio_autostart" , g_settings.inetradio_autostart); configfile.setInt32("lcd4l_support" , g_settings.lcd4l_support); @@ -1199,12 +1218,6 @@ void CNeutrinoApp::saveSetup(const char * fname) 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); - configfile.setInt32("progressbar_timescale_green", g_settings.progressbar_timescale_green); - configfile.setInt32("progressbar_timescale_yellow", g_settings.progressbar_timescale_yellow); - configfile.setInt32("progressbar_timescale_invert", g_settings.progressbar_timescale_invert); configfile.setInt32("infobar_analogclock", g_settings.infobar_analogclock); //NI configfile.setInt32("infobar_show", g_settings.infobar_show); configfile.setInt32("infobar_show_channellogo" , g_settings.infobar_show_channellogo ); @@ -1276,8 +1289,6 @@ void CNeutrinoApp::saveSetup(const char * fname) //widget settings configfile.setBool("widget_fade" , g_settings.widget_fade ); - //theme/color options - CThemes::setTheme(configfile); configfile.setBool("osd_colorsettings_advanced_mode", g_settings.osd_colorsettings_advanced_mode); //personalize @@ -1394,7 +1405,6 @@ void CNeutrinoApp::saveSetup(const char * fname) configfile.setInt32("eventlist_epgplus", g_settings.eventlist_epgplus); configfile.setInt32("channellist_additional", g_settings.channellist_additional); configfile.setBool("channellist_epgtext_align_right", g_settings.channellist_epgtext_align_right); - configfile.setInt32("channellist_progressbar_design", g_settings.channellist_progressbar_design); configfile.setInt32("channellist_foot", g_settings.channellist_foot); configfile.setInt32("channellist_new_zap_mode", g_settings.channellist_new_zap_mode); configfile.setInt32("remote_control_hardware", g_settings.remote_control_hardware); diff --git a/src/system/settings.h b/src/system/settings.h index 754553de7..a44c7c442 100644 --- a/src/system/settings.h +++ b/src/system/settings.h @@ -144,6 +144,14 @@ struct SNeutrinoTheme unsigned char clock_Digit_green; unsigned char clock_Digit_blue; + int progressbar_design; + int progressbar_design_channellist; + int progressbar_gradient; + int progressbar_timescale_red; + int progressbar_timescale_green; + int progressbar_timescale_yellow; + int progressbar_timescale_invert; + //NI unsigned char progressbar_active_red; unsigned char progressbar_active_green; @@ -204,12 +212,6 @@ struct SNeutrinoSettings int infobar_show; int infobar_show_channellogo; int infobar_progressbar; - int progressbar_design; - int progressbar_gradient; - int progressbar_timescale_red; - int progressbar_timescale_green; - int progressbar_timescale_yellow; - int progressbar_timescale_invert; int infobar_casystem_display; int infobar_casystem_dotmatrix; int infobar_casystem_frame; @@ -605,7 +607,6 @@ struct SNeutrinoSettings int eventlist_epgplus; int channellist_additional; int channellist_epgtext_align_right; - int channellist_progressbar_design; int channellist_foot; int channellist_new_zap_mode; int channellist_sort_mode; diff --git a/version_pseudo.h b/version_pseudo.h index 24beacfde..bdfc25f5d 100644 --- a/version_pseudo.h +++ b/version_pseudo.h @@ -1 +1 @@ -#define NEUTRINO_VERSION_PSEUDO "20161411235900" +#define NEUTRINO_VERSION_PSEUDO "20162912080000"