X-Git-Url: http://git.hungrycats.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=hacks%2Fconfig%2Fstarwars.xml;h=bd5407c907075bc8a36a14206341c786300e7d68;hb=de460e831dc8578acfa8b72251ab9346c99c1f96;hp=3459873eeb8d8918fa35cd9142a14fcc22119b0c;hpb=447db08c956099b3b183886729108bf5b364c4b8;p=xscreensaver

diff --git a/hacks/config/starwars.xml b/hacks/config/starwars.xml
index 3459873e..bd5407c9 100644
--- a/hacks/config/starwars.xml
+++ b/hacks/config/starwars.xml
@@ -4,59 +4,56 @@
 
   <command arg="-root"/>
 
-  <number id="delay" 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"/>
-
   <hgroup>
+   <vgroup>
+    <number id="delay" 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"/>
+    <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"/>
+    <number id="lines" type="spinbutton" arg="-lines %"
+             _label="Text Lines" low="4" high="1000" default="125"/>
+   </vgroup>
+
+   <vgroup>
     <select id="align">
-      <option id="left"   _label="Flush Left Text"  arg-set="-left"/>
+      <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="-right"/>
+      <option id="right"  _label="Flush Right Text" arg-set="-alignment right"/>
     </select>
 
     <boolean id="wrap"   _label="Wrap Long Lines" arg-unset="-no-wrap"/>
-  </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="-lines %"
-           _label="Text Lines" low="4" high="1000" default="125"/>
+   <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 Frames-per-Second" arg-set="-fps"/>
 
-  <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"/>
+   </vgroup>
+  </hgroup>
 
   <hgroup>
-    <boolean id="smooth" _label="Anti-aliased Lines" arg-unset="-no-smooth"/>
-    <boolean id="fade"   _label="Thick Lines"        arg-unset="-no-thick"/>
+    <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"/>
   </hgroup>
 
-  <boolean id="texture" _label="Texture-Mapped Font" arg-unset="-no-texture"/>
-  <boolean id="fade"   _label="Fade Out"           arg-unset="-no-fade"/>
-  <boolean id="showfps" _label="Show Frames-per-Second" arg-set="-fps"/>
+  <xscreensaver-text />
 
   <_description>
 Draws 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.  
 
-The text can be the output of a program or the contents of a file or
-URL, as configured on the "Advanced" tab of the main Screensaver
-Preferences window.
-
-Written by Jamie Zawinski and Claudio Matauoka.
+Written by Jamie Zawinski and Claudio Matauoka; 2001.
   </_description>
 </screensaver>