From d7c0bcd68fb2f739c2e4807cde8aa960e864ea24 Mon Sep 17 00:00:00 2001 From: thilo Date: Mon, 7 Nov 2011 20:35:07 +0000 Subject: [PATCH] *neutrino record_setup: moved zapto pre time option from misc to record-setup git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-beta@1837 e54a6e83-5905-42d5-8d5c-058d10e6a962 --- src/gui/miscsettings_menu.cpp | 1 - src/gui/record_setup.cpp | 6 ++++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/src/gui/miscsettings_menu.cpp b/src/gui/miscsettings_menu.cpp index 39e30d19c..54ef10f2e 100644 --- a/src/gui/miscsettings_menu.cpp +++ b/src/gui/miscsettings_menu.cpp @@ -228,7 +228,6 @@ void CMiscMenue::showMiscSettingsMenuGeneral(CMenuWidget *ms_general) ms_general->addItem(new CMenuOptionChooser(LOCALE_EXTRA_START_TOSTANDBY, &g_settings.power_standby, OPTIONS_OFF0_ON1_OPTIONS, OPTIONS_OFF0_ON1_OPTION_COUNT, true)); ms_general->addItem(new CMenuOptionChooser(LOCALE_EXTRA_CACHE_TXT, (int *)&g_settings.cacheTXT, OPTIONS_OFF0_ON1_OPTIONS, OPTIONS_OFF0_ON1_OPTION_COUNT, true)); - ms_general->addItem(new CMenuOptionNumberChooser(LOCALE_MISCSETTINGS_ZAPTO_PRE_TIME, &g_settings.zapto_pre_time, true, 0, 10)); //fan speed if (g_info.has_fan) { diff --git a/src/gui/record_setup.cpp b/src/gui/record_setup.cpp index 04e5c69f2..522af6113 100644 --- a/src/gui/record_setup.cpp +++ b/src/gui/record_setup.cpp @@ -222,12 +222,14 @@ void CRecordSetup::showRecordTimerSetup(CMenuWidget *menu_timersettings) CMenuForwarder *fTimerAfter = new CMenuForwarder(LOCALE_TIMERSETTINGS_RECORD_SAFETY_TIME_AFTER, true, g_settings.record_safety_time_after, timerAfter); //announce - CMenuOptionChooser* zapAnnounce = new CMenuOptionChooser(LOCALE_RECORDINGMENU_ZAP_ON_ANNOUNCE, &g_settings.recording_zap_on_announce, OPTIONS_OFF0_ON1_OPTIONS, OPTIONS_OFF0_ON1_OPTION_COUNT, true); + CMenuOptionChooser* chzapAnnounce = new CMenuOptionChooser(LOCALE_RECORDINGMENU_ZAP_ON_ANNOUNCE, &g_settings.recording_zap_on_announce, OPTIONS_OFF0_ON1_OPTIONS, OPTIONS_OFF0_ON1_OPTION_COUNT, true); + CMenuOptionNumberChooser *chzapCorr = new CMenuOptionNumberChooser(LOCALE_MISCSETTINGS_ZAPTO_PRE_TIME, &g_settings.zapto_pre_time, true, 0, 10); menu_timersettings->addIntroItems(LOCALE_TIMERSETTINGS_SEPARATOR); menu_timersettings->addItem(fTimerBefore); menu_timersettings->addItem(fTimerAfter); - menu_timersettings->addItem(zapAnnounce); + menu_timersettings->addItem(chzapAnnounce); + menu_timersettings->addItem(chzapCorr); }