[xine-cvs] CVS: gnome-xine/misc toolbar-fullscreen.xml, 1.8, 1.9 toolbar-window.xml, 1.6, 1.7

[Darren S. <ds...@us...>]

Update of /cvsroot/xine/gnome-xine/misc
In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv12988/misc

Modified Files:
	toolbar-fullscreen.xml toolbar-window.xml 
Log Message:
Resync with hg (cset 1907).

Index: toolbar-fullscreen.xml
===================================================================
RCS file: /cvsroot/xine/gnome-xine/misc/toolbar-fullscreen.xml,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- toolbar-fullscreen.xml	17 May 2006 01:08:23 -0000	1.8
+++ toolbar-fullscreen.xml	27 Feb 2007 18:03:50 -0000	1.9
@@ -30,11 +30,14 @@
    <button image="gtk-properties" relief="none" tip="~Show/hide the A/V settings"
 	   onclick="settings_show ();"
 	   />
-   <label text="" box-expand="1" />
-   <label text="" box-expand="1"/>
+   <label text="" box-expand="1" width="20" />
    <end />
-   <control type="audio channel" />
+   <hbox spacing="0" padding="0">
+    <image stock="gxine-settings-audio-channel" />
+    <control type="audio channel" />
+   </hbox>
    <control type="volume" width="105" box-expand="1" box-fill="1" />
+   <image stock="gxine-settings-volume" />
    <control type="mute" />
   </hbox>
  </vbox>

Index: toolbar-window.xml
===================================================================
RCS file: /cvsroot/xine/gnome-xine/misc/toolbar-window.xml,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- toolbar-window.xml	17 May 2006 01:08:23 -0000	1.6
+++ toolbar-window.xml	27 Feb 2007 18:03:50 -0000	1.7
@@ -29,11 +29,14 @@
    <button image="gtk-properties" relief="none" tip="~Show/hide the A/V settings"
 	   onclick="settings_show ();"
 	   />
-   <label text="" box-expand="1" />
-   <label text="" box-expand="1"/>
+   <label text="" box-expand="1" width="20" />
    <end />
-   <control type="audio channel" />
-   <control type="volume" width="105" box-expand="1" box-fill="1" />
+   <hbox spacing="0" padding="0">
+    <image stock="gxine-settings-audio-channel" />
+    <control type="audio channel" />
+   </hbox>
+   <control type="volume" vertical="1" popup="1" window-height="120"
+   	    inverted="1" image="gxine-settings-volume" relief="none" />
    <control type="mute" />
   </hbox>
 </vbox>