* skins2/src/skin_main.cpp: Transparency is default disabled

 * skins2/parser/builder.cpp: s/resize/resizeSE/ (SE as in South-East)
   because in the future resizing will be allowed in all directions
 * share/skins2/default/theme.xml: Updated the skin accordingly

diff --git a/modules/gui/skins2/parser/builder.cpp b/modules/gui/skins2/parser/builder.cpp
index adfc3c74b1796284a63735022d633f888ed9f240..8bb5fc2f82fd53d6742f54b105e9cd48259ee8e6 100755 (executable)
--- a/modules/gui/skins2/parser/builder.cpp
+++ b/modules/gui/skins2/parser/builder.cpp
@@ -397,7 +397,7 @@ void Builder::addImage( const BuilderData::Image &rData )
              NULL);
         pLayout->addControl( pMove, pos, rData.m_layer );
     }
-    else if( rData.m_actionId == "resize" )
+    else if( rData.m_actionId == "resizeSE" )
     {
         CtrlResize *pResize = new CtrlResize( getIntf(), *pImage, *pLayout,
                 UString( getIntf(), rData.m_help.c_str() ), NULL );

diff --git a/modules/gui/skins2/src/skin_main.cpp b/modules/gui/skins2/src/skin_main.cpp
index d9b14ffbb9bc75ae238a9ecd2c31fba654f36c85..76b001b6857d4baf51be114bd1b8504c722fcbee 100644 (file)
--- a/modules/gui/skins2/src/skin_main.cpp
+++ b/modules/gui/skins2/src/skin_main.cpp
@@ -254,7 +254,7 @@ vlc_module_begin();
     add_string( "skins2-config", "", NULL, SKINS2_CONFIG, SKINS2_CONFIG_LONG,
                 VLC_TRUE );
 #ifdef WIN32
-    add_bool( "skins2-transparency", VLC_TRUE, NULL, SKINS2_TRANSPARENCY,
+    add_bool( "skins2-transparency", VLC_FALSE, NULL, SKINS2_TRANSPARENCY,
               SKINS2_TRANSPARENCY_LONG, VLC_FALSE );
 #endif
     set_description( _("Skinnable Interface") );

diff --git a/share/skins2/default/theme.xml b/share/skins2/default/theme.xml
index a5e6cf4f222ac163e94406b4dfe93b3c35368f7a..fc8f3c58dc95d88eb3870beb25134f952aeee59b 100644 (file)
--- a/share/skins2/default/theme.xml
+++ b/share/skins2/default/theme.xml
@@ -118,7 +118,7 @@
       <Image image="playlist7" x="0" y="200" lefttop="leftbottom" rightbottom="leftbottom" action="move"/>
       <Image image="playlist8" x="17" y="200" lefttop="leftbottom" rightbottom="rightbottom" action="move"/>
       <Image image="playlist9" x="350" y="200" lefttop="rightbottom" rightbottom="rightbottom" action="move"/> 
-      <Image image="resize" x="392" y="232" lefttop="rightbottom" rightbottom="rightbottom" action="resize"/>
+      <Image image="resize" x="392" y="232" lefttop="rightbottom" rightbottom="rightbottom" action="resizeSE"/>
 
       <Button x="374" y="12" lefttop="righttop" rightbottom="righttop" up="add_item" down="add_item_onclick" over="add_item" action="playlist.add()" tooltiptext="Add item"/>
       <Button x="374" y="40" up="delete_item" lefttop="righttop" rightbottom="righttop" down="delete_item_onclick" over="delete_item" action="playlist.del()" tooltiptext="Del item"/>
@@ -143,7 +143,7 @@
       <Image image="voutbody7" x="0" y="200" lefttop="leftbottom" rightbottom="leftbottom" action="move"/>
       <Image image="voutbody8" x="17" y="200" lefttop="leftbottom" rightbottom="rightbottom" action="move"/>
       <Image image="voutbody9" x="350" y="200" lefttop="rightbottom" rightbottom="rightbottom" action="move"/>
-      <Image image="resize" x="392" y="232" lefttop="rightbottom" rightbottom="rightbottom" action="resize"/>
+      <Image image="resize" x="392" y="232" lefttop="rightbottom" rightbottom="rightbottom" action="resizeSE"/>
       <Video x="15" y="24" width="350" height="210" lefttop="lefttop" rightbottom="rightbottom"/>
 
       <Checkbox x="15" y="5" up1="close" down1="close_onclick" up2="close" down2="close_onclick" over1="close_mouseover" over2="close_mouseover" state="vout_window.isVisible" action1="vout_window.show()" action2="vout_window.hide()" tooltiptext1="Show Video Window" tooltiptext2="Hide Video Window"/>