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

Revert "Recording Menu: Add option "Always show timer pick list""

Browse Source 
This reverts commit 69d0362c07.


Origin commit data
------------------
Commit: 226ec2c57d
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-11-14 (Mon, 14 Nov 2016)
This commit is contained in:
vanhofen
2016-11-14 23:05:36 +01:00
parent 7f4aad9b4a
commit c0a3c0f5e3
8 changed files with 3 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
data/locale/deutsch.locale
View File

@@ -1444,7 +1444,6 @@ menu.hint_record_fill_warn Zeige Warnung, wenn das Aufnahmemedium zu voll wird
menu.hint_record_slow_warn Zeige Warnung, wenn der Aufnahmepuffer zu überlaufen droht
menu.hint_record_startstop_msg Schaltet die Meldung bei Aufnahmestart/ende ein oder aus.
menu.hint_record_tdir Wählen Sie ein Verzeichnis für Ihre Timeshift-Aufnahmen im temporären Timeshift-Modus
menu.hint_record_tevents Beim wählen der Aufnahme aus dem EPG heraus, Timerliste anzeigen auch wenn keine weiteren Termine vorhanden sind
menu.hint_record_time Aufzeichnungsdauer vor dem Stopp bei der Verwendung von Direktaufzeichnung mit Record-Taste.
menu.hint_record_time_ts Timeshiftdauer vor dem Stopp, wenn temporäres Timeshift aktiviert.
menu.hint_record_timeafter Stellen Sie die Nachlaufzeit für Timer-Aufnahmen ein\nEin Wert von 2 beendet die Aufnahme 2 Minuten nach dem Sendungsende
@@ -2314,7 +2313,6 @@ recordingmenu.server Server
recordingmenu.server_mac MAC-Adresse
recordingmenu.setupnow Einstellungen jetzt übernehmen
recordingmenu.slow_warn Warnung bei langsamen Aufnahmemedien
recordingmenu.tevents Timer Auswahlliste immer anzeigen
recordingmenu.timeshift Timeshift
recordingmenu.tsdir Timeshift Aufnahmeverzeichnis
recordingmenu.vcr Videorekorder

2
data/locale/english.locale
View File

@@ -1444,7 +1444,6 @@ menu.hint_record_fill_warn Show warning, when record medium is nearly full
menu.hint_record_slow_warn Show warning, when record buffer is close to overflow
menu.hint_record_startstop_msg Turns the message when recording start/end on or off.
menu.hint_record_tdir Select directory to save timeshift recordings\nin temporary timeshift mode
menu.hint_record_tevents When choosing recording from EPG, view Timer list even no further entries found
menu.hint_record_time Record duration before stop when\nusing direct record with record button
menu.hint_record_time_ts Timeshift duration before stop when\ntemporary timeshift enabled
menu.hint_record_timeafter Stop record after event end\nin minutes
@@ -2314,7 +2313,6 @@ recordingmenu.server server
recordingmenu.server_mac MAC address
recordingmenu.setupnow Activate changes
recordingmenu.slow_warn Enable slow record warning
recordingmenu.tevents Always show timer pick list
recordingmenu.timeshift Timeshift
recordingmenu.tsdir Timeshift directory
recordingmenu.vcr vcr

2
src/gui/followscreenings.cpp
View File

