X-Git-Url: http://git.hungrycats.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=hacks%2Fconfig%2Fwhirlygig.xml;h=16b22f4a0fac28028552aab52164d593f2b36bbe;hb=6afd6db0ae9396cd7ff897ade597cd5483f49b0e;hp=ba4e5887e2229ee0e23d3b26e041f5c41e4041f8;hpb=8eb2873d7054e705c4e83f22d18c40946a9e2529;p=xscreensaver

diff --git a/hacks/config/whirlygig.xml b/hacks/config/whirlygig.xml
index ba4e5887..16b22f4a 100644
--- a/hacks/config/whirlygig.xml
+++ b/hacks/config/whirlygig.xml
@@ -1,42 +1,88 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
 
-<screensaver name="whirlygig" _label="WhirlyGig">
+<screensaver name="whirlygig" _label="Whirlygig">
 
   <command arg="-root"/>
 
-  <number id="whirlies" type="spinbutton" arg="-whirlies %"
-          _label="Whirlies" low="1" high="50" default="40"/>
-
-  <number id="lines" type="spinbutton" arg="-nlines %"
-          _label="Lines" low="-1" high="50" default="-1"/>
-
   <hgroup>
-    <number id="xspeed" type="spinbutton" arg="-xspeed %"
-            _label="Speed" low="0.0" high="10.0" default="1.0"/>
-    <number id="yspeed" type="spinbutton" arg="-yspeed %"
-            _label="x" low="0.0" high="10.0" default="1.0"/>
+   <number id="whirlies" type="spinbutton" arg="-whirlies %"
+           _label="Whirlies" low="-1" high="50" default="-1"/>
+
+   <number id="lines" type="spinbutton" arg="-nlines %"
+           _label="Lines" low="-1" high="50" default="-1"/>
   </hgroup>
 
   <hgroup>
-    <number id="xamplitude" type="spinbutton" arg="-xamplitude %"
-            _label="Amplitude" low="0.0" high="10.0" default="1.0"/>
-    <number id="yamplitude" type="spinbutton" arg="-yamplitude %"
-            _label="x" low="0.0" high="10.0" default="1.0"/>
+   <vgroup>
+    <number id="xspeed" type="slider" arg="-xspeed %"
+            _label="X speed" _low-label="Low" _high-label="High"
+            low="0.0" high="10.0" default="1.0"/>
+    <number id="yspeed" type="slider" arg="-yspeed %"
+            _label="Y speed" _low-label="Low" _high-label="High"
+             low="0.0" high="10.0" default="1.0"/>
+   </vgroup>
+
+   <vgroup>
+    <number id="xamplitude" type="slider" arg="-xamplitude %"
+            _label="X amplitude" _low-label="Low" _high-label="High"
+             low="0.0" high="10.0" default="1.0"/>
+    <number id="yamplitude" type="slider" arg="-yamplitude %"
+            _label="Y amplitude" _low-label="Low" _high-label="High"
+             low="0.0" high="10.0" default="1.0"/>
+   </vgroup>
   </hgroup>
 
+
   <!-- #### -xmode [change] -->
-  <!-- #### -ymode [change] -->
+
+  <hgroup>
+   <select id="xmode">
+    <option id="randomx"    _label="X random" />
+    <option id="spinx"      _label="X spin" arg-set="-xmode spin"/>
+    <option id="funkyx"     _label="X funky" arg-set="-xmode funky"/>
+    <option id="circlex"    _label="X circle" arg-set="-xmode circle"/>
+    <option id="linearx"    _label="X linear" arg-set="-xmode linear"/>
+    <option id="testx"      _label="X test" arg-set="-xmode test"/>
+    <option id="funx"       _label="X fun" arg-set="-xmode fun"/>
+    <option id="inniex"     _label="X innie" arg-set="-xmode innie"/>
+    <option id="lissajousx" _label="X lissajous" arg-set="-xmode lissajous"/>
+   </select>
+
+   <select id="ymode">
+    <option id="randomy"    _label="Y random" />
+    <option id="spiny"      _label="Y spin" arg-set="-ymode spin"/>
+    <option id="funkyy"     _label="Y funky" arg-set="-ymode funky"/>
+    <option id="circley"    _label="Y circle" arg-set="-ymode circle"/>
+    <option id="lineary"    _label="Y linear" arg-set="-ymode linear"/>
+    <option id="testy"      _label="Y test" arg-set="-ymode test"/>
+    <option id="funy"       _label="Y fun" arg-set="-ymode fun"/>
+    <option id="inniey"     _label="Y innie" arg-set="-ymode innie"/>
+    <option id="lissajousy" _label="Y lissajous" arg-set="-ymode lissajous"/>
+   </select>
+ </hgroup>
+
   <!-- #### -speed [1] -->
-  <!-- #### -trail [0] -->
   <!-- #### -color_modifier [-1] -->
   <!-- #### -start_time [-1] -->
   <!-- #### -xoffset [1.0] -->
   <!-- #### -yoffset [1.0] -->
   <!-- #### -offset_period [1] -->
-  <!-- #### -explain [0] -->
-  <!-- #### -wrap [0] -->
+
+  <hgroup>
+   <boolean id="trail" _label="Leave a trail" arg-set="-trail"/>
+   <boolean id="explain" _label="Explain modes" arg-set="-explain"/>
+   <boolean id="wrap" _label="Wrap the screen" arg-set="-wrap"/>
+   <boolean id="showfps" _label="Show frame rate" arg-set="-fps"/>
+  </hgroup>
+
+  <xscreensaver-updater />
 
   <_description>
-Draws zooming chains of sinusoidal spots.  Written by Ashton Trey Belew.
+This screen saver was removed from the XScreenSaver distribution as of
+version 5.08.
+
+Zooming chains of sinusoidal spots.
+
+Written by Ashton Trey Belew; 2001.
   </_description>
 </screensaver>