diff options
| author | Dieter Hametner <dh (plus) vdr (at) gekrumbel (dot) de> | 2008-02-25 01:56:41 +0100 |
|---|---|---|
| committer | Dieter Hametner <dh (plus) vdr (at) gekrumbel (dot) de> | 2008-02-25 01:56:41 +0100 |
| commit | a61f3ee4e41a1c8b575e657a99f8e7ac4276ed17 (patch) | |
| tree | 2605f9a7b4f9d6451e370622b93be4fc973cb351 /pages | |
| parent | 41298f1f32e40644b2837c96c45b02e9ad27f95f (diff) | |
| download | vdr-plugin-live-a61f3ee4e41a1c8b575e657a99f8e7ac4276ed17.tar.gz vdr-plugin-live-a61f3ee4e41a1c8b575e657a99f8e7ac4276ed17.tar.bz2 | |
Added new image for timer conflict notification.
Added a Force function to TimerConflicNotifier.
Added the force notification to timer creation. First tests with this
weren't very promising. Needs some thorough testing also at timer
modification and deletion.
Regenerated language header for backwards compatibilty.
Diffstat (limited to 'pages')
| -rw-r--r-- | pages/edit_timer.ecpp | 3 | ||||
| -rw-r--r-- | pages/timers.ecpp | 1 |
2 files changed, 4 insertions, 0 deletions
diff --git a/pages/edit_timer.ecpp b/pages/edit_timer.ecpp index c269055..7b92551 100644 --- a/pages/edit_timer.ecpp +++ b/pages/edit_timer.ecpp @@ -9,6 +9,7 @@ #include "timers.h" #include "setup.h" #include "epg_events.h" +#include "timerconflict.h" #include "i18n.h" using namespace std; @@ -43,6 +44,7 @@ using namespace vdrlive; <%session scope="global"> bool logged_in(false); string edit_timerreferer; +TimerConflictNotifier timerNotifier; </%session> <%request scope="page"> cTimer* timer; @@ -80,6 +82,7 @@ cTimer* timer; time_t tdate = GetDateFromDatePicker(date, tr("mm/dd/yyyy")); string sdate = DatePickerToC(tdate, "yyyy-mm-dd"); LiveTimerManager().UpdateTimer( timer, flags, channel, weekdays, sdate, start, stop, priority, lifetime, title, aux ); + timerNotifier.SetTimerModification(); return reply.redirect(!edit_timerreferer.empty()?edit_timerreferer:"timers.html"); } } diff --git a/pages/timers.ecpp b/pages/timers.ecpp index bc57b66..029d447 100644 --- a/pages/timers.ecpp +++ b/pages/timers.ecpp @@ -6,6 +6,7 @@ #include "setup.h" #include "i18n.h" #include "epg_events.h" +#include "timerconflict.h" #include "livefeatures.h" using namespace std; |