X-Git-Url: http://git.hungrycats.org/cgi-bin/gitweb.cgi?p=xscreensaver;a=blobdiff_plain;f=hacks%2Fconfig%2Fcarousel.xml;h=96c7a65fc58cff0ed8f3481de3b162ebb20e52b5;hp=113d48465d0331cbf934dc78709e62e1299f1d32;hb=c1b9b55ad8d59dc05ef55e316aebf5863e7dfa56;hpb=de460e831dc8578acfa8b72251ab9346c99c1f96

diff --git a/hacks/config/carousel.xml b/hacks/config/carousel.xml
index 113d4846..96c7a65f 100644
--- a/hacks/config/carousel.xml
+++ b/hacks/config/carousel.xml
@@ -5,37 +5,44 @@
   <command arg="-root"/>
 
   <hgroup>
+   <vgroup>
+
+    <number id="delay" type="slider" arg="-delay %"
+            _label="Frame rate" _low-label="Low" _high-label="High"
+            low="0" high="100000" default="10000"
+            convert="invert"/>
+
+    <number id="speed" type="slider" arg="-speed %"
+            _label="Animation speed" _low-label="Slow" _high-label="Fast"
+            low="0.1" high="8.0" default="1.0"/>
+
+    <number id="duration" type="slider" arg="-duration %"
+            _label="Time until loading a new image"
+            _low-label="5 seconds" _high-label="1 minute"
+            low="5" high="60" default="20"/>
+
+   </vgroup>
+   <vgroup>
+
     <number id="count" type="spinbutton" arg="-count %"
-            _label="Number of Images:" low="1" high="20" default="7"/>
+            _label="Number of images" low="1" high="20" default="7"/>
+
     <select id="mode">
-      <option id="tiltxy"  _label="Tilt In/Out and Left/Right"/>
-      <option id="tiltx"   _label="Tilt In/Out Only"     arg-set="-tilt x"/>
-      <option id="tilty"   _label="Tilt Left/Right Only" arg-set="-tilt y"/>
-      <option id="notilt"  _label="No Tilting"           arg-set="-tilt 0"/>
+      <option id="tiltxy"  _label="Tilt in/out and left/right"/>
+      <option id="tiltx"   _label="Tilt in/out only"     arg-set="-tilt x"/>
+      <option id="tilty"   _label="Tilt left/right only" arg-set="-tilt y"/>
+      <option id="notilt"  _label="No tilting"           arg-set="-tilt 0"/>
     </select>
-  </hgroup>
-
-  <number id="duration" type="slider" arg="-duration %"
-          _label="Time until loading a new image:"
-          _low-label="5 Seconds" _high-label="1 Minute"
-          low="5" high="60" default="20"/>
 
-  <number id="speed" type="slider" arg="-speed %"
-          _label="Animation Speed" _low-label="Slow" _high-label="Fast"
-          low="0.1" high="8.0" default="1.0"/>
+    <boolean id="zoom" _label="Zoom in/out" arg-unset="-no-zoom"/>
+    <boolean id="titles" _label="Show file names" arg-unset="-no-titles"/>
+    <boolean id="showfps" _label="Show frame rate" arg-set="-fps"/>
 
-  <number id="delay" type="slider" arg="-delay %"
-          _label="Frame Rate" _low-label="Low" _high-label="High"
-          low="0" high="100000" default="20000"
-          convert="invert"/>
+   </vgroup>
+  </hgroup>
 
   <xscreensaver-image />
 
-  <boolean id="zoom" _label="Zoom In/Out" arg-unset="-no-zoom"/>
-  <boolean id="titles" _label="Show Image Titles" arg-unset="-no-titles"/>
-
-  <boolean id="showfps" _label="Show Frames-per-Second" arg-set="-fps"/>
-
   <_description>
 Loads several random images, and displays them flying in a circular
 formation.  The formation changes speed and direction randomly, and