VDR Live - <$ timer ? tr("Edit timer") : tr("New timer") $>

From fdee52caab6c03c9512ce16ed654838ce621367e Mon Sep 17 00:00:00 2001 From: Sascha Volkenandt Date: Fri, 5 Jan 2007 20:56:33 +0000 Subject: - added new page edit_timer - removed obsolete new_timer - added button and link to edit_timer --- pages/Makefile | 2 +- pages/edit_timer.ecpp | 130 ++++++++++++++++++++++++++++++++++++++++++++++++++ pages/new_timer.ecpp | 114 ------------------------------------------- pages/schedule.ecpp | 1 + pages/timers.ecpp | 4 +- thread.cpp | 1 + 6 files changed, 135 insertions(+), 117 deletions(-) create mode 100644 pages/edit_timer.ecpp delete mode 100644 pages/new_timer.ecpp diff --git a/pages/Makefile b/pages/Makefile index 53266af..4f6422c 100644 --- a/pages/Makefile +++ b/pages/Makefile @@ -17,7 +17,7 @@ VDRDIR ?= ../../../.. OBJS = menu.o event_widget.o channels.o recordings.o schedule.o \ screenshot.o timers.o whats_on_now.o whats_on_next.o \ - keypress.o remote.o + keypress.o remote.o channels_widget.o ### Default rules: diff --git a/pages/edit_timer.ecpp b/pages/edit_timer.ecpp new file mode 100644 index 0000000..aa0ec63 --- /dev/null +++ b/pages/edit_timer.ecpp @@ -0,0 +1,130 @@ +<%pre> +#include +#include +#include +#include "setup.h" +#include "tools.h" +#include "timers.h" + +using namespace vdrlive; + + +<%args> +timerid; + +<{ + ReadLock channelsLock( Channels ); + if (!channelsLock) + return DECLINED; // XXX error page + + { + ReadLock channelsLock2( Channels ); + if (!channelsLock2)return DECLINED; + } + + cMutexLock timersLock( &LiveTimerManager() ); + SortedTimers& timers = LiveTimerManager().GetTimers(); + + cTimer* timer = 0; + if ( !timerid.empty() ) { + timer = timers.GetByTimerId( timerid ); + if ( timer == 0 ) + return DECLINED; // XXX error page + } + +}> + + + VDR Live - <$ timer ? tr("Edit timer") : tr("New timer") $> + + + +

+<& menu > +

+ + + diff --git a/pages/new_timer.ecpp b/pages/new_timer.ecpp deleted file mode 100644 index e8c27e7..0000000 --- a/pages/new_timer.ecpp +++ /dev/null @@ -1,114 +0,0 @@ -<%pre> -#include -#include -#include -#include -#include "setup.h" -#include "tools.h" - -using namespace vdrlive; - - -<%args> - -<{ - ReadLock channelsLock( Channels ); - if (channelsLock) { -}> - - - VDR Live - <$ tr("New timer") $> - - - -

-<& menu > -

- - - -<{ - } -}> \ No newline at end of file diff --git a/pages/schedule.ecpp b/pages/schedule.ecpp index b1443cf..fcc784d 100644 --- a/pages/schedule.ecpp +++ b/pages/schedule.ecpp @@ -43,6 +43,7 @@ int channel = -1; Name() ?>

+<& channels_widget name=("channel") &>

Timer aktiv:	+ Ja + Nein +
+ Kanal: +	+ +
Titel
Tag der Aufnahme
Wochentag	+ Montag + Dienstag + Mittwoch + Donnerstag + Freitag + Samstag + Sonntag +
Startzeit:	:
Endzeit:	:
VPS verwenden
Priorität:
Lebensdauer:

Timer aktiv:	- Ja - Nein -
- Kanal: -	- -
Titel
Tag der Aufnahme
Wochentag	- Montag - Dienstag - Mittwoch - Donnerstag - Freitag - Samstag - Sonntag -
Startzeit:	:
Endzeit:	:
VPS verwenden
Priorität:
Lebensdauer: