* forwardport of [15426] and [15516]

share/skins2/default/theme.xml

@@ -184,7 +184,8 @@
         <SubBitmap x="0" y="22" height="11" width="34" id="switch_down"/>
     </Bitmap>
     <Window id="main" x="100" y="100" dragdrop="true" playondrop="false" visible="true">
-	<Layout width="500" height="300" maxheight="1024" maxwidth="1280" id="video"><Group x="0" y="0">
+        <Layout width="454" height="300" maxheight="1024" maxwidth="1280" id="video">
+            <Group x="0" y="0">
                 <Anchor x="-1" y="0" priority="2"/>
                 <!--The Framework-->
                 <Image x="0" y="0" image="lefttop" lefttop="lefttop" rightbottom="lefttop" action="move"/>
@@ -227,7 +228,7 @@
                 <Slider x="26" y="226" points="(0,0),(400,0)" up="timeslider" value="time" lefttop="leftbottom" rightbottom="rightbottom"/>
 
                 <Slider x="310" y="259" points="(17,10),(75,10)" up="vol_slider" value="volume" tooltiptext="Volume: $V%" lefttop="leftbottom" rightbottom="leftbottom">
-            <SliderBackground image="vol_bg" x="310" y="259" nbvert="55"/>
+                    <SliderBackground image="vol_bg" nbvert="55"/>
                 </Slider>
                 <Image x="269" y="259" image="vol_mask" lefttop="leftbottom" rightbottom="leftbottom"/>
                 <!--The Buttons-->
@@ -254,10 +255,12 @@
                 <Checkbox x="276" y="258" up1="eq_up" over1="eq_over" down1="eq_down" up2="eq_down" down2="eq_up" action1="eqwin.show()" action2="eqwin.hide()" tooltiptext1="Show Equalizer" tooltiptext2="Hide Equalizer" lefttop="leftbottom" rightbottom="leftbottom" state="eqwin.isVisible"/>
 
                 <Button x="310" y="258" up="mute_up" over="mute_over" down="mute_down" action="vlc.mute()" tooltiptext="Mute" lefttop="leftbottom" rightbottom="leftbottom"/>
-		</Group></Layout>
+            </Group>
+        </Layout>
     </Window>
     <Window x="555" y="100" dragdrop="true" playondrop="false" visible="false" id="plwin">
-	<Layout height="300" width="300" id="pllayout" maxheight="1024" maxwidth="1280" minheight="150"><Group x="0" y="0">
+        <Layout height="300" width="300" id="pllayout" maxheight="1024" maxwidth="1280" minheight="150">
+            <Group x="0" y="0">
                 <Anchor x="-1" y="0" priority="2"/>
                 <Image x="0" y="0" image="playlist_lefttop" lefttop="lefttop" rightbottom="lefttop" action="move"/>
                 <Image x="14" y="0" image="playlist_topframe" lefttop="lefttop" rightbottom="righttop" resize="scale" action="move"/>
@@ -291,7 +294,8 @@
         </Layout>
     </Window>
     <Window x="100" y="401" dragdrop="false" id="eqwin" visible="false">
-	<Layout width="300" height="150" id="eqwinlayout"><Group x="0" y="0">
+        <Layout width="300" height="150" id="eqwinlayout">
+            <Group x="0" y="0">
                 <Anchor x="-1" y="0" priority="2"/>
                 <Anchor x="300" y="0" priority="3"/>
                 <Image x="0" y="0" image="equalizer_bg" action="move"/>
@@ -324,7 +328,8 @@
                 <Checkbox x="277" y="18" up1="equalizer_disabled" up2="equalizer_enabled" action1="equalizer.enable()" action2="equalizer.disable()" tooltiptext1="Enable Equalizer" tooltiptext2="Disable Equalizer" state="equalizer.isEnabled"/>
                 <Anchor x="-1" y="151" priority="3"/>
                 <Anchor x="300" y="151" priority="3"/>
-	</Group></Layout>
+            </Group>
+        </Layout>
     </Window>
 
     <Window id="creditswin" visible="false" x="256" y="256">
@@ -337,7 +342,8 @@
     </Window>
 
     <Window id="minwin" visible="false" x="100" y="100">
-	<Layout id="minilayout" width="300" height="100"><Group x="0" y="0">
+        <Layout id="minilayout" width="300" height="100">
+            <Group x="0" y="0">
                 <Anchor x="-1" y="0" priority="2"/>
                 <Anchor x="300" y="0" priority="3"/>
                 <Image x="0" y="0" action="move" image="minimal_bg"/>
@@ -358,7 +364,7 @@
                 <Button x="110" y="64" up="fast_up" over="fast_over" down="fast_down" action="vlc.faster()" tooltiptext="Play Faster" lefttop="leftbottom" rightbottom="leftbottom"/>
                 <Button x="128" y="64" up="next_up" over="next_over" down="next_down" action="playlist.next()" tooltiptext="Play Next Item in the Playlist" lefttop="leftbottom" rightbottom="leftbottom"/>
                 <Slider x="214" y="65" points="(17,10),(75,10)" up="vol_slider" value="volume" tooltiptext="Volume: $V%" lefttop="leftbottom" rightbottom="leftbottom">
-            <SliderBackground image="vol_bg" x="310" y="259" nbvert="55"/>
+                    <SliderBackground image="vol_bg" nbvert="55"/>
                 </Slider>
                 <Image x="173" y="65" image="vol_mask" lefttop="leftbottom" rightbottom="leftbottom"/>
                 <Button x="215" y="64" up="mute_up" over="mute_over" down="mute_down" action="vlc.mute()" tooltiptext="Mute" lefttop="leftbottom" rightbottom="leftbottom"/>
@@ -367,6 +373,7 @@
                 <Checkbox x="183" y="64" up1="eq_up" over1="eq_over" down1="eq_down" up2="eq_down" down2="eq_up" action1="eqwin.show()" action2="eqwin.hide()" tooltiptext1="Show Equalizer" tooltiptext2="Hide Equalizer" lefttop="leftbottom" rightbottom="leftbottom" state="eqwin.isVisible"/>
                 <Anchor x="-1" y="101" priority="3"/>
                 <Anchor x="300" y="101" priority="3"/>
-	</Group></Layout>
+            </Group>
+        </Layout>
     </Window>
 </Theme>