From 2715f918e977b4c87adc50ca7c38969e114f94a0 Mon Sep 17 00:00:00 2001 From: William Kendrick Date: Thu, 14 Apr 2011 06:26:45 +0000 Subject: [PATCH] Documenting mouse accessibility and onscreen keyboard options. Normalizing those options ('-' instead of '_' in their names, like other opts.) --- docs/CHANGES.txt | 24 ++++--- docs/OPTIONS.txt | 19 +++-- docs/README.txt | 2 +- docs/html/OPTIONS.html | 16 ++++- src/manpage/tuxpaint.1 | 18 ++++- src/parse.gperf | 130 +++++++++++++++++------------------ src/tuxpaint-completion.bash | 2 + 7 files changed, 130 insertions(+), 81 deletions(-) diff --git a/docs/CHANGES.txt b/docs/CHANGES.txt index 3e02a5152..741c2e9cc 100644 --- a/docs/CHANGES.txt +++ b/docs/CHANGES.txt @@ -48,6 +48,21 @@ $Id$ * Added support for building under Haiku OS Scott McCreary + * Accessibility Improvements: + --------------------------- + * Added a mouse accessibility mode to avoid the need to drag the mouse. + ("--mouse-accessibility") + by Ankit Choudary (GSOC 2009) + with integration and fixes by + Pere Pujal i Carabantes + + * Added an option to display an on-screen keyboard when using the + 'Text' and 'Label' tools. (Experimental.) + ("--onscreen-keyboard") + by Ankit Choudary (GSOC 2009) + with integration and fixes by + Pere Pujal i Carabantes + * Other Improvements: ------------------- * Tux Paint (in windowed mode) now only centers itself if @@ -55,15 +70,8 @@ $Id$ the SDL_VIDEO_WINDOW_POS environment variable. (SourceForge Bug #3138446) - * Adding a mouse mode to avoid the need to drag the mouse. - FIXME: Explain - by Ankit Choudary - - * Allowing to paint with the keyboard. - FIXME: Explain - by Ankit Choudary. - * Creating thumbnails for the starters we provide. + (Speeds up 'New' dialog appearance.) Pere Pujal i Carabantes * On systems where Pango is used for UI text rendering, Tux Paint now diff --git a/docs/OPTIONS.txt b/docs/OPTIONS.txt index 664166cae..ae87f3c0d 100644 --- a/docs/OPTIONS.txt +++ b/docs/OPTIONS.txt @@ -9,7 +9,7 @@ Options Documentation bill@newbreedsoftware.com http://www.tuxpaint.org/ - January 12, 2011 + April 13, 2011 ---------------------------------------------------------------------- @@ -369,6 +369,15 @@ Windows Users This can be useful for people who prefer things right-to-left, rather than left-to-right. + mouse-accessibility=yes + In this mode, instead of clicking, dragging and releasing + (e.g., to draw), you click, move, and click again to end the + motion. + + onscreen-keyboard=yes + Presents a clickable on-screen keyboard when using the Text + and Label tools. + stampsize=SIZE Use this option to force Tux Paint to set the starting size of @@ -767,6 +776,8 @@ Windows Users --nostampcontrols --nomagiccontrols --nolabel + --mouse-accessibility + --onscreen-keyboard --sysfonts --alllocalefonts --mirrorstamps @@ -888,9 +899,9 @@ Command-Line Informational Options Available Languages +------------------------------------------------------------------+ - | | Language | Language | Input Method | - |Locale Code| (native name) | (English name) | Cycle Key | - | | | | Combination | + | |Language |Language |Input Method | + |Locale Code|(native name) |(English name) |Cycle Key | + | | | |Combination | |-----------+-------------------+-----------------+----------------| |C | |English | | |-----------+-------------------+-----------------+----------------| diff --git a/docs/README.txt b/docs/README.txt index 84ea4f7a1..1fd7aff2a 100644 --- a/docs/README.txt +++ b/docs/README.txt @@ -14,7 +14,7 @@ ---------------------------------------------------------------------- +-------------------------------------------+ - | Table of Contents | + |Table of Contents | |-------------------------------------------| | * About | | * Using Tux Paint | diff --git a/docs/html/OPTIONS.html b/docs/html/OPTIONS.html index 74d08f484..1fb345682 100644 --- a/docs/html/OPTIONS.html +++ b/docs/html/OPTIONS.html @@ -23,7 +23,7 @@ New Breed Software

http://www.tuxpaint.org/

-

January 12, 2011

+

April 13, 2011

@@ -460,6 +460,18 @@ New Breed Software

rather than left-to-right.

+
mouse-accessibility=yes
+
+ In this mode, instead of clicking, dragging and releasing + (e.g., to draw), you click, move, and click again to end the motion. +
+ +
onscreen-keyboard=yes
+
+ Presents a clickable on-screen keyboard when using the Text and + Label tools. +
+
stampsize=SIZE

Use this option to force Tux Paint to set the starting size of @@ -1182,6 +1194,8 @@ New Breed Software

--nostampcontrols
--nomagiccontrols
--nolabel
+ --mouse-accessibility
+ --onscreen-keyboard
--sysfonts
--alllocalefonts
--mirrorstamps
diff --git a/src/manpage/tuxpaint.1 b/src/manpage/tuxpaint.1 index 78e3991f2..b512ec62f 100644 --- a/src/manpage/tuxpaint.1 +++ b/src/manpage/tuxpaint.1 @@ -1,5 +1,5 @@ -.\" tuxpaint.1 - 2011.01.12 -.TH TUXPAINT 1 "12 January 2011" "0.9.22" "Tux Paint" +.\" tuxpaint.1 - 2011.04.13 +.TH TUXPAINT 1 "13 April 2011" "0.9.22" "Tux Paint" .SH NAME tuxpaint -- "Tux Paint", a drawing program for young children. @@ -63,6 +63,10 @@ tuxpaint -- "Tux Paint", a drawing program for young children. .br [\-\-mirrorstamps] .br +[\-\-mouse-accessibility] +.br +[\-\-onscreen-keyboard] +.br [\-\-stampsize=\fISIZE\fP] .br [\-\-keyboard] @@ -362,6 +366,16 @@ With \fImirrorstamps\fP set, stamps which can be mirrored will appear mirrored by default. This can be useful when used by people who prefer things right-to-left over left-to-right. +.TP 8 +.B \-\-mouse-accessibility +In this mode, instead of clicking, dragging and releasing (e.g., to draw), +you click, move, and click again to end the motion. + +.TP 8 +.B \-\-onscreen-keyboard +Presents a clickable on-screen keyboard when using the \fIText\fP and +\fILabel\fP tools. + .TB 8 .B \-\-stampsize=\fIsize\fP \-\-stampsize=default Sets the default size of all stamps, relative to their possible sizes diff --git a/src/parse.gperf b/src/parse.gperf index 1c0b5cdea..f5006fa83 100644 --- a/src/parse.gperf +++ b/src/parse.gperf @@ -90,71 +90,71 @@ static void imm_copying(void) struct cfg %% -alllocalefonts, POSBOOL(all_locale_fonts) -allowscreensaver, NEGBOOL(disable_screensaver) -altprint, MULTI(alt_print_command_default) -altprintalways, MULTI(alt_print_command_default) -altprintcommand, MULTI(altprintcommand) -altprintmod, MULTI(alt_print_command_default) -altprintnever, MULTI(alt_print_command_default) -autosave, POSBOOL(autosave_on_quit) -buttondistinction, NEGBOOL(no_button_distinction) -colorfile, MULTI(colorfile) -complexshapes, NEGBOOL(simple_shapes) -copying, IMM(copying) -currentlocalefont, NEGBOOL(all_locale_fonts) -datadir, MULTI(datadir) -disablescreensaver, POSBOOL(disable_screensaver) -dontgrab, NEGBOOL(grab_input) -dontmirrorstamps, NEGBOOL(mirrorstamps) -fancycursors, NEGBOOL(no_fancy_cursors) -fullscreen, MULTI(parsertmp_fullscreen_native) -grab, POSBOOL(grab_input) -help, IMM(help) -hidecursor, POSBOOL(hide_cursor) -keyboard, POSBOOL(keymouse) -label, NEGBOOL(disable_label) -lang, MULTI(parsertmp_lang) -locale, MULTI(parsertmp_locale) -lockfile, POSBOOL(ok_to_use_lockfile) -magiccontrols, NEGBOOL(disable_magic_controls) -mirrorstamps, POSBOOL(mirrorstamps) -mixedcase, NEGBOOL(only_uppercase) -mouse, NEGBOOL(keymouse) -native, POSBOOL(native_screensize) -orient, MULTI(rotate_orientation) -outlines, NEGBOOL(dont_do_xor) -papersize, MULTI(papersize) -print, NEGBOOL(disable_print) -printcfg, POSBOOL(use_print_config) -printcommand, MULTI(printcommand) -printdelay, MULTI(print_delay) -quit, NEGBOOL(disable_quit) -save, NEGBOOL(disable_save) -savedir, MULTI(savedir) -saveover, MULTI(promptless_save) -saveoverask, MULTI(promptless_save) -saveovernew, MULTI(promptless_save) -shortcuts, NEGBOOL(noshortcuts) -showcursor, NEGBOOL(hide_cursor) -simpleshapes, POSBOOL(simple_shapes) -sound, POSBOOL(use_sound) -stampcontrols, NEGBOOL(disable_stamp_controls) -stamps, NEGBOOL(dont_load_stamps) -stampsize, MULTI(stamp_size_override) -startblank, POSBOOL(start_blank) -startlast, NEGBOOL(start_blank) -sysconfig, POSBOOL(parsertmp_sysconfig) -sysfonts, NEGBOOL(no_system_fonts) -uppercase, POSBOOL(only_uppercase) -usage, IMM(usage) -verbose-version, IMM(verbose_version) -version, IMM(version) -wheelmouse, POSBOOL(wheely) -windowed, NEGBOOL(fullscreen) -windowsize, MULTI(parsertmp_windowsize) -mouse_accessibility, POSBOOL(mouseaccessibility) -onscreen_keyboard, POSBOOL(onscreen_keyboard) +alllocalefonts, POSBOOL(all_locale_fonts) +allowscreensaver, NEGBOOL(disable_screensaver) +altprint, MULTI(alt_print_command_default) +altprintalways, MULTI(alt_print_command_default) +altprintcommand, MULTI(altprintcommand) +altprintmod, MULTI(alt_print_command_default) +altprintnever, MULTI(alt_print_command_default) +autosave, POSBOOL(autosave_on_quit) +buttondistinction, NEGBOOL(no_button_distinction) +colorfile, MULTI(colorfile) +complexshapes, NEGBOOL(simple_shapes) +copying, IMM(copying) +currentlocalefont, NEGBOOL(all_locale_fonts) +datadir, MULTI(datadir) +disablescreensaver, POSBOOL(disable_screensaver) +dontgrab, NEGBOOL(grab_input) +dontmirrorstamps, NEGBOOL(mirrorstamps) +fancycursors, NEGBOOL(no_fancy_cursors) +fullscreen, MULTI(parsertmp_fullscreen_native) +grab, POSBOOL(grab_input) +help, IMM(help) +hidecursor, POSBOOL(hide_cursor) +keyboard, POSBOOL(keymouse) +label, NEGBOOL(disable_label) +lang, MULTI(parsertmp_lang) +locale, MULTI(parsertmp_locale) +lockfile, POSBOOL(ok_to_use_lockfile) +magiccontrols, NEGBOOL(disable_magic_controls) +mirrorstamps, POSBOOL(mirrorstamps) +mixedcase, NEGBOOL(only_uppercase) +mouse, NEGBOOL(keymouse) +native, POSBOOL(native_screensize) +orient, MULTI(rotate_orientation) +outlines, NEGBOOL(dont_do_xor) +papersize, MULTI(papersize) +print, NEGBOOL(disable_print) +printcfg, POSBOOL(use_print_config) +printcommand, MULTI(printcommand) +printdelay, MULTI(print_delay) +quit, NEGBOOL(disable_quit) +save, NEGBOOL(disable_save) +savedir, MULTI(savedir) +saveover, MULTI(promptless_save) +saveoverask, MULTI(promptless_save) +saveovernew, MULTI(promptless_save) +shortcuts, NEGBOOL(noshortcuts) +showcursor, NEGBOOL(hide_cursor) +simpleshapes, POSBOOL(simple_shapes) +sound, POSBOOL(use_sound) +stampcontrols, NEGBOOL(disable_stamp_controls) +stamps, NEGBOOL(dont_load_stamps) +stampsize, MULTI(stamp_size_override) +startblank, POSBOOL(start_blank) +startlast, NEGBOOL(start_blank) +sysconfig, POSBOOL(parsertmp_sysconfig) +sysfonts, NEGBOOL(no_system_fonts) +uppercase, POSBOOL(only_uppercase) +usage, IMM(usage) +verbose-version, IMM(verbose_version) +version, IMM(version) +wheelmouse, POSBOOL(wheely) +windowed, NEGBOOL(fullscreen) +windowsize, MULTI(parsertmp_windowsize) +mouse-accessibility, POSBOOL(mouseaccessibility) +onscreen-keyboard, POSBOOL(onscreen_keyboard) %% void parse_one_option(struct cfginfo *restrict tmpcfg, const char *str, const char *opt, const char *restrict src) diff --git a/src/tuxpaint-completion.bash b/src/tuxpaint-completion.bash index 61a779685..aef5a8ac0 100644 --- a/src/tuxpaint-completion.bash +++ b/src/tuxpaint-completion.bash @@ -60,6 +60,8 @@ _tuxpaint() -l --lang -L --locale \ --nosysconfig \ --nolockfile \ + --mouse-accessibility \ + --onscreen-keyboard \ --colorfile' -- $cur ) ) # We don't accept filenames on the command-line yet -bjk 2009.09.09 # else