Adding the new joystick and onscreen keyboard options to tuxpaint-completion.bash and OPTIONS.html.

2 files changed, 156 insertions, 2 deletions

diff --git a/docs/html/OPTIONS.html b/docs/html/OPTIONS.html
index 21f5467..90f4fcd 100644
--- a/docs/html/OPTIONS.html
+++ b/docs/html/OPTIONS.html
@@ -472,10 +472,25 @@ New Breed Software</p>
     <b>Label</b> tools.
   </dd>
 
+  <dt><code><b>onscreen-keyboard-layout=<i>LAYOUTNAME</i></b></code></dt>
+  <dd>
+    Selects the initial layout for the on-screen keyboard when using the <b>Text</b> and
+    <b>Label</b> tools.<br>
+    Note: Using this option implies automatically <b>onscreen-keyboard=yes</b>, so setting both is redundant.
+  </dd>
+
+  <dt><code><b>onscreen-keyboard-disable-change=yes</b></code></dt>
+  <dd>
+    Disables the possibility for changing the layout of the on-screen keyboard when using the <b>Text</b> and
+    <b>Label</b> tools, usefull for simplifying things for the small children.<br>
+    Note: Using this option implies automatically <b>onscreen-keyboard=yes</b>, so setting both is redundant.
+  </dd>
+
+
   <dt><code><b>joystick-slowness=<i>SPEED</i></b></code></dt>
   <dd>
     Sets a delay at each axis motion, allowing to slow the joystick.
-    Allowed values are 0 to 500. Default value is 15.
+    Allowed values are from 0 to 500. Default value is 15.
   </dd>
 
   <dt><code><b>joystick-threshold=<i>THRESHOLD</i></b></code></dt>
@@ -490,6 +505,102 @@ New Breed Software</p>
     Allowed values are from 1 to 7. Default value is 7.
   </dd>
 
+  <dt><code><b>joystick-hat-timeout=<i>MILISECONDS</i></b></code></dt>
+  <dd>
+    Sets the delay after wich the pointer will start moving automatically if the hat is keeped pushed.
+    Allowed values are from 0 to 3000. Default value is 1000.
+  </dd>
+
+  <dt><code><b>joystick-hat-slowness=<i>SPEED</i></b></code></dt>
+  <dd>
+    Sets a delay at each automatic motion, allowing to slow the speed of the hat.
+    Allowed values are from 0 to 500. Default value is 15.
+  </dd>
+
+  <dt><code><b>joystick-btn-escape=<i>BUTTON NUMBER</i></b></code></dt>
+  <dd>
+    Selects the joystick button number, as seen by SDL, that will be used to generate a escape event.
+    Usefull to dismiss dialogs and quit.
+  </dd>
+
+  <dt><code><b>joystick-btn-brush=<i>BUTTON NUMBER</i></b></code></dt>
+  <dd>
+    Selects the joystick button number, as seen by SDL, that will be a shortcurt to select the brush tool.
+  </dd>
+
+  <dt><code><b>joystick-btn-stamp=<i>BUTTON NUMBER</i></b></code></dt>
+  <dd>
+    Selects the joystick button number, as seen by SDL, that will be a shortcurt to select the stamp tool.
+  </dd>
+
+  <dt><code><b>joystick-btn-lines=<i>BUTTON NUMBER</i></b></code></dt>
+  <dd>
+    Selects the joystick button number, as seen by SDL, that will be a shortcurt to select the lines tool.
+  </dd>
+
+  <dt><code><b>joystick-btn-shapes=<i>BUTTON NUMBER</i></b></code></dt>
+  <dd>
+    Selects the joystick button number, as seen by SDL, that will be a shortcurt to select the shapes tool.
+  </dd>
+
+  <dt><code><b>joystick-btn-text=<i>BUTTON NUMBER</i></b></code></dt>
+  <dd>
+    Selects the joystick button number, as seen by SDL, that will be a shortcurt to select the text tool.
+  </dd>
+
+  <dt><code><b>joystick-btn-label=<i>BUTTON NUMBER</i></b></code></dt>
+  <dd>
+    Selects the joystick button number, as seen by SDL, that will be a shortcurt to select the label tool.
+  </dd>
+
+  <dt><code><b>joystick-btn-magic=<i>BUTTON NUMBER</i></b></code></dt>
+  <dd>
+    Selects the joystick button number, as seen by SDL, that will be a shortcurt to select the magic tool.
+  </dd>
+
+  <dt><code><b>joystick-btn-undo=<i>BUTTON NUMBER</i></b></code></dt>
+  <dd>
+    Selects the joystick button number, as seen by SDL, that will be a shortcurt to the undo tool.
+  </dd>
+
+  <dt><code><b>joystick-btn-redo=<i>BUTTON NUMBER</i></b></code></dt>
+  <dd>
+    Selects the joystick button number, as seen by SDL, that will be a shortcurt to the redo tool.
+  </dd>
+
+  <dt><code><b>joystick-btn-eraser=<i>BUTTON NUMBER</i></b></code></dt>
+  <dd>
+    Selects the joystick button number, as seen by SDL, that will be a shortcurt for selecting the eraser tool.
+  </dd>
+
+  <dt><code><b>joystick-btn-new=<i>BUTTON NUMBER</i></b></code></dt>
+  <dd>
+    Selects the joystick button number, as seen by SDL, that will be a shortcurt to launch the dialog for opening a new draw.
+  </dd>
+
+  <dt><code><b>joystick-btn-open=<i>BUTTON NUMBER</i></b></code></dt>
+  <dd>
+    Selects the joystick button number, as seen by SDL, that will be a shortcurt to launch the dialog for opening an existing draw.
+  </dd>
+
+  <dt><code><b>joystick-btn-save=<i>BUTTON NUMBER</i></b></code></dt>
+  <dd>
+    Selects the joystick button number, as seen by SDL, that will be a shortcurt for saving the draw.
+  </dd>
+
+  <dt><code><b>joystick-btn-pgsetup=<i>BUTTON NUMBER</i></b></code></dt>
+  <dd>
+    Selects the joystick button number, as seen by SDL, that will be a shortcurt to launch the page setup dialog for printing.
+  </dd>
+
+  <dt><code><b>joystick-btn-print=<i>BUTTON NUMBER</i></b></code></dt>
+  <dd>
+    Selects the joystick button number, as seen by SDL, that will be a shortcurt to print.
+  </dd>
+
+
+
+
   <dt><code><b>stampsize=<i>SIZE</i></b></code></dt>
   <dd>
     <p>Use this option to force Tux&nbsp;Paint to set the starting size of
