* moved the default skins2 theme in share/skins2/default/

  * all: added a "tooltipfont" element in the <Theme> tag (unused at the
      moment)

diff --git a/modules/gui/skins2/parser/builder.cpp b/modules/gui/skins2/parser/builder.cpp
index e5963d86306938c5d10a167210c3da36e3a71efd..3002e9086740e96e88f16bb96e2447af211575f3 100755 (executable)
--- a/modules/gui/skins2/parser/builder.cpp
+++ b/modules/gui/skins2/parser/builder.cpp
@@ -116,10 +116,8 @@ void Builder::addTheme( const BuilderData::Theme &rData )
     rManager.setMagnetValue( rData.m_magnet );
     rManager.setAlphaValue( rData.m_alpha );
     rManager.setMoveAlphaValue( rData.m_moveAlpha );
-    // XXX:  font to fix
     GenericFont *pFont = new FT2Font( getIntf(), "FreeSans.ttf", 12 );
     pFont->init();
-    rManager.createTooltip( *pFont );
 }
 
 

diff --git a/modules/gui/skins2/parser/builder_data.def b/modules/gui/skins2/parser/builder_data.def
index de495f88879253a335b3f7ab29a439d13357f937..a018aab8cc77e4b172b769a3cda3dc4a17d9ceed 100644 (file)
--- a/modules/gui/skins2/parser/builder_data.def
+++ b/modules/gui/skins2/parser/builder_data.def
@@ -1,4 +1,4 @@
-Theme 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
 Font id:string fontName:string size:int
 Window id:string xPos:int yPos:int visible:bool dragDrop:bool playOnDrop:bool

diff --git a/modules/gui/skins2/parser/builder_data.hpp b/modules/gui/skins2/parser/builder_data.hpp
index 31beb43c18f92d4b0bd512a72de452e617dff95f..67daa133ebdd018fcc26f9949394cca1d31fa6fa 100644 (file)
--- a/modules/gui/skins2/parser/builder_data.hpp
+++ b/modules/gui/skins2/parser/builder_data.hpp
@@ -42,9 +42,10 @@ struct BuilderData
     /// Type definition
     struct Theme
     {
-        Theme( int magnet, uint32_t alpha, uint32_t moveAlpha, uint32_t fadeTime ):
-m_magnet( magnet ), m_alpha( alpha ), m_moveAlpha( moveAlpha ), m_fadeTime( fadeTime ) {}
+        Theme( const string & tooltipfont, int magnet, uint32_t alpha, uint32_t moveAlpha, uint32_t fadeTime ):
+m_tooltipfont( tooltipfont ), m_magnet( magnet ), m_alpha( alpha ), m_moveAlpha( moveAlpha ), m_fadeTime( fadeTime ) {}
 
+        const string m_tooltipfont;
         int m_magnet;
         uint32_t m_alpha;
         uint32_t m_moveAlpha;

diff --git a/modules/gui/skins2/parser/skin_parser.cpp b/modules/gui/skins2/parser/skin_parser.cpp
index bb54b7b7f70fcbc60672cf81b1b922470d9c8049..df4cd9feb9ef69667137070d5753e5dc645da825 100644 (file)
--- a/modules/gui/skins2/parser/skin_parser.cpp
+++ b/modules/gui/skins2/parser/skin_parser.cpp
@@ -25,7 +25,7 @@
 #include <math.h>
 
 // Current DTD version
-#define SKINS_DTD_VERSION "1.99"
+#define SKINS_DTD_VERSION "2.0"
 
 
 SkinParser::SkinParser( intf_thread_t *pIntf, const string &rFileName ):
@@ -180,9 +180,9 @@ void SkinParser::handleBeginElement( const string &rName, AttrList_t &attr )
             m_errors = true;
             return;
         }
-        const BuilderData::Theme theme( atoi( attr["magnet"] ),
-                atoi( attr["alpha"] ), atoi( attr["movealpha"] ),
-                atoi( attr["fadetime"] ) );
+        const BuilderData::Theme theme( attr["tooltipfont"],
+                atoi( attr["magnet"] ), atoi( attr["alpha"] ),
+                atoi( attr["movealpha"] ), atoi( attr["fadetime"] ) );
         m_data.m_listTheme.push_back( theme );
     }
 

