mirrors/neutrino
1
0
Fork 0
mirror of https://github.com/tuxbox-neutrino/neutrino.git synced 2025-08-29 00:11:14 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into pu/msgbox

Browse Source 
Conflicts:
    	src/gui/followscreenings.cpp
This commit is contained in:
Thilo Graf
2016-11-15 19:49:27 +01:00
parent c8ad32b1e4 d6cb1d206f
commit 2e8c700dd2
8 changed files with 25 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/gui/record_setup.cpp
View File

@@ -338,6 +338,13 @@ void CRecordSetup::showRecordTimerSetup(CMenuWidget *menu_timersettings)
ch->setHint("", LOCALE_MENU_HINT_RECORD_ZAP_PRE_TIME);
ch->setNumberFormat(nf);
menu_timersettings->addItem(ch);
menu_timersettings->addItem(GenericMenuSeparatorLine);
//allow followscreenings
CMenuOptionChooser* followscreenings = new CMenuOptionChooser(LOCALE_TIMERSETTINGS_FOLLOWSCREENINGS, &g_settings.timer_followscreenings, OPTIONS_OFF0_ON1_OPTIONS, OPTIONS_OFF0_ON1_OPTION_COUNT, true);
followscreenings->setHint("", LOCALE_MENU_HINT_TIMER_FOLLOWSCREENINGS);
menu_timersettings->addItem(followscreenings);
}