Changeset 8086b07cf076736d43c955c00c4cbb1464e53dd7

Timestamp:

01/28/07 17:49:30 (1 year ago)

Author:

Olivier Teulière <ipkiss@videolan.org>

git-committer:

Olivier Teulière <ipkiss@videolan.org> 1170002970 +0000

git-parent:

[7c23b5c78d6520d80bcbc2f31d0f3b8173c58978]

git-author:

Olivier Teulière <ipkiss@videolan.org> 1170002970 +0000

Message:

• skins2:
  
  • New Panel tag, allowing to group the resizing behaviour of controls
    
  • Documentation updated accordingly
    
  • Fixed a memory leak due to CtrlMove/CtrlResize? objects
    

Files:

• doc/skins/skins2-howto.xml (modified) (9 diffs)
• modules/gui/skins2/parser/builder.cpp (modified) (23 diffs)
• modules/gui/skins2/parser/builder.hpp (modified) (3 diffs)
• modules/gui/skins2/parser/builder_data.def (modified) (1 diff)
• modules/gui/skins2/parser/builder_data.hpp (modified) (18 diffs)
• modules/gui/skins2/parser/skin_parser.cpp (modified) (12 diffs)
• modules/gui/skins2/parser/skin_parser.hpp (modified) (1 diff)
• modules/gui/skins2/src/generic_layout.cpp (modified) (5 diffs)
• modules/gui/skins2/src/generic_layout.hpp (modified) (4 diffs)
• modules/gui/skins2/src/theme.cpp (modified) (1 diff)
• modules/gui/skins2/src/theme.hpp (modified) (3 diffs)
• modules/gui/skins2/src/window_manager.cpp (modified) (1 diff)
• modules/gui/skins2/src/window_manager.hpp (modified) (1 diff)
• modules/gui/skins2/utils/position.cpp (modified) (11 diffs)
• modules/gui/skins2/utils/position.hpp (modified) (8 diffs)
• share/skins2/skin.dtd (modified) (1 diff)

doc/skins/skins2-howto.xml