diff --git a/modules/gui/skins2/theme/FreeSans.ttf b/share/skins2/default/FreeSans.ttf
similarity index 100%
rename from modules/gui/skins2/theme/FreeSans.ttf
rename to share/skins2/default/FreeSans.ttf

diff --git a/modules/gui/skins2/theme/FreeSansBold.ttf b/share/skins2/default/FreeSansBold.ttf
similarity index 100%
rename from modules/gui/skins2/theme/FreeSansBold.ttf
rename to share/skins2/default/FreeSansBold.ttf

diff --git a/modules/gui/skins2/theme/add_item.png b/share/skins2/default/add_item.png
similarity index 100%
rename from modules/gui/skins2/theme/add_item.png
rename to share/skins2/default/add_item.png

diff --git a/modules/gui/skins2/theme/add_item_onclick.png b/share/skins2/default/add_item_onclick.png
similarity index 100%
rename from modules/gui/skins2/theme/add_item_onclick.png
rename to share/skins2/default/add_item_onclick.png

diff --git a/modules/gui/skins2/theme/body.png b/share/skins2/default/body.png
similarity index 100%
rename from modules/gui/skins2/theme/body.png
rename to share/skins2/default/body.png

diff --git a/modules/gui/skins2/theme/close.png b/share/skins2/default/close.png
similarity index 100%
rename from modules/gui/skins2/theme/close.png
rename to share/skins2/default/close.png

diff --git a/modules/gui/skins2/theme/close_mouseover.png b/share/skins2/default/close_mouseover.png
similarity index 100%
rename from modules/gui/skins2/theme/close_mouseover.png
rename to share/skins2/default/close_mouseover.png

diff --git a/modules/gui/skins2/theme/close_onclick.png b/share/skins2/default/close_onclick.png
similarity index 100%
rename from modules/gui/skins2/theme/close_onclick.png
rename to share/skins2/default/close_onclick.png

diff --git a/modules/gui/skins2/theme/delete_item.png b/share/skins2/default/delete_item.png
similarity index 100%
rename from modules/gui/skins2/theme/delete_item.png
rename to share/skins2/default/delete_item.png

diff --git a/modules/gui/skins2/theme/delete_item_onclick.png b/share/skins2/default/delete_item_onclick.png
similarity index 100%
rename from modules/gui/skins2/theme/delete_item_onclick.png
rename to share/skins2/default/delete_item_onclick.png

diff --git a/modules/gui/skins2/theme/disabled.png b/share/skins2/default/disabled.png
similarity index 100%
rename from modules/gui/skins2/theme/disabled.png
rename to share/skins2/default/disabled.png

diff --git a/modules/gui/skins2/theme/fast.png b/share/skins2/default/fast.png
similarity index 100%
rename from modules/gui/skins2/theme/fast.png
rename to share/skins2/default/fast.png

diff --git a/modules/gui/skins2/theme/fast_disabled.png b/share/skins2/default/fast_disabled.png
similarity index 100%
rename from modules/gui/skins2/theme/fast_disabled.png
rename to share/skins2/default/fast_disabled.png

diff --git a/modules/gui/skins2/theme/fast_onclick.png b/share/skins2/default/fast_onclick.png
similarity index 100%
rename from modules/gui/skins2/theme/fast_onclick.png
rename to share/skins2/default/fast_onclick.png

diff --git a/modules/gui/skins2/theme/next.png b/share/skins2/default/next.png
similarity index 100%
rename from modules/gui/skins2/theme/next.png
rename to share/skins2/default/next.png

diff --git a/modules/gui/skins2/theme/next_disabled.png b/share/skins2/default/next_disabled.png
similarity index 100%
rename from modules/gui/skins2/theme/next_disabled.png
rename to share/skins2/default/next_disabled.png

diff --git a/modules/gui/skins2/theme/next_onclick.png b/share/skins2/default/next_onclick.png
similarity index 100%
rename from modules/gui/skins2/theme/next_onclick.png
rename to share/skins2/default/next_onclick.png

diff --git a/modules/gui/skins2/theme/pause.png b/share/skins2/default/pause.png
similarity index 100%
rename from modules/gui/skins2/theme/pause.png
rename to share/skins2/default/pause.png