@@ -1219,6 +1330,29 @@ New Breed Software</p>
     --nolabel<br>
     --mouse-accessibility<br>
     --onscreen-keyboard<br>
+    --onscreen-keyboard-layout<br>
+    --onscreen-keyboard-disable-change<br>
+    --joystick-slowness<br>
+    --joystick-threshold<br>
+    --joystick-maxsteps<br>
+    --joystick-hat-slowness<br>
+    --joystick-hat-timeout<br>
+    --joystick-btn-escape<br>
+    --joystick-btn-brush<br>
+    --joystick-btn-stamp<br>
+    --joystick-btn-lines<br>
+    --joystick-btn-shapes<br>
+    --joystick-btn-text<br>
+    --joystick-btn-label<br>
+    --joystick-btn-magic<br>
+    --joystick-btn-undo<br>
+    --joystick-btn-redo<br>
+    --joystick-btn-eraser<br>
+    --joystick-btn-new<br>
+    --joystick-btn-open<br>
+    --joystick-btn-save<br>
+    --joystick-btn-pgsetup<br>
+    --joystick-btn-print<br>
     --sysfonts<br>
     --alllocalefonts<br>
     --mirrorstamps<br>
diff --git a/src/tuxpaint-completion.bash b/src/tuxpaint-completion.bash
index 796a209..f10b2f1 100644
--- a/src/tuxpaint-completion.bash
+++ b/src/tuxpaint-completion.bash
@@ -3,7 +3,7 @@
 # Bill Kendrick <bill@newbreedsoftware.com>; http://www.tuxpaint.org/
 # Based on inkscape's completion file, by allali@univ-mlv.fr
 #
-# $Id: tuxpaint-completion.bash,v 1.3 2011/05/27 21:14:15 perepujal Exp $
+# $Id: tuxpaint-completion.bash,v 1.4 2011/09/05 09:50:45 perepujal Exp $
 
 # FIXME: See http://www.debian-administration.org/articles/316 for an intro
 # to how we should be doing this... -bjk 2009.09.09
@@ -62,9 +62,29 @@ _tuxpaint()
 			--nolockfile \
 			--mouse-accessibility \
 			--onscreen-keyboard \
+			--onscreen-keyboard-layout \
+			--onscreen-keyboard-disable-change \
 			--joystick-slowness \
 			--joystick-threshold \
 			--joystick-maxsteps \
+			--joystick-hat-slowness \
+			--joystick-hat-timeout \
+			--joystick-btn-escape \
+			--joystick-btn-brush \
+			--joystick-btn-stamp \
+			--joystick-btn-lines \
+			--joystick-btn-shapes\
+			--joystick-btn-text \
+			--joystick-btn-label \
+			--joystick-btn-magic \
+			--joystick-btn-undo \
+			--joystick-btn-redo \
+			--joystick-btn-eraser \
+			--joystick-btn-new \
+			--joystick-btn-open \
+			--joystick-btn-save \
+			--joystick-btn-pgsetup \
+			--joystick-btn-print \
 			--colorfile' -- $cur ) ) 
 # We don't accept filenames on the command-line yet -bjk 2009.09.09
 #        else