X-Git-Url: http://git.hungrycats.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=hacks%2Fconfig%2Fpolyhedra.xml;h=d8d99897bdf1bbf86a8cac5c25e362415cb05f8a;hb=c1b9b55ad8d59dc05ef55e316aebf5863e7dfa56;hp=febe66a78c7749c5f3bc92912b6b691f040d96a1;hpb=0d6b320def9180cf907ceaed56b23a972a11b757;p=xscreensaver

diff --git a/hacks/config/polyhedra.xml b/hacks/config/polyhedra.xml
index febe66a7..d8d99897 100644
--- a/hacks/config/polyhedra.xml
+++ b/hacks/config/polyhedra.xml
@@ -5,43 +5,32 @@
   <command arg="-root"/>
 
   <number id="delay" type="slider" arg="-delay %"
-          _label="Animation Speed" _low-label="Slow" _high-label="Fast"
-          low="0" high="50000" default="30000"
+          _label="Frame rate" _low-label="Low" _high-label="High"
+          low="0" high="100000" default="30000"
           convert="invert"/>
 
   <number id="speed" type="slider" arg="-speed %"
-          _label="Motion Speed" _low-label="Slow" _high-label="Fast"
+          _label="Speed" _low-label="Slow" _high-label="Fast"
           low="0.01" high="5.0" default="1.0"/>
 
   <number id="duration" type="slider" arg="-duration %"
           _label="Duration" _low-label="1 second" _high-label="30 seconds"
           low="1" high="30" default="12"/>
 
-  <select id="rotation">
-    <option id="no"  _label="Don't Rotate" arg-set="-no-spin"/>
-    <option id="x"   _label="Rotate around X axis" arg-set="-spin X"/>
-    <option id="y"   _label="Rotate around Y axis" arg-set="-spin Y"/>
-    <option id="z"   _label="Rotate around Z axis" arg-set="-spin Z"/>
-    <option id="xy"  _label="Rotate around X and Y axes" arg-set="-spin XY"/>
-    <option id="xz"  _label="Rotate around X and Z axes" arg-set="-spin XZ"/>
-    <option id="yz"  _label="Rotate around Y and Z axes" arg-set="-spin YZ"/>
-    <option id="xyz" _label="Rotate around all three axes"/>
-  </select>
-
   <select id="object">
-<option id="random" _label="Display Random Polyhedron"/>
-<option _label="Pentagonal Prism" arg-set="-which pentagonal_prism"/>
-<option _label="Pentagonal Dipyramid" arg-set="-which pentagonal_dipyramid"/>
-<option _label="Pentagonal Antiprism" arg-set="-which pentagonal_antiprism"/>
-<option _label="Pentagonal Deltohedron" arg-set="-which pentagonal_deltohedron"/>
-<option _label="Pentagrammic Prism" arg-set="-which pentagrammic_prism"/>
-<option _label="Pentagrammic Dipyramid" arg-set="-which pentagrammic_dipyramid"/>
-<option _label="Pentagrammic Antiprism" arg-set="-which pentagrammic_antiprism"/>
-<option _label="Pentagrammic Deltohedron" arg-set="-which pentagrammic_deltohedron"/>
-<option _label="Pentagrammic Crossed Antiprism" arg-set="-which pentagrammic_crossed_antiprism"/>
-<option _label="Pentagrammic Concave Deltohedron" arg-set="-which pentagrammic_concave_deltohedron"/>
+<option id="random" _label="Display random polyhedron"/>
+<option _label="Pentagonal prism" arg-set="-which pentagonal_prism"/>
+<option _label="Pentagonal dipyramid" arg-set="-which pentagonal_dipyramid"/>
+<option _label="Pentagonal antiprism" arg-set="-which pentagonal_antiprism"/>
+<option _label="Pentagonal deltohedron" arg-set="-which pentagonal_deltohedron"/>
+<option _label="Pentagrammic prism" arg-set="-which pentagrammic_prism"/>
+<option _label="Pentagrammic dipyramid" arg-set="-which pentagrammic_dipyramid"/>
+<option _label="Pentagrammic antiprism" arg-set="-which pentagrammic_antiprism"/>
+<option _label="Pentagrammic deltohedron" arg-set="-which pentagrammic_deltohedron"/>
+<option _label="Pentagrammic crossed antiprism" arg-set="-which pentagrammic_crossed_antiprism"/>
+<option _label="Pentagrammic concave deltohedron" arg-set="-which pentagrammic_concave_deltohedron"/>
 <option _label="Tetrahedron" arg-set="-which tetrahedron"/>
