Ticket #8783: diff-MythCenter-wide.upatch

File diff-MythCenter-wide.upatch, 93.4 KB (added by newbury@…, 15 years ago)

MythCenter-wide field space revisions in diff -u format against svn 25722

Line 
1diff -r -b -B -i -u /keep/usb/mythtv/themes/MythCenter-wide/base.xml /keep/usb/newmyth/MythCenter-wide/base.xml
2--- /keep/usb/mythtv/themes/MythCenter-wide/base.xml 2010-08-22 09:44:22.870845205 -0400
3+++ /keep/usb/newmyth/MythCenter-wide/base.xml 2010-08-20 23:13:23.000000000 -0400
4@@ -256,16 +257,16 @@
5
6 <!-- Base definition of a buttonlist in wide configuration -->
7 <buttonlist name="basebuttonlist2">
8- <area>0,0,1240,356</area>
9+ <area>0,0,1240,380</area>
10 <layout>vertical</layout>
11 <spacing>4</spacing>
12 <wrapstyle>selection</wrapstyle>
13- <buttonarea>0,0,1200,356</buttonarea>
14+ <buttonarea>0,0,1200,376</buttonarea>
15 <statetype name="buttonitem">
16 <area>0,0,1200,26</area>
17 <state name="active">
18 <textarea name="buttontext">
19- <area>34,2,1138,24</area>
20+ <area>34,2,1156,24</area>
21 <font>basesmall_normal</font>
22 <font state="disabled">basesmall_disabled</font>
23 <font state="error">basesmall_error</font>
24@@ -277,14 +278,14 @@
25 </state>
26 <state name="selectedactive" from="active">
27 <shape name="selectbar">
28- <area>28,0,1144,30</area>
29+ <area>20,0,1156,30</area>
30 <type>roundbox</type>
31 </shape>
32 <textarea name="buttontext">
33- <area>34,2,1138,26</area>
34+ <area>34,2,1156,24</area>
35 <font>base_normal_selected</font>
36 <font state="disabled">basesmall_disabled_selected</font>
37 <font state="error">basesmall_error_selected</font>
38@@ -363,10 +364,12 @@
39
40 <!-- Base definition of a wide button -->
41 <button name="basewidebutton">
42+ <area>0,0,291,44</area>
43 <position>0,0</position>
44 <statetype name="buttonstate">
45 <state name="active">
46 <imagetype name="background">
47+ <area>0,0,290,43</area>
48 <position>0,0</position>
49 <filename>wide_button_background.png</filename>
50 </imagetype>
51@@ -380,14 +383,14 @@
52 </state>
53 <state name="selected" from="active">
54 <imagetype name="background">
55- <area>2,2,282,43</area>
56+ <area>0,0,290,43</area>
57 <filename>wide_button_selected_background.png</filename>
58 </imagetype>
59 </state>
60 <state name="disabled" from="active" />
61 <state name="pushed" from="active">
62 <imagetype name="background">
63- <area>0,0,282,43</area>
64+ <area>0,0,290,43</area>
65 <filename>wide_button_pushed_background.png</filename>
66 </imagetype>
67 <textarea name="text">
68@@ -399,15 +402,15 @@
69
70 <!-- Base definition of a very wide button -->
71 <button name="baseverywidebutton">
72- <area>0,0,496,44</area>
73+ <area>0,0,696,44</area>
74 <statetype name="buttonstate">
75 <state name="active">
76 <imagetype name="background">
77- <area>0,0,495,43</area>
78+ <area>0,0,695,43</area>
79 <filename>very_wide_button_background.png</filename>
80 </imagetype>
81 <textarea name="text">
82- <area>2,2,492,40</area>
83+ <area>2,2,692,40</area>
84 <align>allcenter</align>
85 <font>basesmall_normal_button</font>
86 <font state="selected">basesmall_selected_button</font>
87@@ -416,14 +419,14 @@
88 </state>
89 <state name="selected" from="active">
90 <imagetype name="background">
91- <area>0,0,495,43</area>
92+ <area>0,0,695,43</area>
93 <filename>very_wide_button_selected_background.png</filename>
94 </imagetype>
95 </state>
96 <state name="disabled" from="active" />
97 <state name="pushed" from="active">
98 <imagetype name="background">
99- <area>0,0,495,43</area>
100+ <area>0,0,695,43</area>
101 <filename>very_wide_button_pushed_background.png</filename>
102 </imagetype>
103 <textarea name="text">
104@@ -564,14 +567,14 @@
105
106 <!-- Base definition of a wide spinbox (room for strings) -->
107 <spinbox name="basewidespinbox" from="basespinbox">
108- <area>0,0,496,44</area>
109+ <area>0,0,696,44</area>
110 <layout>horizontal</layout>
111- <buttonarea>0,0,476,44</buttonarea>
112+ <buttonarea>0,0,676,44</buttonarea>
113 <statetype name="buttonitem">
114 <state name="active">
115- <area>0,0,476,44</area>
116+ <area>0,0,676,44</area>
117 <textarea name="buttontext">
118- <area>4,4,468,36</area>
119+ <area>4,4,668,36</area>
120 </textarea>
121 </state>
122 <state name="selectedactive" from="active">
123@@ -580,10 +583,10 @@
124 <state name="selectedinactive" from="active" />
125 </statetype>
126 <statetype name="downscrollarrow">
127- <position>480,2</position>
128+ <position>680,2</position>
129 </statetype>
130 <statetype name="upscrollarrow">
131- <position>480,22</position>
132+ <position>680,22</position>
133 </statetype>
134 </spinbox>
135
136@@ -642,13 +645,13 @@
137
138 <!-- Base definition of a list in wide 'selector' configuration -->
139 <buttonlist name="basewideselector" from="baseselector">
140- <area>0,0,496,44</area>
141- <buttonarea>0,0,476,44</buttonarea>
142+ <area>0,0,696,44</area>
143+ <buttonarea>0,0,676,44</buttonarea>
144 <statetype name="buttonitem">
145 <state name="active">
146- <area>0,0,476,44</area>
147+ <area>0,0,676,44</area>
148 <textarea name="buttontext">
149- <area>14,2,448,40</area>
150+ <area>14,2,648,40</area>
151 </textarea>
152 </state>
153 <state name="selectedactive" from="active">
154@@ -657,21 +660,21 @@
155 <state name="selectedinactive" from="active" />
156 </statetype>
157 <statetype name="downscrollarrow">
158- <position>480,2</position>
159+ <position>680,2</position>
160 </statetype>
161 <statetype name="upscrollarrow">
162- <position>480,22</position>
163+ <position>680,22</position>
164 </statetype>
165 </buttonlist>
166
167 <buttonlist name="baseverywideselector" from="baseselector">
168- <area>0,0,506,44</area>
169- <buttonarea>0,0,496,44</buttonarea>
170+ <area>0,0,710,44</area>
171+ <buttonarea>0,0,696,44</buttonarea>
172 <statetype name="buttonitem">
173 <state name="active">
174- <area>0,0,496,44</area>
175+ <area>0,0,696,44</area>
176 <textarea name="buttontext">
177- <area>2,2,492,40</area>
178+ <area>2,2,692,40</area>
179 <align>allcenter</align>
180 </textarea>
181 </state>
182@@ -681,10 +684,10 @@
183 <state name="selectedinactive" from="active" />
184 </statetype>
185 <statetype name="downscrollarrow">
186- <position>500,2</position>
187+ <position>700,2</position>
188 </statetype>
189 <statetype name="upscrollarrow">
190- <position>500,22</position>
191+ <position>700,22</position>
192 </statetype>
193 </buttonlist>
194
195@@ -693,6 +696,7 @@
196 <area>0,0,0,0</area>
197 <font>basesmall</font>
198 <multiline>no</multiline>
199+ <fill color="#000000" alpha="120" />
200 <align>left</align>
201 </textarea>
202
203@@ -746,7 +750,7 @@
204 <shape name="basebackground">
205 <area>0,0,0,0</area>
206 <type>roundbox</type>
207 </shape>
208@@ -797,7 +801,7 @@
209
210 <shape name="background" from="basebackground">
211 <area>10,10,1260,700</area>
212 </shape>
213
214 <textarea name="title" from="basetextarea">
215@@ -1097,7 +1101,7 @@
216 <filename>ui/background.png</filename>
217 </imagetype>
218
219 <color>#FFFFFF</color>
220 <pixelsize>26</pixelsize>
221 <weight>bold</weight>
222diff -r -b -B -i -u /keep/usb/mythtv/themes/MythCenter-wide/htmls/.svn/entries /keep/usb/newmyth/MythCenter-wide/htmls/.svn/entries
223--- /keep/usb/mythtv/themes/MythCenter-wide/htmls/.svn/entries 2010-08-22 09:43:47.660601398 -0400
224+++ /keep/usb/newmyth/MythCenter-wide/htmls/.svn/entries 2010-03-29 11:57:30.000000000 -0400
225@@ -1,7 +1,7 @@
226 10
227
228 dir
229-25794
230+23850
231 http://svn.mythtv.org/svn/trunk/mythtv/themes/MythCenter-wide/htmls
232 http://svn.mythtv.org/svn
233
234@@ -32,7 +32,7 @@
235
236
237
238-2010-08-22T13:43:47.659597Z
239+2010-03-29T15:57:30.185830Z
240 b336f87670461c6ad29143137b5d6e72
241 2009-08-22T22:40:48.317811Z
242 21442
243@@ -66,7 +66,7 @@
244
245
246
247-2010-08-22T13:43:47.660601Z
248+2010-03-29T15:57:30.186821Z
249 40612c774033928bf08e199ac29d616a
250 2009-08-22T22:40:48.317811Z
251 21442
252diff -r -b -B -i -u /keep/usb/mythtv/themes/MythCenter-wide/recordings-ui.xml /keep/usb/newmyth/MythCenter-wide/recordings-ui.xml
253--- /keep/usb/mythtv/themes/MythCenter-wide/recordings-ui.xml 2010-08-22 09:44:22.871850011 -0400
254+++ /keep/usb/newmyth/MythCenter-wide/recordings-ui.xml 2010-08-19 22:33:44.000000000 -0400
255@@ -117,15 +117,15 @@
256 <state name="marked"></state>
257 </statetype>
258 <textarea name="titlesubtitle" from="buttontext">
259- <area>32,2,656,28</area>
260+ <area>15,2,656,28</area>
261 <align>vcenter</align>
262 </textarea>
263 <textarea name="shortdate" from="titlesubtitle">
264- <area>634,2,120,28</area>
265+ <area>620,2,90,28</area>
266 <align>right,vcenter</align>
267 </textarea>
268 <textarea name="starttime" from="shortdate">
269- <area>760,2,114,28</area>
270+ <area>720,2,150,28</area>
271 <align>right,vcenter</align>
272 </textarea>
273 <statetype name="watched">
274@@ -150,10 +150,10 @@
275 <state name="selectedinactive" from="active" />
276 <state name="selectedactive" from="active">
277 <shape name="selectbar">
278- <area>26,0,854,30</area>
279+ <area>10,0,870,30</area>
280 </shape>
281 <textarea name="titlesubtitle" from="buttontext">
282- <area>32,2,656,28</area>
283+ <area>15,2,656,28</area>
284 <font>basesmall_normal_selected</font>
285 <font state="disabled">basesmall_disabled_selected</font>
286 <font state="error">basesmall_error_selected</font>
287@@ -163,11 +163,11 @@
288 <align>vcenter</align>
289 </textarea>
290 <textarea name="shortdate" from="titlesubtitle">
291- <area>634,2,120,28</area>
292+ <area>620,2,90,28</area>
293 <align>right,vcenter</align>
294 </textarea>
295 <textarea name="starttime" from="shortdate">
296- <area>760,2,114,28</area>
297+ <area>720,2,150,28</area>
298 <align>right,vcenter</align>
299 </textarea>
300 </state>
301@@ -288,11 +288,17 @@
302 </textarea>
303
304 <textarea name="channel" from="basetextarea">
305- <area>24,444,160,30</area>
306+ <area>24,444,256,30</area>
307 </textarea>
308
309 <textarea name="timedate" from="basetextarea">
310- <area>194,444,480,30</area>
311+ <area>364,444,480,30</area>
312+ </textarea>
313+
314+ <textarea name="filesize_str" from="basetextarea">
315+ <area>24,680,190,40</area>
316+ <font>deleterecordings_filesize_font</font>
317+ <align>right</align>
318 </textarea>
319
320 <textarea name="description" from="basetextarea">
321@@ -315,6 +321,24 @@
322 <multiline>yes</multiline>
323 <align>allcenter</align>
324 </textarea>
325+
326+ <progressbar name="usedbar">
327+ <area>250,680,536,38</area>
328+ <layout>horizontal</layout>
329+ <style>reveal</style>
330+ <imagetype name="background">
331+ <filename>progressbar_background.png</filename>
332+ </imagetype>
333+ <imagetype name="progressimage">
334+ <area>0,0,100%,100%</area>
335+ <filename>progressbar_fill2.png</filename>
336+ </imagetype>
337+ </progressbar>
338+
339+ <textarea name="freereport">
340+ <area>260,684,526,34</area>
341+ <font>baselarge</font>
342+ </textarea>
343 </window>
344
345 <window name="deleterecordings">
346@@ -603,21 +627,21 @@
347 </textarea>
348
349 <textarea name="channel" from="basetextarea">
350- <area>24,444,160,30</area>
351+ <area>24,444,256,30</area>
352 </textarea>
353
354 <textarea name="timedate" from="basetextarea">
355- <area>194,444,480,30</area>
356+ <area>364,444,480,30</area>
357 </textarea>
358
359 <textarea name="filesize_str" from="basetextarea">
360- <area>710,430,190,40</area>
361+ <area>24,680,190,40</area>
362 <font>deleterecordings_filesize_font</font>
363 <align>right</align>
364 </textarea>
365
366 <textarea name="description" from="basetextarea">
367- <area>24,484,890,220</area>
368+ <area>24,480,890,200</area>
369 <multiline>yes</multiline>
370 <cutdown>yes</cutdown>
371 <template>%|"SUBTITLE|"% %STARS% %DESCRIPTION%</template>
372@@ -638,7 +662,7 @@
373 </textarea>
374
375 <progressbar name="usedbar">
376- <area>14,664,536,38</area>
377+ <area>250,680,536,38</area>
378 <layout>horizontal</layout>
379 <style>reveal</style>
380 <imagetype name="background">
381@@ -651,7 +675,7 @@
382 </progressbar>
383
384 <textarea name="freereport">
385- <area>24,666,526,34</area>
386+ <area>260,684,526,34</area>
387 <font>baselarge</font>
388 </textarea>
389
390diff -r -b -B -i -u /keep/usb/mythtv/themes/MythCenter-wide/schedule-ui.xml /keep/usb/newmyth/MythCenter-wide/schedule-ui.xml
391--- /keep/usb/mythtv/themes/MythCenter-wide/schedule-ui.xml 2010-08-22 09:44:22.866601089 -0400
392+++ /keep/usb/newmyth/MythCenter-wide/schedule-ui.xml 2010-08-20 22:50:31.000000000 -0400
393@@ -145,7 +145,7 @@
394 </textarea>
395
396 <textarea name="subtitle" from="basetextarea">
397- <area>40,80,376,30</area>
398+ <area>40,80,620,30</area>
399 <align>left,vcenter</align>
400 <font>basesmall</font>
401 </textarea>
402@@ -157,7 +157,7 @@
403 </textarea>
404
405 <textarea name="rectypestatus" from="basetextarea">
406- <area>710,80,530,30</area>
407+ <area>680,80,550,30</area>
408 <align>right,vcenter</align>
409 <font>basesmallyellow</font>
410 </textarea>
411@@ -471,13 +471,14 @@
412 <window name="viewscheduled">
413
414 <textarea name="pagetitle">
415- <area>20,4,570,40</area>
416+ <area>20,4,400,40</area>
417 <font>baselarge</font>
418+ <align>left,bottom</align>
419 <value>Scheduled Recordings</value>
420 </textarea>
421
422 <shape name="list_background" from="basebackground">
423- <area>20,48,1240,370</area>
424+ <area>20,48,1240,380</area>
425 </shape>
426
427 <textarea name="status" from="basetextarea">
428@@ -489,35 +490,37 @@
429 </textarea>
430
431 <textarea name="filterlabel" from="basetextarea">
432- <area>20,430,126,30</area>
433+ <area>30,430,130,30</area>
434 <value>Showing:</value>
435 </textarea>
436
437 <textarea name="filter" from="basetextarea">
438- <area>140,430,150,30</area>
439+ <area>180,430,150,30</area>
440 </textarea>
441
442 <buttonlist name="schedules" from="basebuttonlist2">
443- <position>24,58</position>
444+ <area>30,60,1220,374</area>
445+ <buttonarea>0,0,1200,374</buttonarea>
446+ <spacing>4</spacing>
447 <statetype name="buttonitem">
448 <area>0,0,1200,24</area>
449 <state name="active">
450 <textarea name="shortstarttimedate" from="buttontext">
451- <area>32,2,190,24</area>
452+ <area>10,2,215,24</area>
453 </textarea>
454 <textarea name="channel" from="shortstarttimedate">
455- <area>240,2,190,24</area>
456+ <area>240,2,230,24</area>
457 </textarea>
458 <textarea name="title" from="shortstarttimedate">
459- <area>440,2,690,24</area>
460+ <area>480,2,675,24</area>
461 </textarea>
462 <textarea name="card" from="shortstarttimedate">
463- <area>1144,2,36,24</area>
464+ <area>1165,2,30,24</area>
465 </textarea>
466 </state>
467 <state name="selectedactive" from="active">
468 <textarea name="shortstarttimedate" from="buttontext">
469- <area>32,2,190,24</area>
470+ <area>10,2,215,24</area>
471 <font>base_normal_selected</font>
472 <font state="disabled">basesmall_disabled_selected</font>
473 <font state="error">basesmall_error_selected</font>
474@@ -526,16 +529,16 @@
475 <font state="running">basesmall_running_selected</font>
476 </textarea>
477 <textarea name="channel" from="shortstarttimedate">
478- <area>240,2,190,24</area>
479+ <area>240,2,220,24</area>
480 </textarea>
481 <textarea name="title" from="shortstarttimedate">
482- <area>440,2,690,24</area>
483+ <area>475,2,675,24</area>
484 </textarea>
485 <textarea name="card" from="shortstarttimedate">
486- <area>1144,2,36,24</area>
487+ <area>1165,2,30,24</area>
488 </textarea>
489 <shape name="selectbar">
490- <area>10,0,1176,28</area>
491+ <area>8,0,1180,28</area>
492 <!--<font>basesmallbold</font>-->
493 </shape>
494 </state>
495@@ -544,27 +547,27 @@
496 </buttonlist>
497
498 <textarea name="title" from="basetextarea">
499- <area>20,460,1240,40</area>
500+ <area>30,454,1200,50</area>
501 <font>baselarge</font>
502 </textarea>
503
504 <textarea name="channel" from="basetextarea">
505- <area>20,500,160,30</area>
506+ <area>30,494,360,30</area>
507 </textarea>
508
509 <textarea name="timedate" from="basetextarea">
510- <area>200,500,420,30</area>
511+ <area>410,490,520,30</area>
512 </textarea>
513
514 <textarea name="description" from="basetextarea">
515- <area>20,530,1240,160</area>
516+ <area>30,524,1200,150</area>
517 <multiline>yes</multiline>
518 <cutdown>yes</cutdown>
519 <template>%|"SUBTITLE|"%\n%YEARSTARS%%DESCRIPTION%</template>
520 </textarea>
521
522 <textarea name="rectypestatus" from="basetextarea">
523- <area>830,430,420,30</area>
524+ <area>630,430,620,30</area>
525 <align>right</align>
526 </textarea>
527
528@@ -702,7 +705,7 @@
529 </shape>
530
531 <textarea name="prioritylabel" from="basetextarea">
532- <area>944,14,94,40</area>
533+ <area>900,14,200,40</area>
534 <value>Priority</value>
535 <align>allcenter</align>
536 </textarea>
537@@ -770,25 +773,26 @@
538 </buttonlist>
539
540 <textarea name="title" from="basetextarea">
541- <area>230,450,740,40</area>
542+ <area>24,450,740,40</area>
543 <font>basemedium</font>
544 </textarea>
545
546 <textarea name="scheduleinfo" from="basetextarea">
547- <area>230,490,740,30</area>
548+ <area>24,490,740,30</area>
549 </textarea>
550
551 <textarea name="rec_str" from="basetextarea">
552- <area>230,530,430,30</area>
553+ <area>24,530,430,30</area>
554 </textarea>
555
556 <textarea name="recprioritylabel" from="basetextarea">
557- <area>700,490,170,30</area>
558+ <area>700,490,200,30</area>
559 <value>Priority:</value>
560+ <align>right</align>
561 </textarea>
562
563 <textarea name="recpriority" from="basetextarea">
564- <area>870,490,40,30</area>
565+ <area>920,490,40,30</area>
566 <align>right</align>
567 </textarea>
568
569@@ -799,23 +803,25 @@
570 <textarea name="rectypeprioritylabel" from="recprioritylabel">
571 <position>700,520</position>
572 <value>Type Priority:</value>
573+ <align>right</align>
574 </textarea>
575
576 <textarea name="rectypepriority" from="recpriority">
577- <position>870,520</position>
578+ <position>920,520</position>
579 </textarea>
580
581 <textarea name="finalprioritylabel" from="recprioritylabel">
582 <position>700,550</position>
583 <value>Final Priority:</value>
584+ <align>right</align>
585 </textarea>
586
587 <textarea name="finalpriority" from="recpriority">
588- <position>870,550</position>
589+ <position>920,550</position>
590 </textarea>
591
592 <textarea name="keyinstr" from="basetextarea">
593- <area>0,570,800,30</area>
594+ <area>0,590,1280,30</area>
595 <value>(1) Title (2) Priority (4) Type</value>
596 <align>allcenter</align>
597 </textarea>
598@@ -1129,7 +1135,7 @@
599 <value>Program Listings</value>
600 </textarea>
601 <textarea name="keyinstr" from="basetextarea">
602- <area>500,4,200,40</area>
603+ <area>425,4,300,40</area>
604 <align>hcenter,bottom</align>
605 <value>(1) Time (2) Title</value>
606 </textarea>
607@@ -1151,21 +1157,21 @@
608 <area>0,0,1200,24</area>
609 <state name="active">
610 <textarea name="shortstarttimedate" from="buttontext">
611- <area>32,2,190,24</area>
612+ <area>10,2,215,24</area>
613 </textarea>
614 <textarea name="channel" from="shortstarttimedate">
615- <area>240,2,190,24</area>
616+ <area>240,2,230,24</area>
617 </textarea>
618 <textarea name="titlesubtitle" from="shortstarttimedate">
619- <area>440,2,640,24</area>
620+ <area>480,2,675,24</area>
621 </textarea>
622 <textarea name="card" from="shortstarttimedate">
623- <area>1160,2,30,24</area>
624+ <area>1165,2,30,24</area>
625 </textarea>
626 </state>
627 <state name="selectedactive" from="active">
628 <textarea name="shortstarttimedate" from="buttontext">
629- <area>32,2,190,24</area>
630+ <area>10,2,215,24</area>
631 <font>base_normal_selected</font>
632 <font state="disabled">basesmall_disabled_selected</font>
633 <font state="error">basesmall_error_selected</font>
634@@ -1174,16 +1180,16 @@
635 <font state="running">basesmall_running_selected</font>
636 </textarea>
637 <textarea name="channel" from="shortstarttimedate">
638- <area>240,2,190,24</area>
639+ <area>240,2,230,24</area>
640 </textarea>
641 <textarea name="titlesubtitle" from="shortstarttimedate">
642- <area>440,2,640,24</area>
643+ <area>480,2,675,24</area>
644 </textarea>
645 <textarea name="card" from="shortstarttimedate">
646- <area>1160,2,30,24</area>
647+ <area>1165,2,30,24</area>
648 </textarea>
649 <shape name="selectbar">
650- <area>20,0,1168,28</area>
651+ <area>8,0,1180,28</area>
652 </shape>
653 </state>
654 <state name="selectedinactive" from="active" />
655@@ -1204,7 +1210,7 @@
656 <area>30,494,360,30</area>
657 </textarea>
658 <textarea name="timedate" from="basetextarea">
659- <area>410,494,520,30</area>
660+ <area>410,490,520,30</area>
661 </textarea>
662 <textarea name="description" from="basetextarea">
663 <area>30,524,1200,150</area>
664@@ -1292,7 +1298,7 @@
665 <shape name="select_background">
666 <area>70,520,1120,32</area>
667 <type>roundbox</type>
668 <line color="#FFFFFF" alpha="128" width="2"/>
669 <cornerradius>10</cornerradius>
670 </shape>
671@@ -1410,7 +1416,7 @@
672 <area>90,290,540,28</area>
673 </textarea>
674 <textarea name="channel" from="basetextarea">
675- <area>880,290,280,36</area>
676+ <area>780,290,380,36</area>
677 <align>right</align>
678 </textarea>
679 <textarea name="rectypestatus" from="basetextarea">
680@@ -1447,57 +1453,58 @@
681 <window name="managerecrules">
682
683 <textarea name="pagetitle" from="basetextarea">
684- <area>20,4,650,40</area>
685+ <area>20,4,400,40</area>
686 <font>baselarge</font>
687 <value>Manage Recording Rules</value>
688 </textarea>
689
690 <shape name="list_background" from="basebackground">
691- <area>20,48,1240,360</area>
692+ <area>20,48,1240,380</area>
693 </shape>
694
695 <textarea name="callsignlabel" from="basetextarea">
696- <area>660,14,100,40</area>
697+ <area>500,4,170,40</area>
698 <value>Channel</value>
699 <align>right</align>
700 </textarea>
701
702 <textarea name="lastrecordedlabel" from="basetextarea">
703- <area>790,14,290,40</area>
704+ <area>680,4,300,40</area>
705 <value>Last Recorded</value>
706 <align>right</align>
707 </textarea>
708
709 <textarea name="prioritylabel" from="basetextarea">
710- <area>1140,14,96,40</area>
711+ <area>1100,4,180,40</area>
712 <value>Priority</value>
713 </textarea>
714
715 <buttonlist name="programs" from="basebuttonlist2">
716 <area>20,26,1280,420</area>
717- <buttonarea>0,34,1234,340</buttonarea>
718+ <buttonarea>0,34,1240,340</buttonarea>
719 <statetype name="buttonitem">
720 <state name="active">
721 <textarea name="rectype" from="buttontext">
722- <area>30,2,20,24</area>
723+ <area>20,2,20,24</area>
724 </textarea>
725 <textarea name="title" from="buttontext">
726- <area>60,2,590,24</area>
727+ <area>50,2,550,24</area>
728 </textarea>
729 <textarea name="callsign" from="buttontext">
730- <area>650,2,160,24</area>
731+ <area>600,2,140,24</area>
732+ <align>left</align>
733 </textarea>
734 <textarea name="lastrecorded" from="buttontext">
735- <area>770,2,290,24</area>
736+ <area>760,2,360,24</area>
737 <align>vcenter,right</align>
738 </textarea>
739 <textarea name="finalpriority" from="buttontext">
740- <area>1130,2,40,24</area>
741+ <area>1140,2,40,24</area>
742 <align>vcenter,right</align>
743 </textarea>
744 <textarea name="dummy" from="buttontext">
745 <value></value>
746- <area>1170,2,40,24</area>
747+ <area>1190,2,30,24</area>
748 </textarea>
749 </state>
750 <state name="selectedactive" from="active">
751@@ -1529,58 +1536,58 @@
752 </textarea>
753
754 <textarea name="finalprioritylabel" from="basetextarea">
755- <area>1110,490,90,30</area>
756+ <area>1000,490,180,30</area>
757 <value>Priority:</value>
758 <align>right</align>
759 </textarea>
760
761 <textarea name="finalpriority" from="basetextarea">
762- <area>1210,490,40,30</area>
763+ <area>1200,490,40,30</area>
764 <align>right</align>
765 </textarea>
766
767 <textarea name="recordinggrouplabel" from="basetextarea">
768- <area>30,550,190,30</area>
769+ <area>30,550,250,30</area>
770 <value>Recording Group:</value>
771 <align>right</align>
772 </textarea>
773
774 <textarea name="recordinggroup" from="basetextarea">
775- <area>230,550,160,30</area>
776+ <area>300,550,200,30</area>
777 </textarea>
778
779 <textarea name="categorylabel" from="basetextarea">
780- <area>30,580,190,30</area>
781+ <area>30,580,250,30</area>
782 <value>Category:</value>
783 <align>right</align>
784 </textarea>
785
786 <textarea name="category" from="basetextarea">
787- <area>230,580,160,30</area>
788+ <area>300,580,200,30</area>
789 </textarea>
790
791 <textarea name="storagegrouplabel" from="basetextarea">
792- <area>640,550,190,30</area>
793+ <area>640,550,250,30</area>
794 <value>Storage Group:</value>
795 <align>right</align>
796 </textarea>
797
798 <textarea name="storagegroup" from="basetextarea">
799- <area>840,550,160,30</area>
800+ <area>900,550,200,30</area>
801 </textarea>
802
803 <textarea name="recordingprofilelabel" from="basetextarea">
804- <area>640,580,190,30</area>
805+ <area>640,580,250,30</area>
806 <value>Recording Profile:</value>
807 <align>right</align>
808 </textarea>
809
810 <textarea name="recordingprofile" from="basetextarea">
811- <area>840,580,160,30</area>
812+ <area>900,580,200,30</area>
813 </textarea>
814
815 <textarea name="keyinstr">
816- <area>0,660,1280,30</area>
817+ <area>0,680,1280,30</area>
818 <value>(1) Title (2) Priority (4) Type</value>
819 <align>allcenter</align>
820 </textarea>
821@@ -1617,7 +1624,9 @@
822 </textedit>
823
824 <textarea name="sampleslabel" from="ruleslabel">
825- <area>30,230,220,40</area>
826+ <area>30,230,220,80</area>
827+ <align>left,top</align>
828+ <multiline>yes</multiline>
829 <value>Sample Clauses:</value>
830 </textarea>
831
832@@ -1733,7 +1742,7 @@
833 </textarea>
834
835 <textarea name="channel" from="basetextarea">
836- <area>1024,260,200,36</area>
837+ <area>1000,260,230,36</area>
838 <align>right</align>
839 </textarea>
840
841@@ -1745,46 +1754,46 @@
842
843 <buttonlist name="rules" from="baseverywideselector">
844 <helptext>Select the recording rule</helptext>
845- <position>410,304</position>
846+ <position>250,304</position>
847 </buttonlist>
848
849 <button name="schedoptions" from="baseverywidebutton">
850- <position>410,354</position>
851+ <position>250,354</position>
852 <value>Schedule Options</value>
853 <helptext></helptext>
854 </button>
855
856 <button name="storeoptions" from="baseverywidebutton">
857- <position>410,400</position>
858+ <position>250,400</position>
859 <value>Storage Options</value>
860 <helptext></helptext>
861 </button>
862
863 <button name="postprocessing" from="baseverywidebutton">
864- <position>410,444</position>
865+ <position>250,444</position>
866 <value>Post Processing</value>
867 <helptext></helptext>
868 </button>
869
870 <button name="schedinfo" from="baseverywidebutton">
871- <position>410,490</position>
872+ <position>250,490</position>
873 <value>Schedule Info</value>
874 <helptext></helptext>
875 </button>
876
877 <button name="preview" from="baseverywidebutton">
878- <position>410,534</position>
879+ <position>250,534</position>
880 <value>Preview</value>
881 <helptext></helptext>
882 </button>
883
884 <button name="cancel" from="basebutton">
885- <position>330,644</position>
886+ <position>250,644</position>
887 <value>Cancel</value>
888 </button>
889
890 <button name="save" from="basebutton">
891- <position>830,644</position>
892+ <position>780,644</position>
893 <value>Save</value>
894 </button>
895 </window>
896@@ -1816,7 +1825,7 @@
897 </textarea>
898
899 <spinbox name="priority" from="basewidespinbox">
900- <position>454,310</position>
901+ <position>250,310</position>
902 <template type="negative">Reduce priority by %n</template>
903 <template type="zero">Normal recording priority</template>
904 <template type="positive">Raise priority by %n</template>
905@@ -1824,12 +1833,12 @@
906 </spinbox>
907
908 <buttonlist name="input" from="basewideselector">
909- <position>454,354</position>
910+ <position>250,354</position>
911 <helptext></helptext>
912 </buttonlist>
913
914 <spinbox name="startoffset" from="basewidespinbox">
915- <position>454,400</position>
916+ <position>250,400</position>
917 <template type="negative">Start recording %n minute(s) late</template>
918 <template type="zero">Start recording on time</template>
919 <template type="positive">Start recording %n minute(s) early</template>
920@@ -1837,7 +1846,7 @@
921 </spinbox>
922
923 <spinbox name="endoffset" from="basewidespinbox">
924- <position>454,444</position>
925+ <position>250,444</position>
926 <template type="negative">End recording %n minute(s) early</template>
927 <template type="zero">End recording on time</template>
928 <template type="positive">End recording %n minute(s) late</template>
929@@ -1845,17 +1854,17 @@
930 </spinbox>
931
932 <buttonlist name="dupmethod" from="basewideselector">
933- <position>454,490</position>
934+ <position>250,490</position>
935 <helptext></helptext>
936 </buttonlist>
937
938 <buttonlist name="dupscope" from="basewideselector">
939- <position>454,534</position>
940+ <position>250,534</position>
941 <helptext></helptext>
942 </buttonlist>
943
944 <checkbox name="ruleactive" from="basecheckbox">
945- <position>454,580</position>
946+ <position>250,580</position>
947 </checkbox>
948
949 <textarea name="ruleactivelabel" from="basetextarea">
950@@ -1864,7 +1873,7 @@
951 </textarea>
952
953 <button name="back" from="basebutton">
954- <position>590,644</position>
955+ <position>550,644</position>
956 <value>Back</value>
957 </button>
958 </window>
959@@ -1896,39 +1905,39 @@
960 </textarea>
961
962 <buttonlist name="recprofile" from="basewideselector">
963- <position>454,310</position>
964+ <position>250,310</position>
965 <helptext></helptext>
966 </buttonlist>
967
968 <buttonlist name="recgroup" from="basewideselector">
969- <position>454,354</position>
970+ <position>250,354</position>
971 <helptext></helptext>
972 </buttonlist>
973
974 <buttonlist name="storagegroup" from="basewideselector">
975- <position>454,400</position>
976+ <position>250,400</position>
977 <helptext></helptext>
978 </buttonlist>
979
980 <buttonlist name="playgroup" from="basewideselector">
981- <position>454,444</position>
982+ <position>250,444</position>
983 <helptext></helptext>
984 </buttonlist>
985
986 <spinbox name="maxepisodes" from="basewidespinbox">
987- <position>454,490</position>
988+ <position>250,490</position>
989 <template type="zero">No episode limit</template>
990 <template type="positive">Keep at most %n episode(s)</template>
991 <helptext></helptext>
992 </spinbox>
993
994 <buttonlist name="maxnewest" from="basewideselector">
995- <position>454,534</position>
996+ <position>250,534</position>
997 <helptext></helptext>
998 </buttonlist>
999
1000 <checkbox name="autoexpire" from="basecheckbox">
1001- <position>454,580</position>
1002+ <position>250,580</position>
1003 </checkbox>
1004
1005 <textarea name="autoexpirelabel" from="basetextarea">
1006@@ -1937,7 +1946,7 @@
1007 </textarea>
1008
1009 <button name="back" from="basebutton">
1010- <position>590,646</position>
1011+ <position>550,646</position>
1012 <value>Back</value>
1013 </button>
1014 </window>
1015@@ -1969,7 +1978,7 @@
1016 </textarea>
1017
1018 <checkbox name="autocommflag" from="basecheckbox">
1019- <position>454,310</position>
1020+ <position>250,310</position>
1021 </checkbox>
1022
1023 <textarea name="autocommflaglabel" from="basetextarea">
1024@@ -1978,7 +1987,7 @@
1025 </textarea>
1026
1027 <checkbox name="autotranscode" from="basecheckbox">
1028- <position>454,354</position>
1029+ <position>250,354</position>
1030 </checkbox>
1031
1032 <textarea name="autotranscodelabel" from="basetextarea">
1033@@ -1992,7 +2001,7 @@
1034 </buttonlist>
1035
1036 <checkbox name="userjob1" from="basecheckbox">
1037- <position>454,444</position>
1038+ <position>250,444</position>
1039 </checkbox>
1040
1041 <textarea name="userjob1label" from="basetextarea">
1042@@ -2001,7 +2010,7 @@
1043 </textarea>
1044
1045 <checkbox name="userjob2" from="basecheckbox">
1046- <position>454,490</position>
1047+ <position>250,490</position>
1048 </checkbox>
1049
1050 <textarea name="userjob2label" from="basetextarea">
1051@@ -2010,7 +2019,7 @@
1052 </textarea>
1053
1054 <checkbox name="userjob3" from="basecheckbox">
1055- <position>454,534</position>
1056+ <position>250,534</position>
1057 </checkbox>
1058
1059 <textarea name="userjob3label" from="basetextarea">
1060@@ -2019,7 +2028,7 @@
1061 </textarea>
1062
1063 <checkbox name="userjob4" from="basecheckbox">
1064- <position>454,580</position>
1065+ <position>250,580</position>
1066 </checkbox>
1067
1068 <textarea name="userjob4label" from="basetextarea">
1069@@ -2028,7 +2037,7 @@
1070 </textarea>
1071
1072 <button name="back" from="basebutton">
1073- <position>590,644</position>
1074+ <position>550,644</position>
1075 <value>Back</value>
1076 </button>
1077 </window>
1078diff -r -b -B -i -u /keep/usb/mythtv/themes/MythCenter-wide/.svn/all-wcprops /keep/usb/newmyth/MythCenter-wide/.svn/all-wcprops
1079--- /keep/usb/mythtv/themes/MythCenter-wide/.svn/all-wcprops 2010-08-22 09:44:22.881846117 -0400
1080+++ /keep/usb/newmyth/MythCenter-wide/.svn/all-wcprops 2010-03-29 11:57:37.000000000 -0400
1081@@ -1,95 +1,89 @@
1082 K 25
1083 svn:wc:ra_dav:version-url
1084 V 55
1085-/svn/!svn/ver/25640/trunk/mythtv/themes/MythCenter-wide
1086+/svn/!svn/ver/23850/trunk/mythtv/themes/MythCenter-wide
1087 END
1088 config-ui.xml
1089 K 25
1090 svn:wc:ra_dav:version-url
1091 V 69
1092-/svn/!svn/ver/25640/trunk/mythtv/themes/MythCenter-wide/config-ui.xml
1093+/svn/!svn/ver/23577/trunk/mythtv/themes/MythCenter-wide/config-ui.xml
1094 END
1095-appear-ui.xml
1096+preview.jpg
1097 K 25
1098 svn:wc:ra_dav:version-url
1099-V 69
1100-/svn/!svn/ver/24548/trunk/mythtv/themes/MythCenter-wide/appear-ui.xml
1101+V 67
1102+/svn/!svn/ver/21756/trunk/mythtv/themes/MythCenter-wide/preview.jpg
1103 END
1104-osd.xml
1105+appear-ui.xml
1106 K 25
1107 svn:wc:ra_dav:version-url
1108-V 63
1109-/svn/!svn/ver/24823/trunk/mythtv/themes/MythCenter-wide/osd.xml
1110+V 69
1111+/svn/!svn/ver/23577/trunk/mythtv/themes/MythCenter-wide/appear-ui.xml
1112 END
1113-qtlook.txt
1114+welcome-ui.xml
1115 K 25
1116 svn:wc:ra_dav:version-url
1117-V 66
1118-/svn/!svn/ver/21756/trunk/mythtv/themes/MythCenter-wide/qtlook.txt
1119+V 70
1120+/svn/!svn/ver/23577/trunk/mythtv/themes/MythCenter-wide/welcome-ui.xml
1121 END
1122-status-ui.xml
1123+schedule-ui.xml
1124 K 25
1125 svn:wc:ra_dav:version-url
1126-V 69
1127-/svn/!svn/ver/24544/trunk/mythtv/themes/MythCenter-wide/status-ui.xml
1128+V 71
1129+/svn/!svn/ver/23738/trunk/mythtv/themes/MythCenter-wide/schedule-ui.xml
1130 END
1131-README
1132+qtlook.txt
1133 K 25
1134 svn:wc:ra_dav:version-url
1135-V 62
1136-/svn/!svn/ver/21756/trunk/mythtv/themes/MythCenter-wide/README
1137+V 66
1138+/svn/!svn/ver/21756/trunk/mythtv/themes/MythCenter-wide/qtlook.txt
1139 END
1140-preview.jpg
1141+base.xml
1142 K 25
1143 svn:wc:ra_dav:version-url
1144-V 67
1145-/svn/!svn/ver/21756/trunk/mythtv/themes/MythCenter-wide/preview.jpg
1146+V 64
1147+/svn/!svn/ver/23850/trunk/mythtv/themes/MythCenter-wide/base.xml
1148 END
1149-welcome-ui.xml
1150+recordings-ui.xml
1151 K 25
1152 svn:wc:ra_dav:version-url
1153-V 70
1154-/svn/!svn/ver/25354/trunk/mythtv/themes/MythCenter-wide/welcome-ui.xml
1155+V 73
1156+/svn/!svn/ver/23577/trunk/mythtv/themes/MythCenter-wide/recordings-ui.xml
1157 END
1158-schedule-ui.xml
1159+settings-ui.xml
1160 K 25
1161 svn:wc:ra_dav:version-url
1162 V 71
1163-/svn/!svn/ver/24553/trunk/mythtv/themes/MythCenter-wide/schedule-ui.xml
1164+/svn/!svn/ver/23577/trunk/mythtv/themes/MythCenter-wide/settings-ui.xml
1165 END
1166-recordings-ui.xml
1167+README
1168 K 25
1169 svn:wc:ra_dav:version-url
1170-V 73
1171-/svn/!svn/ver/24544/trunk/mythtv/themes/MythCenter-wide/recordings-ui.xml
1172+V 62
1173+/svn/!svn/ver/21756/trunk/mythtv/themes/MythCenter-wide/README
1174 END
1175-base.xml
1176+status-ui.xml
1177 K 25
1178 svn:wc:ra_dav:version-url
1179-V 64
1180-/svn/!svn/ver/25152/trunk/mythtv/themes/MythCenter-wide/base.xml
1181+V 69
1182+/svn/!svn/ver/23577/trunk/mythtv/themes/MythCenter-wide/status-ui.xml
1183 END
1184-settings-ui.xml
1185+themeinfo.xml
1186 K 25
1187 svn:wc:ra_dav:version-url
1188-V 71
1189-/svn/!svn/ver/24544/trunk/mythtv/themes/MythCenter-wide/settings-ui.xml
1190+V 69
1191+/svn/!svn/ver/23577/trunk/mythtv/themes/MythCenter-wide/themeinfo.xml
1192 END
1193 controls-ui.xml
1194 K 25
1195 svn:wc:ra_dav:version-url
1196 V 71
1197-/svn/!svn/ver/24544/trunk/mythtv/themes/MythCenter-wide/controls-ui.xml
1198-END
1199-themeinfo.xml
1200-K 25
1201-svn:wc:ra_dav:version-url
1202-V 69
1203-/svn/!svn/ver/24544/trunk/mythtv/themes/MythCenter-wide/themeinfo.xml
1204+/svn/!svn/ver/23577/trunk/mythtv/themes/MythCenter-wide/controls-ui.xml
1205 END
1206 menu-ui.xml
1207 K 25
1208 svn:wc:ra_dav:version-url
1209 V 67
1210-/svn/!svn/ver/24548/trunk/mythtv/themes/MythCenter-wide/menu-ui.xml
1211+/svn/!svn/ver/23577/trunk/mythtv/themes/MythCenter-wide/menu-ui.xml
1212 END
1213diff -r -b -B -i -u /keep/usb/mythtv/themes/MythCenter-wide/.svn/entries /keep/usb/newmyth/MythCenter-wide/.svn/entries
1214--- /keep/usb/mythtv/themes/MythCenter-wide/.svn/entries 2010-08-22 09:44:22.882847642 -0400
1215+++ /keep/usb/newmyth/MythCenter-wide/.svn/entries 2010-03-29 11:57:37.000000000 -0400
1216@@ -1,15 +1,15 @@
1217 10
1218
1219 dir
1220-25794
1221+23850
1222 http://svn.mythtv.org/svn/trunk/mythtv/themes/MythCenter-wide
1223 http://svn.mythtv.org/svn
1224
1225
1226
1227-2010-08-14T02:38:10.896782Z
1228-25640
1229-markk
1230+2010-03-29T15:41:56.776284Z
1231+23850
1232+robertm
1233
1234
1235
1236@@ -32,11 +32,11 @@
1237
1238
1239
1240-2010-08-22T13:44:22.853597Z
1241-0659526dcb953ac7cbcae5819eb4022d
1242-2010-08-14T02:38:10.896782Z
1243-25640
1244-markk
1245+2010-03-29T15:57:37.001822Z
1246+dfe29aa1a8c9d428c54fc94f40e1e643
1247+2010-02-20T20:26:52.501857Z
1248+23577
1249+danielk
1250
1251
1252
1253@@ -58,7 +58,7 @@
1254
1255
1256
1257-3378
1258+4008
1259
1260
1261 title
1262 dir
1263@@ -69,11 +69,11 @@
1264
1265
1266
1267-2010-08-22T13:44:22.853597Z
1268-b71379f7c2852c07f7053e35704f55e6
1269-2010-05-10T21:58:08.743903Z
1270-24548
1271-stuartm
1272+2010-03-29T15:57:37.001822Z
1273+9013d04cd6d4e3967fa299dc0cc0656c
1274+2010-02-20T20:26:52.501857Z
1275+23577
1276+danielk
1277
1278
1279
1280@@ -95,41 +95,7 @@
1281
1282
1283
1284-1646
1285-
1286
1287-osd.xml
1288-file
1289-
1290-
1291-
1292-
1293-2010-08-22T13:44:22.854600Z
1294-9ac646159bd02c995f00fe73b31fc14c
1295-2010-05-24T03:30:16.677103Z
1296-24823
1297-markk
1298-
1299-
1300-
1301-
1302-
1303-
1304-
1305-
1306-
1307-
1308-
1309-
1310-
1311-
1312-
1313-
1314-
1315-
1316-
1317-
1318-
1319-4841
1320+1584
1321
1322
1323 qtlook.txt
1324 file
1325@@ -137,7 +103,7 @@
1326
1327
1328
1329-2010-08-22T13:44:22.855594Z
1330+2010-03-29T15:57:37.002821Z
1331 09956d3eeca7d2e2c2d12243830a9394
1332 2009-04-10T23:49:38.319787Z
1333 20346
1334@@ -174,11 +140,11 @@
1335
1336
1337
1338-2010-08-22T13:44:22.863595Z
1339-5fe914c6918c04c9ef7157f8bbdbb6c4
1340-2010-05-10T21:03:57.495962Z
1341-24544
1342-stuartm
1343+2010-03-29T15:57:37.002821Z
1344+63c905292182cc83d9fc842d7fd5d6ff
1345+2010-02-20T20:26:52.501857Z
1346+23577
1347+danielk
1348
1349
1350
1351@@ -200,7 +166,7 @@
1352
1353
1354
1355-3110
1356+3059
1357
1358
1359 README
1360 file
1361@@ -208,7 +174,7 @@
1362
1363
1364
1365-2010-08-22T13:44:22.855594Z
1366+2010-03-29T15:57:37.002821Z
1367 1c203b98189be2103a31842e23aa6cd2
1368 2009-04-10T23:49:38.319787Z
1369 20346
1370@@ -245,7 +211,7 @@
1371
1372
1373
1374-2010-08-22T13:44:22.865597Z
1375+2010-03-29T15:57:37.003821Z
1376 4d357f5add083a6505806fdd6698e689
1377 2007-06-15T10:37:57.535470Z
1378 13696
1379@@ -279,11 +245,11 @@
1380
1381
1382
1383-2010-08-22T13:44:22.865597Z
1384-250dd6addf290d2dd62d53e9f2f7d470
1385-2010-07-16T15:24:25.671301Z
1386-25354
1387-rkulagow
1388+2010-03-29T15:57:37.003821Z
1389+b1b7b96515ee3f6676f3249be888567a
1390+2010-02-20T20:26:52.501857Z
1391+23577
1392+danielk
1393
1394
1395
1396@@ -305,7 +271,7 @@
1397
1398
1399
1400-4110
1401+3940
1402
1403
1404 schedule-ui.xml
1405 file
1406@@ -313,11 +279,11 @@
1407
1408
1409
1410-2010-08-22T13:44:22.866601Z
1411-ea24d966f99f87c9ad7cf124d0c01392
1412-2010-05-10T23:23:33.722528Z
1413-24553
1414-stuartm
1415+2010-03-29T15:57:37.004823Z
1416+b1cfd60c8ce00dd74d4ccaa1473b81ec
1417+2010-03-14T21:34:09.899894Z
1418+23738
1419+robertm
1420
1421
1422
1423@@ -339,7 +305,7 @@
1424
1425
1426
1427-72141
1428+72151
1429
1430
1431 recordings-ui.xml
1432 file
1433@@ -347,11 +313,11 @@
1434
1435
1436
1437-2010-08-22T13:44:22.871850Z
1438-a2af2673feaabeee71c2ccd69b488702
1439-2010-05-10T21:03:57.495962Z
1440-24544
1441-stuartm
1442+2010-03-29T15:57:37.006822Z
1443+b6766ff6ea923ab8f20a08afc9b7839e
1444+2010-02-20T20:26:52.501857Z
1445+23577
1446+danielk
1447
1448
1449
1450@@ -373,7 +339,7 @@
1451
1452
1453
1454-38513
1455+38463
1456
1457
1458 base.xml
1459 file
1460@@ -381,11 +347,11 @@
1461
1462
1463
1464-2010-08-22T13:44:22.870845Z
1465-80ef989fd0abf1885b6f002bd5805e6b
1466-2010-06-22T03:27:17.680539Z
1467-25152
1468-beirdo
1469+2010-03-29T15:57:37.005822Z
1470+dac01cf3e93ca9cb529396f7c976bd6f
1471+2010-03-29T15:41:56.776284Z
1472+23850
1473+robertm
1474 has-props
1475
1476
1477@@ -407,7 +373,7 @@
1478
1479
1480
1481-40878
1482+40078
1483
1484
1485 settings-ui.xml
1486 file
1487@@ -415,11 +381,11 @@
1488
1489
1490
1491-2010-08-22T13:44:22.871850Z
1492-04c73f5173161c2b4590a4a1ec8a9a18
1493-2010-05-10T21:03:57.495962Z
1494-24544
1495-stuartm
1496+2010-03-29T15:57:37.006822Z
1497+f241c088352f7c118bd49b8c6690f8a8
1498+2010-02-20T20:26:52.501857Z
1499+23577
1500+danielk
1501
1502
1503
1504@@ -441,7 +407,7 @@
1505
1506
1507
1508-1924
1509+1873
1510
1511
1512 ui
1513 dir
1514@@ -452,11 +418,11 @@
1515
1516
1517
1518-2010-08-22T13:44:22.875619Z
1519-a583416af98b9b05810cd618df5c35ec
1520-2010-05-10T21:03:57.495962Z
1521-24544
1522-stuartm
1523+2010-03-29T15:57:37.007822Z
1524+a96e88690d0e6d5ad8fd796fe55d02fd
1525+2010-02-20T20:26:52.501857Z
1526+23577
1527+danielk
1528 has-props
1529
1530
1531@@ -478,7 +444,7 @@
1532
1533
1534
1535-2191
1536+2152
1537
1538
1539 controls-ui.xml
1540 file
1541@@ -486,11 +452,11 @@
1542
1543
1544
1545-2010-08-22T13:44:22.875619Z
1546-a30655c26a3316abfa60927cd946eff8
1547-2010-05-10T21:03:57.495962Z
1548-24544
1549-stuartm
1550+2010-03-29T15:57:37.007822Z
1551+204e6d5b98ac4baf1d7dc48112b618d2
1552+2010-02-20T20:26:52.501857Z
1553+23577
1554+danielk
1555
1556
1557
1558@@ -512,7 +478,7 @@
1559
1560
1561
1562-2034
1563+1983
1564
1565
1566 menu-ui.xml
1567 file
1568@@ -520,11 +486,11 @@
1569
1570
1571
1572-2010-08-22T13:44:22.881846Z
1573-1ceb4c6c58e57e5ad3f8d78b7f13c146
1574-2010-05-10T21:58:08.743903Z
1575-24548
1576-stuartm
1577+2010-03-29T15:57:37.008823Z
1578+95a3156c4ff56823f892959e0a42ec0d
1579+2010-02-20T20:26:52.501857Z
1580+23577
1581+danielk
1582 has-props
1583
1584
1585@@ -546,5 +512,5 @@
1586
1587
1588
1589-22547
1590+22435
1591
1592
1593diff -r -b -B -i -u /keep/usb/mythtv/themes/MythCenter-wide/.svn/text-base/appear-ui.xml.svn-base /keep/usb/newmyth/MythCenter-wide/.svn/text-base/appear-ui.xml.svn-base
1594--- /keep/usb/mythtv/themes/MythCenter-wide/.svn/text-base/appear-ui.xml.svn-base 2010-08-22 09:43:47.565354714 -0400
1595+++ /keep/usb/newmyth/MythCenter-wide/.svn/text-base/appear-ui.xml.svn-base 2010-03-29 11:57:30.000000000 -0400
1596@@ -1,13 +1,12 @@
1597 <?xml version="1.0" encoding="utf-8"?>
1598-<!DOCTYPE mythuitheme SYSTEM "../mythuitheme.dtd">
1599 <mythuitheme>
1600 <window name="appearance">
1601
1602- <fontdef name="title" face="Droid Sans">
1603+ <font name="title" face="Droid Sans">
1604 <color>#ffffff</color>
1605 <pixelsize>26</pixelsize>
1606- <weight>bold</weight>
1607- </fontdef>
1608+ <bold>yes</bold>
1609+ </font>
1610
1611 <textarea name="part">
1612 <font>title</font>
1613diff -r -b -B -i -u /keep/usb/mythtv/themes/MythCenter-wide/.svn/text-base/base.xml.svn-base /keep/usb/newmyth/MythCenter-wide/.svn/text-base/base.xml.svn-base
1614--- /keep/usb/mythtv/themes/MythCenter-wide/.svn/text-base/base.xml.svn-base 2010-08-22 09:44:16.046596187 -0400
1615+++ /keep/usb/newmyth/MythCenter-wide/.svn/text-base/base.xml.svn-base 2010-03-29 11:57:35.000000000 -0400
1616@@ -1,145 +1,140 @@
1617-<?xml version="1.0" encoding="UTF-8" ?>
1618-<!DOCTYPE mythuitheme SYSTEM "../mythuitheme.dtd">
1619+<?xml version="1.0" encoding="utf-8"?>
1620 <mythuitheme>
1621
1622 <!-- Base Font Definitions -->
1623- <fontdef name="basesmall" face="Droid Sans">
1624+ <font name="basesmall" face="Droid Sans">
1625 <pixelsize>22</pixelsize>
1626 <color>#EEEEEE</color>
1627- <weight>bold</weight>
1628- </fontdef>
1629+ <bold>yes</bold>
1630+ </font>
1631
1632- <fontdef name="basesmaller" from="basesmall">
1633- <pixelsize>18</pixelsize>
1634- </fontdef>
1635-
1636- <fontdef name="basesmallbold" from="basesmall">
1637- <weight>bold</weight>
1638- </fontdef>
1639+ <font name="basesmallbold" from="basesmall">
1640+ <bold>yes</bold>
1641+ </font>
1642
1643- <fontdef name="small" from="basesmall">
1644+ <font name="small" from="basesmall">
1645 <shadowcolor>#000000</shadowcolor>
1646 <shadowoffset>2,2</shadowoffset>
1647 <shadowalpha>0</shadowalpha>
1648- </fontdef>
1649+ </font>
1650
1651- <fontdef name="basemedium" from="basesmall" face="Liberation Sans">
1652+ <font name="basemedium" from="basesmall" face="Liberation Sans">
1653 <pixelsize>26</pixelsize>
1654- </fontdef>
1655+ </font>
1656
1657- <fontdef name="basemediumbold" from="basemedium">
1658+ <font name="basemediumbold" from="basemedium">
1659 <pixelsize>26</pixelsize>
1660- <weight>bold</weight>
1661- </fontdef>
1662+ <bold>yes</bold>
1663+ </font>
1664
1665- <fontdef name="baselarge" from="basemedium">
1666+ <font name="baselarge" from="basemedium">
1667 <pixelsize>30</pixelsize>
1668 <shadowcolor>#000000</shadowcolor>
1669 <shadowoffset>4,4</shadowoffset>
1670 <shadowalpha>64</shadowalpha>
1671- <weight>bold</weight>
1672- </fontdef>
1673+ <bold>yes</bold>
1674+ </font>
1675
1676- <fontdef name="baselargenormal" from="baselarge">
1677- <weight>normal</weight>
1678- </fontdef>
1679+ <font name="baselargenormal" from="baselarge">
1680+ <bold>no</bold>
1681+ </font>
1682
1683- <fontdef name="baseextralarge" from="baselarge">
1684+ <font name="baseextralarge" from="baselarge">
1685 <pixelsize>34</pixelsize>
1686 <shadowcolor>#000000</shadowcolor>
1687 <shadowoffset>4,4</shadowoffset>
1688 <shadowalpha>64</shadowalpha>
1689- <weight>bold</weight>
1690- </fontdef>
1691+ <bold>yes</bold>
1692+ </font>
1693
1694 <!-- State variations on small font -->
1695- <fontdef name="basesmall_normal_selected" from="basesmallbold">
1696+ <font name="basesmall_normal_selected" from="basesmallbold">
1697 <color>#FFFFFF</color>
1698- </fontdef>
1699- <fontdef name="basesmall_normal" from="basesmall">
1700+ </font>
1701+ <font name="basesmall_normal" from="basesmall">
1702 <color>#9999cc</color>
1703- </fontdef>
1704- <fontdef name="basesmall_normal_inactive" from="basesmall">
1705+ </font>
1706+ <font name="basesmall_normal_inactive" from="basesmall">
1707 <color>#666666</color>
1708- </fontdef>
1709- <fontdef name="basesmall_warning_selected" from="basesmallbold">
1710+ </font>
1711+ <font name="basesmall_warning_selected" from="basesmallbold">
1712 <color>#dddd44</color>
1713- </fontdef>
1714- <fontdef name="basesmall_warning" from="basesmall">
1715+ </font>
1716+ <font name="basesmall_warning" from="basesmall">
1717 <color>#bbbb33</color>
1718- </fontdef>
1719- <fontdef name="basesmall_favourite_selected" from="basesmallbold">
1720+ </font>
1721+ <font name="basesmall_favourite_selected" from="basesmallbold">
1722 <color>#dddd44</color>
1723- </fontdef>
1724- <fontdef name="basesmall_favourite" from="basesmall">
1725+ </font>
1726+ <font name="basesmall_favourite" from="basesmall">
1727 <color>#bbbb33</color>
1728- </fontdef>
1729- <fontdef name="basesmall_favourite_unavailable" from="basesmall">
1730+ </font>
1731+ <font name="basesmall_favourite_unavailable" from="basesmall">
1732 <color>#9999cc</color>
1733- </fontdef>
1734- <fontdef name="basesmall_error_selected" from="basesmallbold">
1735+ </font>
1736+ <font name="basesmall_error_selected" from="basesmallbold">
1737 <color>#900800</color>
1738- </fontdef>
1739- <fontdef name="basesmall_error" from="basesmall">
1740+ </font>
1741+ <font name="basesmall_error" from="basesmall">
1742 <color>#700700</color>
1743- </fontdef>
1744- <fontdef name="basesmall_disabled_selected" from="basesmallbold">
1745+ </font>
1746+ <font name="basesmall_disabled_selected" from="basesmallbold">
1747 <color>#888888</color>
1748- </fontdef>
1749- <fontdef name="basesmall_disabled" from="basesmall">
1750+ </font>
1751+ <font name="basesmall_disabled" from="basesmall">
1752 <color>#666666</color>
1753- </fontdef>
1754- <fontdef name="basesmall_running_selected" from="basesmallbold">
1755+ </font>
1756+ <font name="basesmall_running_selected" from="basesmallbold">
1757 <color>#00FF00</color>
1758- </fontdef>
1759- <fontdef name="basesmall_running" from="basesmall">
1760+ </font>
1761+ <font name="basesmall_running" from="basesmall">
1762 <color>#11DD11</color>
1763- </fontdef>
1764- <fontdef name="basesmall_textedit" from="basesmall">
1765+ </font>
1766+ <font name="basesmall_textedit" from="basesmall">
1767 <color>#000000</color>
1768- </fontdef>
1769- <fontdef name="basesmall_normal_button" from="basesmallbold">
1770+ </font>
1771+ <font name="basesmall_normal_button" from="basesmallbold">
1772 <color>#FFFFFF</color>
1773- </fontdef>
1774- <fontdef name="basesmall_selected_button" from="basesmallbold">
1775+ </font>
1776+ <font name="basesmall_selected_button" from="basesmallbold">
1777 <color>#FFFFFF</color>
1778- </fontdef>
1779- <fontdef name="basesmall_disabled_button" from="basesmallbold">
1780+ </font>
1781+ <font name="basesmall_disabled_button" from="basesmallbold">
1782 <color>#9999cc</color>
1783- </fontdef>
1784+ </font>
1785 <!-- State variations on medium font -->
1786- <fontdef name="basemedium_normal" from="basemediumbold">
1787+ <font name="basemedium_normal" from="basemediumbold">
1788 <color>#9999cc</color>
1789- </fontdef>
1790- <fontdef name="basemedium_normal_selected" from="basemedium">
1791+ </font>
1792+ <font name="basemedium_normal_selected" from="basemedium">
1793 <color>#FFFFFF</color>
1794- </fontdef>
1795- <fontdef name="basemedium_disabled" from="basemedium">
1796+ </font>
1797+ <font name="basemedium_disabled" from="basemedium">
1798 <color>#666666</color>
1799- </fontdef>
1800- <fontdef name="basemedium_highlight" from="basemediumbold">
1801+ </font>
1802+ <font name="basemedium_highlight" from="basemediumbold">
1803 <color>#FFFF33</color>
1804- </fontdef>
1805- <fontdef name="basemedium_normal_button" from="basemediumbold">
1806+ </font>
1807+ <font name="basemedium_normal_button" from="basemediumbold">
1808 <color>#FFFFFF</color>
1809- </fontdef>
1810- <fontdef name="basemedium_selected_button" from="basemediumbold">
1811+ </font>
1812+ <font name="basemedium_selected_button" from="basemediumbold">
1813 <color>#FFFFFF</color>
1814- </fontdef>
1815- <fontdef name="basemedium_disabled_button" from="basemediumbold">
1816+ </font>
1817+ <font name="basemedium_disabled_button" from="basemediumbold">
1818 <color>#9999cc</color>
1819- </fontdef>
1820+ </font>
1821
1822 <!-- Fonts for specific screens -->
1823- <fontdef name="deleterecordings_filesize_font" from="basemedium">
1824+ <font name="deleterecordings_filesize_font" from="basemedium">
1825 <pixelsize>40</pixelsize>
1826 <color>#bbbb33</color>
1827- <weight>bold</weight>
1828- </fontdef>
1829- <fontdef name="baseguide" from="basesmall">
1830+ <bold>yes</bold>
1831+ </font>
1832+ <font name="baseguide" from="basesmall">
1833 <pixelsize>20</pixelsize>
1834- <weight>normal</weight>
1835- </fontdef>
1836+ <bold>no</bold>
1837+ </font>
1838
1839 <!-- Base definition of a shape used as a background on many screens -->
1840 <shape name="basebackground">
1841@@ -169,15 +164,11 @@
1842 <spacing>4</spacing>
1843 <buttonarea>0,0,100%,97%</buttonarea>
1844 <statetype name="buttonitem">
1845- <area>0,0,100%,30</area>
1846 <state name="active">
1847 <area>0,0,100%,30</area>
1848- <shape name="background">
1849- <area>0,0,100%,100%</area>
1850- <fill style="gradient">
1851+ <imagetype name="buttonbackground">
1852 <gradient start="#505050" end="#000000" alpha="200" />
1853- </fill>
1854- </shape>
1855+ </imagetype>
1856 <textarea name="buttontext">
1857 <area>6,0,85%,30</area>
1858 <font>basesmall</font>
1859@@ -208,18 +199,14 @@
1860 </imagetype>
1861 </state>
1862 <state name="selectedactive" from="active">
1863- <shape name="background">
1864- <fill style="gradient">
1865+ <imagetype name="buttonbackground">
1866 <gradient start="#52CA38" end="#349838" alpha="255" />
1867- </fill>
1868- </shape>
1869+ </imagetype>
1870 </state>
1871 <state name="selectedinactive" from="active">
1872- <shape name="background">
1873- <fill style="gradient">
1874+ <imagetype name="buttonbackground">
1875 <gradient start="#52CA38" end="#349838" alpha="100" />
1876- </fill>
1877- </shape>
1878+ </imagetype>
1879 <textarea name="buttontext">
1880 <font>basesmall_normal_inactive</font>
1881 </textarea>
1882@@ -363,15 +350,15 @@
1883
1884 <!-- Base definition of a wide button -->
1885 <button name="basewidebutton">
1886- <position>0,0</position>
1887+ <area>0,0,188,44</area>
1888 <statetype name="buttonstate">
1889 <state name="active">
1890 <imagetype name="background">
1891- <position>0,0</position>
1892+ <area>0,0,187,43</area>
1893 <filename>wide_button_background.png</filename>
1894 </imagetype>
1895 <textarea name="text">
1896- <area>2,2,282,43</area>
1897+ <area>4,2,290,40</area>
1898 <align>allcenter</align>
1899 <font>basemedium_normal_button</font>
1900 <font state="selected">basemedium_selected_button</font>
1901@@ -380,14 +367,14 @@
1902 </state>
1903 <state name="selected" from="active">
1904 <imagetype name="background">
1905- <area>2,2,282,43</area>
1906+ <area>0,0,187,43</area>
1907 <filename>wide_button_selected_background.png</filename>
1908 </imagetype>
1909 </state>
1910 <state name="disabled" from="active" />
1911 <state name="pushed" from="active">
1912 <imagetype name="background">
1913- <area>0,0,282,43</area>
1914+ <area>0,0,187,43</area>
1915 <filename>wide_button_pushed_background.png</filename>
1916 </imagetype>
1917 <textarea name="text">
1918@@ -994,10 +981,9 @@
1919 <layout>grid</layout>
1920 <buttonarea>0,0,500,430</buttonarea>
1921 <statetype name="buttonitem">
1922- <area>0,0,166,106</area>
1923 <state name="active">
1924 <area>0,0,166,106</area>
1925- <shape name="background" />
1926+ <imagetype name="buttonbackground" />
1927 <statetype name="nodetype">
1928 <state name="folder">
1929 <imagetype name="icon">
1930@@ -1033,12 +1019,10 @@
1931 </state>
1932 <state name="selectedinactive" from="active" />
1933 <state name="selectedactive" from="active">
1934- <shape name="background">
1935+ <imagetype name="buttonbackground">
1936 <area>0,0,166,106</area>
1937- <fill style="gradient">
1938 <gradient start="#999999" end="#666666" alpha="220" />
1939- </fill>
1940- </shape>
1941+ </imagetype>
1942 </state>
1943 </statetype>
1944 </buttonlist>
1945@@ -1097,23 +1081,23 @@
1946 <filename>ui/background.png</filename>
1947 </imagetype>
1948
1949- <fontdef name="medium" face="Droid Sans">
1950+ <font name="medium" face="Droid Sans">
1951 <color>#FFFFFF</color>
1952 <pixelsize>26</pixelsize>
1953- <weight>bold</weight>
1954- </fontdef>
1955+ <bold>yes</bold>
1956+ </font>
1957
1958- <fontdef name="large" face="Liberation Sans">
1959+ <font name="large" face="Liberation Sans">
1960 <color>#FFFFFF</color>
1961 <pixelsize>28</pixelsize>
1962- <weight>bold</weight>
1963- </fontdef>
1964+ <bold>yes</bold>
1965+ </font>
1966
1967- <fontdef name="clock" face="Liberation Sans">
1968+ <font name="clock" face="Liberation Sans">
1969 <color>#FFFFFF</color>
1970 <pixelsize>26</pixelsize>
1971- <weight>bold</weight>
1972- </fontdef>
1973+ <bold>yes</bold>
1974+ </font>
1975 </window>
1976
1977 </mythuitheme>
1978diff -r -b -B -i -u /keep/usb/mythtv/themes/MythCenter-wide/.svn/text-base/config-ui.xml.svn-base /keep/usb/newmyth/MythCenter-wide/.svn/text-base/config-ui.xml.svn-base
1979--- /keep/usb/mythtv/themes/MythCenter-wide/.svn/text-base/config-ui.xml.svn-base 2010-08-22 09:43:43.939877153 -0400
1980+++ /keep/usb/newmyth/MythCenter-wide/.svn/text-base/config-ui.xml.svn-base 2010-03-29 11:57:29.000000000 -0400
1981@@ -1,5 +1,3 @@
1982-<?xml version="1.0" encoding="utf-8"?>
1983-<!DOCTYPE mythuitheme SYSTEM "../mythuitheme.dtd">
1984 <mythuitheme>
1985
1986 <window name="channeloverview">
1987@@ -19,8 +17,9 @@
1988 <fill color="#333333" alpha="180" />
1989 </shape>
1990
1991- <shape name="sourcename_background" from="channum_column">
1992+ <shape name="sourcename_background">
1993 <area>854,42,290,356</area>
1994+ <fill color="#333333" alpha="180" />
1995 </shape>
1996
1997 <buttonlist name="channels" from="basebuttonlist2">
1998@@ -99,4 +98,27 @@
1999
2000 </window>
2001
2002+ <window name="osdmenueditor">
2003+
2004+ <textarea name="title" from="basetextarea">
2005+ <font>baselarge</font>
2006+ <area>0,20,1000,40</area>
2007+ <value>OSD Menu Editor</value>
2008+ <align>center</align>
2009+ </textarea>
2010+
2011+ <buttonlist name="states" from="basebuttonlist">
2012+ <area>60,100,300,300</area>
2013+ <showarrow>no</showarrow>
2014+ </buttonlist>
2015+
2016+ <buttonlist name="categories" from="basebuttonlist">
2017+ <area>402,100,500,500</area>
2018+ </buttonlist>
2019+
2020+ <button name="done" from="basebutton">
2021+ <position>500,620</position>
2022+ <value>Done</value>
2023+ </button>
2024+ </window>
2025 </mythuitheme>
2026diff -r -b -B -i -u /keep/usb/mythtv/themes/MythCenter-wide/.svn/text-base/controls-ui.xml.svn-base /keep/usb/newmyth/MythCenter-wide/.svn/text-base/controls-ui.xml.svn-base
2027--- /keep/usb/mythtv/themes/MythCenter-wide/.svn/text-base/controls-ui.xml.svn-base 2010-08-22 09:44:16.230631885 -0400
2028+++ /keep/usb/newmyth/MythCenter-wide/.svn/text-base/controls-ui.xml.svn-base 2010-03-29 11:57:36.000000000 -0400
2029@@ -1,5 +1,4 @@
2030 <?xml version="1.0" encoding="utf-8"?>
2031-<!DOCTYPE mythuitheme SYSTEM "../mythuitheme.dtd">
2032 <mythuitheme>
2033
2034 <window name="keygrabpopup">
2035diff -r -b -B -i -u /keep/usb/mythtv/themes/MythCenter-wide/.svn/text-base/menu-ui.xml.svn-base /keep/usb/newmyth/MythCenter-wide/.svn/text-base/menu-ui.xml.svn-base
2036--- /keep/usb/mythtv/themes/MythCenter-wide/.svn/text-base/menu-ui.xml.svn-base 2010-08-22 09:44:22.852595953 -0400
2037+++ /keep/usb/newmyth/MythCenter-wide/.svn/text-base/menu-ui.xml.svn-base 2010-03-29 11:57:37.000000000 -0400
2038@@ -1,27 +1,24 @@
2039-<?xml version="1.0" encoding="utf-8"?>
2040-<!DOCTYPE mythuitheme SYSTEM "../mythuitheme.dtd">
2041-
2042 <!-- theme.xml for the MythCenter theme - by Jeroen Brosens -->
2043 <mythuitheme>
2044 <window name="mainmenu">
2045
2046- <fontdef name="menufont" face="Liberation Sans">
2047+ <font name="menufont" face="Liberation Sans">
2048 <color>#FFFFFF</color>
2049 <pixelsize>30</pixelsize>
2050- <weight>bold</weight>
2051+ <bold>yes</bold>
2052 <shadowcolor>#000000</shadowcolor>
2053 <shadowoffset>2,2</shadowoffset>
2054 <shadowalpha>50</shadowalpha>
2055- </fontdef>
2056+ </font>
2057
2058- <fontdef name="clock" from="small">
2059+ <font name="clock" from="small">
2060 <pixelsize>28</pixelsize>
2061- </fontdef>
2062+ </font>
2063
2064 <clock name="clock">
2065 <area>780,40,480,40</area>
2066 <font>clock</font>
2067- <template>%DATE%, %TIME%</template>
2068+ <format>%DATE%, %TIME%</format>
2069 <align>center</align>
2070 </clock>
2071
2072Only in /keep/usb/mythtv/themes/MythCenter-wide/.svn/text-base: osd.xml.svn-base
2073diff -r -b -B -i -u /keep/usb/mythtv/themes/MythCenter-wide/.svn/text-base/recordings-ui.xml.svn-base /keep/usb/newmyth/MythCenter-wide/.svn/text-base/recordings-ui.xml.svn-base
2074--- /keep/usb/mythtv/themes/MythCenter-wide/.svn/text-base/recordings-ui.xml.svn-base 2010-08-22 09:44:16.139595653 -0400
2075+++ /keep/usb/newmyth/MythCenter-wide/.svn/text-base/recordings-ui.xml.svn-base 2010-03-29 11:57:35.000000000 -0400
2076@@ -1,5 +1,4 @@
2077-<?xml version="1.0" encoding="utf-8"?>
2078-<!DOCTYPE mythuitheme SYSTEM "../mythuitheme.dtd">
2079+<?xml version="1.0" encoding="UTF-8" ?>
2080 <mythuitheme>
2081
2082 <window name ="watchrecordings">
2083diff -r -b -B -i -u /keep/usb/mythtv/themes/MythCenter-wide/.svn/text-base/schedule-ui.xml.svn-base /keep/usb/newmyth/MythCenter-wide/.svn/text-base/schedule-ui.xml.svn-base
2084--- /keep/usb/mythtv/themes/MythCenter-wide/.svn/text-base/schedule-ui.xml.svn-base 2010-08-22 09:44:15.922591241 -0400
2085+++ /keep/usb/newmyth/MythCenter-wide/.svn/text-base/schedule-ui.xml.svn-base 2010-03-29 11:57:35.000000000 -0400
2086@@ -1,5 +1,4 @@
2087-<?xml version="1.0" encoding="utf-8"?>
2088-<!DOCTYPE mythuitheme SYSTEM "../mythuitheme.dtd">
2089+<?xml version="1.0" encoding="UTF-8" ?>
2090 <mythuitheme>
2091
2092 <window name="programguide">
2093@@ -7,35 +6,35 @@
2094 <shape name="shape1">
2095 <area>20,20,1240,210</area>
2096 <type>roundbox</type>
2097- <fill color="#000000" alpha="30" />
2098+ <fill color="#000000" alpha="30"></fill>
2099 <cornerradius>10</cornerradius>
2100 </shape>
2101
2102 <shape name="shape2">
2103 <area>30,126,1220,100</area>
2104 <type>roundbox</type>
2105- <fill color="#000000" alpha="30" />
2106+ <fill color="#000000" alpha="30"></fill>
2107 <cornerradius>10</cornerradius>
2108 </shape>
2109
2110 <shape name="shape3">
2111 <area>30,74,660,40</area>
2112 <type>roundbox</type>
2113- <fill color="#000000" alpha="30" />
2114+ <fill color="#000000" alpha="30"></fill>
2115 <cornerradius>10</cornerradius>
2116 </shape>
2117
2118 <shape name="shape4">
2119 <area>700,74,550,40</area>
2120 <type>roundbox</type>
2121- <fill color="#000000" alpha="30" />
2122+ <fill color="#000000" alpha="30"></fill>
2123 <cornerradius>10</cornerradius>
2124 </shape>
2125
2126 <shape name="shape5">
2127 <area>20,240,1240,456</area>
2128 <type>roundbox</type>
2129- <fill color="#000000" alpha="30" />
2130+ <fill color="#000000" alpha="30"></fill>
2131 <cornerradius>10</cornerradius>
2132 </shape>
2133
2134@@ -130,8 +129,9 @@
2135 <clock name="time">
2136 <area>1090,30,150,32</area>
2137 <align>right,vcenter</align>
2138- <template>%TIME%</template>
2139- <font>basemedium</font>
2140+ <format>%TIME%</format>
2141+ <font>clock</font>
2142+ <secondflash>no</secondflash>
2143 </clock>
2144
2145 <imagetype name="channelicon">
2146@@ -139,7 +139,7 @@
2147 </imagetype>
2148
2149 <textarea name="title" from="basetextarea">
2150- <area>100,22,980,50</area>
2151+ <area>40,22,1000,50</area>
2152 <align>left,vcenter</align>
2153 <font>baselarge</font>
2154 </textarea>
2155@@ -169,42 +169,42 @@
2156 <shape name="shape1">
2157 <area>20,20,1240,210</area>
2158 <type>roundbox</type>
2159- <fill color="#000000" alpha="30" />
2160+ <fill color="#000000" alpha="30"></fill>
2161 <cornerradius>10</cornerradius>
2162 </shape>
2163
2164 <shape name="shape2">
2165 <area>30,124,890,100</area>
2166 <type>roundbox</type>
2167- <fill color="#000000" alpha="30" />
2168+ <fill color="#000000" alpha="30"></fill>
2169 <cornerradius>10</cornerradius>
2170 </shape>
2171
2172 <shape name="shape3">
2173 <area>30,74,500,40</area>
2174 <type>roundbox</type>
2175- <fill color="#000000" alpha="30" />
2176+ <fill color="#000000" alpha="30"></fill>
2177 <cornerradius>10</cornerradius>
2178 </shape>
2179
2180 <shape name="shape4">
2181 <area>540,74,380,40</area>
2182 <type>roundbox</type>
2183- <fill color="#000000" alpha="30" />
2184+ <fill color="#000000" alpha="30"></fill>
2185 <cornerradius>10</cornerradius>
2186 </shape>
2187
2188 <shape name="shape5">
2189 <area>20,240,1240,456</area>
2190 <type>roundbox</type>
2191- <fill color="#000000" alpha="30" />
2192+ <fill color="#000000" alpha="30"></fill>
2193 <cornerradius>10</cornerradius>
2194 </shape>
2195
2196 <shape name="shape6">
2197 <area>934,44,310,180</area>
2198 <type>roundbox</type>
2199- <fill color="#000000" alpha="255" />
2200+ <fill color="#000000" alpha="255"></fill>
2201 <cornerradius>6</cornerradius>
2202 </shape>
2203
2204@@ -353,7 +353,8 @@
2205 <clock name="time">
2206 <area>1090,14,150,32</area>
2207 <align>right,vcenter</align>
2208- <template>%TIME%</template>
2209+ <format>%TIME%</format>
2210+ <secondflash>yes</secondflash>
2211 </clock>
2212
2213 <imagetype name="channelicon">
2214@@ -877,18 +878,16 @@
2215 <textedit name="description">
2216 <area>340,400,600,100</area>
2217 <statetype name="background">
2218- <area>0,0,100%,100%</area>
2219 <state name="active">
2220- <area>0,0,100%,100%</area>
2221- <shape name="background">
2222- <area>0,0,100%,100%</area>
2223- <fill color="#FFFFFF" alpha="180" />
2224- </shape>
2225+ <imagetype name="background">
2226+ <area>0,0,600,100</area>
2227+ <gradient start="#FFFFFF" end="#FFFFFF" alpha="180" />
2228+ </imagetype>
2229 </state>
2230 <state name="selected" from="active">
2231- <shape name="background">
2232- <fill alpha="255" />
2233- </shape>
2234+ <imagetype name="background">
2235+ <gradient start="#FFFFFF" end="#FFFFFF" alpha="255" />
2236+ </imagetype>
2237 </state>
2238 <state name="inactive" from="active" />
2239 </statetype>
2240@@ -1374,10 +1373,10 @@
2241 <state name="active">
2242 <textarea name="buttontext">
2243 <area>34,0,330,26</area>
2244- <font>basesmall_normal</font>
2245+ <font>basesmall_normal_selected</font>
2246 <cutdown>no</cutdown>
2247 <align>left,vcenter</align>
2248- <font state="disabled">basesmall_disabled</font>
2249+ <font state="disabled">basesmall_normal</font>
2250 <font state="error">basesmall_error</font>
2251 <font state="warning">basesmall_warning</font>
2252 <font state="normal">basesmall_normal</font>
2253@@ -1390,7 +1389,7 @@
2254 <font>basesmall_normal_selected</font>
2255 <cutdown>no</cutdown>
2256 <align>left,vcenter</align>
2257- <font state="disabled">basesmall_disabled_selected</font>
2258+ <font state="disabled">basesmall_normal_selected</font>
2259 <font state="error">basesmall_error_selected</font>
2260 <font state="warning">basesmall_warning_selected</font>
2261 <font state="normal">basesmall_normal_selected</font>
2262@@ -1407,18 +1406,18 @@
2263 <font>baselarge</font>
2264 </textarea>
2265 <textarea name="timedate" from="basetextarea">
2266- <area>90,290,540,28</area>
2267+ <area>90,250,540,28</area>
2268 </textarea>
2269 <textarea name="channel" from="basetextarea">
2270- <area>880,290,280,36</area>
2271+ <area>880,250,280,36</area>
2272 <align>right</align>
2273 </textarea>
2274 <textarea name="rectypestatus" from="basetextarea">
2275- <area>90,254,600,36</area>
2276+ <area>90,214,600,36</area>
2277 <font>basesmallyellow</font>
2278 </textarea>
2279 <textarea name="description" from="basetextarea">
2280- <area>90,90,1040,176</area>
2281+ <area>90,90,1040,156</area>
2282 <multiline>yes</multiline>
2283 <template>%|"SUBTITLE|"%\n%LONGREPEAT%%STARS| %%DESCRIPTION%</template>
2284 </textarea>
2285@@ -1438,7 +1437,7 @@
2286 <value>Search For</value>
2287 </textarea>
2288 <textarea name="search" from="basetextarea">
2289- <area>350,350,300,30</area>
2290+ <area>370,350,300,30</area>
2291 <value></value>
2292 </textarea>
2293
2294@@ -1636,18 +1635,16 @@
2295 <textedit name="description">
2296 <area>100,340,1080,150</area>
2297 <statetype name="background">
2298- <area>0,0,100%,100%</area>
2299 <state name="active">
2300- <area>0,0,100%,100%</area>
2301- <shape name="background">
2302- <area>0,0,100%,100%</area>
2303- <fill color="#FFFFFF" alpha="180" />
2304- </shape>
2305+ <imagetype name="background">
2306+ <area>0,0,1080,150</area>
2307+ <gradient start="#FFFFFF" end="#FFFFFF" alpha="180" />
2308+ </imagetype>
2309 </state>
2310 <state name="selected" from="active">
2311- <shape name="background">
2312- <fill alpha="255" />
2313- </shape>
2314+ <imagetype name="background">
2315+ <gradient start="#FFFFFF" end="#FFFFFF" alpha="255" />
2316+ </imagetype>
2317 </state>
2318 <state name="inactive" from="active" />
2319 </statetype>
2320@@ -1670,18 +1667,16 @@
2321 <textedit name="subtitle">
2322 <area>300,520,880,86</area>
2323 <statetype name="background">
2324- <area>0,0,100%,100%</area>
2325 <state name="active">
2326- <area>0,0,100%,100%</area>
2327- <shape name="background">
2328- <area>0,0,100%,100%</area>
2329- <fill color="#FFFFFF" alpha="180" />
2330- </shape>
2331+ <imagetype name="background">
2332+ <area>0,0,880,86</area>
2333+ <gradient start="#FFFFFF" end="#FFFFFF" alpha="180" />
2334+ </imagetype>
2335 </state>
2336 <state name="selected" from="active">
2337- <shape name="background">
2338- <fill alpha="255" />
2339- </shape>
2340+ <imagetype name="background">
2341+ <gradient start="#FFFFFF" end="#FFFFFF" alpha="255" />
2342+ </imagetype>
2343 </state>
2344 <state name="inactive" from="active" />
2345 </statetype>
2346diff -r -b -B -i -u /keep/usb/mythtv/themes/MythCenter-wide/.svn/text-base/settings-ui.xml.svn-base /keep/usb/newmyth/MythCenter-wide/.svn/text-base/settings-ui.xml.svn-base
2347--- /keep/usb/mythtv/themes/MythCenter-wide/.svn/text-base/settings-ui.xml.svn-base 2010-08-22 09:44:16.161654538 -0400
2348+++ /keep/usb/newmyth/MythCenter-wide/.svn/text-base/settings-ui.xml.svn-base 2010-03-29 11:57:35.000000000 -0400
2349@@ -1,5 +1,4 @@
2350 <?xml version="1.0" encoding="utf-8"?>
2351-<!DOCTYPE mythuitheme SYSTEM "../mythuitheme.dtd">
2352 <mythuitheme>
2353
2354 <window name="rawsettingseditor">
2355diff -r -b -B -i -u /keep/usb/mythtv/themes/MythCenter-wide/.svn/text-base/status-ui.xml.svn-base /keep/usb/newmyth/MythCenter-wide/.svn/text-base/status-ui.xml.svn-base
2356--- /keep/usb/mythtv/themes/MythCenter-wide/.svn/text-base/status-ui.xml.svn-base 2010-08-22 09:44:15.536595467 -0400
2357+++ /keep/usb/newmyth/MythCenter-wide/.svn/text-base/status-ui.xml.svn-base 2010-03-29 11:57:35.000000000 -0400
2358@@ -1,5 +1,4 @@
2359 <?xml version="1.0" encoding="utf-8"?>
2360-<!DOCTYPE mythuitheme SYSTEM "../mythuitheme.dtd">
2361 <mythuitheme>
2362
2363 <window name="status">
2364diff -r -b -B -i -u /keep/usb/mythtv/themes/MythCenter-wide/.svn/text-base/themeinfo.xml.svn-base /keep/usb/newmyth/MythCenter-wide/.svn/text-base/themeinfo.xml.svn-base
2365--- /keep/usb/mythtv/themes/MythCenter-wide/.svn/text-base/themeinfo.xml.svn-base 2010-08-22 09:44:16.208123293 -0400
2366+++ /keep/usb/newmyth/MythCenter-wide/.svn/text-base/themeinfo.xml.svn-base 2010-03-29 11:57:35.000000000 -0400
2367@@ -1,4 +1,3 @@
2368-<?xml version="1.0" encoding="utf-8"?>
2369 <themeinfo>
2370 <!-- The Theme Name (Required) -->
2371 <name>MythCenter-wide</name>
2372diff -r -b -B -i -u /keep/usb/mythtv/themes/MythCenter-wide/.svn/text-base/welcome-ui.xml.svn-base /keep/usb/newmyth/MythCenter-wide/.svn/text-base/welcome-ui.xml.svn-base
2373--- /keep/usb/mythtv/themes/MythCenter-wide/.svn/text-base/welcome-ui.xml.svn-base 2010-08-22 09:44:15.735851452 -0400
2374+++ /keep/usb/newmyth/MythCenter-wide/.svn/text-base/welcome-ui.xml.svn-base 2010-03-29 11:57:35.000000000 -0400
2375@@ -1,5 +1,4 @@
2376 <?xml version="1.0" encoding="utf-8"?>
2377-<!DOCTYPE mythuitheme SYSTEM "../mythuitheme.dtd">
2378 <mythuitheme>
2379
2380 <window name="welcome_screen">
2381@@ -7,47 +6,47 @@
2382 <!--
2383 First, define all the fonts we need on this screen
2384 -->
2385- <fontdef name="title" from="baselarge">
2386+ <font name="title" from="baselarge">>
2387 <color>#ffff00</color>
2388+ <dropcolor>#000000</dropcolor>
2389 <pixelsize>34</pixelsize>
2390- <shadowcolor>#000000</shadowcolor>
2391- <shadowoffset>2,2</shadowoffset>
2392- <weight>bold</weight>
2393- </fontdef>
2394+ <shadow>2,2</shadow>
2395+ <bold>yes</bold>
2396+ </font>
2397
2398- <fontdef name="time" from="basesmall">
2399+ <font name="time" from="basesmall">
2400 <color>#9999cc</color>
2401 <pixelsize>20</pixelsize>
2402- <weight>bold</weight>
2403- </fontdef>
2404+ <bold>yes</bold>
2405+ </font>
2406
2407- <fontdef name="label" from="basesmall">
2408+ <font name="label" from="basesmall">
2409 <color>#ffff00</color>
2410+ <dropcolor>#000000</dropcolor>
2411 <pixelsize>26</pixelsize>
2412- <shadowcolor>#000000</shadowcolor>
2413- <shadowoffset>2,2</shadowoffset>
2414- <weight>bold</weight>
2415- </fontdef>
2416+ <shadow>2,2</shadow>
2417+ <bold>yes</bold>
2418+ </font>
2419
2420- <fontdef name="info" from="basesmall">
2421+ <font name="info" from="basesmall">
2422 <color>#ffffff</color>
2423 <pixelsize>22</pixelsize>
2424- <weight>bold</weight>
2425- </fontdef>
2426+ <bold>yes</bold>
2427+ </font>
2428
2429- <fontdef name="warning" from="basesmall">
2430+ <font name="warning" from="basesmall">
2431 <color>#ff0000</color>
2432+ <dropcolor>#000000</dropcolor>
2433 <pixelsize>22</pixelsize>
2434- <shadowcolor>#000000</shadowcolor>
2435- <shadowoffset>2,2</shadowoffset>
2436- <weight>bold</weight>
2437- </fontdef>
2438+ <shadow>2,2</shadow>
2439+ <bold>yes</bold>
2440+ </font>
2441
2442- <fontdef name="buttons" from="basesmall">
2443+ <font name="buttons" from="basesmall">
2444 <color>#ffff00</color>
2445 <pixelsize>20</pixelsize>
2446- <weight>bold</weight>
2447- </fontdef>
2448+ <bold>yes</bold>
2449+ </font>
2450
2451
2452 <textarea name="title" from="basetextarea">
2453@@ -63,14 +62,14 @@
2454 <clock name="date">
2455 <area>32,24,304,84</area>
2456 <font>time</font>
2457- <template>dddd\ndd MMMM yyyy</template>
2458+ <format>dddd\ndd MMMM yyyy</format>
2459 <align>left,top</align>
2460 <cutdown>true</cutdown>
2461 </clock>
2462
2463 <clock name="time" from="date">
2464 <area>1072,24,176,36</area>
2465- <template>%TIME%</template>
2466+ <format>%TIME%</format>
2467 <align>right</align>
2468 </clock>
2469
2470@@ -97,7 +96,7 @@
2471
2472 <textarea name="recording_text" from="status_text">
2473 <area>32,198,1216,180</area>
2474- <value>Retrieving Recording Status...</value>
2475+ <value>Retrieving Recording Status ...</value>
2476 </textarea>
2477
2478 <!--
2479@@ -110,7 +109,7 @@
2480
2481 <textarea name="scheduled_text" from="recording_text">
2482 <area>32,426,1216,144</area>
2483- <value>Retrieving Scheduled Recordings...</value>
2484+ <value>Retrieving Scheduled Recordings ...</value>
2485 </textarea>
2486
2487 <!--
2488diff -r -b -B -i -u /keep/usb/mythtv/themes/MythCenter-wide/title/.svn/entries /keep/usb/newmyth/MythCenter-wide/title/.svn/entries
2489--- /keep/usb/mythtv/themes/MythCenter-wide/title/.svn/entries 2010-08-22 09:43:47.538856721 -0400
2490+++ /keep/usb/newmyth/MythCenter-wide/title/.svn/entries 2010-03-29 11:57:30.000000000 -0400
2491@@ -1,7 +1,7 @@
2492 10
2493
2494 dir
2495-25794
2496+23850
2497 http://svn.mythtv.org/svn/trunk/mythtv/themes/MythCenter-wide/title
2498 http://svn.mythtv.org/svn
2499
2500@@ -32,7 +32,7 @@
2501
2502
2503
2504-2010-08-22T13:43:47.520602Z
2505+2010-03-29T15:57:30.169823Z
2506 4359f8d83b10f79779de64cb2df8ff13
2507 2006-04-01T07:29:59.538394Z
2508 9590
2509@@ -66,7 +66,7 @@
2510
2511
2512
2513-2010-08-22T13:43:47.522594Z
2514+2010-03-29T15:57:30.170822Z
2515 274a883d8799d78f65742d67d04c9746
2516 2006-04-01T07:29:59.538394Z
2517 9590
2518@@ -100,7 +100,7 @@
2519
2520
2521
2522-2010-08-22T13:43:47.521600Z
2523+2010-03-29T15:57:30.169823Z
2524 0c479c75b495febb038415c80456590b
2525 2006-04-01T07:29:59.538394Z
2526 9590
2527@@ -134,7 +134,7 @@
2528
2529
2530
2531-2010-08-22T13:43:47.523594Z
2532+2010-03-29T15:57:30.171822Z
2533 597bf6c52e2112774016c7ee42ec664d
2534 2006-04-01T07:29:59.538394Z
2535 9590
2536@@ -168,7 +168,7 @@
2537
2538
2539
2540-2010-08-22T13:43:47.522594Z
2541+2010-03-29T15:57:30.171822Z
2542 6f5fb8d08b3fadcb14839f53e08756dd
2543 2006-04-01T07:29:59.538394Z
2544 9590
2545@@ -202,7 +202,7 @@
2546
2547
2548
2549-2010-08-22T13:43:47.531602Z
2550+2010-03-29T15:57:30.172822Z
2551 1f091bdf1d78f2e2cfad7b912077e817
2552 2006-04-01T07:29:59.538394Z
2553 9590
2554@@ -236,7 +236,7 @@
2555
2556
2557
2558-2010-08-22T13:43:47.530595Z
2559+2010-03-29T15:57:30.172822Z
2560 2632e4952817418c4767790f8090fefd
2561 2006-04-01T07:29:59.538394Z
2562 9590
2563@@ -270,7 +270,7 @@
2564
2565
2566
2567-2010-08-22T13:43:47.531602Z
2568+2010-03-29T15:57:30.173822Z
2569 736a87c939fa28b9feee63bc46fa5806
2570 2006-04-01T07:29:59.538394Z
2571 9590
2572@@ -304,7 +304,7 @@
2573
2574
2575
2576-2010-08-22T13:43:47.532600Z
2577+2010-03-29T15:57:30.173822Z
2578 dbd4ccfc8d522576c0da5314f58ecc23
2579 2006-04-01T07:29:59.538394Z
2580 9590
2581@@ -338,7 +338,7 @@
2582
2583
2584
2585-2010-08-22T13:43:47.533590Z
2586+2010-03-29T15:57:30.173822Z
2587 31b8d1c087202dc7a17342c81630ba7b
2588 2006-04-01T07:29:59.538394Z
2589 9590
2590@@ -372,7 +372,7 @@
2591
2592
2593
2594-2010-08-22T13:43:47.533590Z
2595+2010-03-29T15:57:30.174822Z
2596 aa594c8c10707c5e9ce252ca6b94221e
2597 2006-04-01T07:29:59.538394Z
2598 9590
2599@@ -406,7 +406,7 @@
2600
2601
2602
2603-2010-08-22T13:43:47.534595Z
2604+2010-03-29T15:57:30.174822Z
2605 cb2709835111518fadc0ba2786d49d14
2606 2006-04-01T07:29:59.538394Z
2607 9590
2608@@ -440,7 +440,7 @@
2609
2610
2611
2612-2010-08-22T13:43:47.535611Z
2613+2010-03-29T15:57:30.174822Z
2614 532cfaa419f1b5d1e0c85be746e56bcb
2615 2006-04-01T07:29:59.538394Z
2616 9590
2617@@ -474,7 +474,7 @@
2618
2619
2620
2621-2010-08-22T13:43:47.535611Z
2622+2010-03-29T15:57:30.175821Z
2623 3f5c11cc01a2a12e9625f73a8735b72f
2624 2006-04-01T07:29:59.538394Z
2625 9590
2626@@ -508,7 +508,7 @@
2627
2628
2629
2630-2010-08-22T13:43:47.536842Z
2631+2010-03-29T15:57:30.175821Z
2632 6c3e636cb8bc32006a204d2a0c85d2bc
2633 2006-04-01T07:29:59.538394Z
2634 9590
2635@@ -542,7 +542,7 @@
2636
2637
2638
2639-2010-08-22T13:43:47.536842Z
2640+2010-03-29T15:57:30.175821Z
2641 b8595727ca947b97d09373ec6ead5732
2642 2006-04-01T07:29:59.538394Z
2643 9590
2644@@ -576,7 +576,7 @@
2645
2646
2647
2648-2010-08-22T13:43:47.537855Z
2649+2010-03-29T15:57:30.176821Z
2650 67d547303a9c93496b3599d1304e66dd
2651 2006-04-01T07:29:59.538394Z
2652 9590
2653Binary files /keep/usb/mythtv/themes/MythCenter-wide/ui/button_on.png and /keep/usb/newmyth/MythCenter-wide/ui/button_on.png differ
2654diff -r -b -B -i -u /keep/usb/mythtv/themes/MythCenter-wide/ui/.svn/entries /keep/usb/newmyth/MythCenter-wide/ui/.svn/entries
2655--- /keep/usb/mythtv/themes/MythCenter-wide/ui/.svn/entries 2010-08-22 09:44:22.781598661 -0400
2656+++ /keep/usb/newmyth/MythCenter-wide/ui/.svn/entries 2010-03-29 11:57:36.000000000 -0400
2657@@ -1,7 +1,7 @@
2658 10
2659
2660 dir
2661-25794
2662+23850
2663 http://svn.mythtv.org/svn/trunk/mythtv/themes/MythCenter-wide/ui
2664 http://svn.mythtv.org/svn
2665
2666@@ -32,7 +32,7 @@
2667
2668
2669
2670-2010-08-22T13:44:22.762596Z
2671+2010-03-29T15:57:36.980823Z
2672 01fd2ec77cb0e1bea4e9b4d8c1b0500e
2673 2006-04-01T07:29:59.538394Z
2674 9590
2675@@ -66,7 +66,7 @@
2676
2677
2678
2679-2010-08-22T13:44:22.765595Z
2680+2010-03-29T15:57:36.980823Z
2681 0e6315cfc6e302d47e84846c28d958cf
2682 2006-04-01T07:29:59.538394Z
2683 9590
2684@@ -100,7 +100,7 @@
2685
2686
2687
2688-2010-08-22T13:44:22.770596Z
2689+2010-03-29T15:57:36.981823Z
2690 196ba780fa14d00b2af1e72d1bfa911f
2691 2006-04-01T07:29:59.538394Z
2692 9590
2693@@ -134,7 +134,7 @@
2694
2695
2696
2697-2010-08-22T13:44:22.775644Z
2698+2010-03-29T15:57:36.982823Z
2699 389d1d7eb812022c58b826ea45c6d102
2700 2006-04-01T07:29:59.538394Z
2701 9590
2702@@ -168,7 +168,7 @@
2703
2704
2705
2706-2010-08-22T13:44:22.777849Z
2707+2010-03-29T15:57:36.982823Z
2708 2d4dcc14606640705992ce9325ef5daa
2709 2009-04-10T23:49:38.319787Z
2710 20346
2711@@ -202,7 +202,7 @@
2712
2713
2714
2715-2010-08-22T13:44:22.780601Z
2716+2010-03-29T15:57:36.983823Z
2717 36530c9c88bdf2cb0d8abc25063e84b8
2718 2006-04-01T07:29:59.538394Z
2719 9590
2720diff -r -b -B -i -u /keep/usb/mythtv/themes/MythCenter-wide/watermark/.svn/entries /keep/usb/newmyth/MythCenter-wide/watermark/.svn/entries
2721--- /keep/usb/mythtv/themes/MythCenter-wide/watermark/.svn/entries 2010-08-22 09:44:15.533593687 -0400
2722+++ /keep/usb/newmyth/MythCenter-wide/watermark/.svn/entries 2010-03-29 11:57:35.000000000 -0400
2723@@ -1,7 +1,7 @@
2724 10
2725
2726 dir
2727-25794
2728+23850
2729 http://svn.mythtv.org/svn/trunk/mythtv/themes/MythCenter-wide/watermark
2730 http://svn.mythtv.org/svn
2731
2732@@ -32,7 +32,7 @@
2733
2734
2735
2736-2010-08-22T13:44:15.485596Z
2737+2010-03-29T15:57:35.587822Z
2738 820f69c01b88cd66db0c666cc640110b
2739 2006-04-01T07:29:59.538394Z
2740 9590
2741@@ -66,7 +66,7 @@
2742
2743
2744
2745-2010-08-22T13:44:15.485596Z
2746+2010-03-29T15:57:35.587822Z
2747 987c7c2b40a9433c03affe3ffe67015f
2748 2008-08-27T05:13:43.670152Z
2749 18203
2750@@ -100,7 +100,7 @@
2751
2752
2753
2754-2010-08-22T13:44:15.486600Z
2755+2010-03-29T15:57:35.588822Z
2756 462b2b91224fd44d09cd33bd3e08413f
2757 2008-08-27T05:13:43.670152Z
2758 18203
2759@@ -134,7 +134,7 @@
2760
2761
2762
2763-2010-08-22T13:44:15.487595Z
2764+2010-03-29T15:57:35.588822Z
2765 674c3f1c9715cab1da4c855e5d8cfc6a
2766 2008-08-27T05:13:43.670152Z
2767 18203
2768@@ -168,7 +168,7 @@
2769
2770
2771
2772-2010-08-22T13:44:15.487595Z
2773+2010-03-29T15:57:35.588822Z
2774 a4c20d9b28481e1b2b7efed525cc8fab
2775 2008-08-27T05:13:43.670152Z
2776 18203
2777@@ -202,7 +202,7 @@
2778
2779
2780
2781-2010-08-22T13:44:15.488595Z
2782+2010-03-29T15:57:35.589822Z
2783 f13e4049d177c8434659adeca810dde4
2784 2009-04-10T23:49:38.319787Z
2785 20346
2786@@ -236,7 +236,7 @@
2787
2788
2789
2790-2010-08-22T13:44:15.489594Z
2791+2010-03-29T15:57:35.589822Z
2792 ab82bc3ac709c6ea325e1ba42bbf2bd4
2793 2008-08-27T05:13:43.670152Z
2794 18203
2795@@ -270,7 +270,7 @@
2796
2797
2798
2799-2010-08-22T13:44:15.495603Z
2800+2010-03-29T15:57:35.589822Z
2801 b9fe893e825b7c0843520e46aa83f395
2802 2008-08-27T05:13:43.670152Z
2803 18203
2804@@ -304,7 +304,7 @@
2805
2806
2807
2808-2010-08-22T13:44:15.496597Z
2809+2010-03-29T15:57:35.621822Z
2810 6961feec68b33cf5dc355ec00feb7c80
2811 2008-08-27T05:13:43.670152Z
2812 18203
2813@@ -338,7 +338,7 @@
2814
2815
2816
2817-2010-08-22T13:44:15.497600Z
2818+2010-03-29T15:57:35.622824Z
2819 6606aa8b73e608250e1b5854a81ce512
2820 2008-08-27T05:13:43.670152Z
2821 18203
2822@@ -372,7 +372,7 @@
2823
2824
2825
2826-2010-08-22T13:44:15.498594Z
2827+2010-03-29T15:57:35.623824Z
2828 211ee6c8c6aef99a6189c3ca13d6a44c
2829 2008-08-27T05:13:43.670152Z
2830 18203
2831@@ -406,7 +406,7 @@
2832
2833
2834
2835-2010-08-22T13:44:15.498594Z
2836+2010-03-29T15:57:35.624823Z
2837 fadf079f0e7c90ca5013026ed8b49c8a
2838 2008-08-27T05:13:43.670152Z
2839 18203
2840@@ -440,7 +440,7 @@
2841
2842
2843
2844-2010-08-22T13:44:15.499595Z
2845+2010-03-29T15:57:35.624823Z
2846 f6a565cfbb9739636c7b407925034af4
2847 2008-08-27T05:13:43.670152Z
2848 18203
2849@@ -474,7 +474,7 @@
2850
2851
2852
2853-2010-08-22T13:44:15.500599Z
2854+2010-03-29T15:57:35.625822Z
2855 284e18d40f1d41e7f511e42c7632832e
2856 2009-04-10T23:49:38.319787Z
2857 20346
2858@@ -508,7 +508,7 @@
2859
2860
2861
2862-2010-08-22T13:44:15.501599Z
2863+2010-03-29T15:57:35.627822Z
2864 b285b16bd040088d647471bc4f433521
2865 2008-08-27T05:13:43.670152Z
2866 18203
2867@@ -542,7 +542,7 @@
2868
2869
2870
2871-2010-08-22T13:44:15.501599Z
2872+2010-03-29T15:57:35.627822Z
2873 5b644500c482a66697d763d0b576644f
2874 2008-08-27T05:13:43.670152Z
2875 18203
2876@@ -576,7 +576,7 @@
2877
2878
2879
2880-2010-08-22T13:44:15.500599Z
2881+2010-03-29T15:57:35.626822Z
2882 dd8a9da5e15c76d34c63a5f804dc37fa
2883 2008-08-27T05:13:43.670152Z
2884 18203
2885@@ -610,7 +610,7 @@
2886
2887
2888
2889-2010-08-22T13:44:15.502590Z
2890+2010-03-29T15:57:35.628822Z
2891 c2af96662c06df038f5016b3dae636b7
2892 2008-08-27T05:13:43.670152Z
2893 18203
2894@@ -644,7 +644,7 @@
2895
2896
2897
2898-2010-08-22T13:44:15.503594Z
2899+2010-03-29T15:57:35.629822Z
2900 3fce92e0d1ea7f36ddaef3d8b2105568
2901 2008-08-27T05:13:43.670152Z
2902 18203
2903@@ -678,7 +678,7 @@
2904
2905
2906
2907-2010-08-22T13:44:15.503594Z
2908+2010-03-29T15:57:35.629822Z
2909 17b4d101912cbbf0dee847591ea8b322
2910 2008-08-27T05:13:43.670152Z
2911 18203
2912@@ -712,7 +712,7 @@
2913
2914
2915
2916-2010-08-22T13:44:15.505597Z
2917+2010-03-29T15:57:35.631823Z
2918 22e5a5bf4e6d596bb7680b59b30f75ff
2919 2008-08-27T05:13:43.670152Z
2920 18203
2921@@ -746,7 +746,7 @@
2922
2923
2924
2925-2010-08-22T13:44:15.504594Z
2926+2010-03-29T15:57:35.630822Z
2927 b9d7f56c1425f04244642ce6cf310954
2928 2008-08-27T05:13:43.670152Z
2929 18203
2930@@ -780,7 +780,7 @@
2931
2932
2933
2934-2010-08-22T13:44:15.506595Z
2935+2010-03-29T15:57:35.632822Z
2936 a8c6cc9bb257b3069c0101d6ac302b3b
2937 2009-04-10T23:49:38.319787Z
2938 20346
2939@@ -814,7 +814,7 @@
2940
2941
2942
2943-2010-08-22T13:44:15.505597Z
2944+2010-03-29T15:57:35.632822Z
2945 5f20a54ddf1d5b8f9e9b45b96267b30f
2946 2008-08-27T05:13:43.670152Z
2947 18203
2948@@ -848,7 +848,7 @@
2949
2950
2951
2952-2010-08-22T13:44:15.506595Z
2953+2010-03-29T15:57:35.633821Z
2954 4aeb2171106e8772634dbe52b3d35e36
2955 2008-08-27T05:13:43.670152Z
2956 18203
2957@@ -882,7 +882,7 @@
2958
2959
2960
2961-2010-08-22T13:44:15.507599Z
2962+2010-03-29T15:57:35.633821Z
2963 a3eac503ff62f0dbeed3311f01b251b0
2964 2008-08-27T05:13:43.670152Z
2965 18203
2966@@ -916,7 +916,7 @@
2967
2968
2969
2970-2010-08-22T13:44:15.509594Z
2971+2010-03-29T15:57:35.634822Z
2972 cefec3bf478adf45cc903d1dbf4ae3fc
2973 2008-08-27T05:13:43.670152Z
2974 18203
2975@@ -950,7 +950,7 @@
2976
2977
2978
2979-2010-08-22T13:44:15.508600Z
2980+2010-03-29T15:57:35.634822Z
2981 be18a1ee0043cc70999bd36facf29450
2982 2008-08-27T05:13:43.670152Z
2983 18203
2984@@ -984,7 +984,7 @@
2985
2986
2987
2988-2010-08-22T13:44:15.509594Z
2989+2010-03-29T15:57:35.634822Z
2990 c280743a5788bbe01229d19069922f02
2991 2009-04-10T23:49:38.319787Z
2992 20346
2993@@ -1018,7 +1018,7 @@
2994
2995
2996
2997-2010-08-22T13:44:15.511595Z
2998+2010-03-29T15:57:35.635821Z
2999 318c768b8e1c1523c271eaf343e19906
3000 2008-08-27T05:13:43.670152Z
3001 18203
3002@@ -1052,7 +1052,7 @@
3003
3004
3005
3006-2010-08-22T13:44:15.510598Z
3007+2010-03-29T15:57:35.635821Z
3008 de4c05cbf3cd5897488b15cfa27bf8ea
3009 2008-08-27T05:13:43.670152Z
3010 18203
3011@@ -1086,7 +1086,7 @@
3012
3013
3014
3015-2010-08-22T13:44:15.512592Z
3016+2010-03-29T15:57:35.635821Z
3017 d98575eec8103d213ff89f910f9c044f
3018 2008-08-27T05:13:43.670152Z
3019 18203
3020@@ -1120,7 +1120,7 @@
3021
3022
3023
3024-2010-08-22T13:44:15.512592Z
3025+2010-03-29T15:57:35.636823Z
3026 c797af619a45c25881cccf3640158c03
3027 2008-08-27T05:13:43.670152Z
3028 18203
3029@@ -1154,7 +1154,7 @@
3030
3031
3032
3033-2010-08-22T13:44:15.513592Z
3034+2010-03-29T15:57:35.636823Z
3035 dfb4e2544ac81be43478c8ab56b86bcb
3036 2008-08-27T05:13:43.670152Z
3037 18203
3038@@ -1188,7 +1188,7 @@
3039
3040
3041
3042-2010-08-22T13:44:15.514639Z
3043+2010-03-29T15:57:35.637832Z
3044 a4df8b334b06fcc3be7aa0b7d0e2f320
3045 2009-04-10T23:49:38.319787Z
3046 20346
3047@@ -1222,7 +1222,7 @@
3048
3049
3050
3051-2010-08-22T13:44:15.515604Z
3052+2010-03-29T15:57:35.637832Z
3053 7cb3ad02cbc40b4513eea664e23b68de
3054 2009-04-10T23:49:38.319787Z
3055 20346
3056@@ -1256,7 +1256,7 @@
3057
3058
3059
3060-2010-08-22T13:44:15.519593Z
3061+2010-03-29T15:57:35.637832Z
3062 6b9fcef1660d0d8398402f0e8909816f
3063 2009-04-10T23:49:38.319787Z
3064 20346
3065@@ -1290,7 +1290,7 @@
3066
3067
3068
3069-2010-08-22T13:44:15.520596Z
3070+2010-03-29T15:57:35.638828Z
3071 81e64dea08a86ea4fbba4f52b592409f
3072 2009-04-10T23:49:38.319787Z
3073 20346
3074@@ -1324,7 +1324,7 @@
3075
3076
3077
3078-2010-08-22T13:44:15.523591Z
3079+2010-03-29T15:57:35.638828Z
3080 26647581501cefe26553e5574f321e4c
3081 2008-08-27T05:13:43.670152Z
3082 18203
3083@@ -1358,7 +1358,7 @@
3084
3085
3086
3087-2010-08-22T13:44:15.524599Z
3088+2010-03-29T15:57:35.638828Z
3089 38a0e955a8e5a15ef57ad0e42eed4827
3090 2008-08-27T05:13:43.670152Z
3091 18203
3092@@ -1392,7 +1392,7 @@
3093
3094
3095
3096-2010-08-22T13:44:15.526596Z
3097+2010-03-29T15:57:35.639946Z
3098 beb7a600a06b8027805f88ef6cf6ae15
3099 2008-09-29T20:04:08.773402Z
3100 18509
3101@@ -1426,7 +1426,7 @@
3102
3103
3104
3105-2010-08-22T13:44:15.527601Z
3106+2010-03-29T15:57:35.639946Z
3107 248b90fe568052bbd14d6ec1e8899b42
3108 2008-08-27T05:13:43.670152Z
3109 18203
3110@@ -1460,7 +1460,7 @@
3111
3112
3113
3114-2010-08-22T13:44:15.528603Z
3115+2010-03-29T15:57:35.639946Z
3116 ecf27d90f34f2e2e95f32774f449273d
3117 2008-08-27T05:13:43.670152Z
3118 18203
3119@@ -1494,7 +1494,7 @@
3120
3121
3122
3123-2010-08-22T13:44:15.530602Z
3124+2010-03-29T15:57:35.640946Z
3125 52232b69b35cd7bf889e8ac5146846ce
3126 2006-04-01T07:29:59.538394Z
3127 9590