X-Git-Url: http://git.hungrycats.org/cgi-bin/gitweb.cgi?p=xscreensaver;a=blobdiff_plain;f=hacks%2Fconfig%2Fslidescreen.xml;h=b9b66864d340067254c134e43672e017f05f4137;hp=d6d705c2b79b247d132a1365b83e3146dd433acd;hb=019de959b265701cd0c3fccbb61f2b69f06bf9ee;hpb=8eb2873d7054e705c4e83f22d18c40946a9e2529

diff --git a/hacks/config/slidescreen.xml b/hacks/config/slidescreen.xml
index d6d705c2..b9b66864 100644
--- a/hacks/config/slidescreen.xml
+++ b/hacks/config/slidescreen.xml
@@ -4,29 +4,49 @@
 
   <command arg="-root"/>
 
-  <number id="speed" 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"/>
 
-  <!-- #### -delay2 [1000000] -->
+   <number id="delay2" type="slider" arg="-delay2 %"
+          _label="Pause" _low-label="Short" _high-label="Long"
+          low="0" high="2000000" default="1000000"/>
 
-  <number id="increment" type="slider" arg="-increment %"
-          _label="Slide Speed" _low-label="Slow" _high-label="Fast"
-          low="1" high="30" default="10"
-          convert="invert"/>
+   <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="grid-size" type="spinbutton" arg="-grid-size %"
-         _label="Grid Size" low="2" high="500" default="70"/>
+    <xscreensaver-image />
 
- <number id="ibw" type="spinbutton" arg="-ibw %"
-         _label="Border Width" low="0" high="50" default="4"/>
+   </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="ibw" type="spinbutton" arg="-ibw %"
+          _label="Gutter size" low="0" high="50" default="4"/>
+
+   <boolean id="showfps" _label="Show frame rate" arg-set="-fps"/>
+
+   <xscreensaver-updater />
+
+   </vgroup>
+  </hgroup>
 
   <_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.  Written by Jamie Zawinski.
+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>
 </screensaver>