diff --git a/modules/gui/skins2/theme/pause_onclick.png b/share/skins2/default/pause_onclick.png
similarity index 100%
rename from modules/gui/skins2/theme/pause_onclick.png
rename to share/skins2/default/pause_onclick.png

diff --git a/modules/gui/skins2/theme/play.png b/share/skins2/default/play.png
similarity index 100%
rename from modules/gui/skins2/theme/play.png
rename to share/skins2/default/play.png

diff --git a/modules/gui/skins2/theme/play_onclick.png b/share/skins2/default/play_onclick.png
similarity index 100%
rename from modules/gui/skins2/theme/play_onclick.png
rename to share/skins2/default/play_onclick.png

diff --git a/modules/gui/skins2/theme/playlist.png b/share/skins2/default/playlist.png
similarity index 100%
rename from modules/gui/skins2/theme/playlist.png
rename to share/skins2/default/playlist.png

diff --git a/modules/gui/skins2/theme/playlist_body1.png b/share/skins2/default/playlist_body1.png
similarity index 100%
rename from modules/gui/skins2/theme/playlist_body1.png
rename to share/skins2/default/playlist_body1.png

diff --git a/modules/gui/skins2/theme/playlist_body2.png b/share/skins2/default/playlist_body2.png
similarity index 100%
rename from modules/gui/skins2/theme/playlist_body2.png
rename to share/skins2/default/playlist_body2.png

diff --git a/modules/gui/skins2/theme/playlist_body3.png b/share/skins2/default/playlist_body3.png
similarity index 100%
rename from modules/gui/skins2/theme/playlist_body3.png
rename to share/skins2/default/playlist_body3.png

diff --git a/modules/gui/skins2/theme/playlist_body4.png b/share/skins2/default/playlist_body4.png
similarity index 100%
rename from modules/gui/skins2/theme/playlist_body4.png
rename to share/skins2/default/playlist_body4.png

diff --git a/modules/gui/skins2/theme/playlist_body6.png b/share/skins2/default/playlist_body6.png
similarity index 100%
rename from modules/gui/skins2/theme/playlist_body6.png
rename to share/skins2/default/playlist_body6.png

diff --git a/modules/gui/skins2/theme/playlist_body7.png b/share/skins2/default/playlist_body7.png
similarity index 100%
rename from modules/gui/skins2/theme/playlist_body7.png
rename to share/skins2/default/playlist_body7.png

diff --git a/modules/gui/skins2/theme/playlist_body8.png b/share/skins2/default/playlist_body8.png
similarity index 100%
rename from modules/gui/skins2/theme/playlist_body8.png
rename to share/skins2/default/playlist_body8.png

diff --git a/modules/gui/skins2/theme/playlist_body9.png b/share/skins2/default/playlist_body9.png
similarity index 100%
rename from modules/gui/skins2/theme/playlist_body9.png
rename to share/skins2/default/playlist_body9.png

diff --git a/modules/gui/skins2/theme/playlist_button.png b/share/skins2/default/playlist_button.png
similarity index 100%
rename from modules/gui/skins2/theme/playlist_button.png
rename to share/skins2/default/playlist_button.png

diff --git a/modules/gui/skins2/theme/playlist_button2.png b/share/skins2/default/playlist_button2.png
similarity index 100%
rename from modules/gui/skins2/theme/playlist_button2.png
rename to share/skins2/default/playlist_button2.png

diff --git a/modules/gui/skins2/theme/playlist_button_onclick.png b/share/skins2/default/playlist_button_onclick.png
similarity index 100%
rename from modules/gui/skins2/theme/playlist_button_onclick.png
rename to share/skins2/default/playlist_button_onclick.png

diff --git a/modules/gui/skins2/theme/playlist_button_onclick2.png b/share/skins2/default/playlist_button_onclick2.png
similarity index 100%
rename from modules/gui/skins2/theme/playlist_button_onclick2.png
rename to share/skins2/default/playlist_button_onclick2.png

diff --git a/modules/gui/skins2/theme/preferences.png b/share/skins2/default/preferences.png
similarity index 100%
rename from modules/gui/skins2/theme/preferences.png
rename to share/skins2/default/preferences.png

diff --git a/modules/gui/skins2/theme/preferences_onclick.png b/share/skins2/default/preferences_onclick.png
similarity index 100%
rename from modules/gui/skins2/theme/preferences_onclick.png
rename to share/skins2/default/preferences_onclick.png

