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

diff --git a/hacks/config/atlantis.xml b/hacks/config/atlantis.xml
index 135f71eb..c31ba6da 100644
--- a/hacks/config/atlantis.xml
+++ b/hacks/config/atlantis.xml
@@ -4,34 +4,39 @@
 
   <command arg="-root"/>
 
-  <number id="whalespeed" type="slider" arg="-whalespeed %"
-           _label="Whale Speed" _low-label="Slow" _high-label="Fast"
-          low="0" high="1000" default="250"/>
-
   <number id="sharkspeed" type="slider" arg="-delay %"
-          _label="Shark Speed" _low-label="Slow" _high-label="Fast"
-          low="0" high="500000" default="25000"
+          _label="Frame rate" _low-label="Low" _high-label="High"
+          low="0" high="100000" default="25000"
           convert="invert"/>
 
+  <number id="whalespeed" type="slider" arg="-whalespeed %"
+           _label="Whale speed" _low-label="Slow" _high-label="Fast"
+          low="0" high="1000" default="250"/>
+
   <number id="sharkproximity" type="slider" arg="-size %"
-          _label="Shark Proximity" _low-label="Shy" _high-label="Agressive"
+          _label="Shark proximity" _low-label="Shy" _high-label="Agressive"
           low="100" high="10000" default="6000"/>
 
-  <number id="sharkcount" type="spinbutton" arg="-count %"
-          _label="Number of Sharks" low="0" high="20" default="4"/>
-
-  <select id="water">
-    <option id="shimmer" _label="Shimmering Water"/>
-    <option id="clear"   _label="Clear Water" arg-set="-no-texture"/>
-  </select>
-
-  <select id="bg">
-    <option id="flat"     _label="Flat Background" arg-set="-no-gradient"/>
-    <option id="gradient" _label="Gradient Background"/>
-  </select>
-
-  <boolean id="wire"    _label="Wireframe"              arg-set="-wireframe"/>
-  <boolean id="showfps" _label="Show Frames-per-Second" arg-set="-fps"/>
+  <number id="sharkcount" type="slider" arg="-count %"
+          _label="Number of sharks" _low-label="None" _high-label="20"
+          low="0" high="20" default="4"/>
+
+  <hgroup>
+   <select id="water">
+     <option id="shimmer" _label="Shimmering water"/>
+     <option id="clear"   _label="Clear water" arg-set="-no-texture"/>
+   </select>
+
+   <select id="bg">
+     <option id="flat"     _label="Flat background" arg-set="-no-gradient"/>
+     <option id="gradient" _label="Gradient background"/>
+   </select>
+  </hgroup>
+
+  <hgroup>
+   <boolean id="wire"    _label="Wireframe"              arg-set="-wireframe"/>
+   <boolean id="showfps" _label="Show frame rate" arg-set="-fps"/>
+  </hgroup>
 
   <_description>
 A 3D animation of a number of sharks, dolphins, and whales.