@@ -63 +63 @@
-<para>Those of you who have already made skins for other software should have no
-difficulty to understand how VLC skins work.</para>
-
-</sect1>
-
-<sect1 id="bezier">
-<title>Bezier curves</title>
-
-<para>One cool thing with VLC sliders is that they are not necessarily rectilinear, but they can follow any Bezier curve. So if you want to have a slider moving on a half-circle, or even doing a loop, you can!</para>
-
-<para>This is not the place to explain how Bezier curves work (see <ulink url="http://astronomy.swin.edu.au/~pbourke/curves/bezier/">http://astronomy.swin.edu.au/~pbourke/curves/bezier/</ulink> for a nice introduction), the main thing to know is that a Bezier curve can be characterized by a set of points. Once you have them (thanks to the <link linkend="CurveMaker">CurveMaker</link> utility for example<!--XXX: deprecated-->), you just need to enter the list of points in the <link linkend="sliderpoints">points</link> attribute. Here is an example with 3 points: points="(2,50),(45,120),(88,50)".</para>
-
-<para>Bezier curves can be used with the <link linkend="Slider">Slider</link> and <link linkend="Anchor">Anchor</link> tags:</para>
-
-<itemizedlist>
-  <listitem><para>For sliders, it defines the curve followed by the cursor of the slider. This curve is of course invisible, so if you want a visible background for your <link linkend="Slider">Slider</link> you need to provide it yourself using the <link linkend="Image">Image</link> tag.</para></listitem>
-  <listitem><para>For anchors, the use of Bezier curves is more anecdotic. Its purpose is to have non-ponctual anchor, the whole curve becoming the anchor. In this case, a ponctual anchor (and only a ponctual one) can be attracted by any point of the curve, if it is in its range of action. In fact, you can consider the curve as an easy way to define at once many anchors that share the same properties (except their position, of course :)).</para></listitem>
-</itemizedlist>
-
-<note><para>The coordinates are relative to the upper-left corner of the control (i.e. to its <link linkend="x">x</link> and <link linkend="y">y</link> attributes).</para></note>
-
-</sect1>
@@ -322 +304 @@
-  <sect3 id="layoutwidth">
-    <title>width</title>
-Width of the layout. t
+Initial width of the layout. T
-    <para><emphasis>Required.</emphasis></para>
-  </sect3>
-  <sect3 id="layoutheight">
-    <title>height</title>
-Height of the layout. t
+Initial height of the layout. T
-    <para><emphasis>Required.</emphasis></para>
-  </sect3>
@@ -354 +336 @@
-<sect2 id="Group">
-  <title>Group</title>
-s an offset to the elements it contains. A Group is only supposed to ease the job of the skin designer, who can adjust the position of a group of controls without modifying all the coordinates, but you can ignore it if you want (only one Group is necessary, inside the <link linkend="Layout">Layout</link> tag). Group tags can be nested
+ an offset to the elements it contains. A Group is only supposed to ease the job of the skin designer, who can adjust the position of a group of controls without modifying all the coordinates, but you can ignore it if you want (only one Group is necessary, inside the <link linkend="Layout">Layout</link> tag). Group tags can be nested. Note that Group elements are deprecated, since <link linkend="Panel">Panel</link> elements are more powerful
-  <sect3 id="groupx">
-    <title>x</title>
-Try and guess
+Horizontal offset, relative to the container box (see the <link linkend="layoutmodel">Layout model</link> for more details)
-    <para>Default value: 0</para>
-  </sect3>
-  <sect3 id="groupy">
-    <title>y</title>
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-  </sect3>
-</sect2>
@@ -372 +392 @@
-  <sect3 id="anchorx">
-    <title>x</title>
- 
+
-    <para>Default value: 0</para>
-  </sect3>
@@ -420 +440 @@
-  <sect3 id="x">
-    <title>x</title>
-parent tag (usually <link linkend="Group">Group</link> or <link linkend="Layout">Layout</link>)
+container box (see the <link linkend="layoutmodel">Layout model</link>) or to the parent <link linkend="Group">Group</link>
-    <para>Default value: 0</para>
-  </sect3>
-  <sect3 id="y">
-    <title>y</title>
-parent tag (usually <link linkend="Group">Group</link> or <link linkend="Layout">Layout</link>)
+container box (see the <link linkend="layoutmodel">Layout model</link>) or to the parent <link linkend="Group">Group</link>
-    <para>Default value: 0</para>
-  </sect3>
-  <sect3 id="lefttop">
-    <title>lefttop</title>
-Layout the top-left-hand corner of this control is attached, in case of resizing. Possible values are 'lefttop', 'leftbottom', 'righttop' and 'rightbottom'
+container box the top-left-hand corner of this control is attached, in case of resizing. Possible values are 'lefttop', 'leftbottom', 'righttop' and 'rightbottom'. See the <link linkend="layoutmodel">Layout model</link> for more details
-    <para>Default value: lefttop</para>
-  </sect3>
-  <sect3 id="rightbottom">
-    <title>rightbottom</title>
-Layout the bottom-right-hand corner of this control is attached, in case of resizing
+container box the bottom-right-hand corner of this control is attached, in case of resizing. See the <link linkend="layoutmodel">Layout model</link> for more details
-    <para>Default value: lefttop</para>
-  </sect3>
-  <sect3 id="xkeepratio">
-    <title>xkeepratio</title>
-<link linkend="Layout">Layout</link>
-layout, without resizing it (to resize it, you would rather use the lefttop/rightbottom attributes)
+container box
+container box, without resizing it (to resize it, you would rather use the lefttop/rightbottom attributes). See the <link linkend="layoutmodel">Layout model</link> for more details
-    <para>Default value: false</para>
-  </sect3>
@@ -447 +467 @@
-    <title>ykeepratio</title>
-    <para>When set to true, the behaviour of the vertical resizing is changed. Instead of taking into account the <link linkend="lefttop">lefttop</link> and <link linkend="rightbottom">rightbottom</link> attributes to determine how the control will be moved/resized, only its initial position inside the <link linkend="Layout">Layout</link> matters. For example, if initially the space to the top of the control is twice as big as the one to its bottom, this will stay the same during any vertical resizing. The height of the control stays constant.</para>
-layout, without resizing it (to resize it, you would rather use the lefttop/rightbottom attributes)
+container box, without resizing it (to resize it, you would rather use the lefttop/rightbottom attributes). See the <link linkend="layoutmodel">Layout model</link> for more details
-    <para>Default value: false</para>
-  </sect3>
@@ -1115 +1135 @@
-</sect1>
-
+<sect1 id="layoutmodel">
+<title>Layout model</title>
+
+<para>Placing the controls on a window is easy, using their x and y attributes, but these positions become insufficient for a resizable window. Some controls (or groups of controls) should stay centered in the window, others should follow the right side of the window, others should change their size automatically, etc... To handle these various behaviours, the layout model followed by the skins engine is a model based on nested boxes.</para>
+
+<para>There are 2 kinds of boxes:</para>
+
+<itemizedlist>
+  <listitem><para>
+    <emphasis>simple boxes</emphasis>: These boxes cannot contain other boxes. All the visible controls are simple boxes: Image, Button, Checkbox, Text, Slider, RadialSlider, Playlist, Playtree, Video.
+  </para></listitem>
+  <listitem><para>
+    <emphasis>container boxes</emphasis>: These boxes can contain other boxes. Only two XML tags create container boxes: <link linkend="Panel">Panel</link> and <link linkend="Layout">Layout</link>. The Layout tag is necessarily the top-level box for the current layout, and cannot be contained, but Panel elements can be contained.
+  </para></listitem>
+</itemizedlist>
+
+<para>A box inside a container box always defines how it should react when its container box is resized. Two different mechanisms are provided: corners anchoring (useful when resizing of the inner box is wanted, for example) and constant ratio (mainly useful to keep the inner box centered inside its parent):</para>
+<itemizedlist>
+  <listitem><para>
+    <emphasis>corners anchoring</emphasis>: The top-left-hand corner (TL) and the bottom-right-hand corner (BR) of the inner box are "tied" to corners of the container box (TL, TR, BL or BR). When any resizing occurs, tied corners move together, which can move or resize the inner box. For example, if the TL corner of the inner box is tied to the TL corner of the container (let's write it TL/TL), and if the BR corner of the inner box is also tied to the TL corner of the container box (BR/TL), the inner box will not be resized, and will always stay at the same place (this is the default behaviour). If we have TL/TL and TL/BL, the inner box is resized vertically its container is resized. If we have TL/TR and BR/TR, the inner box moves with the TR corner of its container. We could even define TL/BR and BR/TL, in which case increasing the size of the container box would shrink the size of the inner box... until it disappears completely!
+  </para>
+  <para>This mechanism is controlled by the <link linkend="lefttop">lefttop</link> and <link linkend="rightbottom">rightbottom</link> attributes of the controls.
+  </para></listitem>
+  <listitem><para>
+    <emphasis>constant ratio</emphasis>: When a box doesn't fill completely its container box, there is space on the top, bottom, left and right of the inner box. It is possible to force the ratio between the space on the top and the space on the bottom (or the one on the left and the one on the right)  to be constant. Any resizing of the container box will then move the inner box accordingly, and the size of the inner box will never change (it overrides the corners anchoring mechanism). The horizontal and vertical ratios being independent, it is for example possible to keep only the horizontal ratio constant, in which case the inner box can still resize vertically (depending on its attributes for the corners anchoring, of course).
+  </para>
+  <para>This mechanism is controlled by the <link linkend="xkeepratio">xkeepratio</link> and <link linkend="ykeepratio">ykeepratio</link> attributes of the controls.
+  </para></listitem>
+</itemizedlist>
+
+</sect1>
+
-
-<sect1>
@@ -1137 +1189 @@
-</sect1>
-
+<sect1 id="bezier">
+<title>Bezier curves</title>
+
+<para>One cool thing with VLC sliders is that they are not necessarily rectilinear, but they can follow any Bezier curve. So if you want to have a slider moving on a half-circle, or even doing a loop, you can!</para>
+
+<para>This is not the place to explain how Bezier curves work (see <ulink url="http://astronomy.swin.edu.au/~pbourke/curves/bezier/">http://astronomy.swin.edu.au/~pbourke/curves/bezier/</ulink> for a nice introduction), the main thing to know is that a Bezier curve can be characterized by a set of points. Once you have them (thanks to the <link linkend="CurveMaker">CurveMaker</link> utility for example<!--XXX: deprecated-->), you just need to enter the list of points in the <link linkend="sliderpoints">points</link> attribute. Here is an example with 3 points: points="(2,50),(45,120),(88,50)".</para>
+
+<para>Bezier curves can be used with the <link linkend="Slider">Slider</link> and <link linkend="Anchor">Anchor</link> tags:</para>
+
+<itemizedlist>
+    <listitem><para>For sliders, it defines the curve followed by the cursor of the slider. This curve is of course invisible, so if you want a visible background for your <link linkend="Slider">Slider</link> you need to provide it yourself using a <link linkend="SliderBackground">SliderBackground</link> or <link linkend="Image">Image</link> tag.</para></listitem>
+  <listitem><para>For anchors, the use of Bezier curves is more anecdotic. Its purpose is to have non-ponctual anchor, the whole curve becoming the anchor. In this case, a ponctual anchor (and only a ponctual one) can be attracted by any point of the curve, if it is in its range of action. In fact, you can consider the curve as an easy way to define at once many anchors that share the same properties (except their position, of course :)).</para></listitem>
+</itemizedlist>
+
+<note><para>The coordinates are relative to the upper-left corner of the control (i.e. to its <link linkend="x">x</link> and <link linkend="y">y</link> attributes).</para></note>
+
+</sect1>
+
-<sect1>
-<title>Tools and advice</title>
@@ -1144 +1214 @@
-
-  <para>
-curve-maker</ulink> (sorry, this is for Windows users only). Basically, you add and remove points at will, and you can move them to see how the curve evolves. When you have reached the perfect curve, you just have to copy-paste the list of abscissas and ordinates to form the <link linkend="sliderpoints">points</link> attribute of your <link linkend="Slider">Slider</link> or <link linkend="Playlist">Playlist
+CurveMaker</ulink> utility (sorry, this is for Windows users only). Basically, you add and remove points at will, and you can move them to see how the curve evolves. When you have reached the perfect curve, you just have to copy-paste the list of abscissas and ordinates to form the <link linkend="sliderpoints">points</link> attribute of your <link linkend="Slider">Slider</link> or <link linkend="Anchor">Anchor
-  </para>
-

modules/gui/skins2/parser/builder.cpp

@@ -108 +108 @@
-    ADD_OBJECTS( PopupMenu );
-    ADD_OBJECTS( Layout );
+    ADD_OBJECTS( Panel );
-    ADD_OBJECTS( Anchor );
-    ADD_OBJECTS( Button );
@@ -138 +139 @@
-        } \
-    }
+
+
+// Macro to get the parent box of a control, given the panel ID
+#define GET_BOX( pRect, id, pLayout ) \
+    if( id == "none" ) \
+        pRect = &pLayout->getRect(); \
+    else \
+    { \
+        const Position *pParent = \
+            m_pTheme->getPositionById( rData.m_panelId ); \
+        if( pParent == NULL ) \
+        { \
+            msg_Err( getIntf(), "parent panel could not be found: %s", \
+                     rData.m_panelId.c_str() ); \
+            return; \
+        } \
+        pRect = pParent; \
+    }
+
-
-void Builder::addTheme( const BuilderData::Theme &rData )
@@ -383 +403 @@
-                                       rData.m_xPos, rData.m_yPos,
-                                       pCurve->getWidth(),
-
+
+
-
-    Anchor *pAnc = new Anchor( getIntf(), pos, rData.m_range, rData.m_priority,
@@ -425 +446 @@
-        *pBmpDown, *pCommand, UString( getIntf(), rData.m_tooltip.c_str() ),
-        UString( getIntf(), rData.m_help.c_str() ), pVisible );
+    m_pTheme->m_controls[rData.m_id] = CtrlGenericPtr( pButton );
-
-    // Compute the position of the control
-    // XXX (we suppose all the images have the same size...)
+    const GenericRect *pRect;
+    GET_BOX( pRect, rData.m_panelId , pLayout);
-    const Position pos = makePosition( rData.m_leftTop, rData.m_rightBottom,
-                                       rData.m_xPos, rData.m_yPos,
-                                       pBmpUp->getWidth(),
-Layou
+Rec
-                                       rData.m_xKeepRatio, rData.m_yKeepRatio );
-
-    pLayout->addControl( pButton, pos, rData.m_layer );
-
-    m_pTheme->m_controls[rData.m_id] = CtrlGenericPtr( pButton );
-}
-
@@ -501 +523 @@
-        UString( getIntf(), rData.m_tooltip2.c_str() ), *pVar,
-        UString( getIntf(), rData.m_help.c_str() ), pVisible );
+    m_pTheme->m_controls[rData.m_id] = CtrlGenericPtr( pCheckbox );
-
-    // Compute the position of the control
-    // XXX (we suppose all the images have the same size...)
+    const GenericRect *pRect;
+    GET_BOX( pRect, rData.m_panelId , pLayout);
-    const Position pos = makePosition( rData.m_leftTop, rData.m_rightBottom,
-                                       rData.m_xPos, rData.m_yPos,
-                                       pBmpUp1->getWidth(),
-Layou
+Rec
-                                       rData.m_xKeepRatio, rData.m_yKeepRatio );
-
-    pLayout->addControl( pCheckbox, pos, rData.m_layer );
-
-    m_pTheme->m_controls[rData.m_id] = CtrlGenericPtr( pCheckbox );
-}
-
@@ -551 +574 @@
-    CtrlImage *pImage = new CtrlImage( getIntf(), *pBmp, *pCommand,
-        resizeMethod, UString( getIntf(), rData.m_help.c_str() ), pVisible );
+    m_pTheme->m_controls[rData.m_id] = CtrlGenericPtr( pImage );
-
-    // Compute the position of the control
+    const GenericRect *pRect;
+    GET_BOX( pRect, rData.m_panelId , pLayout);
-    const Position pos = makePosition( rData.m_leftTop, rData.m_rightBottom,
-                                       rData.m_xPos, rData.m_yPos,
-                                       pBmp->getWidth(), pBmp->getHeight(),
-Layou
+Rec
-                                       rData.m_yKeepRatio );
-
-    // XXX: test to be changed! XXX
-    if( rData.m_actionId == "move" )
-    {
@@ -565 +590 @@
-             *pImage, *pWindow, UString( getIntf(), rData.m_help.c_str() ),
-             pVisible );
+        m_pTheme->m_controls[rData.m_id + "_move"] = CtrlGenericPtr( pMove );
-        pLayout->addControl( pMove, pos, rData.m_layer );
-    }
@@ -573 +599 @@
-                UString( getIntf(), rData.m_help.c_str() ), pVisible,
-                WindowManager::kResizeS );
+        m_pTheme->m_controls[rData.m_id + "_rsz"] = CtrlGenericPtr( pResize );
-        pLayout->addControl( pResize, pos, rData.m_layer );
-    }
@@ -581 +608 @@
-                UString( getIntf(), rData.m_help.c_str() ), pVisible,
-                WindowManager::kResizeE );
+        m_pTheme->m_controls[rData.m_id + "_rsz"] = CtrlGenericPtr( pResize );
-        pLayout->addControl( pResize, pos, rData.m_layer );
-    }
@@ -589 +617 @@
-                UString( getIntf(), rData.m_help.c_str() ), pVisible,
-                WindowManager::kResizeSE );
+        m_pTheme->m_controls[rData.m_id + "_rsz"] = CtrlGenericPtr( pResize );
-        pLayout->addControl( pResize, pos, rData.m_layer );
-    }
@@ -595 +624 @@
-        pLayout->addControl( pImage, pos, rData.m_layer );
-    }
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-}
-
@@ -658 +710 @@
-        UString( getIntf(), rData.m_help.c_str() ), rData.m_color, pVisible,
-        scrolling, alignment );
+    m_pTheme->m_controls[rData.m_id] = CtrlGenericPtr( pText );
-
-    int height = pFont->getSize();
-
-    // Compute the position of the control
+    const GenericRect *pRect;
+    GET_BOX( pRect, rData.m_panelId , pLayout);
-    const Position pos = makePosition( rData.m_leftTop, rData.m_rightBottom,
-                                       rData.m_xPos, rData.m_yPos,
-Layou
+Rec
-                                       rData.m_xKeepRatio, rData.m_yKeepRatio );
-
@@ -672 +727 @@
-    UString msg( getIntf(), rData.m_text.c_str() );
-    pVar->set( msg );
-
-    m_pTheme->m_controls[rData.m_id] = CtrlGenericPtr( pText );
-}
-
@@ -709 +762 @@
-                              UString( getIntf(), rData.m_help.c_str() ),
-                              pVisible );
+    m_pTheme->m_controls[rData.m_id] = CtrlGenericPtr( pRadial );
-
-    // XXX: resizing is not supported
-    // Compute the position of the control
+    const GenericRect *pRect;
+    GET_BOX( pRect, rData.m_panelId , pLayout);
-    const Position pos = makePosition( rData.m_leftTop, rData.m_rightBottom,
-                                       rData.m_xPos, rData.m_yPos,
-                                       pSeq->getWidth(),
-                                       pSeq->getHeight() / rData.m_nbImages,
-Layou
+Rec
-                                       rData.m_xKeepRatio, rData.m_yKeepRatio );
-
-    pLayout->addControl( pRadial, pos, rData.m_layer );
-
-    m_pTheme->m_controls[rData.m_id] = CtrlGenericPtr( pRadial );
-}
-
@@ -773 +827 @@
-        rData.m_nbVert, rData.m_padHoriz, rData.m_padVert,
-        pVisible, UString( getIntf(), rData.m_help.c_str() ) );
+    m_pTheme->m_controls[rData.m_id + "_bg"] = CtrlGenericPtr( pBackground );
-
-    // Compute the position of the control
+    const GenericRect *pRect;
+    GET_BOX( pRect, rData.m_panelId , pLayout);
-    const Position pos = makePosition( rData.m_leftTop, rData.m_rightBottom,
-                                       rData.m_xPos, rData.m_yPos,
-                                       pCurve->getWidth(), pCurve->getHeight(),
-Layou
+Rec
-                                       rData.m_xKeepRatio, rData.m_yKeepRatio );
-
-    pLayout->addControl( pBackground, pos, rData.m_layer );
-
-    m_pTheme->m_controls[rData.m_id + "_bg"] = CtrlGenericPtr( pBackground );
-
-    // Get the bitmaps of the cursor
@@ -800 +855 @@
-        UString( getIntf(), rData.m_tooltip.c_str() ),
-        UString( getIntf(), rData.m_help.c_str() ) );
+    m_pTheme->m_controls[rData.m_id] = CtrlGenericPtr( pCursor );
-
-    pLayout->addControl( pCursor, pos, rData.m_layer );
-
-    m_pTheme->m_controls[rData.m_id] = CtrlGenericPtr( pCursor );
-
-    // Associate the cursor to the background
@@ -854 +908 @@
-       fgColor, playColor, bgColor1, bgColor2, selColor,
-       UString( getIntf(), rData.m_help.c_str() ), pVisible );
+    m_pTheme->m_controls[rData.m_id] = CtrlGenericPtr( pList );
-
-    // Compute the position of the control
+    const GenericRect *pRect;
+    GET_BOX( pRect, rData.m_panelId , pLayout);
-    const Position pos = makePosition( rData.m_leftTop, rData.m_rightBottom,
-                                       rData.m_xPos, rData.m_yPos,
-                                       rData.m_width, rData.m_height,
-Layou
+Rec
-                                       rData.m_xKeepRatio, rData.m_yKeepRatio );
-
-    pLayout->addControl( pList, pos, rData.m_layer );
-
-    m_pTheme->m_controls[rData.m_id] = CtrlGenericPtr( pList );
-}
-
@@ -919 +974 @@
-       fgColor, playColor, bgColor1, bgColor2, selColor,
-       UString( getIntf(), rData.m_help.c_str() ), pVisible, pFlat );
+    m_pTheme->m_controls[rData.m_id] = CtrlGenericPtr( pTree );
-
-    // Compute the position of the control
+    const GenericRect *pRect;
+    GET_BOX( pRect, rData.m_panelId , pLayout);
-    const Position pos = makePosition( rData.m_leftTop, rData.m_rightBottom,
-                                       rData.m_xPos, rData.m_yPos,
-                                       rData.m_width, rData.m_height,
-Layou
+Rec
-                                       rData.m_xKeepRatio, rData.m_yKeepRatio );
-
-    pLayout->addControl( pTree, pos, rData.m_layer );
-
-    m_pTheme->m_controls[rData.m_id] = CtrlGenericPtr( pTree );
-}
-
@@ -949 +1005 @@
-        rData.m_autoResize, UString( getIntf(), rData.m_help.c_str() ),
-        pVisible );
+    m_pTheme->m_controls[rData.m_id] = CtrlGenericPtr( pVideo );
-
-    // Compute the position of the control
+    const GenericRect *pRect;
+    GET_BOX( pRect, rData.m_panelId , pLayout);
-    const Position pos = makePosition( rData.m_leftTop, rData.m_rightBottom,
-                                       rData.m_xPos, rData.m_yPos,
-                                       rData.m_width, rData.m_height,
-Layou
+Rec
-                                       rData.m_xKeepRatio, rData.m_yKeepRatio );
-
-    pLayout->addControl( pVideo, pos, rData.m_layer );
-
-    m_pTheme->m_controls[rData.m_id] = CtrlGenericPtr( pVideo );
-}
-
@@ -966 +1023 @@
-                                      const string &rRightBottom,
-                                      int xPos, int yPos, int width,
-Box &rBox
+GenericRect &rRect
-                                      bool xKeepRatio, bool yKeepRatio ) const
-{
@@ -973 +1030 @@
-    Position::Ref_t refRightBottom = Position::kLeftTop;
-
-Box
-Box
+Rect
+Rect
-
-    // Position of the left top corner
@@ -1043 +1100 @@
-    }
-
-Box
+Rect
-                     refRightBottom, xKeepRatio, yKeepRatio );
-}
@@ -1102 +1159 @@
-            return NULL;
-        }
-
-
-
-
-
-
-
-
+
-        xBez.push_back( x );
-        yBez.push_back( y );