diff --git a/modules/gui/skins2/theme/previous.png b/share/skins2/default/previous.png
similarity index 100%
rename from modules/gui/skins2/theme/previous.png
rename to share/skins2/default/previous.png

diff --git a/modules/gui/skins2/theme/previous_disabled.png b/share/skins2/default/previous_disabled.png
similarity index 100%
rename from modules/gui/skins2/theme/previous_disabled.png
rename to share/skins2/default/previous_disabled.png

diff --git a/modules/gui/skins2/theme/previous_onclick.png b/share/skins2/default/previous_onclick.png
similarity index 100%
rename from modules/gui/skins2/theme/previous_onclick.png
rename to share/skins2/default/previous_onclick.png

diff --git a/modules/gui/skins2/theme/reduce.png b/share/skins2/default/reduce.png
similarity index 100%
rename from modules/gui/skins2/theme/reduce.png
rename to share/skins2/default/reduce.png

diff --git a/modules/gui/skins2/theme/reduce_disabled.png b/share/skins2/default/reduce_disabled.png
similarity index 100%
rename from modules/gui/skins2/theme/reduce_disabled.png
rename to share/skins2/default/reduce_disabled.png

diff --git a/modules/gui/skins2/theme/reduce_onclick.png b/share/skins2/default/reduce_onclick.png
similarity index 100%
rename from modules/gui/skins2/theme/reduce_onclick.png
rename to share/skins2/default/reduce_onclick.png

diff --git a/modules/gui/skins2/theme/resize.png b/share/skins2/default/resize.png
similarity index 100%
rename from modules/gui/skins2/theme/resize.png
rename to share/skins2/default/resize.png

diff --git a/modules/gui/skins2/theme/rev.png b/share/skins2/default/rev.png
similarity index 100%
rename from modules/gui/skins2/theme/rev.png
rename to share/skins2/default/rev.png

diff --git a/modules/gui/skins2/theme/rev_disabled.png b/share/skins2/default/rev_disabled.png
similarity index 100%
rename from modules/gui/skins2/theme/rev_disabled.png
rename to share/skins2/default/rev_disabled.png

diff --git a/modules/gui/skins2/theme/rev_onclick.png b/share/skins2/default/rev_onclick.png
similarity index 100%
rename from modules/gui/skins2/theme/rev_onclick.png
rename to share/skins2/default/rev_onclick.png

diff --git a/modules/gui/skins2/theme/skin.dtd b/share/skins2/default/skin.dtd
similarity index 98%
rename from modules/gui/skins2/theme/skin.dtd
rename to share/skins2/default/skin.dtd
index bfa378d3ed76f72f9dd6b5e04c81402f6e64a935..17a67060191a5259f61879f70a15a2a1578778e3 100644 (file)
--- a/modules/gui/skins2/theme/skin.dtd
+++ b/share/skins2/default/skin.dtd
@@ -1,10 +1,11 @@
-<!-- version 1.99
+<!-- version 2.0
 -->
 
 
 <!ELEMENT Theme (ThemeInfo,(Bitmap|Font|Window)*)>
     <!ATTLIST Theme
-        version     CDATA   "1.0"
+        version     CDATA   #REQUIRED
+        tooltipfont CDATA   "defaultfont"
         magnet      CDATA   "15"
         alpha       CDATA   "255"
         movealpha   CDATA   "255"

diff --git a/modules/gui/skins2/theme/slider.png b/share/skins2/default/slider.png
similarity index 100%
rename from modules/gui/skins2/theme/slider.png
rename to share/skins2/default/slider.png

diff --git a/modules/gui/skins2/theme/slider2.png b/share/skins2/default/slider2.png
similarity index 100%
rename from modules/gui/skins2/theme/slider2.png
rename to share/skins2/default/slider2.png

diff --git a/modules/gui/skins2/theme/slider_onclick.png b/share/skins2/default/slider_onclick.png
similarity index 100%
rename from modules/gui/skins2/theme/slider_onclick.png
rename to share/skins2/default/slider_onclick.png

diff --git a/modules/gui/skins2/theme/slider_playlist.png b/share/skins2/default/slider_playlist.png
similarity index 100%
rename from modules/gui/skins2/theme/slider_playlist.png
rename to share/skins2/default/slider_playlist.png

