X-Git-Url: http://git.hungrycats.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=hacks%2Fconfig%2Fmirrorblob.xml;h=3bdd1385697fa0656f9a63ffbd72aeeb6d084682;hb=ccb7f4903325f92555a9722bba74b58346654ba0;hp=7601266c2f8598e024115cf08627138507d1b93b;hpb=96a411663168b0ba5432b407a83be55f3df0c802;p=xscreensaver

diff --git a/hacks/config/mirrorblob.xml b/hacks/config/mirrorblob.xml
index 7601266c..3bdd1385 100644
--- a/hacks/config/mirrorblob.xml
+++ b/hacks/config/mirrorblob.xml
@@ -4,18 +4,22 @@
 
   <command arg="-root"/>
 
-  <hgroup>
-    <select id="render">
-      <option id="wire"  _label="Wireframe" arg-set="-wire"/>
-      <option id="solid" _label="Solid Surface"/>
-    </select>
-  </hgroup>
-
-  <number id="speed" type="slider" arg="-delay %"
+  <number id="delay" type="slider" arg="-delay %"
           _label="Speed" _low-label="Slow" _high-label="Fast"
           low="0" high="20000" default="10000"
           convert="invert"/>
 
+  <number id="hold_time" type="slider" arg="-hold_time %"
+          _label="Time until loading a new image:"
+          _low-label="10 Seconds" _high-label="5 Minutes"
+          low="10" high="300" default="30"/>
+
+  <number id="fade_speed" type="slider" arg="-fade_time %"
+          _label="Crossfade Duration:"
+          _low-label="None" _high-label="30 Seconds"
+          low="0" high="30" default="5"/>
+
+<!--
   <number id="x_res" type="slider" arg="-x_res %"
           _label="X Resolution" low="5" high="500" default="60"/>
 
@@ -24,33 +28,28 @@
 
   <number id="field_points" type="slider" arg="-field_points %"
           _label="Field Points" low="0" high="50" default="10"/>
-
-  <number id="hold_frames" type="slider" arg="-hold_frames %"
-          _label="Frames Between Images" low="1" high="65536" default="10240"/>
-
-  <number id="fade_speed" type="slider" arg="-fade_speed %"
-          _label="Fade Speed" low="1" high="256" default="1"/>
+-->
 
   <hgroup>
     <select id="Calculation Method">
-      <option id="wire"  _label="Blobby"/>
-      <option id="calm"  _label="Calm"           arg-set="-incremental 1"/>
-      <option id="freaky"  _label="Freaky"       arg-set="-incremental 3"/>
+      <option id="blobby"   _label="Blobby"/>
+      <option id="calm"     _label="Calm"           arg-set="-incremental 1"/>
+      <option id="freaky"   _label="Freaky"       arg-set="-incremental 3"/>
       <option id="vfreaky"  _label="Very Freaky" arg-set="-incremental 2"/>
     </select>
-  </hgroup>
 
-  <hgroup>
-   <vgroup>
-     <boolean id="walls" _label="Enable Walls"/>
-     <boolean id="colour" _label="Enable Colouring" arg-set="-colour"/>
-     <boolean id="texture" _label="Enable Reflected Image" arg-unset="-no-texture"/>
-     <boolean id="background" _label="Enable Background Image" arg-unset="-no-bgimage"/>
-     <boolean id="offset_texture" _label="Offset Texture Coordinates" arg-set="-offset_texture"/>
-     <boolean id="showfps" _label="Show Frames-per-Second" arg-set="-fps"/>
-   </vgroup>
+    <select id="render">
+      <option id="wire"  _label="Wireframe" arg-set="-wire"/>
+      <option id="solid" _label="Solid Surface"/>
+    </select>
   </hgroup>
 
+  <boolean id="walls" _label="Enable Walls"/>
+  <boolean id="colour" _label="Enable Colouring" arg-set="-colour"/>
+  <boolean id="texture" _label="Enable Reflected Image" arg-unset="-no-texture"/>
+  <boolean id="offset_texture" _label="Offset Texture Coordinates" arg-set="-offset_texture"/>
+  <boolean id="showfps" _label="Show Frames-per-Second" arg-set="-fps"/>
+
   <_description>
 Draws a wobbly blob that distorts the image behind it.
 Requires OpenGL hardware acceleration for nice animation.