Commit ac01cdf7 authored by Olivier Teulière's avatar Olivier Teulière

* skins2: Removed the Theme.fadetime attribute (unused)

parent c43b027d
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
Bitmap id:string fileName:string alphaColor:uint32_t Bitmap id:string fileName:string alphaColor:uint32_t
BitmapFont id:string file:string type:string BitmapFont id:string file:string type:string
Font id:string fontFile:string size:int Font id:string fontFile:string size:int
......
...@@ -42,14 +42,13 @@ struct BuilderData ...@@ -42,14 +42,13 @@ struct BuilderData
/// Type definition /// Type definition
struct Theme struct Theme
{ {
Theme( const string & tooltipfont, int magnet, uint32_t alpha, uint32_t moveAlpha, uint32_t fadeTime ): Theme( const string & tooltipfont, int magnet, uint32_t alpha, uint32_t moveAlpha ):
m_tooltipfont( tooltipfont ), m_magnet( magnet ), m_alpha( alpha ), m_moveAlpha( moveAlpha ), m_fadeTime( fadeTime ) {} m_tooltipfont( tooltipfont ), m_magnet( magnet ), m_alpha( alpha ), m_moveAlpha( moveAlpha ) {}
const string m_tooltipfont; const string m_tooltipfont;
int m_magnet; int m_magnet;
uint32_t m_alpha; uint32_t m_alpha;
uint32_t m_moveAlpha; uint32_t m_moveAlpha;
uint32_t m_fadeTime;
}; };
/// List /// List
list<Theme> m_listTheme; list<Theme> m_listTheme;
......
...@@ -255,8 +255,7 @@ void SkinParser::handleBeginElement( const string &rName, AttrList_t &attr ) ...@@ -255,8 +255,7 @@ void SkinParser::handleBeginElement( const string &rName, AttrList_t &attr )
const BuilderData::Theme theme( attr["tooltipfont"], const BuilderData::Theme theme( attr["tooltipfont"],
atoi( attr["magnet"] ), atoi( attr["magnet"] ),
convertInRange( attr["alpha"], 1, 255, "alpha" ), convertInRange( attr["alpha"], 1, 255, "alpha" ),
convertInRange( attr["movealpha"], 1, 255, "movealpha" ), convertInRange( attr["movealpha"], 1, 255, "movealpha" ) );
atoi( attr["fadetime"] ) );
m_data.m_listTheme.push_back( theme ); m_data.m_listTheme.push_back( theme );
} }
......
<!DOCTYPE Theme PUBLIC "-//VideoLAN//DTD VLC Skins V2.0//EN" "skin.dtd"> <!DOCTYPE Theme PUBLIC "-//VideoLAN//DTD VLC Skins V2.0//EN" "skin.dtd">
<Theme version="2.0" magnet="20" alpha="255" movealpha="192" fadetime="500"> <Theme version="2.0" magnet="20" alpha="255" movealpha="192">
<ThemeInfo name="VLC OSX Interface" author="BigBen" <ThemeInfo name="VLC OSX Interface" author="BigBen"
email="bigben@videolan.org" webpage="http://www.videolan.org"/> email="bigben@videolan.org" webpage="http://www.videolan.org"/>
......
...@@ -9,7 +9,6 @@ ...@@ -9,7 +9,6 @@
magnet CDATA "15" magnet CDATA "15"
alpha CDATA "255" alpha CDATA "255"
movealpha CDATA "255" movealpha CDATA "255"
fadetime CDATA "400"
> >
<!-- main elements --> <!-- main elements -->
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment