diff options
| author | louis <louis.braun@gmx.de> | 2015-07-07 17:58:10 +0200 |
|---|---|---|
| committer | louis <louis.braun@gmx.de> | 2015-07-07 17:58:10 +0200 |
| commit | 5a6fb850b35bc63325cac482daaa70b00b0e8e8b (patch) | |
| tree | c46bea143641a4a0f4461b971ae2cd03e10ac76b /dtd | |
| parent | 50fe393724a265341b1745dd401db9d93f46f354 (diff) | |
| download | vdr-plugin-skindesigner-5a6fb850b35bc63325cac482daaa70b00b0e8e8b.tar.gz vdr-plugin-skindesigner-5a6fb850b35bc63325cac482daaa70b00b0e8e8b.tar.bz2 | |
immplemented areacontainers to group areas
Diffstat (limited to 'dtd')
| -rw-r--r-- | dtd/displayaudiotracks.dtd | 6 | ||||
| -rw-r--r-- | dtd/displaychannel.dtd | 38 | ||||
| -rw-r--r-- | dtd/displaymenu.dtd | 46 | ||||
| -rw-r--r-- | dtd/displaymenuplugin.dtd | 20 | ||||
| -rw-r--r-- | dtd/displaymessage.dtd | 4 | ||||
| -rw-r--r-- | dtd/displayplugin.dtd | 6 | ||||
| -rw-r--r-- | dtd/displayreplay.dtd | 38 | ||||
| -rw-r--r-- | dtd/functions.dtd | 12 |
8 files changed, 90 insertions, 80 deletions
diff --git a/dtd/displayaudiotracks.dtd b/dtd/displayaudiotracks.dtd index 0ebdf80..b4b0c59 100644 --- a/dtd/displayaudiotracks.dtd +++ b/dtd/displayaudiotracks.dtd @@ -21,13 +21,13 @@ debuggrid CDATA #IMPLIED
>
-<!ELEMENT background (area|areascroll)*>
+<!ELEMENT background (areacontainer|area|areascroll)*>
<!ATTLIST background
debug CDATA #IMPLIED
condition CDATA #IMPLIED
>
-<!ELEMENT header (area|areascroll)*>
+<!ELEMENT header (areacontainer|area|areascroll)*>
<!ATTLIST header
debug CDATA #IMPLIED
condition CDATA #IMPLIED
@@ -45,6 +45,6 @@ orientation (horizontal|vertical) #REQUIRED
>
-<!ELEMENT listelement (area|areascroll)*>
+<!ELEMENT listelement (areacontainer|area|areascroll)*>
%functions;
\ No newline at end of file diff --git a/dtd/displaychannel.dtd b/dtd/displaychannel.dtd index e0f718b..589f372 100644 --- a/dtd/displaychannel.dtd +++ b/dtd/displaychannel.dtd @@ -24,79 +24,79 @@ debuggrid CDATA #IMPLIED
>
-<!ELEMENT background (area)*>
+<!ELEMENT background (areacontainer|area|areascroll)*>
<!ATTLIST background
debug CDATA #IMPLIED
condition CDATA #IMPLIED
>
-<!ELEMENT channelinfo (area|areascroll)*>
+<!ELEMENT channelinfo (areacontainer|area|areascroll)*>
<!ATTLIST channelinfo
debug CDATA #IMPLIED
condition CDATA #IMPLIED
>
-<!ELEMENT epginfo (area|areascroll)*>
+<!ELEMENT epginfo (areacontainer|area|areascroll)*>
<!ATTLIST epginfo
debug CDATA #IMPLIED
condition CDATA #IMPLIED
>
-<!ELEMENT progressbar (area|areascroll)*>
+<!ELEMENT progressbar (areacontainer|area|areascroll)*>
<!ATTLIST progressbar
debug CDATA #IMPLIED
condition CDATA #IMPLIED
>
-<!ELEMENT progressbarback (area)*>
+<!ELEMENT progressbarback (areacontainer|area|areascroll)*>
<!ATTLIST progressbarback
debug CDATA #IMPLIED
condition CDATA #IMPLIED
>
-<!ELEMENT statusinfo (area|areascroll)*>
+<!ELEMENT statusinfo (areacontainer|area|areascroll)*>
<!ATTLIST statusinfo
debug CDATA #IMPLIED
condition CDATA #IMPLIED
>
-<!ELEMENT audioinfo (area|areascroll)*>
+<!ELEMENT audioinfo (areacontainer|area|areascroll)*>
<!ATTLIST audioinfo
debug CDATA #IMPLIED
condition CDATA #IMPLIED
>
-<!ELEMENT ecminfo (area|areascroll)*>
+<!ELEMENT ecminfo (areacontainer|area|areascroll)*>
<!ATTLIST ecminfo
debug CDATA #IMPLIED
condition CDATA #IMPLIED
>
-<!ELEMENT screenresolution (area|areascroll)*>
+<!ELEMENT screenresolution (areacontainer|area|areascroll)*>
<!ATTLIST screenresolution
debug CDATA #IMPLIED
condition CDATA #IMPLIED
>
-<!ELEMENT channelgroup (area|areascroll)*>
+<!ELEMENT channelgroup (areacontainer|area|areascroll)*>
<!ATTLIST channelgroup
debug CDATA #IMPLIED
condition CDATA #IMPLIED
>
-<!ELEMENT signalquality (area|areascroll)*>
+<!ELEMENT signalquality (areacontainer|area|areascroll)*>
<!ATTLIST signalquality
debug CDATA #IMPLIED
condition CDATA #IMPLIED
>
-<!ELEMENT signalqualityback (area|areascroll)*>
+<!ELEMENT signalqualityback (areacontainer|area|areascroll)*>
<!ATTLIST signalqualityback
debug CDATA #IMPLIED
condition CDATA #IMPLIED
>
-<!ELEMENT devices (area|areascroll)*>
+<!ELEMENT devices (areacontainer|area|areascroll)*>
<!ATTLIST devices
detached CDATA #IMPLIED
delay CDATA #IMPLIED
@@ -111,7 +111,7 @@ mode CDATA #IMPLIED
>
-<!ELEMENT currentweather (area|areascroll)*>
+<!ELEMENT currentweather (areacontainer|area|areascroll)*>
<!ATTLIST currentweather
detached CDATA #IMPLIED
delay CDATA #IMPLIED
@@ -125,7 +125,7 @@ condition CDATA #IMPLIED
>
-<!ELEMENT scrapercontent (area|areascroll)*>
+<!ELEMENT scrapercontent (areacontainer|area|areascroll)*>
<!ATTLIST scrapercontent
detached CDATA #IMPLIED
delay CDATA #IMPLIED
@@ -139,7 +139,7 @@ condition CDATA #IMPLIED
>
-<!ELEMENT datetime (area|areascroll)*>
+<!ELEMENT datetime (areacontainer|area|areascroll)*>
<!ATTLIST datetime
detached CDATA #IMPLIED
delay CDATA #IMPLIED
@@ -153,7 +153,7 @@ condition CDATA #IMPLIED
>
-<!ELEMENT time (area|areascroll)*>
+<!ELEMENT time (areacontainer|area|areascroll)*>
<!ATTLIST time
detached CDATA #IMPLIED
delay CDATA #IMPLIED
@@ -167,13 +167,13 @@ condition CDATA #IMPLIED
>
-<!ELEMENT message (area|areascroll)*>
+<!ELEMENT message (areacontainer|area|areascroll)*>
<!ATTLIST message
debug CDATA #IMPLIED
condition CDATA #IMPLIED
>
-<!ELEMENT customtokens (area|areascroll)*>
+<!ELEMENT customtokens (areacontainer|area|areascroll)*>
<!ATTLIST customtokens
detached CDATA #IMPLIED
delay CDATA #IMPLIED
diff --git a/dtd/displaymenu.dtd b/dtd/displaymenu.dtd index 7bff662..0569d42 100644 --- a/dtd/displaymenu.dtd +++ b/dtd/displaymenu.dtd @@ -16,13 +16,13 @@ debuggrid CDATA #IMPLIED
>
-<!ELEMENT background (area)*>
+<!ELEMENT background (areacontainer|area|areascroll)*>
<!ATTLIST background
debug CDATA #IMPLIED
condition CDATA #IMPLIED
>
-<!ELEMENT header (area|areascroll)*>
+<!ELEMENT header (areacontainer|area|areascroll)*>
<!ATTLIST header
detached CDATA #IMPLIED
delay CDATA #IMPLIED
@@ -36,7 +36,7 @@ condition CDATA #IMPLIED
>
-<!ELEMENT datetime (area|areascroll)*>
+<!ELEMENT datetime (areacontainer|area|areascroll)*>
<!ATTLIST datetime
detached CDATA #IMPLIED
delay CDATA #IMPLIED
@@ -50,7 +50,7 @@ condition CDATA #IMPLIED
>
-<!ELEMENT time (area|areascroll)*>
+<!ELEMENT time (areacontainer|area|areascroll)*>
<!ATTLIST time
detached CDATA #IMPLIED
delay CDATA #IMPLIED
@@ -64,7 +64,7 @@ condition CDATA #IMPLIED
>
-<!ELEMENT message (area|areascroll)*>
+<!ELEMENT message (areacontainer|area|areascroll)*>
<!ATTLIST message
detached CDATA #IMPLIED
delay CDATA #IMPLIED
@@ -78,19 +78,19 @@ condition CDATA #IMPLIED
>
-<!ELEMENT sortmode (area|areascroll)*>
+<!ELEMENT sortmode (areacontainer|area|areascroll)*>
<!ATTLIST sortmode
debug CDATA #IMPLIED
condition CDATA #IMPLIED
>
-<!ELEMENT colorbuttons (area|areascroll)*>
+<!ELEMENT colorbuttons (areacontainer|area|areascroll)*>
<!ATTLIST colorbuttons
debug CDATA #IMPLIED
condition CDATA #IMPLIED
>
-<!ELEMENT timers (area|areascroll)*>
+<!ELEMENT timers (areacontainer|area|areascroll)*>
<!ATTLIST timers
detached CDATA #IMPLIED
delay CDATA #IMPLIED
@@ -104,7 +104,7 @@ condition CDATA #IMPLIED
>
-<!ELEMENT discusage (area|areascroll)*>
+<!ELEMENT discusage (areacontainer|area|areascroll)*>
<!ATTLIST discusage
detached CDATA #IMPLIED
delay CDATA #IMPLIED
@@ -118,7 +118,7 @@ condition CDATA #IMPLIED
>
-<!ELEMENT devices (area|areascroll)*>
+<!ELEMENT devices (areacontainer|area|areascroll)*>
<!ATTLIST devices
detached CDATA #IMPLIED
delay CDATA #IMPLIED
@@ -133,7 +133,7 @@ mode CDATA #IMPLIED
>
-<!ELEMENT systemload (area|areascroll)*>
+<!ELEMENT systemload (areacontainer|area|areascroll)*>
<!ATTLIST systemload
detached CDATA #IMPLIED
delay CDATA #IMPLIED
@@ -147,7 +147,7 @@ condition CDATA #IMPLIED
>
-<!ELEMENT systemmemory (area|areascroll)*>
+<!ELEMENT systemmemory (areacontainer|area|areascroll)*>
<!ATTLIST systemmemory
detached CDATA #IMPLIED
delay CDATA #IMPLIED
@@ -161,7 +161,7 @@ condition CDATA #IMPLIED
>
-<!ELEMENT temperatures (area|areascroll)*>
+<!ELEMENT temperatures (areacontainer|area|areascroll)*>
<!ATTLIST temperatures
detached CDATA #IMPLIED
delay CDATA #IMPLIED
@@ -175,7 +175,7 @@ condition CDATA #IMPLIED
>
-<!ELEMENT vdrstatistics (area|areascroll)*>
+<!ELEMENT vdrstatistics (areacontainer|area|areascroll)*>
<!ATTLIST vdrstatistics
detached CDATA #IMPLIED
delay CDATA #IMPLIED
@@ -189,7 +189,7 @@ condition CDATA #IMPLIED
>
-<!ELEMENT currentschedule (area|areascroll)*>
+<!ELEMENT currentschedule (areacontainer|area|areascroll)*>
<!ATTLIST currentschedule
detached CDATA #IMPLIED
delay CDATA #IMPLIED
@@ -203,7 +203,7 @@ condition CDATA #IMPLIED
>
-<!ELEMENT currentweather (area|areascroll)*>
+<!ELEMENT currentweather (areacontainer|area|areascroll)*>
<!ATTLIST currentweather
detached CDATA #IMPLIED
delay CDATA #IMPLIED
@@ -217,7 +217,7 @@ condition CDATA #IMPLIED
>
-<!ELEMENT lastrecordings (area|areascroll)*>
+<!ELEMENT lastrecordings (areacontainer|area|areascroll)*>
<!ATTLIST lastrecordings
detached CDATA #IMPLIED
delay CDATA #IMPLIED
@@ -231,7 +231,7 @@ condition CDATA #IMPLIED
>
-<!ELEMENT customtokens (area|areascroll)*>
+<!ELEMENT customtokens (areacontainer|area|areascroll)*>
<!ATTLIST customtokens
detached CDATA #IMPLIED
delay CDATA #IMPLIED
@@ -245,19 +245,19 @@ condition CDATA #IMPLIED
>
-<!ELEMENT scrollbar (area|areascroll)*>
+<!ELEMENT scrollbar (areacontainer|area|areascroll)*>
<!ATTLIST scrollbar
debug CDATA #IMPLIED
condition CDATA #IMPLIED
>
-<!ELEMENT detailheader (area|areascroll)*>
+<!ELEMENT detailheader (areacontainer|area|areascroll)*>
<!ATTLIST detailheader
debug CDATA #IMPLIED
condition CDATA #IMPLIED
>
-<!ELEMENT tablabels (area|areascroll)*>
+<!ELEMENT tablabels (areacontainer|area|areascroll)*>
<!ATTLIST tablabels
debug CDATA #IMPLIED
condition CDATA #IMPLIED
@@ -421,12 +421,12 @@ orientation (horizontal|vertical) #REQUIRED
>
-<!ELEMENT listelement (area|areascroll)*>
+<!ELEMENT listelement (areacontainer|area|areascroll)*>
<!ATTLIST listelement
debug CDATA #IMPLIED
>
-<!ELEMENT currentelement (area|areascroll)*>
+<!ELEMENT currentelement (areacontainer|area|areascroll)*>
<!ATTLIST currentelement
delay CDATA #REQUIRED
fadetime CDATA #IMPLIED
diff --git a/dtd/displaymenuplugin.dtd b/dtd/displaymenuplugin.dtd index d7352c6..1f9560f 100644 --- a/dtd/displaymenuplugin.dtd +++ b/dtd/displaymenuplugin.dtd @@ -16,42 +16,42 @@ debuggrid CDATA #IMPLIED
>
-<!ELEMENT background (area)*>
+<!ELEMENT background (areacontainer|area|areascroll)*>
<!ATTLIST background
debug CDATA #IMPLIED
>
-<!ELEMENT header (area|areascroll)*>
+<!ELEMENT header (areacontainer|area|areascroll)*>
<!ATTLIST header
debug CDATA #IMPLIED
>
-<!ELEMENT datetime (area|areascroll)*>
+<!ELEMENT datetime (areacontainer|area|areascroll)*>
<!ATTLIST datetime
debug CDATA #IMPLIED
>
-<!ELEMENT message (area|areascroll)*>
+<!ELEMENT message (areacontainer|area|areascroll)*>
<!ATTLIST message
debug CDATA #IMPLIED
>
-<!ELEMENT colorbuttons (area|areascroll)*>
+<!ELEMENT colorbuttons (areacontainer|area|areascroll)*>
<!ATTLIST colorbuttons
debug CDATA #IMPLIED
>
-<!ELEMENT scrollbar (area|areascroll)*>
+<!ELEMENT scrollbar (areacontainer|area|areascroll)*>
<!ATTLIST scrollbar
debug CDATA #IMPLIED
>
-<!ELEMENT detailheader (area|areascroll)*>
+<!ELEMENT detailheader (areacontainer|area|areascroll)*>
<!ATTLIST detailheader
debug CDATA #IMPLIED
>
-<!ELEMENT tablabels (area|areascroll)*>
+<!ELEMENT tablabels (areacontainer|area|areascroll)*>
<!ATTLIST tablabels
debug CDATA #IMPLIED
>
@@ -68,12 +68,12 @@ orientation (horizontal|vertical) #REQUIRED
>
-<!ELEMENT listelement (area|areascroll)*>
+<!ELEMENT listelement (areacontainer|area|areascroll)*>
<!ATTLIST listelement
debug CDATA #IMPLIED
>
-<!ELEMENT currentelement (area|areascroll)*>
+<!ELEMENT currentelement (areacontainer|area|areascroll)*>
<!ATTLIST currentelement
delay CDATA #REQUIRED
fadetime CDATA #IMPLIED
diff --git a/dtd/displaymessage.dtd b/dtd/displaymessage.dtd index 1b85442..392adf5 100644 --- a/dtd/displaymessage.dtd +++ b/dtd/displaymessage.dtd @@ -21,12 +21,12 @@ debuggrid CDATA #IMPLIED
>
-<!ELEMENT background (area)*>
+<!ELEMENT background (areacontainer|area|areascroll)*>
<!ATTLIST background
debug CDATA #IMPLIED
>
-<!ELEMENT message (area|areascroll)*>
+<!ELEMENT message (areacontainer|area|areascroll)*>
<!ATTLIST message
debug CDATA #IMPLIED
>
diff --git a/dtd/displayplugin.dtd b/dtd/displayplugin.dtd index 2e436d9..9d00b26 100644 --- a/dtd/displayplugin.dtd +++ b/dtd/displayplugin.dtd @@ -22,18 +22,18 @@ debuggrid CDATA #IMPLIED
>
-<!ELEMENT viewelement (area|areascroll)*>
+<!ELEMENT viewelement (areacontainer|area|areascroll)*>
<!ATTLIST viewelement
name CDATA #REQUIRED
debug CDATA #IMPLIED
>
-<!ELEMENT scrollbar (area|areascroll)*>
+<!ELEMENT scrollbar (areacontainer|area|areascroll)*>
<!ATTLIST scrollbar
debug CDATA #IMPLIED
>
-<!ELEMENT tablabels (area|areascroll)*>
+<!ELEMENT tablabels (areacontainer|area|areascroll)*>
<!ATTLIST tablabels
debug CDATA #IMPLIED
>
diff --git a/dtd/displayreplay.dtd b/dtd/displayreplay.dtd index d5d47fc..e0bfa3b 100644 --- a/dtd/displayreplay.dtd +++ b/dtd/displayreplay.dtd @@ -25,29 +25,29 @@ debuggrid CDATA #IMPLIED
>
-<!ELEMENT background (area)*>
+<!ELEMENT background (areacontainer|area|areascroll)*>
<!ATTLIST background
debug CDATA #IMPLIED
>
-<!ELEMENT backgroundmodeonly (area)*>
+<!ELEMENT backgroundmodeonly (areacontainer|area|areascroll)*>
<!ATTLIST backgroundmodeonly
debug CDATA #IMPLIED
>
-<!ELEMENT datetime (area|areascroll)*>
+<!ELEMENT datetime (areacontainer|area|areascroll)*>
<!ATTLIST datetime
debug CDATA #IMPLIED
condition CDATA #IMPLIED
>
-<!ELEMENT time (area|areascroll)*>
+<!ELEMENT time (areacontainer|area|areascroll)*>
<!ATTLIST time
debug CDATA #IMPLIED
condition CDATA #IMPLIED
>
-<!ELEMENT scrapercontent (area|areascroll)*>
+<!ELEMENT scrapercontent (areacontainer|area|areascroll)*>
<!ATTLIST scrapercontent
detached CDATA #IMPLIED
delay CDATA #IMPLIED
@@ -61,73 +61,73 @@ condition CDATA #IMPLIED
>
-<!ELEMENT rectitle (area|areascroll)*>
+<!ELEMENT rectitle (areacontainer|area|areascroll)*>
<!ATTLIST rectitle
debug CDATA #IMPLIED
condition CDATA #IMPLIED
>
-<!ELEMENT recinfo (area|areascroll)*>
+<!ELEMENT recinfo (areacontainer|area|areascroll)*>
<!ATTLIST recinfo
debug CDATA #IMPLIED
condition CDATA #IMPLIED
>
-<!ELEMENT currenttime (area|areascroll)*>
+<!ELEMENT currenttime (areacontainer|area|areascroll)*>
<!ATTLIST currenttime
debug CDATA #IMPLIED
condition CDATA #IMPLIED
>
-<!ELEMENT totaltime (area|areascroll)*>
+<!ELEMENT totaltime (areacontainer|area|areascroll)*>
<!ATTLIST totaltime
debug CDATA #IMPLIED
condition CDATA #IMPLIED
>
-<!ELEMENT endtime (area|areascroll)*>
+<!ELEMENT endtime (areacontainer|area|areascroll)*>
<!ATTLIST endtime
debug CDATA #IMPLIED
condition CDATA #IMPLIED
>
-<!ELEMENT progressbar (area|areascroll)*>
+<!ELEMENT progressbar (areacontainer|area|areascroll)*>
<!ATTLIST progressbar
debug CDATA #IMPLIED
condition CDATA #IMPLIED
>
-<!ELEMENT cutmarks (area|areascroll)*>
+<!ELEMENT cutmarks (areacontainer|area|areascroll)*>
<!ATTLIST cutmarks
debug CDATA #IMPLIED
condition CDATA #IMPLIED
>
-<!ELEMENT controlicons (area|areascroll)*>
+<!ELEMENT controlicons (areacontainer|area|areascroll)*>
<!ATTLIST controlicons
debug CDATA #IMPLIED
condition CDATA #IMPLIED
>
-<!ELEMENT controliconsmodeonly (area|areascroll)*>
+<!ELEMENT controliconsmodeonly (areacontainer|area|areascroll)*>
<!ATTLIST controliconsmodeonly
debug CDATA #IMPLIED
condition CDATA #IMPLIED
>
-<!ELEMENT jump (area|areascroll)*>
+<!ELEMENT jump (areacontainer|area|areascroll)*>
<!ATTLIST jump
debug CDATA #IMPLIED
condition CDATA #IMPLIED
>
-<!ELEMENT message (area|areascroll)*>
+<!ELEMENT message (areacontainer|area|areascroll)*>
<!ATTLIST message
debug CDATA #IMPLIED
condition CDATA #IMPLIED
>
-<!ELEMENT onpause (area|areascroll)*>
+<!ELEMENT onpause (areacontainer|area|areascroll)*>
<!ATTLIST onpause
debug CDATA #IMPLIED
delay CDATA #REQUIRED
@@ -135,7 +135,7 @@ condition CDATA #IMPLIED
>
-<!ELEMENT onpausemodeonly (area|areascroll)*>
+<!ELEMENT onpausemodeonly (areacontainer|area|areascroll)*>
<!ATTLIST onpausemodeonly
debug CDATA #IMPLIED
delay CDATA #REQUIRED
@@ -143,7 +143,7 @@ condition CDATA #IMPLIED
>
-<!ELEMENT customtokens (area|areascroll)*>
+<!ELEMENT customtokens (areacontainer|area|areascroll)*>
<!ATTLIST customtokens
debug CDATA #IMPLIED
condition CDATA #IMPLIED
diff --git a/dtd/functions.dtd b/dtd/functions.dtd index 50198f4..85ef1f5 100644 --- a/dtd/functions.dtd +++ b/dtd/functions.dtd @@ -1,3 +1,13 @@ +<!ELEMENT areacontainer (area|areascroll)*> +<!ATTLIST areacontainer + x CDATA #IMPLIED + y CDATA #IMPLIED + width CDATA #IMPLIED + height CDATA #IMPLIED + condition CDATA #IMPLIED + debug (true|false) #IMPLIED +> + <!ELEMENT area (loop|fill|drawtext|drawtextbox|drawimage|drawtextvertical|drawrectangle|drawellipse|drawslope)*> <!ATTLIST area x CDATA #IMPLIED @@ -28,7 +38,7 @@ debug (true|false) #IMPLIED > -<!ELEMENT grid (area|areascroll)*> +<!ELEMENT grid (areacontainer|area|areascroll)*> <!ATTLIST grid x CDATA #REQUIRED y CDATA #REQUIRED |
