X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=share%2Fskins2%2Fskin.dtd;h=5a7ff145a1d3b81fb431d6df3f1ab01b7276c6be;hb=d727c4590f83751a2f28fcdfd8af3886ebeb45d8;hp=80b970b84efa0fe8a33138eb5f7abfbe76707ffa;hpb=e0352f9138f8da06abf7cb621011bbfafda9c803;p=vlc

diff --git a/share/skins2/skin.dtd b/share/skins2/skin.dtd
index 80b970b84e..5a7ff145a1 100644
--- a/share/skins2/skin.dtd
+++ b/share/skins2/skin.dtd
@@ -2,7 +2,7 @@
 -->
 
 
-<!ELEMENT Theme (ThemeInfo,(Bitmap|BitmapFont|Font|Window)*)>
+<!ELEMENT Theme (ThemeInfo,(Include|IniFile|Bitmap|BitmapFont|Font|PopupMenu|Window)*)>
     <!ATTLIST Theme
         version     CDATA   #REQUIRED
         tooltipfont CDATA   "defaultfont"
@@ -12,11 +12,22 @@
     >
 
 <!-- main elements -->
+<!ELEMENT IniFile EMPTY>
+    <!ATTLIST IniFile
+        id          CDATA   #REQUIRED
+        file        CDATA   #REQUIRED
+    >
+<!ELEMENT Include EMPTY>
+    <!ATTLIST Include
+        file        CDATA   #REQUIRED
+    >
 <!ELEMENT Bitmap (SubBitmap)*>
     <!ATTLIST Bitmap
         id          CDATA   #REQUIRED
         file        CDATA   #REQUIRED
         alphacolor  CDATA   #REQUIRED
+        nbframes    CDATA   "1"
+        fps         CDATA   "0"
     >
 <!ELEMENT SubBitmap EMPTY>
     <!ATTLIST SubBitmap
@@ -25,6 +36,8 @@
         y           CDATA   #REQUIRED
         width       CDATA   #REQUIRED
         height      CDATA   #REQUIRED
+        nbframes    CDATA   "1"
+        fps         CDATA   "0"
     >
 <!ELEMENT Font EMPTY>
     <!ATTLIST Font
@@ -38,6 +51,16 @@
         file        CDATA   #REQUIRED
         type        CDATA   "digits"
     >
+<!ELEMENT PopupMenu (MenuItem|MenuSeparator)+>
+    <!ATTLIST PopupMenu
+        id          CDATA   #REQUIRED
+    >
+<!ELEMENT MenuItem EMPTY>
+    <!ATTLIST MenuItem
+        label       CDATA   #REQUIRED
+        action      CDATA   "none"
+    >
+<!ELEMENT MenuSeparator EMPTY>
 <!ELEMENT ThemeInfo EMPTY>
     <!ATTLIST ThemeInfo
         name        CDATA   #IMPLIED
@@ -54,8 +77,8 @@
         dragdrop    CDATA   "true"
         playondrop  CDATA   "true"
     >
-
-<!ELEMENT Layout (Group)>
+<!ELEMENT Layout (Group|Image|Button|Playlist|Slider|RadialSlider|Text|Checkbox|
+                  Anchor|Video|Playtree|Panel)+>
     <!ATTLIST Layout
         id          CDATA   "none"
         width       CDATA   #REQUIRED
@@ -65,18 +88,32 @@
         minheight   CDATA   "-1"
         maxheight   CDATA   "-1"
     >
+<!-- Grouping elements -->
 <!ELEMENT Group (Group|Image|Button|Playlist|Slider|RadialSlider|Text|Checkbox|
-                 Anchor|Video|Playtree)+>
+                 Anchor|Video|Playtree|Panel)+>
     <!ATTLIST Group
         x           CDATA   "0"
         y           CDATA   "0"
     >
+<!ELEMENT Panel (Group|Image|Button|Playlist|Slider|RadialSlider|Text|Checkbox|
+                 Anchor|Video|Playtree|Panel)+>
+    <!ATTLIST Panel
+        x           CDATA   "0"
+        y           CDATA   "0"
+        lefttop     CDATA   "lefttop"
+        rightbottom CDATA   "lefttop"
+        xkeepratio  CDATA   "false"
+        ykeepratio  CDATA   "false"
+        width       CDATA   #REQUIRED
+        height      CDATA   #REQUIRED
+    >
 
 <!-- Anchors -->
 <!ELEMENT Anchor EMPTY>
     <!ATTLIST Anchor
         x           CDATA   "0"
         y           CDATA   "0"