modules/gui/skins2/parser/builder.hpp

@@ -38 +38 @@
-class GenericFont;
-class Position;
-Box
+GenericRect
-
-
@@ -80 +80 @@
-        void addCheckbox( const BuilderData::Checkbox &rData );
-        void addImage( const BuilderData::Image &rData );
+        void addPanel( const BuilderData::Panel &rData );
-        void addText( const BuilderData::Text &rData );
-        void addRadialSlider( const BuilderData::RadialSlider &rData );
@@ -91 +92 @@
-                                     const string &rRightBottom,
-                                     int xPos, int yPos, int width, int height,
-
+
+
-                                     bool yKeepRatio = false ) const;
-

modules/gui/skins2/parser/builder_data.def

@@ -10 +10 @@
-Layout id:string width:int height:int minWidth:int maxWidth:int minHeight:int maxHeight:int windowId:string
-Anchor xPos:int yPos:int leftTop:string range:int priority:int points:string layoutId:string
-
-
-
+ panelId:string
+ panelId:string
+ panelId:string
-IniFile id:string file:string
-
-
-
-
-
-
+
+
+
+
+
+
+

modules/gui/skins2/parser/builder_data.hpp

@@ -204 +204 @@
-    struct Button
-    {
-
-
+, const string & panelId
+, m_panelId( panelId )
-
-        string m_id;
@@ -224 +224 @@
-        string m_windowId;
-        string m_layoutId;
+        string m_panelId;
-    };
-    /// List
@@ -231 +232 @@
-    struct Checkbox
-    {
-
-
+, const string & panelId
+, m_panelId( panelId )
-
-        string m_id;
@@ -257 +258 @@
-        string m_windowId;
-        string m_layoutId;
+        string m_panelId;
-    };
-    /// List
@@ -264 +266 @@
-    struct Image
-    {
-
-
+, const string & panelId
+, m_panelId( panelId )
-
-        string m_id;
@@ -283 +285 @@
-        string m_windowId;
-        string m_layoutId;
+        string m_panelId;
-    };
-    /// List
@@ -300 +303 @@
-
-    /// Type definition
+    struct Panel
+    {
+        Panel( const string & id, int xPos, int yPos, const string & leftTop, const string & rightBottom, bool xKeepRatio, bool yKeepRatio, int width, int height, int layer, const string & windowId, const string & layoutId, const string & panelId ):
+m_id( id ), m_xPos( xPos ), m_yPos( yPos ), m_leftTop( leftTop ), m_rightBottom( rightBottom ), m_xKeepRatio( xKeepRatio ), m_yKeepRatio( yKeepRatio ), m_width( width ), m_height( height ), m_layer( layer ), m_windowId( windowId ), m_layoutId( layoutId ), m_panelId( panelId ) {}
+
+        string m_id;
+        int m_xPos;
+        int m_yPos;
+        string m_leftTop;
+        string m_rightBottom;
+        bool m_xKeepRatio;
+        bool m_yKeepRatio;
+        int m_width;
+        int m_height;
+        int m_layer;
+        string m_windowId;
+        string m_layoutId;
+        string m_panelId;
+    };
+    /// List
+    list<Panel> m_listPanel;
+
+    /// Type definition
-    struct Text
-    {
-
-
+