mirrors/recycled-ni-neutrino
1
0
Fork 0
mirror of https://github.com/tuxbox-fork-migrations/recycled-ni-neutrino.git synced 2025-09-02 18:31:12 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'cst-next' of git://coolstreamtech.de/cst-public-gui-neutrino into ni/cst-next

Browse Source 
Conflicts:
	data/locale/deutsch.locale
	data/locale/english.locale
	src/system/locals.h
	src/system/locals_intern.h


Origin commit data
------------------
Branch: ni/coolstream
Commit: 796bd79e0e
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-06-02 (Thu, 02 Jun 2016)



------------------
This commit was generated by Migit
This commit is contained in:
vanhofen
2016-06-02 21:42:10 +02:00
parent d9980f2d87 8e429f9e6a
commit cec7e5b8bb
12 changed files with 110 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/gui/record_setup.cpp
View File

@@ -234,6 +234,11 @@ int CRecordSetup::showRecordSetup()
end_of_recording->setHint("", LOCALE_MENU_HINT_RECORD_END);
recordingSettings->addItem(end_of_recording);
// already_found
CMenuOptionChooser* already_found = new CMenuOptionChooser(LOCALE_RECORDINGMENU_ALREADY_FOUND_CHECK, &g_settings.recording_already_found_check, OPTIONS_OFF0_ON1_OPTIONS, OPTIONS_OFF0_ON1_OPTION_COUNT, true);
already_found->setHint(NEUTRINO_ICON_HINT_IMAGELOGO, LOCALE_MENU_HINT_RECORD_ALREADY_FOUND_CHECK);
recordingSettings->addItem(already_found);
if (!g_settings.easymenu) {
CMenuOptionChooser* slow_warn = new CMenuOptionChooser(LOCALE_RECORDINGMENU_SLOW_WARN, &g_settings.recording_slow_warning, OPTIONS_OFF0_ON1_OPTIONS, OPTIONS_OFF0_ON1_OPTION_COUNT, true);
slow_warn->setHint("", LOCALE_MENU_HINT_RECORD_SLOW_WARN);