-<option _label="Truncated Tetrahedron" arg-set="-which truncated_tetrahedron"/>
+<option _label="Truncated tetrahedron" arg-set="-which truncated_tetrahedron"/>
 <option _label="Triakistetrahedron" arg-set="-which triakistetrahedron"/>
 <option _label="Octahemioctahedron" arg-set="-which octahemioctahedron"/>
 <option _label="Octahemioctacron" arg-set="-which octahemioctacron"/>
@@ -50,144 +39,149 @@
 <option _label="Octahedron" arg-set="-which octahedron"/>
 <option _label="Cube" arg-set="-which cube"/>
 <option _label="Cuboctahedron" arg-set="-which cuboctahedron"/>
-<option _label="Rhombic Dodecahedron" arg-set="-which rhombic_dodecahedron"/>
-<option _label="Truncated Octahedron" arg-set="-which truncated_octahedron"/>
+<option _label="Rhombic dodecahedron" arg-set="-which rhombic_dodecahedron"/>
+<option _label="Truncated octahedron" arg-set="-which truncated_octahedron"/>
 <option _label="Tetrakishexahedron" arg-set="-which tetrakishexahedron"/>
-<option _label="Truncated Cube" arg-set="-which truncated_cube"/>
+<option _label="Truncated cube" arg-set="-which truncated_cube"/>
 <option _label="Triakisoctahedron" arg-set="-which triakisoctahedron"/>
 <option _label="Rhombicuboctahedron" arg-set="-which rhombicuboctahedron"/>
-<option _label="Deltoidal Icositetrahedron" arg-set="-which deltoidal_icositetrahedron"/>
-<option _label="Truncated Cuboctahedron" arg-set="-which truncated_cuboctahedron"/>
+<option _label="Deltoidal icositetrahedron" arg-set="-which deltoidal_icositetrahedron"/>
+<option _label="Truncated cuboctahedron" arg-set="-which truncated_cuboctahedron"/>
 <option _label="Disdyakisdodecahedron" arg-set="-which disdyakisdodecahedron"/>
-<option _label="Snub Cube" arg-set="-which snub_cube"/>
-<option _label="Pentagonal Icositetrahedron" arg-set="-which pentagonal_icositetrahedron"/>
-<option _label="Small Cubicuboctahedron" arg-set="-which small_cubicuboctahedron"/>
-<option _label="Small Hexacronic Icositetrahedron" arg-set="-which small_hexacronic_icositetrahedron"/>
-<option _label="Great Cubicuboctahedron" arg-set="-which great_cubicuboctahedron"/>
-<option _label="Great Hexacronic Icositetrahedron" arg-set="-which great_hexacronic_icositetrahedron"/>
+<option _label="Snub cube" arg-set="-which snub_cube"/>
+<option _label="Pentagonal icositetrahedron" arg-set="-which pentagonal_icositetrahedron"/>
+<option _label="Small cubicuboctahedron" arg-set="-which small_cubicuboctahedron"/>
+<option _label="Small hexacronic icositetrahedron" arg-set="-which small_hexacronic_icositetrahedron"/>
+<option _label="Great cubicuboctahedron" arg-set="-which great_cubicuboctahedron"/>
+<option _label="Great hexacronic icositetrahedron" arg-set="-which great_hexacronic_icositetrahedron"/>
 <option _label="Cubohemioctahedron" arg-set="-which cubohemioctahedron"/>
 <option _label="Hexahemioctacron" arg-set="-which hexahemioctacron"/>
-<option _label="Cubitruncated Cuboctahedron" arg-set="-which cubitruncated_cuboctahedron"/>
+<option _label="Cubitruncated cuboctahedron" arg-set="-which cubitruncated_cuboctahedron"/>
 <option _label="Tetradyakishexahedron" arg-set="-which tetradyakishexahedron"/>
