X-Git-Url: http://git.hungrycats.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=hacks%2Fconfig%2Fwebcollage.xml;h=ad3a0bc3b0e956b1979079245bc507303bf27feb;hb=c1b9b55ad8d59dc05ef55e316aebf5863e7dfa56;hp=f998fd9c8c0b89001cf95fc28ff642e55811e9a0;hpb=8eb2873d7054e705c4e83f22d18c40946a9e2529;p=xscreensaver

diff --git a/hacks/config/webcollage.xml b/hacks/config/webcollage.xml
index f998fd9c..ad3a0bc3 100644
--- a/hacks/config/webcollage.xml
+++ b/hacks/config/webcollage.xml
@@ -4,30 +4,46 @@
 
   <command arg="-root"/>
 
-  <number id="timeout" type="slider" arg="-delay %"
-          _label="URL Timeout" _low-label="2 seconds" _high-label="2 minutes"
-          low="2" high="120" default="30"/>
+  <hgroup>
+   <vgroup>
+    <number id="delay" type="slider" arg="-delay %"
+            _label="Delay between images" _low-label="None" _high-label="30 secs"
+            low="0" high="30" default="2"/>
+
+    <number id="timeout" type="slider" arg="-timeout %"
+            _label="Network timeout" _low-label="2 secs" _high-label="2 min"
+            low="2" high="120" default="30"/>
+   </vgroup>
+   <vgroup>
+    <number id="opacity" type="slider" arg="-opacity %"
+            _label="Image opacity" _low-label="Transparent" _high-label="Opaque"
+            low="0.1" high="1.0" default="0.85"/>
+
+   <boolean id="showfps" _label="Show frame rate" arg-set="-fps"/>
+
+   </vgroup>
+  </hgroup>
+
+<!--
+  <string id="filter"  _label="Per-image filter program" arg="-filter %"/>
+  <string id="filter2" _label="Overall filter program" arg="-filter2 %"/>
+  <file id="dictionary" _label="Dictionary file" arg="-dictionary %"/>
+  <file id="dir" _label="Image directory" arg="-directory %"/>
+ -->
 
-  <number id="speed" type="slider" arg="-delay %"
-          _label="Speed" _low-label="Slow" _high-label="Fast"
-          low="0" high="30" default="1"
-          convert="invert"/>
-
-  <string id="filter"  _label="Per-Image Filter Program" arg="-filter %"/>
+  <_description>
+This makes collages out of random images pulled off of the
+World Wide Web.  It finds these images by doing random web searches,
+and then extracting images from the returned pages.
 
-  <string id="filter2" _label="Overall Filter Program" arg="-filter2 %"/>
+WARNING: THE INTERNET SOMETIMES CONTAINS PORNOGRAPHY.
 
-  <file id="dictionary" _label="Dictionary File" arg="-dictionary %"/>
+The Internet being what it is, absolutely anything might show up in the
+collage including -- quite possibly -- pornography, or even nudity.
+Please act accordingly.
 
-  <_description>
-This program makes collages out of random images pulled off of the
-World Wide Web.  It finds these images by doing random web searches,
-and then extracting images from the returned pages.  It can also be set
-up to filter the images through the `VidWhacker' program, above, which
-looks really great.
+See also http://www.jwz.org/webcollage/
 
-(Note that most of the images it finds are text, and not pictures.
-This is because most of the web is pictures of text.  Which is pretty
-sad.)  Written by Jamie Zawinski.
+Written by Jamie Zawinski; 1999.
   </_description>
 </screensaver>