Author: duncan
Date: Wed Jan 31 18:55:04 2007
New Revision: 9115
Added:
branches/rel-1/freevo/share/skins/freevo-skin.dtd
- copied, changed from r9109,
/branches/rel-1/freevo/share/skins/main/freevo-skin.dtd
Removed:
branches/rel-1/freevo/share/skins/main/freevo-skin.dtd
Modified:
branches/rel-1/freevo/share/skins/main/basic.fxd
branches/rel-1/freevo/share/skins/main/bluestar.fxd
branches/rel-1/freevo/share/skins/main/blurr.fxd
branches/rel-1/freevo/share/skins/main/crystal.fxd
branches/rel-1/freevo/share/skins/main/dark.fxd
branches/rel-1/freevo/share/skins/main/image.fxd
branches/rel-1/freevo/share/skins/main/info.fxd
branches/rel-1/freevo/share/skins/main/mediaportal.fxd
branches/rel-1/freevo/share/skins/main/noia.fxd
branches/rel-1/freevo/share/skins/main/rain.fxd
branches/rel-1/freevo/share/skins/plugins/video_details.fxd
Log:
Added more restrictions to the DTD and moved it to the parent directory
Added the DTD to the other skins. Dark shows an error with the font.
Copied: branches/rel-1/freevo/share/skins/freevo-skin.dtd (from r9109,
/branches/rel-1/freevo/share/skins/main/freevo-skin.dtd)
==============================================================================
--- /branches/rel-1/freevo/share/skins/main/freevo-skin.dtd (original)
+++ branches/rel-1/freevo/share/skins/freevo-skin.dtd Wed Jan 31 18:55:04 2007
@@ -1,4 +1,10 @@
<!-- DTD for Freevo Skins -->
+<!NOTATION jpeg SYSTEM "image/jpeg">
+<!NOTATION png SYSTEM "image/png">
+<!ENTITY % visible "(yes | no | not-idlebar)">
+<!ENTITY % align "(left | center | right | justified)">
+<!ENTITY % valign "(top | center | bottom)">
+
<!ELEMENT freevo (skin)>
<!ELEMENT skin ((iconset | setvar | main | menu | menuset | layout | font |
color | image | popup | player | tv | splashscreen | headlines)+)>
@@ -9,8 +15,8 @@
<!ATTLIST iconset theme CDATA #REQUIRED>
<!ELEMENT setvar EMPTY>
-<!ATTLIST setvar name CDATA #REQUIRED>
-<!ATTLIST setvar val CDATA #REQUIRED>
+<!ATTLIST setvar name (box_under_icon | anamorphic) #REQUIRED>
+<!ATTLIST setvar val (0 | 1) #REQUIRED>
<!ELEMENT main (item+)>
<!ATTLIST main imagedir CDATA #IMPLIED>
@@ -22,58 +28,82 @@
<!ATTLIST style text CDATA #REQUIRED>
<!ATTLIST style image CDATA #IMPLIED>
-<!ELEMENT menuset ((screen | title | view | listing | info)+)>
+<!-- label is really an id but can't have spaces -->
+<!ELEMENT menuset ((screen | title | subtitle | view | listing | info)+)>
<!ATTLIST menuset label CDATA #REQUIRED>
<!ATTLIST menuset inherits CDATA #IMPLIED>
<!ELEMENT screen (area?)>
-<!ATTLIST screen layout CDATA #REQUIRED>
-<!ATTLIST screen height CDATA #IMPLIED>
-<!ATTLIST screen width CDATA #IMPLIED>
-<!ATTLIST screen x CDATA #IMPLIED>
-<!ATTLIST screen y CDATA #IMPLIED>
-<!ATTLIST screen visible CDATA #IMPLIED>
+<!ATTLIST screen
+ layout CDATA #REQUIRED
+ width CDATA #IMPLIED
+ height CDATA #IMPLIED
+ x CDATA #IMPLIED
+ y CDATA #IMPLIED
+ visible CDATA #IMPLIED
+>
<!ELEMENT area EMPTY>
-<!ATTLIST area layout CDATA #IMPLIED>
-<!ATTLIST area height CDATA #IMPLIED>
-<!ATTLIST area width CDATA #IMPLIED>
-<!ATTLIST area x CDATA #IMPLIED>
-<!ATTLIST area y CDATA #IMPLIED>
-<!ATTLIST area visible CDATA #IMPLIED>
+<!ATTLIST area
+ layout CDATA #IMPLIED
+ width CDATA #IMPLIED
+ height CDATA #IMPLIED
+ x CDATA #IMPLIED
+ y CDATA #IMPLIED
+ visible CDATA #IMPLIED
+>
<!ELEMENT title EMPTY>
-<!ATTLIST title layout CDATA #IMPLIED>
-<!ATTLIST title height CDATA #IMPLIED>
-<!ATTLIST title width CDATA #IMPLIED>
-<!ATTLIST title x CDATA #IMPLIED>
-<!ATTLIST title y CDATA #IMPLIED>
-<!ATTLIST title visible CDATA #IMPLIED>
+<!ATTLIST title
+ layout CDATA #IMPLIED
+ width CDATA #IMPLIED
+ height CDATA #IMPLIED
+ x CDATA #IMPLIED
+ y CDATA #IMPLIED
+ align %align; #IMPLIED
+ visible CDATA #IMPLIED
+>
+
+<!ELEMENT subtitle EMPTY>
+<!ATTLIST subtitle
+ layout CDATA #IMPLIED
+ width CDATA #IMPLIED
+ height CDATA #IMPLIED
+ x CDATA #IMPLIED
+ y CDATA #IMPLIED
+ visible CDATA #IMPLIED
+>
<!ELEMENT view EMPTY>
-<!ATTLIST view layout CDATA #IMPLIED>
-<!ATTLIST view align CDATA #IMPLIED>
-<!ATTLIST view height CDATA #IMPLIED>
-<!ATTLIST view width CDATA #IMPLIED>
-<!ATTLIST view x CDATA #IMPLIED>
-<!ATTLIST view y CDATA #IMPLIED>
-<!ATTLIST view visible CDATA #IMPLIED>
+<!ATTLIST view
+ layout CDATA #IMPLIED
+ align %align; #IMPLIED
+ width CDATA #IMPLIED
+ height CDATA #IMPLIED
+ x CDATA #IMPLIED
+ y CDATA #IMPLIED
+ visible CDATA #IMPLIED
+>
<!ELEMENT listing (image*, area*)>
-<!ATTLIST listing layout CDATA #IMPLIED>
-<!ATTLIST listing height CDATA #IMPLIED>
-<!ATTLIST listing width CDATA #IMPLIED>
-<!ATTLIST listing x CDATA #IMPLIED>
-<!ATTLIST listing y CDATA #IMPLIED>
-<!ATTLIST listing visible CDATA #IMPLIED>
+<!ATTLIST listing
+ layout CDATA #IMPLIED
+ width CDATA #IMPLIED
+ height CDATA #IMPLIED
+ x CDATA #IMPLIED
+ y CDATA #IMPLIED
+ visible CDATA #IMPLIED
+>
<!ELEMENT info EMPTY>
-<!ATTLIST info layout CDATA #IMPLIED>
-<!ATTLIST info height CDATA #IMPLIED>
-<!ATTLIST info width CDATA #IMPLIED>
-<!ATTLIST info x CDATA #IMPLIED>
-<!ATTLIST info y CDATA #IMPLIED>
-<!ATTLIST info visible CDATA #IMPLIED>
+<!ATTLIST info
+ layout CDATA #IMPLIED
+ width CDATA #IMPLIED
+ height CDATA #IMPLIED
+ x CDATA #IMPLIED
+ y CDATA #IMPLIED
+ visible CDATA #IMPLIED
+>
<!ELEMENT layout (background?, content?)>
<!ATTLIST layout label CDATA #REQUIRED>
@@ -81,88 +111,115 @@
<!ELEMENT background (image*, rectangle*, image?)>
<!ELEMENT content (item*)>
-<!ATTLIST content color CDATA #IMPLIED>
-<!ATTLIST content font CDATA #IMPLIED>
-<!ATTLIST content type CDATA #IMPLIED>
-<!ATTLIST content align CDATA #IMPLIED>
-<!ATTLIST content valign CDATA #IMPLIED>
-<!ATTLIST content spacing CDATA #IMPLIED>
-<!ATTLIST content height CDATA #IMPLIED>
-<!ATTLIST content width CDATA #IMPLIED>
-<!ATTLIST content x CDATA #IMPLIED>
-<!ATTLIST content y CDATA #IMPLIED>
-<!ATTLIST content hours_per_page CDATA #IMPLIED>
-<!ATTLIST content layout CDATA #IMPLIED>
+<!ATTLIST content
+ color CDATA #IMPLIED
+ font CDATA #IMPLIED
+ type CDATA #IMPLIED
+ align %align; #IMPLIED
+ valign %valign; #IMPLIED
+ spacing CDATA #IMPLIED
+ width CDATA #IMPLIED
+ height CDATA #IMPLIED
+ x CDATA #IMPLIED
+ y CDATA #IMPLIED
+ hours_per_page CDATA #IMPLIED
+ layout CDATA #IMPLIED
+>
+<!-- only splashscreen has a content with a layout
+ layout CDATA #IMPLIED
+-->
<!ELEMENT player (screen, ((view, info)? | (info, view)?), title)>
<!ELEMENT image EMPTY>
-<!ATTLIST image filename CDATA #IMPLIED>
-<!ATTLIST image label CDATA #IMPLIED>
-<!ATTLIST image image CDATA #IMPLIED>
-<!ATTLIST image height CDATA #IMPLIED>
-<!ATTLIST image width CDATA #IMPLIED>
-<!ATTLIST image x CDATA #IMPLIED>
-<!ATTLIST image y CDATA #IMPLIED>
-<!ATTLIST image visible CDATA #IMPLIED>
+<!ATTLIST image
+ label CDATA #IMPLIED
+ filename CDATA #IMPLIED
+ image CDATA #IMPLIED
+ width CDATA #IMPLIED
+ height CDATA #IMPLIED
+ x CDATA #IMPLIED
+ y CDATA #IMPLIED
+ visible CDATA #IMPLIED
+>
<!ELEMENT item ((rectangle | if | goto_pos | text | shadow | newline)*)>
-<!ATTLIST item label CDATA #IMPLIED>
-<!ATTLIST item image CDATA #IMPLIED>
-<!ATTLIST item name CDATA #IMPLIED>
-<!ATTLIST item font CDATA #IMPLIED>
-<!ATTLIST item type CDATA #IMPLIED>
-<!ATTLIST item align CDATA #IMPLIED>
-<!ATTLIST item valign CDATA #IMPLIED>
-<!ATTLIST item height CDATA #IMPLIED>
-<!ATTLIST item width CDATA #IMPLIED>
+<!ATTLIST item
+ label CDATA #IMPLIED
+ image CDATA #IMPLIED
+ name CDATA #IMPLIED
+ font CDATA #IMPLIED
+ type CDATA #IMPLIED
+ icon CDATA #IMPLIED
+ outicon CDATA #IMPLIED
+ align %align; #IMPLIED
+ valign %valign; #IMPLIED
+ width CDATA #IMPLIED
+ height CDATA #IMPLIED
+>
<!ELEMENT font (shadow?)>
-<!ATTLIST font color CDATA #IMPLIED>
-<!ATTLIST font label CDATA #REQUIRED>
-<!ATTLIST font name CDATA #REQUIRED>
-<!ATTLIST font size CDATA #REQUIRED>
+<!ATTLIST font
+ label CDATA #REQUIRED
+ name CDATA #IMPLIED
+ color CDATA #IMPLIED
+ size CDATA #IMPLIED
+>
+<!--
+ align %align; #IMPLIED
+-->
<!ELEMENT color EMPTY>
-<!ATTLIST color label CDATA #REQUIRED>
-<!ATTLIST color value CDATA #REQUIRED>
+<!ATTLIST color
+ label CDATA #REQUIRED
+ value CDATA #REQUIRED
+>
<!ELEMENT shadow EMPTY>
-<!ATTLIST shadow border CDATA #IMPLIED>
-<!ATTLIST shadow color CDATA #REQUIRED>
-<!ATTLIST shadow visible CDATA #REQUIRED>
-<!ATTLIST shadow x CDATA #IMPLIED>
-<!ATTLIST shadow y CDATA #IMPLIED>
+<!ATTLIST shadow
+ border CDATA #IMPLIED
+ color CDATA #REQUIRED
+ visible CDATA #REQUIRED
+ x CDATA #IMPLIED
+ y CDATA #IMPLIED
+>
<!ELEMENT rectangle EMPTY>
-<!ATTLIST rectangle color CDATA #IMPLIED>
-<!ATTLIST rectangle bgcolor CDATA #IMPLIED>
-<!ATTLIST rectangle radius CDATA #IMPLIED>
-<!ATTLIST rectangle height CDATA #IMPLIED>
-<!ATTLIST rectangle width CDATA #IMPLIED>
-<!ATTLIST rectangle size CDATA #IMPLIED>
-<!ATTLIST rectangle x CDATA #IMPLIED>
-<!ATTLIST rectangle y CDATA #IMPLIED>
+<!ATTLIST rectangle
+ color CDATA #IMPLIED
+ bgcolor CDATA #IMPLIED
+ radius CDATA #IMPLIED
+ height CDATA #IMPLIED
+ width CDATA #IMPLIED
+ size CDATA #IMPLIED
+ x CDATA #IMPLIED
+ y CDATA #IMPLIED
+>
<!ELEMENT if ((if | text | newline | goto_pos)+)>
<!ATTLIST if expression CDATA #IMPLIED>
<!ELEMENT text (#PCDATA)>
-<!ATTLIST text expression CDATA #IMPLIED>
-<!ATTLIST text mode CDATA #IMPLIED>
-<!ATTLIST text dim CDATA #IMPLIED>
-<!ATTLIST text valign CDATA #IMPLIED>
-<!ATTLIST text align CDATA #IMPLIED>
-<!ATTLIST text height CDATA #IMPLIED>
-<!ATTLIST text width CDATA #IMPLIED>
-<!ATTLIST text font CDATA #IMPLIED>
+<!ATTLIST text
+ expression CDATA #IMPLIED
+ mode (hard | soft) "hard"
+ dim CDATA #IMPLIED
+ align %align; #IMPLIED
+ valign %valign; #IMPLIED
+ height CDATA #IMPLIED
+ width CDATA #IMPLIED
+ font CDATA #IMPLIED
+ ellipses CDATA #IMPLIED
+>
<!ELEMENT newline EMPTY>
<!ELEMENT goto_pos EMPTY>
-<!ATTLIST goto_pos mode CDATA #REQUIRED>
-<!ATTLIST goto_pos x CDATA #IMPLIED>
-<!ATTLIST goto_pos y CDATA #IMPLIED>
+<!ATTLIST goto_pos
+ mode (relative | absolute) "relative"
+ x CDATA #IMPLIED
+ y CDATA #IMPLIED
+>
<!ELEMENT popup EMPTY>
<!ATTLIST popup layout CDATA #REQUIRED>
@@ -172,8 +229,4 @@
<!ELEMENT splashscreen (screen, content)>
-<!ELEMENT headlines (screen, title, info)>
-
-<!-- Other attributes
-<!ATTLIST where like (true|false) "false">
--->
+<!ELEMENT headlines (screen, title?, info)>
Modified: branches/rel-1/freevo/share/skins/main/basic.fxd
==============================================================================
--- branches/rel-1/freevo/share/skins/main/basic.fxd (original)
+++ branches/rel-1/freevo/share/skins/main/basic.fxd Wed Jan 31 18:55:04 2007
@@ -1,5 +1,5 @@
<?xml version="1.0" ?>
-<!DOCTYPE freevo-skin SYSTEM "freevo-skin.dtd">
+<!DOCTYPE freevo-skin SYSTEM "../freevo-skin.dtd">
<freevo>
<!--
Modified: branches/rel-1/freevo/share/skins/main/bluestar.fxd
==============================================================================
--- branches/rel-1/freevo/share/skins/main/bluestar.fxd (original)
+++ branches/rel-1/freevo/share/skins/main/bluestar.fxd Wed Jan 31 18:55:04 2007
@@ -1,4 +1,5 @@
<?xml version="1.0" ?>
+<!DOCTYPE freevo-skin SYSTEM "../freevo-skin.dtd">
<freevo>
<skin include="info" geometry="800x600">
Modified: branches/rel-1/freevo/share/skins/main/blurr.fxd
==============================================================================
--- branches/rel-1/freevo/share/skins/main/blurr.fxd (original)
+++ branches/rel-1/freevo/share/skins/main/blurr.fxd Wed Jan 31 18:55:04 2007
@@ -1,5 +1,5 @@
<?xml version="1.0" ?>
-<!DOCTYPE freevo-skin SYSTEM "freevo-skin.dtd">
+<!DOCTYPE freevo-skin SYSTEM "../freevo-skin.dtd">
<freevo>
<skin include="basic" geometry="800x600">
Modified: branches/rel-1/freevo/share/skins/main/crystal.fxd
==============================================================================
--- branches/rel-1/freevo/share/skins/main/crystal.fxd (original)
+++ branches/rel-1/freevo/share/skins/main/crystal.fxd Wed Jan 31 18:55:04 2007
@@ -1,4 +1,5 @@
<?xml version="1.0" ?>
+<!DOCTYPE freevo-skin SYSTEM "../freevo-skin.dtd">
<freevo>
<skin include="info" geometry="800x600">
Modified: branches/rel-1/freevo/share/skins/main/dark.fxd
==============================================================================
--- branches/rel-1/freevo/share/skins/main/dark.fxd (original)
+++ branches/rel-1/freevo/share/skins/main/dark.fxd Wed Jan 31 18:55:04 2007
@@ -1,5 +1,5 @@
<?xml version="1.0" ?>
-<!DOCTYPE freevo-skin SYSTEM "freevo-skin.dtd">
+<!DOCTYPE freevo-skin SYSTEM "../freevo-skin.dtd">
<freevo>
<skin geometry="800x600" include="info">
<iconset theme="tuxntosh"/>
Modified: branches/rel-1/freevo/share/skins/main/image.fxd
==============================================================================
--- branches/rel-1/freevo/share/skins/main/image.fxd (original)
+++ branches/rel-1/freevo/share/skins/main/image.fxd Wed Jan 31 18:55:04 2007
@@ -1,4 +1,5 @@
<?xml version="1.0" ?>
+<!DOCTYPE freevo-skin SYSTEM "../freevo-skin.dtd">
<freevo>
<!--
Modified: branches/rel-1/freevo/share/skins/main/info.fxd
==============================================================================
--- branches/rel-1/freevo/share/skins/main/info.fxd (original)
+++ branches/rel-1/freevo/share/skins/main/info.fxd Wed Jan 31 18:55:04 2007
@@ -1,4 +1,5 @@
<?xml version="1.0" ?>
+<!DOCTYPE freevo-skin SYSTEM "../freevo-skin.dtd">
<freevo>
<skin include="basic" geometry="800x600">
Modified: branches/rel-1/freevo/share/skins/main/mediaportal.fxd
==============================================================================
--- branches/rel-1/freevo/share/skins/main/mediaportal.fxd (original)
+++ branches/rel-1/freevo/share/skins/main/mediaportal.fxd Wed Jan 31
18:55:04 2007
@@ -1,5 +1,5 @@
<?xml version="1.0" ?>
-<!DOCTYPE freevo-skin SYSTEM "freevo-skin.dtd">
+<!DOCTYPE freevo-skin SYSTEM "../freevo-skin.dtd">
<freevo>
<skin include="basic" geometry="800x600">
Modified: branches/rel-1/freevo/share/skins/main/noia.fxd
==============================================================================
--- branches/rel-1/freevo/share/skins/main/noia.fxd (original)
+++ branches/rel-1/freevo/share/skins/main/noia.fxd Wed Jan 31 18:55:04 2007
@@ -1,4 +1,5 @@
<?xml version="1.0" ?>
+<!DOCTYPE freevo-skin SYSTEM "../freevo-skin.dtd">
<freevo>
<skin include="info" geometry="800x600">
Modified: branches/rel-1/freevo/share/skins/main/rain.fxd
==============================================================================
--- branches/rel-1/freevo/share/skins/main/rain.fxd (original)
+++ branches/rel-1/freevo/share/skins/main/rain.fxd Wed Jan 31 18:55:04 2007
@@ -1,4 +1,5 @@
<?xml version="1.0" ?>
+<!DOCTYPE freevo-skin SYSTEM "../freevo-skin.dtd">
<freevo>
<skin include="info" geometry="800x600">
Modified: branches/rel-1/freevo/share/skins/plugins/video_details.fxd
==============================================================================
--- branches/rel-1/freevo/share/skins/plugins/video_details.fxd (original)
+++ branches/rel-1/freevo/share/skins/plugins/video_details.fxd Wed Jan 31
18:55:04 2007
@@ -1,15 +1,16 @@
<?xml version="1.0" ?>
+<!DOCTYPE freevo-skin SYSTEM "../freevo-skin.dtd">
<freevo>
<skin geometry="800x600">
- <!-- skin informations for the plugin video.details -->
+ <!-- skin informations for the plugin video.details -->
- <!-- the main menu -->
- <menu type="video details">
- <style text="video details"/>
- </menu>
+ <!-- the main menu -->
+ <menu type="video details">
+ <style text="video details"/>
+ </menu>
- <menuset label="video details">
+ <menuset label="video details">
<screen layout="screen" x="0" y="0" width="800" height="600"/>
<view layout="view" x="590" y="100" width="200" height="280"/>
<listing layout="listing" x="10" y="430" width="780" height="160"/>
-------------------------------------------------------------------------
Using Tomcat but need to do more? Need to support web services, security?
Get stuff done quickly with pre-integrated technology to make your job easier.
Download IBM WebSphere Application Server v.1.0.1 based on Apache Geronimo
http://sel.as-us.falkag.net/sel?cmd=lnk&kid=120709&bid=263057&dat=121642
_______________________________________________
Freevo-cvslog mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/freevo-cvslog