-<option _label="Great Rhombicuboctahedron" arg-set="-which great_rhombicuboctahedron"/>
-<option _label="Great Deltoidal Icositetrahedron" arg-set="-which great_deltoidal_icositetrahedron"/>
-<option _label="Small Rhombihexahedron" arg-set="-which small_rhombihexahedron"/>
-<option _label="Small Rhombihexacron" arg-set="-which small_rhombihexacron"/>
-<option _label="Stellated Truncated Hexahedron" arg-set="-which stellated_truncated_hexahedron"/>
-<option _label="Great Triakisoctahedron" arg-set="-which great_triakisoctahedron"/>
-<option _label="Great Truncated Cuboctahedron" arg-set="-which great_truncated_cuboctahedron"/>
-<option _label="Great Disdyakisdodecahedron" arg-set="-which great_disdyakisdodecahedron"/>
-<option _label="Great Rhombihexahedron" arg-set="-which great_rhombihexahedron"/>
-<option _label="Great Rhombihexacron" arg-set="-which great_rhombihexacron"/>
+<option _label="Great rhombicuboctahedron" arg-set="-which great_rhombicuboctahedron"/>
+<option _label="Great deltoidal icositetrahedron" arg-set="-which great_deltoidal_icositetrahedron"/>
+<option _label="Small rhombihexahedron" arg-set="-which small_rhombihexahedron"/>
+<option _label="Small rhombihexacron" arg-set="-which small_rhombihexacron"/>
+<option _label="Stellated truncated hexahedron" arg-set="-which stellated_truncated_hexahedron"/>
+<option _label="Great triakisoctahedron" arg-set="-which great_triakisoctahedron"/>
+<option _label="Great truncated cuboctahedron" arg-set="-which great_truncated_cuboctahedron"/>
+<option _label="Great disdyakisdodecahedron" arg-set="-which great_disdyakisdodecahedron"/>
+<option _label="Great rhombihexahedron" arg-set="-which great_rhombihexahedron"/>
+<option _label="Great rhombihexacron" arg-set="-which great_rhombihexacron"/>
 <option _label="Icosahedron" arg-set="-which icosahedron"/>
 <option _label="Dodecahedron" arg-set="-which dodecahedron"/>
 <option _label="Icosidodecahedron" arg-set="-which icosidodecahedron"/>
-<option _label="Rhombic Triacontahedron" arg-set="-which rhombic_triacontahedron"/>
-<option _label="Truncated Icosahedron" arg-set="-which truncated_icosahedron"/>
+<option _label="Rhombic triacontahedron" arg-set="-which rhombic_triacontahedron"/>
+<option _label="Truncated icosahedron" arg-set="-which truncated_icosahedron"/>
 <option _label="Pentakisdodecahedron" arg-set="-which pentakisdodecahedron"/>
-<option _label="Truncated Dodecahedron" arg-set="-which truncated_dodecahedron"/>
+<option _label="Truncated dodecahedron" arg-set="-which truncated_dodecahedron"/>
 <option _label="Triakisicosahedron" arg-set="-which triakisicosahedron"/>
 <option _label="Rhombicosidodecahedron" arg-set="-which rhombicosidodecahedron"/>
-<option _label="Deltoidal Hexecontahedron" arg-set="-which deltoidal_hexecontahedron"/>
-<option _label="Truncated Icosidodechedon" arg-set="-which truncated_icosidodechedon"/>
+<option _label="Deltoidal hexecontahedron" arg-set="-which deltoidal_hexecontahedron"/>
+<option _label="Truncated icosidodechedon" arg-set="-which truncated_icosidodechedon"/>
 <option _label="Disdyakistriacontahedron" arg-set="-which disdyakistriacontahedron"/>
