]> git.sesse.net Git - vlc/commitdiff
* all: added a SliderBackground to the volume slider of the default skin
authorCyril Deguet <asmax@videolan.org>
Sun, 30 Apr 2006 13:12:34 +0000 (13:12 +0000)
committerCyril Deguet <asmax@videolan.org>
Sun, 30 Apr 2006 13:12:34 +0000 (13:12 +0000)
 (fixes an incorrect behaviour when clicking on the white part of the slider)

share/Makefile.am
share/skins2/default/main/vol_bg.png [new file with mode: 0644]
share/skins2/default/main/vol_slider.png
share/skins2/default/theme.xml

index b78e22c1715590ef12da2385fc2e36a4c9c87b1b..fdcaeea1e938d54e6f575486f2c62896fe8291dc 100644 (file)
@@ -89,6 +89,7 @@ skins2_default_vlt_FILES = \
         skins2/default/main/main_over.png \
         skins2/default/main/pause_down.png \
         skins2/default/main/dvd_prevchapter.png \
+        skins2/default/main/vol_bg.png \
         skins2/default/main/vol_mask.png \
         skins2/default/main/vol_slider.png \
         skins2/default/main/dvd_menu.png \
diff --git a/share/skins2/default/main/vol_bg.png b/share/skins2/default/main/vol_bg.png
new file mode 100644 (file)
index 0000000..79fbb88
Binary files /dev/null and b/share/skins2/default/main/vol_bg.png differ
index 998d9cae60edd811c61676b4f71f8c36eb048c46..b6583311bf62f2911106d8694549dc63c51d5237 100644 (file)
Binary files a/share/skins2/default/main/vol_slider.png and b/share/skins2/default/main/vol_slider.png differ
index 597a61d7a6b4b9158ff2e4a7520facf70b67b27e..1bacf88569224487c7350a3ddab57bd015e751dd 100644 (file)
@@ -48,7 +48,6 @@
                <SubBitmap x="326" y="258" width="30" height="24" id="eq_up"/>\r
                \r
                <SubBitmap x="360" y="258" width="14" height="24" id="mute_up"/>\r
-               <SubBitmap x="374" y="258" width="70" height="24" id="volume_bg"/>\r
        </Bitmap>\r
                <Bitmap id="main_over" file="main/main_over.png" alphacolor="#FF00FF">\r
                <SubBitmap x="408" y="2" width="34" height="11" id="close_over"/>\r
        <Bitmap file="main/dvd_nextchapter.png" id="dvd_nextchapter" alphacolor="#FF00FF"/>\r
        <Bitmap file="main/dvd_nexttitle.png" id="dvd_nexttitle" alphacolor="#FF00FF"/>\r
        <Bitmap file="main/vol_mask.png" id="vol_mask" alphacolor="#FF00FF"/>\r
+       <Bitmap file="main/vol_bg.png" id="vol_bg" alphacolor="#FF00FF"/>\r
        <Bitmap file="main/vol_slider.png" id="vol_slider" alphacolor="#FF00FF"/>\r
        <!--The Playlist Images-->\r
        <Bitmap file="playlist/playlist.png" id="playlist_blank" alphacolor="#FF00FF">\r
                \r
                <Slider x="26" y="226" points="(0,0),(400,0)" up="timeslider" value="time" lefttop="leftbottom" rightbottom="rightbottom"/>\r
                \r
-               <Image x="324" y="258" image="volume_bg" lefttop="leftbottom" rightbottom="leftbottom"/>\r
-               <Slider x="327" y="269" points="(0,0),(58,0)" up="vol_slider" value="volume" tooltiptext="Volume: $V%" lefttop="leftbottom" rightbottom="leftbottom"/>\r
+               <Slider x="310" y="259" points="(17,10),(75,10)" up="vol_slider" value="volume" tooltiptext="Volume: $V%" lefttop="leftbottom" rightbottom="leftbottom">\r
+            <SliderBackground image="vol_bg" x="310" y="259" nbvert="55"/>\r
+               </Slider>\r
                <Image x="269" y="259" image="vol_mask" lefttop="leftbottom" rightbottom="leftbottom"/>\r
-               \r
                <!--The Buttons-->\r
                <Checkbox x="18" y="251" up1="play_up" over1="play_over" down1="play_down" up2="pause_up" over2="pause_over" down2="pause_down" action1="vlc.play()" action2="vlc.pause()" state="vlc.isPlaying" lefttop="leftbottom" rightbottom="leftbottom"/>\r
                \r
                <Button x="94" y="64" up="stop_up" over="stop_over" down="stop_down" action="vlc.stop()" tooltiptext="Stop Playing" lefttop="leftbottom" rightbottom="leftbottom"/>\r
                <Button x="110" y="64" up="fast_up" over="fast_over" down="fast_down" action="vlc.faster()" tooltiptext="Play Faster" lefttop="leftbottom" rightbottom="leftbottom"/>\r
                <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"/>\r
-               \r
-\r
-               <Image x="229" y="64" image="volume_bg" lefttop="leftbottom" rightbottom="leftbottom"/>\r
-               <Slider x="231" y="75" points="(0,0),(58,0)" up="vol_slider" value="volume" tooltiptext="Volume: $V%" lefttop="leftbottom" rightbottom="leftbottom"/>\r
+               <Slider x="214" y="65" points="(17,10),(75,10)" up="vol_slider" value="volume" tooltiptext="Volume: $V%" lefttop="leftbottom" rightbottom="leftbottom">\r
+            <SliderBackground image="vol_bg" x="310" y="259" nbvert="55"/>\r
+               </Slider>\r
                <Image x="173" y="65" image="vol_mask" lefttop="leftbottom" rightbottom="leftbottom"/>\r
                <Button x="215" y="64" up="mute_up" over="mute_over" down="mute_down" action="vlc.mute()" tooltiptext="Mute" lefttop="leftbottom" rightbottom="leftbottom"/>\r
                                \r