2006-03-08: 3.4.4betav3.4.4beta

- Added script "convert.sh" to convert the AutoTimer information in VDR's timers.conf to the new format (see "convert.sh" for usage).
- Use the summary/aux timer field to store AutoTimer information to be compatible to VDR v1.3.44 and later.
- Removed "Add summary to new timers" option. The EPG summary is no longer copied to the timer's summary/aux field (for VDR 1.3.44+) or always copied (VDR 1.3.43-).
- Made summary textfield readonly while adding/editing a timer.
- Unless NO_EVENTID or NO_EVENTID_ON is used the EPG-ID is stored in every (auto)timer set using VDRAdmin-AM.
- For every timer the current start/stop margins are saved in its summary/aux field. These are used for checking AutoTimers by time.
- Fixed bug while checking for already programmed (auto)timers if not using EPG-ID.

7 files changed, 22 insertions, 12 deletions

diff --git a/template/default/config.html b/template/default/config.html
index 60d6c02..0b8904d 100644
--- a/template/default/config.html
+++ b/template/default/config.html
@@ -408,7 +408,7 @@
 							</td>
 							<td class="col_right"></td>
 						</tr>
-						<tr class="row_odd">
+<!--						<tr class="row_odd">
 							<td class="col_left"></td>
 							<td class="col_label"><h5><%! Add summary to new timers: !%></h5></td>
 							<td class="col_value">
@@ -416,7 +416,7 @@
 								<input type="radio" name="TM_ADD_SUMMARY" value="0" id="tm_add_summary_no" <tmpl_unless tm_add_summary>checked</tmpl_unless> /><label for="tm_add_summary_no"><%! No !%></label>
 							</td>
 							<td class="col_right"></td>
-						</tr>
+						</tr>-->
 						<tr class="footer">
 							<td class="col_left"></td>
 							<td colspan="2"></td>