-<option _label="Snub Dodecahedron" arg-set="-which snub_dodecahedron"/>
-<option _label="Pentagonal Hexecontahedron" arg-set="-which pentagonal_hexecontahedron"/>
-<option _label="Small Ditrigonal Icosidodecahedron" arg-set="-which small_ditrigonal_icosidodecahedron"/>
-<option _label="Small Triambic Icosahedron" arg-set="-which small_triambic_icosahedron"/>
-<option _label="Small Icosicosidodecahedron" arg-set="-which small_icosicosidodecahedron"/>
-<option _label="Small Icosacronic Hexecontahedron" arg-set="-which small_icosacronic_hexecontahedron"/>
-<option _label="Small Snub Icosicosidodecahedron" arg-set="-which small_snub_icosicosidodecahedron"/>
-<option _label="Small Hexagonal Hexecontahedron" arg-set="-which small_hexagonal_hexecontahedron"/>
-<option _label="Small Dodecicosidodecahedron" arg-set="-which small_dodecicosidodecahedron"/>
-<option _label="Small Dodecacronic Hexecontahedron" arg-set="-which small_dodecacronic_hexecontahedron"/>
-<option _label="Small Stellated Dodecahedron" arg-set="-which small_stellated_dodecahedron"/>
-<option _label="Great Dodecahedron" arg-set="-which great_dodecahedron"/>
-<option _label="Great Dodecadodecahedron" arg-set="-which great_dodecadodecahedron"/>
-<option _label="Medial Rhombic Triacontahedron" arg-set="-which medial_rhombic_triacontahedron"/>
-<option _label="Truncated Great Dodecahedron" arg-set="-which truncated_great_dodecahedron"/>
-<option _label="Small Stellapentakisdodecahedron" arg-set="-which small_stellapentakisdodecahedron"/>
+<option _label="Snub dodecahedron" arg-set="-which snub_dodecahedron"/>
+<option _label="Pentagonal hexecontahedron" arg-set="-which pentagonal_hexecontahedron"/>
+<option _label="Small ditrigonal icosidodecahedron" arg-set="-which small_ditrigonal_icosidodecahedron"/>
+<option _label="Small triambic icosahedron" arg-set="-which small_triambic_icosahedron"/>
+<option _label="Small icosicosidodecahedron" arg-set="-which small_icosicosidodecahedron"/>
+<option _label="Small icosacronic hexecontahedron" arg-set="-which small_icosacronic_hexecontahedron"/>
+<option _label="Small snub icosicosidodecahedron" arg-set="-which small_snub_icosicosidodecahedron"/>
+<option _label="Small hexagonal hexecontahedron" arg-set="-which small_hexagonal_hexecontahedron"/>
+<option _label="Small dodecicosidodecahedron" arg-set="-which small_dodecicosidodecahedron"/>
+<option _label="Small dodecacronic hexecontahedron" arg-set="-which small_dodecacronic_hexecontahedron"/>
+<option _label="Small stellated dodecahedron" arg-set="-which small_stellated_dodecahedron"/>
+<option _label="Great dodecahedron" arg-set="-which great_dodecahedron"/>
+<option _label="Great dodecadodecahedron" arg-set="-which great_dodecadodecahedron"/>
+<option _label="Medial rhombic triacontahedron" arg-set="-which medial_rhombic_triacontahedron"/>
+<option _label="Truncated great dodecahedron" arg-set="-which truncated_great_dodecahedron"/>
+<option _label="Small stellapentakisdodecahedron" arg-set="-which small_stellapentakisdodecahedron"/>
 <option _label="Rhombidodecadodecahedron" arg-set="-which rhombidodecadodecahedron"/>