@@ -155,7 +155,7 @@ void CFollowScreenings::show()
getFollowScreenings();
if (followlist.size() == 1 && !g_settings.recording_tevents) { //NI
if (followlist.size() == 1) {
snprintf(actionstr, sizeof(actionstr), "%lu", followlist.front().startTime);
exec(NULL, actionstr);
} else {

5
src/gui/record_setup.cpp
View File

@@ -266,11 +266,6 @@ int CRecordSetup::showRecordSetup()
cover->setHint("", LOCALE_MENU_HINT_RECORD_AUTO_COVER);
recordingSettings->addItem(cover);
//NI configure timer events in followcreening
CMenuOptionChooser* tevents = new CMenuOptionChooser(LOCALE_RECORDINGMENU_TEVENTS, &g_settings.recording_tevents, OPTIONS_OFF0_ON1_OPTIONS, OPTIONS_OFF0_ON1_OPTION_COUNT, true);
tevents->setHint("", LOCALE_MENU_HINT_RECORD_TEVENTS);
recordingSettings->addItem(tevents);
recordingSettings->addItem(GenericMenuSeparatorLine);
if (!g_settings.easymenu) {

6
src/neutrino.cpp
View File

@@ -718,9 +718,8 @@ int CNeutrinoApp::loadSetup(const char * fname)
g_settings.recording_epg_for_filename = configfile.getBool("recording_epg_for_filename" , true);
g_settings.recording_epg_for_end = configfile.getBool("recording_epg_for_end" , true);
g_settings.recording_save_in_channeldir = configfile.getBool("recording_save_in_channeldir" , false);
g_settings.recording_slow_warning = configfile.getBool("recording_slow_warning" , false); //NI
g_settings.recording_fill_warning = configfile.getInt32("recording_fill_warning", 95); //NI
g_settings.recording_tevents = configfile.getBool("recording_tevents", false); //NI
g_settings.recording_slow_warning = configfile.getBool("recording_slow_warning" , false); //NI
g_settings.recording_fill_warning = configfile.getInt32("recording_fill_warning", 95); //NI
g_settings.recording_startstop_msg = configfile.getBool("recording_startstop_msg" , true);
g_settings.recording_already_found_check = configfile.getBool("recording_already_found_check", false);
@@ -1324,7 +1323,6 @@ void CNeutrinoApp::saveSetup(const char * fname)
configfile.setBool ("recording_save_in_channeldir" , g_settings.recording_save_in_channeldir );
configfile.setBool ("recording_slow_warning" , g_settings.recording_slow_warning );
configfile.setInt32 ("recording_fill_warning" , g_settings.recording_fill_warning ); //NI
configfile.setBool ("recording_tevents" , g_settings.recording_tevents ); //NI
configfile.setBool ("recording_startstop_msg" , g_settings.recording_startstop_msg );
configfile.setBool ("recording_already_found_check" , g_settings.recording_already_found_check );

2
src/system/locals.h
View File

@@ -1471,7 +1471,6 @@ typedef enum
LOCALE_MENU_HINT_RECORD_SLOW_WARN,
LOCALE_MENU_HINT_RECORD_STARTSTOP_MSG,
LOCALE_MENU_HINT_RECORD_TDIR,
LOCALE_MENU_HINT_RECORD_TEVENTS,
LOCALE_MENU_HINT_RECORD_TIME,
LOCALE_MENU_HINT_RECORD_TIME_TS,
LOCALE_MENU_HINT_RECORD_TIMEAFTER,
@@ -2341,7 +2340,6 @@ typedef enum
LOCALE_RECORDINGMENU_SERVER_MAC,
LOCALE_RECORDINGMENU_SETUPNOW,
LOCALE_RECORDINGMENU_SLOW_WARN,
LOCALE_RECORDINGMENU_TEVENTS,
LOCALE_RECORDINGMENU_TIMESHIFT,
LOCALE_RECORDINGMENU_TSDIR,
LOCALE_RECORDINGMENU_VCR,

2
src/system/locals_intern.h
View File

@@ -1471,7 +1471,6 @@ const char * locale_real_names[] =
"menu.hint_record_slow_warn",
"menu.hint_record_startstop_msg",
"menu.hint_record_tdir",
"menu.hint_record_tevents",
"menu.hint_record_time",
"menu.hint_record_time_ts",
"menu.hint_record_timeafter",
@@ -2341,7 +2340,6 @@ const char * locale_real_names[] =
"recordingmenu.server_mac",
"recordingmenu.setupnow",
"recordingmenu.slow_warn",
"recordingmenu.tevents",
"recordingmenu.timeshift",
"recordingmenu.tsdir",
"recordingmenu.vcr",

1
src/system/settings.h
View File

@@ -466,7 +466,6 @@ struct SNeutrinoSettings
int recording_zap_on_announce;
int recording_slow_warning;
int recording_fill_warning; //NI
int recording_tevents; //NI
int recording_startstop_msg;
int shutdown_timer_record_type;
std::vector<timer_remotebox_item> timer_remotebox_ip;