From 53d9395cdd5bfb149ccc39b0b6728c68dbc9fa80 Mon Sep 17 00:00:00 2001 From: Thomas Keil Date: Tue, 24 Apr 2007 17:09:38 +0000 Subject: Various stuff, I'm in a hurry --- README | 1 + css/styles.css | 37 ++ images/Makefile | 3 +- images/button_green.png | Bin 638 -> 413 bytes images/button_red.png | Bin 611 -> 412 bytes pages/edit_searchtimer.ecpp | 850 ++++++++++++++++++++++++-------------------- pages/edit_timer.ecpp | 5 +- pages/searchtimers.ecpp | 6 +- 8 files changed, 502 insertions(+), 400 deletions(-) diff --git a/README b/README index bfccfc0..6a8a9f3 100644 --- a/README +++ b/README @@ -3,6 +3,7 @@ This is a "plugin" for the Video Disk Recorder (VDR). Written by: Thomas Keil Sascha Volkenandt Dieter Hametner + Christian Wieninger Project's homepage: URL diff --git a/css/styles.css b/css/styles.css index 82919b5..c6630f0 100644 --- a/css/styles.css +++ b/css/styles.css @@ -261,6 +261,37 @@ button.smallbutton { cursor: pointer; } +button.green { + width: 100px; + height: 20px; + background-color: inherit; + background-image: url(button_green.png); + background-repeat: no-repeat; + color: #FFFFFF; + font-size: 12px; + border: 0px; + vertical-align: middle; + text-align: center; + cursor: pointer; + padding-bottom: 3px; +} + +button.red { + width: 100px; + height: 20px; + background-color: inherit; + background-image: url(button_red.png); + background-repeat: no-repeat; + color: #FFFFFF; + font-size: 11px; + border: 0px; + vertical-align: middle; + text-align: center; + cursor: pointer; + padding-bottom: 3px; +} + + table td.buttonpanel { text-align: right; } @@ -626,12 +657,18 @@ table.edit tr td { table.edit tr td.label { font-weight: bold; + vertical-align: top; } table.edit tr.active { background: #DEE6EE; } +table.edit td.blank { + background: none; + border: none; +} + /* ############################## diff --git a/images/Makefile b/images/Makefile index 05f3f7d..fb0f8f7 100644 --- a/images/Makefile +++ b/images/Makefile @@ -21,7 +21,8 @@ OBJS = logo.o record.o active.o inactive.o button_blue.o \ bg_box_l.o bg_box_r.o movie.o menu_line_bg.o \ bg_line.o bg_tools.o zap.o favicon.o bg_line_top.o \ reload.o stop.o one_uparrow.o one_downarrow.o tv.o \ - remotecontrol.o search.o record_timer.o + remotecontrol.o search.o record_timer.o button_red.o \ + button_green.o ### Default rules: diff --git a/images/button_green.png b/images/button_green.png index fe5be5d..45074cf 100644 Binary files a/images/button_green.png and b/images/button_green.png differ diff --git a/images/button_red.png b/images/button_red.png index a73adc3..cfe76b3 100644 Binary files a/images/button_red.png and b/images/button_red.png differ diff --git a/pages/edit_searchtimer.ecpp b/pages/edit_searchtimer.ecpp index d4c3dd4..6476ee1 100644 --- a/pages/edit_searchtimer.ecpp +++ b/pages/edit_searchtimer.ecpp @@ -312,92 +312,104 @@ Blacklists blacklists; function initform() { - changedsearchmode(document.getElementById("search_mode")); - changedchannelmode(document.getElementById("channel_mode")); - changedusetime(document.getElementById("usetime")); - changeduseduration(document.getElementById("useduration")); - changeduseweekday(document.getElementById("useweekday")); - changeduseassearchtimer(document.getElementById("useassearchtimer")); - changeduseextepginfo(document.getElementById("useextepginfo")); - changedavoidrepeats(document.getElementById("avoidrepeats")); - changedblacklistmode(document.getElementById("blacklistmode")); + changedsearchmode(document.getElementById("search_mode")); + changedchannelmode(document.getElementById("channel_mode")); + changedusetime(document.getElementById("usetime")); + changeduseduration(document.getElementById("useduration")); + changeduseweekday(document.getElementById("useweekday")); + changeduseassearchtimer(document.getElementById("useassearchtimer")); + changeduseextepginfo(document.getElementById("useextepginfo")); + changedavoidrepeats(document.getElementById("avoidrepeats")); + changedblacklistmode(document.getElementById("blacklistmode")); + } + + function changedsearchmode(selection) + { + document.getElementById("tolerance").style.display = (selection.options[selection.selectedIndex].value == 5 ? "block" : "none"); + } + + function changedchannelmode(selection) + { + document.getElementById("channelinterval").style.display = (selection.options[selection.selectedIndex].value == 1 ? "block" : "none"); + document.getElementById("channelgroup").style.display = (selection.options[selection.selectedIndex].value == 2 ? "block" : "none"); + } + + function changedusetime(selection) + { + document.getElementById("timesettings").style.display = (selection.checked ? "block" : "none"); + } + + function changeduseduration(selection) + { + document.getElementById("durationsettings").style.display = (selection.checked ? "block" : "none"); + } + + function changeduseweekday(selection) + { + document.getElementById("weekdaysettings").style.display = (selection.checked ? "block" : "none"); + } + + function changeduseassearchtimer(selection) + { + document.getElementById("searchtimermodesettings").style.display = (selection.checked ? "block" : "none"); + changedsearchtimermode(document.getElementById("searchtimer_mode")); + } + + function changedsearchtimermode(selection) + { + document.getElementById("searchtimermode1settings").style.display = + (selection.options[selection.selectedIndex].value == 0 & + document.getElementById("useassearchtimer").checked ? "block" : "none"); + document.getElementById("searchtimermode3settings").style.display = + (selection.options[selection.selectedIndex].value == 2 & + document.getElementById("useassearchtimer").checked ? "block" : "none"); + } + + function changeduseextepginfo(selection) + { + document.getElementById("use_extepg_settings").style.display = (selection.checked ? "block" : "none"); + } + + function changedextepginfo(selection) + { + var i; + document.getElementById(selection.name + "_value").value = ""; + for(i=0;i VDR Live - <$ searchtimer ? tr("Edit search timer") : tr("New search timer") $> @@ -408,321 +420,369 @@ Blacklists blacklists; <& pageelems.logo &> <& menu active=("searchtimers") component=("edit_searchtimer.header") &> -
-
-
- - - - - - - - - - - - - - - - - - - - - - - - - - - - -% if (extEPGInfos.size() > 0) { - - - - + + +% } + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
<$ tr("Search term") $>:
<$ tr("Search mode" ) $>:
-
- -
<$ tr("Match case") $>: id="matchcase"/>
<$ tr("Search in") $>: - /> - - /> - - /> - -
<$ tr("Use extended EPG info" ) $>: - onclick="changeduseextepginfo(this)" id="useextepginfo"/> - +
<$ tr("Use channel" ) $>: + + + + + + +
<$ tr("Use time") $>: + onclick="changedusetime(this)" id="usetime" /> + +
<$ tr("Use duration") $>: + onclick="changeduseduration(this)" id="useduration" /> + +
<$ tr("Use day of week") $>: + onclick="changeduseweekday(this)" id="useweekday" /> + +
<$ tr("Use blacklists" ) $>: + + +
<$ tr("Use in favorites menu") $>:/>
<$ tr("Use as search timer" ) $>: +
+ onclick="changeduseassearchtimer(this)" id="useassearchtimer"/> +
+ + + + +
+ + +
+ +
- <%include>page_exit.eh diff --git a/pages/edit_timer.ecpp b/pages/edit_timer.ecpp index f5e132f..d094d21 100644 --- a/pages/edit_timer.ecpp +++ b/pages/edit_timer.ecpp @@ -208,7 +208,10 @@ cTimer* timer; - + + + + diff --git a/pages/searchtimers.ecpp b/pages/searchtimers.ecpp index 499f908..eab65ce 100644 --- a/pages/searchtimers.ecpp +++ b/pages/searchtimers.ecpp @@ -51,9 +51,9 @@ using namespace vdrlive; UseTime() ? timer->StartTimeFormatted() ?> UseTime() ? timer->StopTimeFormatted() ?>   - .png" alt="" <& tooltip.hint text=(tr("Toggle searchtimer actions (in)active")) &>/> - > - > + .png" alt="" <& tooltip.hint text=(tr("Toggle searchtimer actions (in)active")) &>"/> + > + > <{ -- cgit v1.2.3