X-Git-Url: http://git.hungrycats.org/cgi-bin/gitweb.cgi?p=xscreensaver;a=blobdiff_plain;f=hacks%2Fconfig%2Ftopblock.xml;h=abb47b9b32aa9f070b87267af1007f1e595587e0;hp=5579a168176e1413e0a5478cc9093436934d9303;hb=c1b9b55ad8d59dc05ef55e316aebf5863e7dfa56;hpb=de460e831dc8578acfa8b72251ab9346c99c1f96

diff --git a/hacks/config/topblock.xml b/hacks/config/topblock.xml
index 5579a168..abb47b9b 100644
--- a/hacks/config/topblock.xml
+++ b/hacks/config/topblock.xml
@@ -4,33 +4,41 @@
 
   <command arg="-root"/>
 
-  <number id="delay" type="slider" arg="-delay %"
-          _label="Speed" _low-label="Slow" _high-label="Fast"
-          low="0" high="50000" default="10000"
-          convert="invert"/>
-
-  <number id="size" type="slider" arg="-size %"
-          _label="Carpet Size" _low-label="Small" _high-label="Large"
-          low="1" high="10" default="2"/>
-
-  <number id="spawn" type="slider" arg="-spawn %"
-          _label="Spawn Likelyhood" _low-label="Low" _high-label="High"
-          low="4" high="1000" default="50"
-          convert="invert"/>
-
-  <number id="dropspeed" type="slider" arg="-dropSpeed %"
-          _label="Drop Speed" _low-label="Slow" _high-label="Fast"
-          low="1" high="9" default="4"/>
-
-  <number id="resolution" type="slider" arg="-resolution %"
-          _label="Polygon Count" _low-label="Low" _high-label="High"
-          low="4" high="20" default="4"/>
-
-  <number id="maxColors" type="spinbutton" arg="-maxColors %"
-          _label="Different Colors" low="1" high="7" default="7"/>
-
-  <number id="rotatespeed" type="spinbutton" arg="-rotateSpeed %"
-          _label="Rotation Speed" low="1" high="1000" default="10"/>
+  <hgroup>
+   <vgroup>
+    <number id="delay" type="slider" arg="-delay %"
+            _label="Frame rate" _low-label="Low" _high-label="High"
+            low="0" high="100000" default="10000"
+            convert="invert"/>
+
+    <number id="dropspeed" type="slider" arg="-dropSpeed %"
+            _label="Drop speed" _low-label="Slow" _high-label="Fast"
+            low="1" high="9" default="4"/>
+
+    <number id="size" type="slider" arg="-size %"
+            _label="Carpet size" _low-label="Small" _high-label="Large"
+            low="1" high="10" default="2"/>
+
+    <number id="spawn" type="slider" arg="-spawn %"
+            _label="Spawn likelyhood" _low-label="Low" _high-label="High"
+            low="4" high="1000" default="50"
+            convert="invert"/>
+
+   </vgroup>
+   <vgroup>
+    <number id="resolution" type="slider" arg="-resolution %"
+            _label="Polygon count" _low-label="Low" _high-label="High"
+            low="4" high="20" default="4"/>
+
+  <number id="maxColors" type="slider" arg="-maxColors %"
+          _label="Colors" _low-label="Few" _high-label="Many"
+          low="1" high="32" default="7"/>
+
+  <number id="rotatespeed" type="slider" arg="-rotateSpeed %"
+          _label="Rotation" _low-label="Slow" _high-label="Fast"
+          low="1" high="1000" default="10"/>
+   </vgroup>
+  </hgroup>
  
   <hgroup>
    <boolean id="rotate" _label="Rotate"    arg-unset="-no-rotate"/>
@@ -38,12 +46,13 @@
    <boolean id="blob"   _label="Blob mode" arg-set="-blob"/>
    <boolean id="override" _label="Tunnel mode" arg-set="-override"/>
    <boolean id="carpet" _label="Carpet"    arg-unset="-no-carpet"/>
+  </hgroup>
+  <hgroup>
    <boolean id="nipples" _label="Nipples"  arg-unset="-no-nipples"/>
    <boolean id="wire"   _label="Wireframe" arg-set="-wireframe"/>
+   <boolean id="showfps" _label="Show frame rate" arg-set="-fps"/>
   </hgroup>
 
-  <boolean id="showfps" _label="Show Frames-per-Second" arg-set="-fps"/>
-
   <_description>
 Creates a 3D world with dropping blocks that build up and up.
 Written by rednuht; 2006.