X-Git-Url: http://git.hungrycats.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=hacks%2Fconfig%2Fglslideshow.xml;h=bcd7acb31ec58c23b7945f824b914e19a9cd80cd;hb=7b34ef992563d7bcbb64cc5597dc45fa24470b05;hp=19a80a6d15d6634203f921c6ee8885e13c8584ed;hpb=e4fa2ac140f7bc56571373a7b7eb585fa4500e38;p=xscreensaver

diff --git a/hacks/config/glslideshow.xml b/hacks/config/glslideshow.xml
index 19a80a6d..bcd7acb3 100644
--- a/hacks/config/glslideshow.xml
+++ b/hacks/config/glslideshow.xml
@@ -4,50 +4,53 @@
 
   <command arg="-root"/>
 
-  <number id="duration" type="slider" arg="-duration %"
-          _label="Time until loading a new image:"
-          _low-label="10 Seconds" _high-label="5 Minutes"
-          low="10" high="300" default="30"/>
-
-  <number id="zoom" type="slider" arg="-zoom %"
-          _label="Always show at least this much of the image:"
-          _low-label="50%" _high-label="100%"
-          low="50" high="100" default="75"/>
-
-  <number id="pan" type="slider" arg="-pan %"
-          _label="Pan/Zoom Duration:"
-          _low-label="1 Second" _high-label="30 Seconds"
-          low="1" high="30" default="6"/>
-
-  <number id="fade" type="slider" arg="-fade %"
-          _label="Crossfade Duration:"
-          _low-label="None" _high-label="30 Seconds"
-          low="0" high="30" default="2"/>
-
-  <number id="speed" type="slider" arg="-delay %"
-          _label="Frame Rate:" _low-label="Low" _high-label="High"
-          low="0" high="100000" default="20000"
-          convert="invert"/>
-
-  <boolean id="titles" _label="Show Image Titles" arg-set="-titles"/>
-
-  <boolean id="showfps" _label="Show Frames-per-Second" arg-set="-fps"/>
+  <hgroup>
+   <vgroup>
+   <number id="delay" type="slider" arg="-delay %"
+           _label="Frame rate" _low-label="Low" _high-label="High"
+           low="0" high="100000" default="20000"
+           convert="invert"/>
+
+   <number id="duration" type="slider" arg="-duration %"
+           _label="Time until loading a new image"
+           _low-label="10 seconds" _high-label="5 minutes"
+           low="10" high="300" default="30"/>
+
+   <number id="zoom" type="slider" arg="-zoom %"
+           _label="Always show at least this much of the image"
+           _low-label="50%" _high-label="100%"
+           low="50" high="100" default="75"/>
+
+   </vgroup>
+   <vgroup>
+   <number id="pan" type="slider" arg="-pan %"
+           _label="Pan/zoom duration"
+           _low-label="1 second" _high-label="30 seconds"
+           low="1" high="30" default="6"/>
+
+   <number id="fade" type="slider" arg="-fade %"
+           _label="Crossfade duration"
+           _low-label="None" _high-label="30 seconds"
+           low="0" high="30" default="2"/>
+
+   </vgroup>
+  </hgroup>
+
+  <hgroup>
+   <vgroup>
+    <boolean id="letterbox" _label="Letterbox" arg-unset="-no-letterbox"/>
+    <boolean id="titles" _label="Show file names" arg-set="-titles"/>
+    <boolean id="showfps" _label="Show frame rate" arg-set="-fps"/>
+   </vgroup>
+   <vgroup>
+    <xscreensaver-image />
+   </vgroup>
+  </hgroup>
 
   <_description>
 Loads a random sequence of images and smoothly scans and zooms around
 in each, fading from pan to pan.  
 
-To tell it where to find the images to display, go to the "Advanced"
-tab on the Screensaver Preferences window.  Select "Choose Random
-Images", and enter your image directory in the text field right below
-that.
-
-(Note: not the the "Advanced" button at the bottom of this window:
-the one on the other window.)
-
-This program requires a good video card capable of supporting large
-textures.
-
-Written by Jamie Zawinski and Mike Oliphant.
+Written by Jamie Zawinski and Mike Oliphant; 2003.
   </_description>
 </screensaver>