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

diff --git a/hacks/config/popsquares.xml b/hacks/config/popsquares.xml
index cea3d7b9..514a1808 100644
--- a/hacks/config/popsquares.xml
+++ b/hacks/config/popsquares.xml
@@ -5,8 +5,8 @@
   <command arg="-root"/>
 
   <number id="delay" type="slider" arg="-delay %"
-          _label="Speed" _low-label="Slow" _high-label="Fast"
-          low="0" high="30000" default="25000"
+          _label="Frame rate" _low-label="Low" _high-label="High"
+          low="0" high="100000" default="25000"
           convert="invert"/>
 
   <number id="subdivision" type="spinbutton" arg="-subdivision %"
@@ -18,13 +18,32 @@
           low="0" high="5" default="1"/>
 
   <number id="ncolors" type="spinbutton" arg="-ncolors %"
-            _label="Number of Colors" low="1" high="512" default="128"/>
-
-  <string id="fg" _label="Start color" arg="-fg %"/>
-  <string id="bg" _label="End color" arg="-bg %"/>
+            _label="Number of colors" low="1" high="512" default="128"/>
+
+  <hgroup>
+   <select id="bg">
+    <option id="lred"     _label="Light red"     arg-set="-bg #FF0000"/>
+    <option id="lyellow"  _label="Light yellow"  arg-set="-bg #FFFF00"/>
+    <option id="lgreen"   _label="Light green"   arg-set="-bg #00FF00"/>
+    <option id="lcyan"    _label="Light cyan"    arg-set="-bg #00FFFF"/>
+    <option id="lblue"    _label="Light blue"/>
+    <option id="lmagenta" _label="Light magenta" arg-set="-bg #FF00FF"/>
+   </select>
+
+   <select id="fg">
+    <option id="dred"     _label="Dark red"     arg-set="-fg #8C0000"/>
+    <option id="dyellow"  _label="Dark yellow"  arg-set="-fg #8C8C00"/>
+    <option id="dgreen"   _label="Dark green"   arg-set="-fg #008C00"/>
+    <option id="dcyan"    _label="Dark cyan"    arg-set="-fg #008C8C"/>
+    <option id="dblue"    _label="Dark blue"/>
+    <option id="dmagenta" _label="Dark magenta" arg-set="-fg #8C008C"/>
+   </select>
+  </hgroup>
 
   <boolean id="twitch" _label="Twitch" arg-set="-twitch"/>
 
+  <boolean id="showfps" _label="Show frame rate" arg-set="-fps"/>
+
   <_description>
 This draws a pop-art-ish looking grid of pulsing colors.