X-Git-Url: http://git.hungrycats.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=hacks%2Fconfig%2Fslidescreen.xml;h=efa1091b6362957481001284cfbe0936a4a5ca21;hb=f8cf5ac7b2f53510f80a0eaf286a25298be17bfe;hp=6cd3ccfe17caa80fb33610f598281fed7a3f0a9e;hpb=de460e831dc8578acfa8b72251ab9346c99c1f96;p=xscreensaver

diff --git a/hacks/config/slidescreen.xml b/hacks/config/slidescreen.xml
index 6cd3ccfe..efa1091b 100644
--- a/hacks/config/slidescreen.xml
+++ b/hacks/config/slidescreen.xml
@@ -4,38 +4,46 @@
 
   <command arg="-root"/>
 
-  <number id="delay" type="slider" arg="-delay %"
-          _label="Speed" _low-label="Slow" _high-label="Fast"
-          low="0" high="80000" default="50000"
-          convert="invert"/>
+  <hgroup>
+   <vgroup>
+   <number id="delay" type="slider" arg="-delay %"
+           _label="Frame rate" _low-label="Low" _high-label="High"
+           low="0" high="100000" default="50000"
+           convert="invert"/>
 
- <number id="delay2" type="slider" arg="-delay2 %"
-         _label="Pause" _low-label="Short" _high-label="Long"
-         low="0" high="2000000" default="1000000"/>
+   <number id="delay2" type="slider" arg="-delay2 %"
+          _label="Pause" _low-label="Short" _high-label="Long"
+          low="0" high="2000000" default="1000000"/>
 
-  <number id="duration" type="slider" arg="-duration %"
-          _label="Duration" _low-label="10 seconds" _high-label="10 minutes"
-          low="10" high="600" default="120"/>
+   <number id="duration" type="slider" arg="-duration %"
+           _label="Duration" _low-label="10 seconds" _high-label="10 minutes"
+           low="10" high="600" default="120"/>
 
-  <number id="increment" type="slider" arg="-increment %"
-          _label="Slide Speed" _low-label="Slow" _high-label="Fast"
-          low="1" high="30" default="10"/>
+   </vgroup>
+   <vgroup>
+   <number id="increment" type="slider" arg="-increment %"
+           _label="Slide speed" _low-label="Slow" _high-label="Fast"
+           low="1" high="30" default="10"/>
 
- <number id="grid-size" type="slider" arg="-grid-size %"
-         _label="Cell Size" _low-label="Small" _high-label="Large" 
-         low="12" high="500" default="70"/>
+   <number id="grid-size" type="slider" arg="-grid-size %"
+          _label="Cell size" _low-label="Small" _high-label="Large" 
+          low="12" high="500" default="70"/>
 
- <number id="ibw" type="spinbutton" arg="-ibw %"
-         _label="Gutter Size" low="0" high="50" default="4"/>
+   <number id="ibw" type="spinbutton" arg="-ibw %"
+          _label="Gutter size" low="0" high="50" default="4"/>
+
+   <boolean id="showfps" _label="Show frame rate" arg-set="-fps"/>
+
+   </vgroup>
+  </hgroup>
 
   <xscreensaver-image />
 
   <_description>
-This takes an image, divides it into a grid, and then randomly shuffles
-the squares around as if it was one of those annoying "16-puzzle"
-games, where there is a grid of squares, one of which is missing.
-I hate trying to solve those puzzles, but watching one permute itself
-is more amusing.
+A variant on a "fifteen puzzle", operating on the screen or an image.
+It divides the image into a grid and randomly shuffles the squares.
+
+http://en.wikipedia.org/wiki/Fifteen_puzzle
 
 Written by Jamie Zawinski; 1994.
   </_description>