diff --git a/template/default/copper/style.css b/template/default/copper/style.css
index 6bbb183..20e5210 100644
--- a/template/default/copper/style.css
+++ b/template/default/copper/style.css
@@ -15,6 +15,7 @@ h2 { margin: 0px; font-size: 11px; font-weight: bold; color: black; display: inl
 h3 { margin: 0px; font-size: 11px; font-weight: bold; color: black; }
 h4 { margin: 0px; font-size: 11px; font-weight: normal; font-style: italic; color: black; }
 h5 { margin: 1px 5px; font-size: 11px; font-weight: normal; color: black; text-align: right; }
+h6 { margin: 1px 5px; font-size: 10px; font-weight: normal; color: black; text-align: right; }
 
 label { cursor: default; }
 
diff --git a/template/default/default/style.css b/template/default/default/style.css
index f2ec8c6..f15d39a 100644
--- a/template/default/default/style.css
+++ b/template/default/default/style.css
@@ -81,6 +81,13 @@ h5 {
 	color: black;
 	text-align: right;
 }
+h6 {
+	margin: 1px 5px;
+	font-size: 10px;
+	font-weight: normal;
+	color: black;
+	text-align: right;
+}
 
 label {
 	cursor: default;
diff --git a/template/default/help_config.html b/template/default/help_config.html
index 98ffdc2..b58e31f 100644
--- a/template/default/help_config.html
+++ b/template/default/help_config.html
@@ -137,8 +137,8 @@
 						<dd><%! Here you can (de-)activate the tooltips in the timeline. !%></dd>
 						<dt><%! Tooltips in list: !%></dt>
 						<dd><%! Here you can (de-)activate the tooltips in the list. !%></dd>
-						<dt><%! Add summary to new timers: !%></dt>
-						<dd><%! If you don't want VDRAdmin-AM to add the summary taken from EPG to new timers you can switch it off here. !%></dd>
+<!--						<dt><%! Add summary to new timers: !%></dt>
+						<dd><%! If you don't want VDRAdmin-AM to add the summary taken from EPG to new timers you can switch it off here. !%></dd>-->
 					</dl>
 					<div class="top_link">[<a href="#top"><%! Top !%></a>]</div>
 				</div>
diff --git a/template/default/style.css b/template/default/style.css
index 7d88708..5fa78df 100644
--- a/template/default/style.css
+++ b/template/default/style.css
@@ -15,6 +15,7 @@ h2 { margin: 0px; font-size: 11px; font-weight: bold; color: black; display: inl
 h3 { margin: 0px; font-size: 11px; font-weight: bold; color: black; }
 h4 { margin: 0px; font-size: 11px; font-weight: normal; font-style: italic; color: black; }
 h5 { margin: 1px 5px; font-size: 11px; font-weight: normal; color: black; text-align: right; }
+h6 { margin: 1px 5px; font-size: 10px; font-weight: normal; color: black; text-align: right; }
 
 label { cursor: default; }
 
@@ -59,7 +60,7 @@ label + input { margin-left: 1em; }
 .col_duration { padding-left: 3px; padding-right: 3px; width: 120px; vertical-align: top; }
 .col_name, .col_title * { padding-left: 3px; padding-right: 3px; min-width: 50px; white-space: normal; }
 .col_info, .col_record { width: 65px; text-align: center; }
-.col_active { width: 75px; max-width: 75px; }
+.col_active { width: 75px; }
 .col_stream { width: 70px; max-width: 70px; }
 .col_channel { width: 120px; }
 .col_start, .col_stop, .col_date, .col_time { width: 66px; text-align: right; }
diff --git a/template/default/timer_list.html b/template/default/timer_list.html
index f5b128c..68bb232 100644
--- a/template/default/timer_list.html
+++ b/template/default/timer_list.html
@@ -322,7 +322,7 @@
 								<tmpl_if expr="active == 1"><%! Yes !%></tmpl_if>
 								<tmpl_if expr="(active%32768) == 0"><%! No !%></tmpl_if>
 								<tmpl_if expr="active == 5"><%! VPS !%></tmpl_if>
-								<tmpl_if expr="active == 32769"><%! Auto !%></tmpl_if>
+								<tmpl_if expr="autotimer">(<%! Auto !%>)</tmpl_if>
 							</a>
 						</div>
 					</td>
diff --git a/template/default/timer_new.html b/template/default/timer_new.html
index 19751e1..b6ac8c5 100644
--- a/template/default/timer_new.html
+++ b/template/default/timer_new.html
@@ -81,11 +81,12 @@
 				<td class="col_left"></td>
 				<td class="col_label"><h5><%! AutoTimer Checking: !%></h5></td>
 				<td class="col_value">
-					<tmpl_if expr="event_id > 1">
-						<input type="radio" name="event_id" value="<tmpl_var event_id>" id="event_id" checked /><label for="event_id"><%! Transmission Identification !%></label>
+					<input type="hidden" name="event_id" value="<tmpl_var event_id>"/>
+					<tmpl_if expr="at_epg == 1">
+						<input type="radio" name="autotimer" value="2" id="event_id" <tmpl_if expr="autotimer == 2">checked</tmpl_if> /><label for="event_id"><%! Transmission Identification !%></label>
 					</tmpl_if>
-					<input type="radio" name="event_id" value="1" id="event_time" <tmpl_if expr="event_id == 1">checked</tmpl_if> /><label for="event_time"><%! Time !%></label>
-					<input type="radio" name="event_id" value="0" id="event_off" <tmpl_if expr="event_id == 0">checked</tmpl_if> /><label for="event_off"><%! off !%></label>
+					<input type="radio" name="autotimer" value="1" id="event_time" <tmpl_if expr="autotimer == 1">checked</tmpl_if> /><label for="event_time"><%! Time !%></label>
+					<input type="radio" name="autotimer" value="0" id="event_off" <tmpl_if expr="autotimer == 0">checked</tmpl_if> /><label for="event_off"><%! off !%></label>
 				</td>
 				<td class="col_right"></td>
 			</tr>
@@ -165,8 +166,8 @@
 			</tr>
 			<tr class="row_odd">
 				<td class="col_left"></td>
-				<td class="col_label" valign="top"><h5><%! Summary: !%></h5></td>
-				<td class="col_value"><textarea name="summary" rows="6" cols="80"><tmpl_var summary></textarea></td>
+				<td class="col_label" valign="top"><h5><%! Summary: !%></h5><h6>(<%! readonly !%>)</h6></td>
+				<td class="col_value"><textarea name="summary" rows="6" cols="80" readonly="readonly"><tmpl_var summary></textarea></td>
 				<td class="col_right"></td>
 			</tr>
 			<tr class="footer">