X-Git-Url: http://git.hungrycats.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;ds=sidebyside;f=hacks%2Fconfig%2Fstarwars.xml;h=a78248b23d112e1b79720c123f5e02c39d1f1018;hb=d5186197bc394e10a4402f7f6d23fbb14103bc50;hp=1b112771d73822c14c78abd8037c9e1638a883bb;hpb=8eb2873d7054e705c4e83f22d18c40946a9e2529;p=xscreensaver

diff --git a/hacks/config/starwars.xml b/hacks/config/starwars.xml
index 1b112771..a78248b2 100644
--- a/hacks/config/starwars.xml
+++ b/hacks/config/starwars.xml
@@ -1,55 +1,63 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
 
-<screensaver name="starwars" _label="StarWars">
+<screensaver name="starwars" _label="StarWars" gl="yes">
 
   <command arg="-root"/>
 
-  <number id="speed" type="slider" arg="-delay %"
-          _label="Animation Speed" _low-label="Slow" _high-label="Fast"
-          low="0" high="80000" default="40000"
-          convert="invert"/>
-
-  <number id="steps" type="slider" arg="-steps %"
-          _label="Scroll Speed" _low-label="Slow" _high-label="Fast"
-          low="1" high="100" default="35"
-          convert="invert"/>
+  <video href="http://www.youtube.com/watch?v=UUjC-6e7y_U"/>
 
   <hgroup>
+   <vgroup>
+    <number id="delay" type="slider" arg="-delay %"
+            _low-label="  Frame rate      Low" _high-label="High"
+            low="0" high="100000" default="40000"
+            convert="invert"/>
+    <number id="steps" type="slider" arg="-steps %"
+            _low-label="Scroll speed     Slow" _high-label="Fast"
+            low="1" high="100" default="35"
+            convert="invert"/>
+    <number id="spin" type="slider" arg="-spin %"
+            _low-label=" Stars speed     Slow" _high-label="Fast"
+            low="0.0" high="0.2" default="0.03"/>
+
+    <xscreensaver-text />
+   </vgroup>
+
+   <vgroup>
     <select id="align">
-      <option id="left"   _label="Flush Left Text"  arg-set="-left"/>
-      <option id="center" _label="Centered Text"/>
-      <option id="right"  _label="Flush Right Text" arg-set="-right"/>
+      <option id="left"   _label="Flush left text"  arg-set="-alignment left"/>
+      <option id="center" _label="Centered text"/>
+      <option id="right"  _label="Flush right text" arg-set="-alignment right"/>
     </select>
 
-    <boolean id="wrap"   _label="Wrap Long Lines" arg-unset="-no-wrap"/>
+    <boolean id="wrap"   _label="Wrap long lines" arg-unset="-no-wrap"/>
+   <boolean id="texture" _label="Texture-mapped font" arg-unset="-no-textures"/>
+    <boolean id="smooth" _label="Anti-aliased lines" arg-unset="-no-smooth"/>
+    <hgroup>
+     <boolean id="thick"  _label="Thick lines"        arg-unset="-no-thick"/>
+     <boolean id="fade"   _label="Fade out"           arg-unset="-no-fade"/>
+    </hgroup>
+    <boolean id="showfps" _label="Show frame rate" arg-set="-fps"/>
+
+    <number id="lines" type="spinbutton" arg="-lines %"
+              _label="Text lines" low="4" high="1000" default="125"/>
+    <number id="size" type="spinbutton" arg="-size %"
+             _label="Font point size" low="-1" high="10" default="-1"/>
+    <number id="columns" type="spinbutton" arg="-columns %"
+             _label="or, Text columns" low="-1" high="200" default="-1"/>
+
+   </vgroup>
   </hgroup>
 
-  <file id="program" _label="Text Program" arg="-program %"/>
-
-  <number id="size" type="spinbutton" arg="-size %"
-           _label="Font Point Size" low="-1" high="10" default="-1"/>
-
-  <number id="columns" type="spinbutton" arg="-columns %"
-           _label="Text Columns" low="-1" high="200" default="-1"/>
-
-  <number id="lines" type="spinbutton" arg="-size %"
-           _label="Text Lines" low="4" high="1000" default="125"/>
-
-  <number id="spin" type="slider" arg="-spin %"
-          _label="Star Rotation Speed" _low-label="Slow" _high-label="Fast"
-          low="0.0" high="0.2" default="0.03"/>
-
-  <hgroup>
-    <boolean id="smooth" _label="Anti-aliased Lines" arg-unset="-no-smooth"/>
-    <boolean id="fade"   _label="Thick Lines"        arg-unset="-no-thick"/>
-  </hgroup>
-  <boolean id="fade"   _label="Fade Out"           arg-unset="-no-fade"/>
-
-  <boolean id="showfps" _label="Show Frames-per-Second" arg-set="-fps"/>
+  <xscreensaver-updater />
 
   <_description>
-Draws a stream of text slowly scrolling into the distance at an
+A stream of text slowly scrolling into the distance at an
 angle, over a star field, like at the beginning of the movie of the
-same name.  Written by Jamie Zawinski and Claudio Matauoka.
+same name.  
+
+http://en.wikipedia.org/wiki/Star_Wars_opening_crawl
+
+Written by Jamie Zawinski and Claudio Matauoka; 2001.
   </_description>
 </screensaver>