diff --git a/modules/gui/skins2/theme/slider_volume.png b/share/skins2/default/slider_volume.png
similarity index 100%
rename from modules/gui/skins2/theme/slider_volume.png
rename to share/skins2/default/slider_volume.png

diff --git a/modules/gui/skins2/theme/slider_volume_onclick.png b/share/skins2/default/slider_volume_onclick.png
similarity index 100%
rename from modules/gui/skins2/theme/slider_volume_onclick.png
rename to share/skins2/default/slider_volume_onclick.png

diff --git a/modules/gui/skins2/theme/slow.png b/share/skins2/default/slow.png
similarity index 100%
rename from modules/gui/skins2/theme/slow.png
rename to share/skins2/default/slow.png

diff --git a/modules/gui/skins2/theme/slow_disabled.png b/share/skins2/default/slow_disabled.png
similarity index 100%
rename from modules/gui/skins2/theme/slow_disabled.png
rename to share/skins2/default/slow_disabled.png

diff --git a/modules/gui/skins2/theme/slow_onclick.png b/share/skins2/default/slow_onclick.png
similarity index 100%
rename from modules/gui/skins2/theme/slow_onclick.png
rename to share/skins2/default/slow_onclick.png

diff --git a/modules/gui/skins2/theme/sort.png b/share/skins2/default/sort.png
similarity index 100%
rename from modules/gui/skins2/theme/sort.png
rename to share/skins2/default/sort.png

diff --git a/modules/gui/skins2/theme/sort_onclick.png b/share/skins2/default/sort_onclick.png
similarity index 100%
rename from modules/gui/skins2/theme/sort_onclick.png
rename to share/skins2/default/sort_onclick.png

diff --git a/modules/gui/skins2/theme/stop.png b/share/skins2/default/stop.png
similarity index 100%
rename from modules/gui/skins2/theme/stop.png
rename to share/skins2/default/stop.png

diff --git a/modules/gui/skins2/theme/stop_disabled.png b/share/skins2/default/stop_disabled.png
similarity index 100%
rename from modules/gui/skins2/theme/stop_disabled.png
rename to share/skins2/default/stop_disabled.png

diff --git a/modules/gui/skins2/theme/stop_onclick.png b/share/skins2/default/stop_onclick.png
similarity index 100%
rename from modules/gui/skins2/theme/stop_onclick.png
rename to share/skins2/default/stop_onclick.png

diff --git a/modules/gui/skins2/theme/theme.xml b/share/skins2/default/theme.xml
similarity index 98%
rename from modules/gui/skins2/theme/theme.xml
rename to share/skins2/default/theme.xml
index f0f32d3a8dc0b3cbe5605f92e6616b51bf562eec..ce11af42a675facdf675b3545aeecbcf79b82d8a 100644 (file)
--- a/modules/gui/skins2/theme/theme.xml
+++ b/share/skins2/default/theme.xml
@@ -1,6 +1,6 @@
 <!DOCTYPE Theme SYSTEM "skin.dtd">
 
-<Theme version="1.99" magnet="20" alpha="255" movealpha="192" fadetime="500">
+<Theme version="2.0" magnet="20" alpha="255" movealpha="192" fadetime="500">
   <ThemeInfo name="VLC OSX Interface" author="BigBen"
              email="bigben@videolan.org" webpage="http://www.videolan.org"/>
 
@@ -62,8 +62,8 @@
   <Bitmap id="stop_onclick" file="stop_onclick.png" alphacolor="#FF0000"/>
   <Bitmap id="volume_radial" file="volume.png" alphacolor="#FF0000"/>
 
-  <Font id="default_font" font="FreeSansBold.ttf" size="15"/> 
-  <Font id="playlist_font" font="FreeSansBold.ttf" size="12"/> 
+  <Font id="default_font" font="FreeSansBold.ttf" size="15"/>
+  <Font id="playlist_font" font="FreeSansBold.ttf" size="12"/>
 
   <Window x="230" y="250" dragdrop="true">
 

diff --git a/modules/gui/skins2/theme/volume.png b/share/skins2/default/volume.png
similarity index 100%
rename from modules/gui/skins2/theme/volume.png
rename to share/skins2/default/volume.png