Commit 73d587a5 authored by Olivier Teulière's avatar Olivier Teulière

* skins2/parser/builder*: All the controls now have a 'visible' attribute

 * share/skins2/default/skin.dtd: Changed a few details here and there
parent 39b7e4b6
...@@ -139,7 +139,7 @@ void Builder::addBitmap( const BuilderData::Bitmap &rData ) ...@@ -139,7 +139,7 @@ void Builder::addBitmap( const BuilderData::Bitmap &rData )
void Builder::addFont( const BuilderData::Font &rData ) void Builder::addFont( const BuilderData::Font &rData )
{ {
GenericFont *pFont = new FT2Font( getIntf(), rData.m_fontName, GenericFont *pFont = new FT2Font( getIntf(), rData.m_fontFile,
rData.m_size ); rData.m_size );
if( pFont->init() ) if( pFont->init() )
{ {
...@@ -240,9 +240,14 @@ void Builder::addButton( const BuilderData::Button &rData ) ...@@ -240,9 +240,14 @@ void Builder::addButton( const BuilderData::Button &rData )
return; return;
} }
// Get the visibility variable
// XXX check when it is null
Interpreter *pInterpreter = Interpreter::instance( getIntf() );
VarBool *pVisible = pInterpreter->getVarBool( rData.m_visible, m_pTheme );
CtrlButton *pButton = new CtrlButton( getIntf(), *pBmpUp, *pBmpOver, CtrlButton *pButton = new CtrlButton( getIntf(), *pBmpUp, *pBmpOver,
*pBmpDown, *pCommand, UString( getIntf(), rData.m_tooltip.c_str() ), *pBmpDown, *pCommand, UString( getIntf(), rData.m_tooltip.c_str() ),
UString( getIntf(), rData.m_help.c_str() ), NULL ); UString( getIntf(), rData.m_help.c_str() ), pVisible );
// Compute the position of the control // Compute the position of the control
// XXX (we suppose all the images have the same size...) // XXX (we suppose all the images have the same size...)
...@@ -308,12 +313,16 @@ void Builder::addCheckbox( const BuilderData::Checkbox &rData ) ...@@ -308,12 +313,16 @@ void Builder::addCheckbox( const BuilderData::Checkbox &rData )
return; return;
} }
// Get the visibility variable
// XXX check when it is null
VarBool *pVisible = pInterpreter->getVarBool( rData.m_visible, m_pTheme );
// Create the control // Create the control
CtrlCheckbox *pCheckbox = new CtrlCheckbox( getIntf(), *pBmpUp1, CtrlCheckbox *pCheckbox = new CtrlCheckbox( getIntf(), *pBmpUp1,
*pBmpOver1, *pBmpDown1, *pBmpUp2, *pBmpOver2, *pBmpDown2, *pCommand1, *pBmpOver1, *pBmpDown1, *pBmpUp2, *pBmpOver2, *pBmpDown2, *pCommand1,
*pCommand2, UString( getIntf(), rData.m_tooltip1.c_str() ), *pCommand2, UString( getIntf(), rData.m_tooltip1.c_str() ),
UString( getIntf(), rData.m_tooltip2.c_str() ), *pVar, UString( getIntf(), rData.m_tooltip2.c_str() ), *pVar,
UString( getIntf(), rData.m_help.c_str() ), NULL ); UString( getIntf(), rData.m_help.c_str() ), pVisible );
// Compute the position of the control // Compute the position of the control
// XXX (we suppose all the images have the same size...) // XXX (we suppose all the images have the same size...)
...@@ -347,9 +356,13 @@ void Builder::addImage( const BuilderData::Image &rData ) ...@@ -347,9 +356,13 @@ void Builder::addImage( const BuilderData::Image &rData )
return; return;
} }
// Get the visibility variable
// XXX check when it is null
Interpreter *pInterpreter = Interpreter::instance( getIntf() );
VarBool *pVisible = pInterpreter->getVarBool( rData.m_visible, m_pTheme );
CtrlImage *pImage = new CtrlImage( getIntf(), *pBmp, CtrlImage *pImage = new CtrlImage( getIntf(), *pBmp,
UString( getIntf(), rData.m_help.c_str() ), UString( getIntf(), rData.m_help.c_str() ), pVisible );
NULL);
// Compute the position of the control // Compute the position of the control
const Position pos = makePosition( rData.m_leftTop, rData.m_rightBottom, const Position pos = makePosition( rData.m_leftTop, rData.m_rightBottom,
...@@ -402,8 +415,13 @@ void Builder::addText( const BuilderData::Text &rData ) ...@@ -402,8 +415,13 @@ void Builder::addText( const BuilderData::Text &rData )
pVar->set( msg ); pVar->set( msg );
m_pTheme->m_vars.push_back( VariablePtr( pVar ) ); m_pTheme->m_vars.push_back( VariablePtr( pVar ) );
// Get the visibility variable
// XXX check when it is null
Interpreter *pInterpreter = Interpreter::instance( getIntf() );
VarBool *pVisible = pInterpreter->getVarBool( rData.m_visible, m_pTheme );
CtrlText *pText = new CtrlText( getIntf(), *pVar, *pFont, CtrlText *pText = new CtrlText( getIntf(), *pVar, *pFont,
UString( getIntf(), rData.m_help.c_str() ), rData.m_color, NULL ); UString( getIntf(), rData.m_help.c_str() ), rData.m_color, pVisible );
int height = pFont->getSize(); int height = pFont->getSize();
...@@ -438,12 +456,16 @@ void Builder::addRadialSlider( const BuilderData::RadialSlider &rData ) ...@@ -438,12 +456,16 @@ void Builder::addRadialSlider( const BuilderData::RadialSlider &rData )
return; return;
} }
// Get the visibility variable
// XXX check when it is null
VarBool *pVisible = pInterpreter->getVarBool( rData.m_visible, m_pTheme );
// Create the control // Create the control
CtrlRadialSlider *pRadial = CtrlRadialSlider *pRadial =
new CtrlRadialSlider( getIntf(), *pSeq, rData.m_nbImages, *pVar, new CtrlRadialSlider( getIntf(), *pSeq, rData.m_nbImages, *pVar,
rData.m_minAngle, rData.m_maxAngle, rData.m_minAngle, rData.m_maxAngle,
UString( getIntf(), rData.m_help.c_str() ), UString( getIntf(), rData.m_help.c_str() ),
NULL ); pVisible );
// XXX: resizing is not supported // XXX: resizing is not supported
// Compute the position of the control // Compute the position of the control
...@@ -548,11 +570,15 @@ void Builder::addList( const BuilderData::List &rData ) ...@@ -548,11 +570,15 @@ void Builder::addList( const BuilderData::List &rData )
return; return;
} }
// Get the visibility variable
// XXX check when it is null
VarBool *pVisible = pInterpreter->getVarBool( rData.m_visible, m_pTheme );
// Create the list control // Create the list control
CtrlList *pList = new CtrlList( getIntf(), *pVar, *pFont, CtrlList *pList = new CtrlList( getIntf(), *pVar, *pFont,
rData.m_fgColor, rData.m_playColor, rData.m_bgColor1, rData.m_fgColor, rData.m_playColor, rData.m_bgColor1,
rData.m_bgColor2, rData.m_selColor, rData.m_bgColor2, rData.m_selColor,
UString( getIntf(), rData.m_help.c_str() ), NULL ); UString( getIntf(), rData.m_help.c_str() ), pVisible );
// Compute the position of the control // Compute the position of the control
const Position pos = makePosition( rData.m_leftTop, rData.m_rightBottom, const Position pos = makePosition( rData.m_leftTop, rData.m_rightBottom,
...@@ -575,8 +601,13 @@ void Builder::addVideo( const BuilderData::Video &rData ) ...@@ -575,8 +601,13 @@ void Builder::addVideo( const BuilderData::Video &rData )
return; return;
} }
// Get the visibility variable
// XXX check when it is null
Interpreter *pInterpreter = Interpreter::instance( getIntf() );
VarBool *pVisible = pInterpreter->getVarBool( rData.m_visible, m_pTheme );
CtrlVideo *pVideo = new CtrlVideo( getIntf(), CtrlVideo *pVideo = new CtrlVideo( getIntf(),
UString( getIntf(), rData.m_help.c_str() ), NULL); UString( getIntf(), rData.m_help.c_str() ), pVisible );
// Compute the position of the control // Compute the position of the control
const Position pos = makePosition( rData.m_leftTop, rData.m_rightBottom, const Position pos = makePosition( rData.m_leftTop, rData.m_rightBottom,
......
Theme tooltipfont:string magnet:int alpha:uint32_t moveAlpha:uint32_t fadeTime:uint32_t Theme tooltipfont:string magnet:int alpha:uint32_t moveAlpha:uint32_t fadeTime:uint32_t
Bitmap id:string fileName:string alphaColor:uint32_t Bitmap id:string fileName:string alphaColor:uint32_t
Font id:string fontName:string size:int Font id:string fontFile:string size:int
Window id:string xPos:int yPos:int visible:bool dragDrop:bool playOnDrop:bool Window id:string xPos:int yPos:int visible:bool dragDrop:bool playOnDrop:bool
Layout id:string width:int height:int minWidth:int maxWidth:int minHeight:int maxHeight:int windowId:string Layout id:string width:int height:int minWidth:int maxWidth:int minHeight:int maxHeight:int windowId:string
Anchor xPos:int yPos:int range:int priority:int points:string windowId:string Anchor xPos:int yPos:int range:int priority:int points:string windowId:string
Button id:string xPos:int yPos:int leftTop:string rightBottom:string upId:string downId:string overId:string actionId:string tooltip:string help:string layer:int windowId:string layoutId:string Button id:string xPos:int yPos:int leftTop:string rightBottom:string visible:string upId:string downId:string overId:string actionId:string tooltip:string help:string layer:int windowId:string layoutId:string
Checkbox id:string xPos:int yPos:int leftTop:string rightBottom:string up1Id:string down1Id:string over1Id:string up2Id:string down2Id:string over2Id:string state:string action1:string action2:string tooltip1:string tooltip2:string help:string layer:int windowId:string layoutId:string Checkbox id:string xPos:int yPos:int leftTop:string rightBottom:string visible:string up1Id:string down1Id:string over1Id:string up2Id:string down2Id:string over2Id:string state:string action1:string action2:string tooltip1:string tooltip2:string help:string layer:int windowId:string layoutId:string
Image id:string xPos:int yPos:int leftTop:string rightBottom:string visible:bool bmpId:string actionId:string help:string layer:int windowId:string layoutId:string Image id:string xPos:int yPos:int leftTop:string rightBottom:string visible:string bmpId:string actionId:string help:string layer:int windowId:string layoutId:string
Text id:string xPos:int yPos:int fontId:string text:string width:int color:uint32_t help:string layer:int windowId:string layoutId:string Text id:string xPos:int yPos:int visible:string fontId:string text:string width:int color:uint32_t help:string layer:int windowId:string layoutId:string
RadialSlider id:string visible:string xPos:int yPos:int leftTop:string rightBottom:string sequence:string nbImages:int minAngle:float maxAngle:float value:string tooltip:string help:string layer:int windowId:string layoutId:string RadialSlider id:string visible:string xPos:int yPos:int leftTop:string rightBottom:string sequence:string nbImages:int minAngle:float maxAngle:float value:string tooltip:string help:string layer:int windowId:string layoutId:string
Slider id:string visible:string xPos:int yPos:int leftTop:string rightBottom:string upId:string downId:string overId:string points:string thickness:int value:string tooltip:string help:string layer:int windowId:string layoutId:string Slider id:string visible:string xPos:int yPos:int leftTop:string rightBottom:string upId:string downId:string overId:string points:string thickness:int value:string tooltip:string help:string layer:int windowId:string layoutId:string
List id:string xPos:int yPos:int width:int height:int leftTop:string rightBottom:string fontId:string var:string fgColor:uint32_t playColor:uint32_t bgColor1:uint32_t bgColor2:uint32_t selColor:uint32_t help:string layer:int windowId:string layoutId:string List id:string xPos:int yPos:int visible:string width:int height:int leftTop:string rightBottom:string fontId:string var:string fgColor:uint32_t playColor:uint32_t bgColor1:uint32_t bgColor2:uint32_t selColor:uint32_t help:string layer:int windowId:string layoutId:string
Video id:string xPos:int yPos:int width:int height:int leftTop:string rightBottom:string visible:bool help:string layer:int windowId:string layoutId:string Video id:string xPos:int yPos:int width:int height:int leftTop:string rightBottom:string visible:string help:string layer:int windowId:string layoutId:string
...@@ -70,11 +70,11 @@ m_id( id ), m_fileName( fileName ), m_alphaColor( alphaColor ) {} ...@@ -70,11 +70,11 @@ m_id( id ), m_fileName( fileName ), m_alphaColor( alphaColor ) {}
/// Type definition /// Type definition
struct Font struct Font
{ {
Font( const string & id, const string & fontName, int size ): Font( const string & id, const string & fontFile, int size ):
m_id( id ), m_fontName( fontName ), m_size( size ) {} m_id( id ), m_fontFile( fontFile ), m_size( size ) {}
const string m_id; const string m_id;
const string m_fontName; const string m_fontFile;
int m_size; int m_size;
}; };
/// List /// List
...@@ -133,14 +133,15 @@ m_xPos( xPos ), m_yPos( yPos ), m_range( range ), m_priority( priority ), m_poin ...@@ -133,14 +133,15 @@ m_xPos( xPos ), m_yPos( yPos ), m_range( range ), m_priority( priority ), m_poin
/// Type definition /// Type definition
struct Button struct Button
{ {
Button( const string & id, int xPos, int yPos, const string & leftTop, const string & rightBottom, const string & upId, const string & downId, const string & overId, const string & actionId, const string & tooltip, const string & help, int layer, const string & windowId, const string & layoutId ): Button( const string & id, int xPos, int yPos, const string & leftTop, const string & rightBottom, const string & visible, const string & upId, const string & downId, const string & overId, const string & actionId, const string & tooltip, const string & help, int layer, const string & windowId, const string & layoutId ):
m_id( id ), m_xPos( xPos ), m_yPos( yPos ), m_leftTop( leftTop ), m_rightBottom( rightBottom ), m_upId( upId ), m_downId( downId ), m_overId( overId ), m_actionId( actionId ), m_tooltip( tooltip ), m_help( help ), m_layer( layer ), m_windowId( windowId ), m_layoutId( layoutId ) {} m_id( id ), m_xPos( xPos ), m_yPos( yPos ), m_leftTop( leftTop ), m_rightBottom( rightBottom ), m_visible( visible ), m_upId( upId ), m_downId( downId ), m_overId( overId ), m_actionId( actionId ), m_tooltip( tooltip ), m_help( help ), m_layer( layer ), m_windowId( windowId ), m_layoutId( layoutId ) {}
const string m_id; const string m_id;
int m_xPos; int m_xPos;
int m_yPos; int m_yPos;
const string m_leftTop; const string m_leftTop;
const string m_rightBottom; const string m_rightBottom;
const string m_visible;
const string m_upId; const string m_upId;
const string m_downId; const string m_downId;
const string m_overId; const string m_overId;
...@@ -157,14 +158,15 @@ m_id( id ), m_xPos( xPos ), m_yPos( yPos ), m_leftTop( leftTop ), m_rightBottom( ...@@ -157,14 +158,15 @@ m_id( id ), m_xPos( xPos ), m_yPos( yPos ), m_leftTop( leftTop ), m_rightBottom(
/// Type definition /// Type definition
struct Checkbox struct Checkbox
{ {
Checkbox( const string & id, int xPos, int yPos, const string & leftTop, const string & rightBottom, const string & up1Id, const string & down1Id, const string & over1Id, const string & up2Id, const string & down2Id, const string & over2Id, const string & state, const string & action1, const string & action2, const string & tooltip1, const string & tooltip2, const string & help, int layer, const string & windowId, const string & layoutId ): Checkbox( const string & id, int xPos, int yPos, const string & leftTop, const string & rightBottom, const string & visible, const string & up1Id, const string & down1Id, const string & over1Id, const string & up2Id, const string & down2Id, const string & over2Id, const string & state, const string & action1, const string & action2, const string & tooltip1, const string & tooltip2, const string & help, int layer, const string & windowId, const string & layoutId ):
m_id( id ), m_xPos( xPos ), m_yPos( yPos ), m_leftTop( leftTop ), m_rightBottom( rightBottom ), m_up1Id( up1Id ), m_down1Id( down1Id ), m_over1Id( over1Id ), m_up2Id( up2Id ), m_down2Id( down2Id ), m_over2Id( over2Id ), m_state( state ), m_action1( action1 ), m_action2( action2 ), m_tooltip1( tooltip1 ), m_tooltip2( tooltip2 ), m_help( help ), m_layer( layer ), m_windowId( windowId ), m_layoutId( layoutId ) {} m_id( id ), m_xPos( xPos ), m_yPos( yPos ), m_leftTop( leftTop ), m_rightBottom( rightBottom ), m_visible( visible ), m_up1Id( up1Id ), m_down1Id( down1Id ), m_over1Id( over1Id ), m_up2Id( up2Id ), m_down2Id( down2Id ), m_over2Id( over2Id ), m_state( state ), m_action1( action1 ), m_action2( action2 ), m_tooltip1( tooltip1 ), m_tooltip2( tooltip2 ), m_help( help ), m_layer( layer ), m_windowId( windowId ), m_layoutId( layoutId ) {}
const string m_id; const string m_id;
int m_xPos; int m_xPos;
int m_yPos; int m_yPos;
const string m_leftTop; const string m_leftTop;
const string m_rightBottom; const string m_rightBottom;
const string m_visible;
const string m_up1Id; const string m_up1Id;
const string m_down1Id; const string m_down1Id;
const string m_over1Id; const string m_over1Id;
...@@ -187,7 +189,7 @@ m_id( id ), m_xPos( xPos ), m_yPos( yPos ), m_leftTop( leftTop ), m_rightBottom( ...@@ -187,7 +189,7 @@ m_id( id ), m_xPos( xPos ), m_yPos( yPos ), m_leftTop( leftTop ), m_rightBottom(
/// Type definition /// Type definition
struct Image struct Image
{ {
Image( const string & id, int xPos, int yPos, const string & leftTop, const string & rightBottom, bool visible, const string & bmpId, const string & actionId, const string & help, int layer, const string & windowId, const string & layoutId ): Image( const string & id, int xPos, int yPos, const string & leftTop, const string & rightBottom, const string & visible, const string & bmpId, const string & actionId, const string & help, int layer, const string & windowId, const string & layoutId ):
m_id( id ), m_xPos( xPos ), m_yPos( yPos ), m_leftTop( leftTop ), m_rightBottom( rightBottom ), m_visible( visible ), m_bmpId( bmpId ), m_actionId( actionId ), m_help( help ), m_layer( layer ), m_windowId( windowId ), m_layoutId( layoutId ) {} m_id( id ), m_xPos( xPos ), m_yPos( yPos ), m_leftTop( leftTop ), m_rightBottom( rightBottom ), m_visible( visible ), m_bmpId( bmpId ), m_actionId( actionId ), m_help( help ), m_layer( layer ), m_windowId( windowId ), m_layoutId( layoutId ) {}
const string m_id; const string m_id;
...@@ -195,7 +197,7 @@ m_id( id ), m_xPos( xPos ), m_yPos( yPos ), m_leftTop( leftTop ), m_rightBottom( ...@@ -195,7 +197,7 @@ m_id( id ), m_xPos( xPos ), m_yPos( yPos ), m_leftTop( leftTop ), m_rightBottom(
int m_yPos; int m_yPos;
const string m_leftTop; const string m_leftTop;
const string m_rightBottom; const string m_rightBottom;
bool m_visible; const string m_visible;
const string m_bmpId; const string m_bmpId;
const string m_actionId; const string m_actionId;
const string m_help; const string m_help;
...@@ -209,12 +211,13 @@ m_id( id ), m_xPos( xPos ), m_yPos( yPos ), m_leftTop( leftTop ), m_rightBottom( ...@@ -209,12 +211,13 @@ m_id( id ), m_xPos( xPos ), m_yPos( yPos ), m_leftTop( leftTop ), m_rightBottom(
/// Type definition /// Type definition
struct Text struct Text
{ {
Text( const string & id, int xPos, int yPos, const string & fontId, const string & text, int width, uint32_t color, const string & help, int layer, const string & windowId, const string & layoutId ): Text( const string & id, int xPos, int yPos, const string & visible, const string & fontId, const string & text, int width, uint32_t color, const string & help, int layer, const string & windowId, const string & layoutId ):
m_id( id ), m_xPos( xPos ), m_yPos( yPos ), m_fontId( fontId ), m_text( text ), m_width( width ), m_color( color ), m_help( help ), m_layer( layer ), m_windowId( windowId ), m_layoutId( layoutId ) {} m_id( id ), m_xPos( xPos ), m_yPos( yPos ), m_visible( visible ), m_fontId( fontId ), m_text( text ), m_width( width ), m_color( color ), m_help( help ), m_layer( layer ), m_windowId( windowId ), m_layoutId( layoutId ) {}
const string m_id; const string m_id;
int m_xPos; int m_xPos;
int m_yPos; int m_yPos;
const string m_visible;
const string m_fontId; const string m_fontId;
const string m_text; const string m_text;
int m_width; int m_width;
...@@ -283,12 +286,13 @@ m_id( id ), m_visible( visible ), m_xPos( xPos ), m_yPos( yPos ), m_leftTop( lef ...@@ -283,12 +286,13 @@ m_id( id ), m_visible( visible ), m_xPos( xPos ), m_yPos( yPos ), m_leftTop( lef
/// Type definition /// Type definition
struct List struct List
{ {
List( const string & id, int xPos, int yPos, int width, int height, const string & leftTop, const string & rightBottom, const string & fontId, const string & var, uint32_t fgColor, uint32_t playColor, uint32_t bgColor1, uint32_t bgColor2, uint32_t selColor, const string & help, int layer, const string & windowId, const string & layoutId ): List( const string & id, int xPos, int yPos, const string & visible, int width, int height, const string & leftTop, const string & rightBottom, const string & fontId, const string & var, uint32_t fgColor, uint32_t playColor, uint32_t bgColor1, uint32_t bgColor2, uint32_t selColor, const string & help, int layer, const string & windowId, const string & layoutId ):
m_id( id ), m_xPos( xPos ), m_yPos( yPos ), m_width( width ), m_height( height ), m_leftTop( leftTop ), m_rightBottom( rightBottom ), m_fontId( fontId ), m_var( var ), m_fgColor( fgColor ), m_playColor( playColor ), m_bgColor1( bgColor1 ), m_bgColor2( bgColor2 ), m_selColor( selColor ), m_help( help ), m_layer( layer ), m_windowId( windowId ), m_layoutId( layoutId ) {} m_id( id ), m_xPos( xPos ), m_yPos( yPos ), m_visible( visible ), m_width( width ), m_height( height ), m_leftTop( leftTop ), m_rightBottom( rightBottom ), m_fontId( fontId ), m_var( var ), m_fgColor( fgColor ), m_playColor( playColor ), m_bgColor1( bgColor1 ), m_bgColor2( bgColor2 ), m_selColor( selColor ), m_help( help ), m_layer( layer ), m_windowId( windowId ), m_layoutId( layoutId ) {}
const string m_id; const string m_id;
int m_xPos; int m_xPos;
int m_yPos; int m_yPos;
const string m_visible;
int m_width; int m_width;
int m_height; int m_height;
const string m_leftTop; const string m_leftTop;
...@@ -311,7 +315,7 @@ m_id( id ), m_xPos( xPos ), m_yPos( yPos ), m_width( width ), m_height( height ) ...@@ -311,7 +315,7 @@ m_id( id ), m_xPos( xPos ), m_yPos( yPos ), m_width( width ), m_height( height )
/// Type definition /// Type definition
struct Video struct Video
{ {
Video( const string & id, int xPos, int yPos, int width, int height, const string & leftTop, const string & rightBottom, bool visible, const string & help, int layer, const string & windowId, const string & layoutId ): Video( const string & id, int xPos, int yPos, int width, int height, const string & leftTop, const string & rightBottom, const string & visible, const string & help, int layer, const string & windowId, const string & layoutId ):
m_id( id ), m_xPos( xPos ), m_yPos( yPos ), m_width( width ), m_height( height ), m_leftTop( leftTop ), m_rightBottom( rightBottom ), m_visible( visible ), m_help( help ), m_layer( layer ), m_windowId( windowId ), m_layoutId( layoutId ) {} m_id( id ), m_xPos( xPos ), m_yPos( yPos ), m_width( width ), m_height( height ), m_leftTop( leftTop ), m_rightBottom( rightBottom ), m_visible( visible ), m_help( help ), m_layer( layer ), m_windowId( windowId ), m_layoutId( layoutId ) {}
const string m_id; const string m_id;
...@@ -321,7 +325,7 @@ m_id( id ), m_xPos( xPos ), m_yPos( yPos ), m_width( width ), m_height( height ) ...@@ -321,7 +325,7 @@ m_id( id ), m_xPos( xPos ), m_yPos( yPos ), m_width( width ), m_height( height )
int m_height; int m_height;
const string m_leftTop; const string m_leftTop;
const string m_rightBottom; const string m_rightBottom;
bool m_visible; const string m_visible;
const string m_help; const string m_help;
int m_layer; int m_layer;
const string m_windowId; const string m_windowId;
......
...@@ -55,18 +55,18 @@ void SkinParser::handleBeginElement( const string &rName, AttrList_t &attr ) ...@@ -55,18 +55,18 @@ void SkinParser::handleBeginElement( const string &rName, AttrList_t &attr )
{ {
const BuilderData::Button button( uniqueId( attr["id"] ), atoi( attr["x"] ) + const BuilderData::Button button( uniqueId( attr["id"] ), atoi( attr["x"] ) +
m_xOffset, atoi( attr["y"] ) + m_yOffset, attr["lefttop"], m_xOffset, atoi( attr["y"] ) + m_yOffset, attr["lefttop"],
attr["rightbottom"], attr["up"], attr["down"], attr["over"], attr["rightbottom"], attr["visible"], attr["up"], attr["down"],
attr["action"], attr["tooltiptext"], attr["help"], m_curLayer, attr["over"], attr["action"], attr["tooltiptext"], attr["help"],
m_curWindowId, m_curLayoutId ); m_curLayer, m_curWindowId, m_curLayoutId );
m_curLayer++; m_curLayer++;
m_data.m_listButton.push_back( button ); m_data.m_listButton.push_back( button );
} }
else if( rName == "CheckBox" ) else if( rName == "Checkbox" )
{ {
const BuilderData::Checkbox checkbox( uniqueId( attr["id"] ), atoi( attr["x"] ) + const BuilderData::Checkbox checkbox( uniqueId( attr["id"] ), atoi( attr["x"] ) +
m_xOffset, atoi( attr["y"] ) + m_yOffset, attr["lefttop"], m_xOffset, atoi( attr["y"] ) + m_yOffset, attr["lefttop"],
attr["rightbottom"], attr["up1"], attr["down1"], attr["over1"], attr["rightbottom"], attr["visible"], attr["up1"], attr["down1"], attr["over1"],
attr["up2"], attr["down2"], attr["over2"], attr["state"], attr["up2"], attr["down2"], attr["over2"], attr["state"],
attr["action1"], attr["action2"], attr["tooltiptext1"], attr["action1"], attr["action2"], attr["tooltiptext1"],
attr["tooltiptext2"], attr["help"], m_curLayer, m_curWindowId, attr["tooltiptext2"], attr["help"], m_curLayer, m_curWindowId,
...@@ -77,7 +77,7 @@ void SkinParser::handleBeginElement( const string &rName, AttrList_t &attr ) ...@@ -77,7 +77,7 @@ void SkinParser::handleBeginElement( const string &rName, AttrList_t &attr )
else if( rName == "Font" ) else if( rName == "Font" )
{ {
const BuilderData::Font fontData( attr["id"], attr["font"], const BuilderData::Font fontData( attr["id"], attr["file"],
atoi( attr["size"] ) ); atoi( attr["size"] ) );
m_data.m_listFont.push_back( fontData ); m_data.m_listFont.push_back( fontData );
} }
...@@ -94,7 +94,7 @@ void SkinParser::handleBeginElement( const string &rName, AttrList_t &attr ) ...@@ -94,7 +94,7 @@ void SkinParser::handleBeginElement( const string &rName, AttrList_t &attr )
{ {
const BuilderData::Image imageData( uniqueId( attr["id"] ), atoi( attr["x"] ) + const BuilderData::Image imageData( uniqueId( attr["id"] ), atoi( attr["x"] ) +
m_xOffset, atoi( attr["y"] ) + m_yOffset, attr["lefttop"], m_xOffset, atoi( attr["y"] ) + m_yOffset, attr["lefttop"],
attr["rightbottom"], ConvertBoolean( attr["visible"] ), attr["rightbottom"], attr["visible"],
attr["image"], attr["action"], attr["help"], m_curLayer, attr["image"], attr["action"], attr["help"], m_curLayer,
m_curWindowId, m_curLayoutId ); m_curWindowId, m_curLayoutId );
m_curLayer++; m_curLayer++;
...@@ -116,8 +116,9 @@ void SkinParser::handleBeginElement( const string &rName, AttrList_t &attr ) ...@@ -116,8 +116,9 @@ void SkinParser::handleBeginElement( const string &rName, AttrList_t &attr )
{ {
m_curListId = uniqueId( attr["id"] ); m_curListId = uniqueId( attr["id"] );
const BuilderData::List listData( m_curListId, atoi( attr["x"] ) + const BuilderData::List listData( m_curListId, atoi( attr["x"] ) +
m_xOffset, atoi( attr["y"] ) + m_yOffset, atoi( attr["width"]), m_xOffset, atoi( attr["y"] ) + m_yOffset, attr["visible"],
atoi( attr["height"] ), attr["lefttop"], attr["rightbottom"], atoi( attr["width"]), atoi( attr["height"] ),
attr["lefttop"], attr["rightbottom"],
attr["font"], attr["var"], ConvertColor( attr["fgcolor"] ), attr["font"], attr["var"], ConvertColor( attr["fgcolor"] ),
ConvertColor( attr["playcolor"] ), ConvertColor( attr["playcolor"] ),
ConvertColor( attr["bgcolor1"] ), ConvertColor( attr["bgcolor1"] ),
...@@ -130,7 +131,8 @@ void SkinParser::handleBeginElement( const string &rName, AttrList_t &attr ) ...@@ -130,7 +131,8 @@ void SkinParser::handleBeginElement( const string &rName, AttrList_t &attr )
else if( rName == "RadialSlider" ) else if( rName == "RadialSlider" )
{ {
const BuilderData::RadialSlider radial( uniqueId( attr["id"] ), attr["visible"], const BuilderData::RadialSlider radial( uniqueId( attr["id"] ),
attr["visible"],
atoi( attr["x"] ) + m_xOffset, atoi( attr["y"] ) + m_yOffset, atoi( attr["x"] ) + m_xOffset, atoi( attr["y"] ) + m_yOffset,
attr["lefttop"], attr["rightbottom"], attr["sequence"], attr["lefttop"], attr["rightbottom"], attr["sequence"],
atoi( attr["nbImages"] ), atof( attr["minAngle"] ) * M_PI / 180, atoi( attr["nbImages"] ), atof( attr["minAngle"] ) * M_PI / 180,
...@@ -149,7 +151,8 @@ void SkinParser::handleBeginElement( const string &rName, AttrList_t &attr ) ...@@ -149,7 +151,8 @@ void SkinParser::handleBeginElement( const string &rName, AttrList_t &attr )
// Slider associated to a list // Slider associated to a list
newValue = "playlist.slider"; newValue = "playlist.slider";
} }
const BuilderData::Slider slider( uniqueId( attr["id"] ), attr["visible"], const BuilderData::Slider slider( uniqueId( attr["id"] ),
attr["visible"],
atoi( attr["x"] ) + m_xOffset, atoi( attr["y"] ) + m_yOffset, atoi( attr["x"] ) + m_xOffset, atoi( attr["y"] ) + m_yOffset,
attr["lefttop"], attr["rightbottom"], attr["up"], attr["down"], attr["lefttop"], attr["rightbottom"], attr["up"], attr["down"],
attr["over"], attr["points"], atoi( attr["thickness"] ), attr["over"], attr["points"], atoi( attr["thickness"] ),
...@@ -161,8 +164,9 @@ void SkinParser::handleBeginElement( const string &rName, AttrList_t &attr ) ...@@ -161,8 +164,9 @@ void SkinParser::handleBeginElement( const string &rName, AttrList_t &attr )
else if( rName == "Text" ) else if( rName == "Text" )
{ {
const BuilderData::Text textData( uniqueId( attr["id"] ), atoi( attr["x"] ) + const BuilderData::Text textData( uniqueId( attr["id"] ),
m_xOffset, atoi( attr["y"] ) + m_yOffset, attr["font"], atoi( attr["x"] ) + m_xOffset, atoi( attr["y"] ) + m_yOffset,
attr["visible"], attr["font"],
attr["text"], atoi( attr["width"] ), attr["text"], atoi( attr["width"] ),
ConvertColor( attr["color"] ), attr["help"], m_curLayer, ConvertColor( attr["color"] ), attr["help"], m_curLayer,
m_curWindowId, m_curLayoutId ); m_curWindowId, m_curLayoutId );
...@@ -198,7 +202,7 @@ void SkinParser::handleBeginElement( const string &rName, AttrList_t &attr ) ...@@ -198,7 +202,7 @@ void SkinParser::handleBeginElement( const string &rName, AttrList_t &attr )
atoi( attr["x"] ) + m_xOffset, atoi( attr["y"] ) + m_yOffset, atoi( attr["x"] ) + m_xOffset, atoi( attr["y"] ) + m_yOffset,
atoi( attr["width"] ), atoi( attr["height" ]), atoi( attr["width"] ), atoi( attr["height" ]),
attr["lefttop"], attr["rightbottom"], attr["lefttop"], attr["rightbottom"],
ConvertBoolean( attr["visible"] ), attr["help"], m_curLayer, attr["visible"], attr["help"], m_curLayer,
m_curWindowId, m_curLayoutId ); m_curWindowId, m_curLayoutId );
m_curLayer++; m_curLayer++;
m_data.m_listVideo.push_back( videoData ); m_data.m_listVideo.push_back( videoData );
......
...@@ -22,7 +22,7 @@ ...@@ -22,7 +22,7 @@
<!ELEMENT Font EMPTY> <!ELEMENT Font EMPTY>
<!ATTLIST Font <!ATTLIST Font
id CDATA #REQUIRED id CDATA #REQUIRED
font CDATA "arial" file CDATA #REQUIRED
size CDATA "12" size CDATA "12"
color CDATA "#000000" color CDATA "#000000"
italic CDATA "false" italic CDATA "false"
...@@ -61,7 +61,7 @@ ...@@ -61,7 +61,7 @@
minheight CDATA "-1" minheight CDATA "-1"
maxheight CDATA "-1" maxheight CDATA "-1"
> >
<!ELEMENT Group (Group|Image|Button|Playlist|Slider|RadialSlider|Text|CheckBox| <!ELEMENT Group (Group|Image|Button|Playlist|Slider|RadialSlider|Text|Checkbox|
Anchor|Video)+> Anchor|Video)+>
<!ATTLIST Group <!ATTLIST Group
x CDATA "0" x CDATA "0"
...@@ -94,6 +94,7 @@ ...@@ -94,6 +94,7 @@
<!ELEMENT Button EMPTY> <!ELEMENT Button EMPTY>
<!ATTLIST Button <!ATTLIST Button
id CDATA "none" id CDATA "none"
visible CDATA "true"
x CDATA "0" x CDATA "0"
y CDATA "0" y CDATA "0"
lefttop CDATA "lefttop" lefttop CDATA "lefttop"
...@@ -105,9 +106,10 @@ ...@@ -105,9 +106,10 @@
tooltiptext CDATA "" tooltiptext CDATA ""
help CDATA "" help CDATA ""
> >
<!ELEMENT CheckBox EMPTY> <!ELEMENT Checkbox EMPTY>
<!ATTLIST CheckBox <!ATTLIST Checkbox
id CDATA "none" id CDATA "none"
visible CDATA "true"
x CDATA "0" x CDATA "0"
y CDATA "0" y CDATA "0"
lefttop CDATA "lefttop" lefttop CDATA "lefttop"
......
...@@ -62,8 +62,8 @@ ...@@ -62,8 +62,8 @@
<Bitmap id="stop_onclick" file="stop_onclick.png" alphacolor="#FF0000"/> <Bitmap id="stop_onclick" file="stop_onclick.png" alphacolor="#FF0000"/>
<Bitmap id="volume_radial" file="volume.png" alphacolor="#FF0000"/> <Bitmap id="volume_radial" file="volume.png" alphacolor="#FF0000"/>
<Font id="default_font" font="FreeSansBold.ttf" size="15"/> <Font id="default_font" file="FreeSansBold.ttf" size="15"/>
<Font id="playlist_font" font="FreeSansBold.ttf" size="12"/> <Font id="playlist_font" file="FreeSansBold.ttf" size="12"/>
<Window x="230" y="250" dragdrop="true"> <Window x="230" y="250" dragdrop="true">
...@@ -81,8 +81,8 @@ ...@@ -81,8 +81,8 @@
<Text font="default_font" width="70" x="287" y="79" text="$T" color="#000000"/> <Text font="default_font" width="70" x="287" y="79" text="$T" color="#000000"/>
<Button x="42" y="42" up="preferences" down="preferences_onclick" over="preferences" action="dialogs.prefs()" tooltiptext="Preferences"/> <Button x="42" y="42" up="preferences" down="preferences_onclick" over="preferences" action="dialogs.prefs()" tooltiptext="Preferences"/>
<Button x="17" y="64" up="stop" down="stop_onclick" over="stop" action="vlc.stop()" tooltiptext="Stop"/> <Button x="17" y="64" up="stop" down="stop_onclick" over="stop" action="vlc.stop()" tooltiptext="Stop"/>
<CheckBox x="42" y="87" up1="playlist_button" down1="playlist_button_onclick" up2="playlist_button2" down2="playlist_button_onclick2" state="playlist_window.isVisible" action1="playlist_window.show()" action2="playlist_window.hide()" tooltiptext1="Show Playlist" tooltiptext2="Hide Playlist"/> <Checkbox x="42" y="87" up1="playlist_button" down1="playlist_button_onclick" up2="playlist_button2" down2="playlist_button_onclick2" state="playlist_window.isVisible" action1="playlist_window.show()" action2="playlist_window.hide()" tooltiptext1="Show Playlist" tooltiptext2="Hide Playlist"/>
<CheckBox x="83" y="44" up1="play" up2="pause" down1="play_onclick" down2="pause_onclick" state="vlc.isPlaying" action1="vlc.play()" action2="vlc.pause()" tooltiptext1="Play" tooltiptext2="Pause"/> <Checkbox x="83" y="44" up1="play" up2="pause" down1="play_onclick" down2="pause_onclick" state="vlc.isPlaying" action1="vlc.play()" action2="vlc.pause()" tooltiptext1="Play" tooltiptext2="Pause"/>
<Button x="159" y="37" up="rev" down="rev_click" over="rev" action="vlc.slower()" tooltiptext="Slower"/>