+        lefttop     CDATA   "lefttop"
         priority    CDATA   #REQUIRED
         points      CDATA   "(0,0)"
         range       CDATA   "10"
@@ -91,8 +128,11 @@
         y           CDATA   "0"
         lefttop     CDATA   "lefttop"
         rightbottom CDATA   "lefttop"
+        xkeepratio  CDATA   "false"
+        ykeepratio  CDATA   "false"
         image       CDATA   #REQUIRED
         action      CDATA   "none"
+        action2     CDATA   "none"
         resize      CDATA   "mosaic"
         help        CDATA   ""
     >
@@ -104,6 +144,8 @@
         y           CDATA   "0"
         lefttop     CDATA   "lefttop"
         rightbottom CDATA   "lefttop"
+        xkeepratio  CDATA   "false"
+        ykeepratio  CDATA   "false"
         up          CDATA   #REQUIRED
         down        CDATA   "none"
         over        CDATA   "none"
@@ -119,6 +161,8 @@
         y            CDATA   "0"
         lefttop      CDATA   "lefttop"
         rightbottom  CDATA   "lefttop"
+        xkeepratio  CDATA   "false"
+        ykeepratio  CDATA   "false"
         up1          CDATA   #REQUIRED
         down1        CDATA   "none"
         over1        CDATA   "none"
@@ -140,6 +184,8 @@
         y           CDATA   "0"
         lefttop     CDATA   "lefttop"
         rightbottom CDATA   "lefttop"
+        xkeepratio  CDATA   "false"
+        ykeepratio  CDATA   "false"
         up          CDATA   #REQUIRED
         down        CDATA   "none"
         over        CDATA   "none"
@@ -147,10 +193,18 @@
         thickness   CDATA   "10"
         value       CDATA   "none"
         background  CDATA   "none"
-        nbimages    CDATA   "1"
         tooltiptext CDATA   ""
         help        CDATA   ""
     >
+<!ELEMENT SliderBackground EMPTY>
+    <!ATTLIST SliderBackground
+        id          CDATA   "none"
+        image       CDATA   #REQUIRED
+        nbhoriz     CDATA   "1"
+        nbvert      CDATA   "1"
+        padhoriz    CDATA   "0"
+        padvert     CDATA   "0"
+    >
 <!ELEMENT RadialSlider EMPTY>
     <!ATTLIST RadialSlider
         id          CDATA   "none"
@@ -159,6 +213,8 @@
         y           CDATA   "0"
         lefttop     CDATA   "lefttop"
         rightbottom CDATA   "lefttop"
+        xkeepratio  CDATA   "false"
+        ykeepratio  CDATA   "false"
         sequence    CDATA   #REQUIRED
         nbimages    CDATA   #REQUIRED
         minangle    CDATA   "0"
@@ -176,9 +232,13 @@
         width       CDATA   "0"
         lefttop     CDATA   "lefttop"
         rightbottom CDATA   "lefttop"
+        xkeepratio  CDATA   "false"
+        ykeepratio  CDATA   "false"
         text        CDATA   ""
         font        CDATA   #REQUIRED
         color       CDATA   "#000000"
+        scrolling   CDATA   "auto"
+        alignment   CDATA   "left"
         help        CDATA   ""
     >
 <!ELEMENT Playlist (Slider)?>
@@ -191,6 +251,8 @@
         height      CDATA   "0"
         lefttop     CDATA   "lefttop"
         rightbottom CDATA   "lefttop"
+        xkeepratio  CDATA   "false"
+        ykeepratio  CDATA   "false"
         font        CDATA   #REQUIRED
         bgimage     CDATA   "none"
         fgcolor     CDATA   "#000000"
@@ -210,6 +272,8 @@
         height      CDATA   "0"
         lefttop     CDATA   "lefttop"
         rightbottom CDATA   "lefttop"
+        xkeepratio  CDATA   "false"
+        ykeepratio  CDATA   "false"
         font        CDATA   #REQUIRED
         bgimage     CDATA   "none"
         itemimage   CDATA   "none"
@@ -221,6 +285,7 @@
         bgcolor2    CDATA   "#FFFFFF"
         selcolor    CDATA   "#0000FF"
         help        CDATA   ""
+        flat        CDATA   "false"
     >
 <!ELEMENT Video EMPTY>
     <!ATTLIST Video
@@ -232,6 +297,8 @@
         height      CDATA   "0"
         lefttop     CDATA   "lefttop"
         rightbottom CDATA   "lefttop"
-        autoresize  CDATA   "false"
+        xkeepratio  CDATA   "false"
+        ykeepratio  CDATA   "false"
+        autoresize  CDATA   "true"
         help        CDATA   ""
     >