-<option _label="Medial Deltoidal Hexecontahedron" arg-set="-which medial_deltoidal_hexecontahedron"/>
-<option _label="Small Rhombidodecahedron" arg-set="-which small_rhombidodecahedron"/>
-<option _label="Small Rhombidodecacron" arg-set="-which small_rhombidodecacron"/>
-<option _label="Snub Dodecadodecahedron" arg-set="-which snub_dodecadodecahedron"/>
-<option _label="Medial Pentagonal Hexecontahedron" arg-set="-which medial_pentagonal_hexecontahedron"/>
-<option _label="Ditrigonal Dodecadodecahedron" arg-set="-which ditrigonal_dodecadodecahedron"/>
-<option _label="Medial Triambic Icosahedron" arg-set="-which medial_triambic_icosahedron"/>
-<option _label="Great Ditrigonal Dodecicosidodecahedron" arg-set="-which great_ditrigonal_dodecicosidodecahedron"/>
-<option _label="Great Ditrigonal Dodecacronic Hexecontahedron" arg-set="-which great_ditrigonal_dodecacronic_hexecontahedron"/>
-<option _label="Small Ditrigonal Dodecicosidodecahedron" arg-set="-which small_ditrigonal_dodecicosidodecahedron"/>
-<option _label="Small Ditrigonal Dodecacronic Hexecontahedron" arg-set="-which small_ditrigonal_dodecacronic_hexecontahedron"/>
+<option _label="Medial deltoidal hexecontahedron" arg-set="-which medial_deltoidal_hexecontahedron"/>
+<option _label="Small rhombidodecahedron" arg-set="-which small_rhombidodecahedron"/>
+<option _label="Small rhombidodecacron" arg-set="-which small_rhombidodecacron"/>
+<option _label="Snub dodecadodecahedron" arg-set="-which snub_dodecadodecahedron"/>
+<option _label="Medial pentagonal hexecontahedron" arg-set="-which medial_pentagonal_hexecontahedron"/>
+<option _label="Ditrigonal dodecadodecahedron" arg-set="-which ditrigonal_dodecadodecahedron"/>
+<option _label="Medial triambic icosahedron" arg-set="-which medial_triambic_icosahedron"/>
+<option _label="Great ditrigonal dodecicosidodecahedron" arg-set="-which great_ditrigonal_dodecicosidodecahedron"/>
+<option _label="Great ditrigonal dodecacronic hexecontahedron" arg-set="-which great_ditrigonal_dodecacronic_hexecontahedron"/>
+<option _label="Small ditrigonal dodecicosidodecahedron" arg-set="-which small_ditrigonal_dodecicosidodecahedron"/>
+<option _label="Small ditrigonal dodecacronic hexecontahedron" arg-set="-which small_ditrigonal_dodecacronic_hexecontahedron"/>
 <option _label="Icosidodecadodecahedron" arg-set="-which icosidodecadodecahedron"/>
-<option _label="Medial Icosacronic Hexecontahedron" arg-set="-which medial_icosacronic_hexecontahedron"/>
-<option _label="Icositruncated Dodecadodecahedron" arg-set="-which icositruncated_dodecadodecahedron"/>
+<option _label="Medial icosacronic hexecontahedron" arg-set="-which medial_icosacronic_hexecontahedron"/>
+<option _label="Icositruncated dodecadodecahedron" arg-set="-which icositruncated_dodecadodecahedron"/>
 <option _label="Tridyakisicosahedron" arg-set="-which tridyakisicosahedron"/>
