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

* Timerlist: Ask if the timer of a running recording to be deleted.

Browse Source
This commit is contained in:
micha-bbg
2012-10-14 07:41:21 +02:00
parent 636f7cef05
commit 295efb1e07
5 changed files with 26 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
data/locale/deutsch.locale
View File

@@ -1664,6 +1664,7 @@ timerbar.recordevent Aufnehmen
timerlist.alarmtime Alarmzeit
timerlist.apids Audio PIDs
timerlist.apids_dflt Voreingestellte Tonspuren aufn.
timerlist.ask_to_delete Das Löschen des Timers beendet auch die laufende Aufnahme!\n%sTrotzdem fortsetzen?
timerlist.bouquetselect Bouquet wählen
timerlist.channel Kanal
timerlist.channelselect Kanal wählen

1
data/locale/english.locale
View File

@@ -1664,6 +1664,7 @@ timerbar.recordevent Record
timerlist.alarmtime Alarm time
timerlist.apids Audio PIDs
timerlist.apids_dflt record default audio streams
timerlist.ask_to_delete Deleting of the timer ends the current recording\n%sTo continue anyway?
timerlist.bouquetselect choose bouquet
timerlist.channel Channel
timerlist.channelselect choose channel

25
src/gui/timerlist.cpp
View File

@@ -44,6 +44,7 @@
#include <driver/rcinput.h>
#include <driver/screen_max.h>
#include <driver/fade.h>
#include <driver/record.h>
#include <gui/channellist.h>
#include <gui/color.h>
@@ -571,9 +572,27 @@ int CTimerList::show()
}
else if ((msg == CRCInput::RC_red) && !(timerlist.empty()))
{
Timer->removeTimerEvent(timerlist[selected].eventID);
skipEventID=timerlist[selected].eventID;
update=true;
bool killTimer = true;
if (CRecordManager::getInstance()->RecordingStatus(timerlist[selected].channel_id)) {
std::string title = "";
char buf1[1024];
CEPGData epgdata;
CEitManager::getInstance()->getEPGid(timerlist[selected].epgID, timerlist[selected].epg_starttime, &epgdata);
memset(buf1, '\0', sizeof(buf1));
if (epgdata.title != "")
title = "(" + epgdata.title + ")\n";
snprintf(buf1, sizeof(buf1)-1, g_Locale->getText(LOCALE_TIMERLIST_ASK_TO_DELETE), title.c_str());
if(ShowMsgUTF(LOCALE_RECORDINGMENU_RECORD_IS_RUNNING, buf1,
CMessageBox::mbrYes, CMessageBox::mbYes | CMessageBox::mbNo, NULL, 450, 30, false) == CMessageBox::mbrNo) {
killTimer = false;
update = false;
}
}
if (killTimer) {
Timer->removeTimerEvent(timerlist[selected].eventID);
skipEventID=timerlist[selected].eventID;
update = true;
}
}
else if (msg==CRCInput::RC_green)
{

1
src/system/locals.h
View File

@@ -1691,6 +1691,7 @@ typedef enum
LOCALE_TIMERLIST_ALARMTIME,
LOCALE_TIMERLIST_APIDS,
LOCALE_TIMERLIST_APIDS_DFLT,
LOCALE_TIMERLIST_ASK_TO_DELETE,
LOCALE_TIMERLIST_BOUQUETSELECT,
LOCALE_TIMERLIST_CHANNEL,
LOCALE_TIMERLIST_CHANNELSELECT,

1
src/system/locals_intern.h
View File

@@ -1691,6 +1691,7 @@ const char * locale_real_names[] =
"timerlist.alarmtime",
"timerlist.apids",
"timerlist.apids_dflt",
"timerlist.ask_to_delete",
"timerlist.bouquetselect",
"timerlist.channel",
"timerlist.channelselect",