X-Git-Url: http://git.hungrycats.org/cgi-bin/gitweb.cgi?p=xscreensaver;a=blobdiff_plain;f=hacks%2Fconfig%2Fattraction.xml;h=fc64c82e72f07ee979085d23dfabcc723c6d05f4;hp=39aa08ec1d61cf42420443bc883b9c047d401216;hb=019de959b265701cd0c3fccbb61f2b69f06bf9ee;hpb=49f5b54f312fe4ac2e9bc47581a72451bd0e8439

diff --git a/hacks/config/attraction.xml b/hacks/config/attraction.xml
index 39aa08ec..fc64c82e 100644
--- a/hacks/config/attraction.xml
+++ b/hacks/config/attraction.xml
@@ -4,64 +4,62 @@
 
   <command arg="-root"/>
 
+  <hgroup>
   <select id="mode">
-    <option id="balls"    _label="Balls"    arg-set="-mode balls"/>
+    <option id="balls"    _label="Balls"/>
     <option id="lines"    _label="Lines"    arg-set="-mode lines"/>
     <option id="tails"    _label="Tails"    arg-set="-mode tails"/>
     <option id="polygons" _label="Polygons" arg-set="-mode polygons"/>
     <option id="splines"  _label="Splines"  arg-set="-mode splines"/>
-    <option id="fsplines" _label="Filled Splines"
+    <option id="fsplines" _label="Filled splines"
 					    arg-set="-mode filled-splines"/>
   </select>
 
   <select id="wallmode">
-    <option id="walls"   _label="Bounce Off Walls"/>
-    <option id="nowalls" _label="Ignore Screen Edges" arg-set="-nowalls"/>
+    <option id="walls"   _label="Bounce off walls"/>
+    <option id="nowalls" _label="Ignore screen edges" arg-set="-nowalls"/>
   </select>
 
+  </hgroup>
+
   <hgroup>
+   <vgroup>
     <number id="points" type="spinbutton" arg="-points %"
-              _label="Ball Count" low="0" high="200" default="0"/>
+              _label="Ball count" low="0" high="200" default="0"/>
+    <number id="viscosity" type="slider" arg="-viscosity %"
+            _label="Environmental viscosity"
+            _low-label="Low" _high-label="High"
+            low="0.0" high="1.0" default="1.0"
+            convert="invert"/>
+    <number id="segments" type="slider" arg="-segments %"
+            _label="Trail length" _low-label="Short" _high-label="Long"
+            low="2" high="1000" default="500"/>
+    <number id="ncolors" type="slider" arg="-colors %"
+              _label="Number of colors" _low-label="Two" _high-label="Many"
+              low="1" high="255" default="200"/>
+   </vgroup>
+   <vgroup>
     <number id="size" type="slider" arg="-size %"
-              _low-label="Ball Mass" _high-label="High"
+              _low-label="Ball mass" _high-label="High"
               low="0" high="100" default="0"/>
+    <number id="threshold" type="slider" arg="-threshold %"
+            _label="Repulsion threshold"
+            _low-label="Small" _high-label="Large"
+            low="0" high="600" default="200"/>
+    <number id="delay" type="slider" arg="-delay %"
+            _label="Speed" _low-label="Slow" _high-label="Fast"
+            low="0" high="40000" default="10000"
+            convert="invert"/>
+   </vgroup>
   </hgroup>
 
-  <number id="viscosity" type="slider" arg="-viscosity %"
-          _label="Environmental Viscosity"
-          _low-label="Low" _high-label="High"
-          low="0.0" high="1.0" default="1.0"
-          convert="invert"/>
-
-  <number id="threshold" type="slider" arg="-threshold %"
-          _label="Repulsion Threshold"
-          _low-label="Small" _high-label="Large"
-          low="0" high="600" default="200"/>
-
-  <number id="segments" type="slider" arg="-segments %"
-          _label="Trail Length" _low-label="Short" _high-label="Long"
-          low="2" high="1000" default="500"/>
-
-  <number id="delay" type="slider" arg="-delay %"
-          _label="Speed" _low-label="Slow" _high-label="Fast"
-          low="0" high="40000" default="10000"
-          convert="invert"/>
-
-  <number id="ncolors" type="slider" arg="-colors %"
-            _label="Number of Colors" _low-label="Two" _high-label="Many"
-            low="1" high="255" default="200"/>
-
-  <number id="color_contrast" type="slider" arg="-color-shift %"
-          _label="Color Contrast" _low-label="Low" _high-label="High"
-           low="0" high="25" default="3"/>
-
-  <boolean id="orbit" _label="Orbital Mode" arg-set="-orbit"/>
   <hgroup>
+    <boolean id="orbit" _label="Orbital mode" arg-set="-orbit"/>
     <number id="radius" type="spinbutton" arg="-radius %"
               _label="Radius" low="0" high="1000" default="0"/>
     <number id="vmult" type="slider" arg="-vmult %"
             _low-label="Outward" _high-label="Inward"
-             low="-5.0" high="5.0" default="0.9"/>
+            low="-5.0" high="5.0" default="0.9"/>
   </hgroup>
 
   <!-- #### -vx [?] -->
@@ -71,13 +69,16 @@
   <!-- #### -correct-bounce -->
   <!-- #### -graphmode [none] -->
 
+  <boolean id="showfps" _label="Show frame rate" arg-set="-fps"/>
+
+  <xscreensaver-updater />
+
   <_description>
 
-Uses a simple simple motion model to generate many different display
-modes.  The control points attract each other up to a certain
-distance, and then begin to repel each other.  The
-attraction/repulsion is proportional to the distance between any two
-particles, similar to the strong and weak nuclear forces.
+Points attract each other up to a certain distance, and then begin to
+repel each other.  The attraction/repulsion is proportional to the
+distance between any two particles, similar to the strong and weak
+nuclear forces.
 
 Written by Jamie Zawinski and John Pezaris; 1992.
   </_description>