-<option _label="Snub Icosidodecadodecahedron" arg-set="-which snub_icosidodecadodecahedron"/>
-<option _label="Medial Hexagonal Hexecontahedron" arg-set="-which medial_hexagonal_hexecontahedron"/>
-<option _label="Great Ditrigonal Icosidodecahedron" arg-set="-which great_ditrigonal_icosidodecahedron"/>
-<option _label="Great Triambic Icosahedron" arg-set="-which great_triambic_icosahedron"/>
-<option _label="Great Icosicosidodecahedron" arg-set="-which great_icosicosidodecahedron"/>
-<option _label="Great Icosacronic Hexecontahedron" arg-set="-which great_icosacronic_hexecontahedron"/>
-<option _label="Small Icosihemidodecahedron" arg-set="-which small_icosihemidodecahedron"/>
-<option _label="Small Icosihemidodecacron" arg-set="-which small_icosihemidodecacron"/>
-<option _label="Small Dodecicosahedron" arg-set="-which small_dodecicosahedron"/>
-<option _label="Small Dodecicosacron" arg-set="-which small_dodecicosacron"/>
-<option _label="Small Dodecahemidodecahedron" arg-set="-which small_dodecahemidodecahedron"/>
-<option _label="Small Dodecahemidodecacron" arg-set="-which small_dodecahemidodecacron"/>
-<option _label="Great Stellated Dodecahedron" arg-set="-which great_stellated_dodecahedron"/>
-<option _label="Great Icosahedron" arg-set="-which great_icosahedron"/>
-<option _label="Great Icosidodecahedron" arg-set="-which great_icosidodecahedron"/>
-<option _label="Great Rhombic Triacontahedron" arg-set="-which great_rhombic_triacontahedron"/>
-<option _label="Great Truncated Icosahedron" arg-set="-which great_truncated_icosahedron"/>
-<option _label="Great Stellapentakisdodecahedron" arg-set="-which great_stellapentakisdodecahedron"/>
+<option _label="Snub icosidodecadodecahedron" arg-set="-which snub_icosidodecadodecahedron"/>
+<option _label="Medial hexagonal hexecontahedron" arg-set="-which medial_hexagonal_hexecontahedron"/>
+<option _label="Great ditrigonal icosidodecahedron" arg-set="-which great_ditrigonal_icosidodecahedron"/>
+<option _label="Great triambic icosahedron" arg-set="-which great_triambic_icosahedron"/>
+<option _label="Great icosicosidodecahedron" arg-set="-which great_icosicosidodecahedron"/>
+<option _label="Great icosacronic hexecontahedron" arg-set="-which great_icosacronic_hexecontahedron"/>
+<option _label="Small icosihemidodecahedron" arg-set="-which small_icosihemidodecahedron"/>
+<option _label="Small icosihemidodecacron" arg-set="-which small_icosihemidodecacron"/>
+<option _label="Small dodecicosahedron" arg-set="-which small_dodecicosahedron"/>
+<option _label="Small dodecicosacron" arg-set="-which small_dodecicosacron"/>
+<option _label="Small dodecahemidodecahedron" arg-set="-which small_dodecahemidodecahedron"/>
+<option _label="Small dodecahemidodecacron" arg-set="-which small_dodecahemidodecacron"/>
+<option _label="Great stellated dodecahedron" arg-set="-which great_stellated_dodecahedron"/>
+<option _label="Great icosahedron" arg-set="-which great_icosahedron"/>
+<option _label="Great icosidodecahedron" arg-set="-which great_icosidodecahedron"/>
+<option _label="Great rhombic triacontahedron" arg-set="-which great_rhombic_triacontahedron"/>
+<option _label="Great truncated icosahedron" arg-set="-which great_truncated_icosahedron"/>
+<option _label="Great stellapentakisdodecahedron" arg-set="-which great_stellapentakisdodecahedron"/>
 <option _label="Rhombicosahedron" arg-set="-which rhombicosahedron"/>
 <option _label="Rhombicosacron" arg-set="-which rhombicosacron"/>
-<option _label="Great Snub Icosidodecahedron" arg-set="-which great_snub_icosidodecahedron"/>
-<option _label="Great Pentagonal Hexecontahedron" arg-set="-which great_pentagonal_hexecontahedron"/>
-<option _label="Small Stellated Truncated Dodecahedron" arg-set="-which small_stellated_truncated_dodecahedron"/>
-<option _label="Great Pentakisdodekahedron" arg-set="-which great_pentakisdodekahedron"/>
-<option _label="Truncated Dodecadodecahedron" arg-set="-which truncated_dodecadodecahedron"/>
-<option _label="Medial Disdyakistriacontahedron" arg-set="-which medial_disdyakistriacontahedron"/>
-<option _label="Inverted Snub Dodecadodecahedron" arg-set="-which inverted_snub_dodecadodecahedron"/>
-<option _label="Medial Inverted Pentagonal Hexecontahedron" arg-set="-which medial_inverted_pentagonal_hexecontahedron"/>
-<option _label="Great Dodecicosidodecahedron" arg-set="-which great_dodecicosidodecahedron"/>
-<option _label="Great Dodecacronic Hexecontahedron" arg-set="-which great_dodecacronic_hexecontahedron"/>
-<option _label="Small Dodecahemicosahedron" arg-set="-which small_dodecahemicosahedron"/>
-<option _label="Small Dodecahemicosacron" arg-set="-which small_dodecahemicosacron"/>
-<option _label="Great Dodecicosahedron" arg-set="-which great_dodecicosahedron"/>
-<option _label="Great Dodecicosacron" arg-set="-which great_dodecicosacron"/>
-<option _label="Great Snub Dodecicosidodecahedron" arg-set="-which great_snub_dodecicosidodecahedron"/>
-<option _label="Great Hexagonal Hexecontahedron" arg-set="-which great_hexagonal_hexecontahedron"/>
-<option _label="Great Dodecahemicosahedron" arg-set="-which great_dodecahemicosahedron"/>
-<option _label="Great Dodecahemicosacron" arg-set="-which great_dodecahemicosacron"/>
-<option _label="Great Stellated Truncated Dodecahedron" arg-set="-which great_stellated_truncated_dodecahedron"/>
-<option _label="Great Triakisicosahedron" arg-set="-which great_triakisicosahedron"/>
-<option _label="Great Rhombicosidodecahedron" arg-set="-which great_rhombicosidodecahedron"/>
-<option _label="Great Deltoidal Hexecontahedron" arg-set="-which great_deltoidal_hexecontahedron"/>
-<option _label="Great Truncated Icosidodecahedron" arg-set="-which great_truncated_icosidodecahedron"/>
-<option _label="Great Disdyakistriacontahedron" arg-set="-which great_disdyakistriacontahedron"/>
-<option _label="Great Inverted Snub Icosidodecahedron" arg-set="-which great_inverted_snub_icosidodecahedron"/>
-<option _label="Great Inverted Pentagonal Hexecontahedron" arg-set="-which great_inverted_pentagonal_hexecontahedron"/>
-<option _label="Great Dodecahemidodecahedron" arg-set="-which great_dodecahemidodecahedron"/>
-<option _label="Great Dodecahemidodecacron" arg-set="-which great_dodecahemidodecacron"/>
-<option _label="Great Icosihemidodecahedron" arg-set="-which great_icosihemidodecahedron"/>
-<option _label="Great Icosihemidodecacron" arg-set="-which great_icosihemidodecacron"/>
-<option _label="Small Retrosnub Icosicosidodecahedron" arg-set="-which small_retrosnub_icosicosidodecahedron"/>
-<option _label="Small Hexagrammic Hexecontahedron" arg-set="-which small_hexagrammic_hexecontahedron"/>
-<option _label="Great Rhombidodecahedron" arg-set="-which great_rhombidodecahedron"/>
-<option _label="Great Rhombidodecacron" arg-set="-which great_rhombidodecacron"/>
-<option _label="Great Retrosnub Icosidodecahedron" arg-set="-which great_retrosnub_icosidodecahedron"/>
-<option _label="Great Pentagrammic Hexecontahedron" arg-set="-which great_pentagrammic_hexecontahedron"/>
-<option _label="Great Dirhombicosidodecahedron" arg-set="-which great_dirhombicosidodecahedron"/>
-<option _label="Great Dirhombicosidodecacron" arg-set="-which great_dirhombicosidodecacron"/>
+<option _label="Great snub icosidodecahedron" arg-set="-which great_snub_icosidodecahedron"/>
+<option _label="Great pentagonal hexecontahedron" arg-set="-which great_pentagonal_hexecontahedron"/>
+<option _label="Small stellated truncated dodecahedron" arg-set="-which small_stellated_truncated_dodecahedron"/>
+<option _label="Great pentakisdodekahedron" arg-set="-which great_pentakisdodekahedron"/>
+<option _label="Truncated dodecadodecahedron" arg-set="-which truncated_dodecadodecahedron"/>
+<option _label="Medial disdyakistriacontahedron" arg-set="-which medial_disdyakistriacontahedron"/>
+<option _label="Inverted snub dodecadodecahedron" arg-set="-which inverted_snub_dodecadodecahedron"/>
+<option _label="Medial inverted pentagonal hexecontahedron" arg-set="-which medial_inverted_pentagonal_hexecontahedron"/>
+<option _label="Great dodecicosidodecahedron" arg-set="-which great_dodecicosidodecahedron"/>
+<option _label="Great dodecacronic hexecontahedron" arg-set="-which great_dodecacronic_hexecontahedron"/>
+<option _label="Small dodecahemicosahedron" arg-set="-which small_dodecahemicosahedron"/>
+<option _label="Small dodecahemicosacron" arg-set="-which small_dodecahemicosacron"/>
+<option _label="Great dodecicosahedron" arg-set="-which great_dodecicosahedron"/>
+<option _label="Great dodecicosacron" arg-set="-which great_dodecicosacron"/>
+<option _label="Great snub dodecicosidodecahedron" arg-set="-which great_snub_dodecicosidodecahedron"/>
+<option _label="Great hexagonal hexecontahedron" arg-set="-which great_hexagonal_hexecontahedron"/>
+<option _label="Great dodecahemicosahedron" arg-set="-which great_dodecahemicosahedron"/>
+<option _label="Great dodecahemicosacron" arg-set="-which great_dodecahemicosacron"/>
+<option _label="Great stellated truncated dodecahedron" arg-set="-which great_stellated_truncated_dodecahedron"/>
+<option _label="Great triakisicosahedron" arg-set="-which great_triakisicosahedron"/>
+<option _label="Great rhombicosidodecahedron" arg-set="-which great_rhombicosidodecahedron"/>
+<option _label="Great deltoidal hexecontahedron" arg-set="-which great_deltoidal_hexecontahedron"/>
+<option _label="Great truncated icosidodecahedron" arg-set="-which great_truncated_icosidodecahedron"/>
+<option _label="Great disdyakistriacontahedron" arg-set="-which great_disdyakistriacontahedron"/>
+<option _label="Great inverted snub icosidodecahedron" arg-set="-which great_inverted_snub_icosidodecahedron"/>
+<option _label="Great inverted pentagonal hexecontahedron" arg-set="-which great_inverted_pentagonal_hexecontahedron"/>
+<option _label="Great dodecahemidodecahedron" arg-set="-which great_dodecahemidodecahedron"/>
+<option _label="Great dodecahemidodecacron" arg-set="-which great_dodecahemidodecacron"/>
+<option _label="Great icosihemidodecahedron" arg-set="-which great_icosihemidodecahedron"/>
+<option _label="Great icosihemidodecacron" arg-set="-which great_icosihemidodecacron"/>
+<option _label="Small retrosnub icosicosidodecahedron" arg-set="-which small_retrosnub_icosicosidodecahedron"/>
+<option _label="Small hexagrammic hexecontahedron" arg-set="-which small_hexagrammic_hexecontahedron"/>
+<option _label="Great rhombidodecahedron" arg-set="-which great_rhombidodecahedron"/>
+<option _label="Great rhombidodecacron" arg-set="-which great_rhombidodecacron"/>
+<option _label="Great retrosnub icosidodecahedron" arg-set="-which great_retrosnub_icosidodecahedron"/>
+<option _label="Great pentagrammic hexecontahedron" arg-set="-which great_pentagrammic_hexecontahedron"/>
+<option _label="Great dirhombicosidodecahedron" arg-set="-which great_dirhombicosidodecahedron"/>
+<option _label="Great dirhombicosidodecacron" arg-set="-which great_dirhombicosidodecacron"/>
+<option _label="Utah teapotahedron" arg-set="-which utah_teapotahedron"/>
   </select>
 
-
-  <boolean id="titles"  _label="Show Description" arg-unset="-no-titles"/>
-  <boolean id="wander" _label="Wander"    arg-unset="-no-wander"/>
-  <boolean id="wire"   _label="Wireframe" arg-set="-wireframe"/>
-  <boolean id="showfps" _label="Show Frames-per-Second" arg-set="-fps"/>
+  <hgroup>
+   <boolean id="spin"    _label="Spin"      arg-unset="-no-spin"/>
+   <boolean id="wander"  _label="Wander"    arg-unset="-no-wander"/>
+   <boolean id="wire"    _label="Wireframe" arg-set="-wireframe"/>
+  </hgroup>
+  <hgroup>
+   <boolean id="titles"  _label="Show description" arg-unset="-no-titles"/>
+   <boolean id="showfps" _label="Show frame rate" arg-set="-fps"/>
+  </hgroup>
 
   <_description>
 Displays different 3D solids and some information about each.
@@ -195,6 +189,8 @@ A new solid is chosen every few seconds.  There are 75 uniform
 polyhedra, plus 5 infinite sets of prisms and antiprisms;
 including their duals brings the total to 160.
 
-Written by Dr. Zvi Har'El and Jamie Zawinski.
+http://en.wikipedia.org/wiki/Uniform_polyhedra
+
+Written by Dr. Zvi Har'El and Jamie Zawinski; 2004.
   </_description>
 </screensaver>