Bump to 0.9.24; improve usage output
Bumping to 0.9.24; going to add a new feature momentarily. Improved usage output (e.g., that of "tuxpaint --help"); broke the options into groups that match the tabs in Tux Paint Config., added some missing options.
This commit is contained in:
Bill Kendrick
parent
32cf7679a9
commit
268e213e6d
5 changed files with 84 additions and 71 deletions
4
Makefile
4
Makefile
|
|
@ -4,12 +4,12 @@
|
||||||
# Various contributors (see AUTHORS.txt)
|
# Various contributors (see AUTHORS.txt)
|
||||||
# http://www.tuxpaint.org/
|
# http://www.tuxpaint.org/
|
||||||
|
|
||||||
# June 14, 2002 - September 24, 2018
|
# June 14, 2002 - December 18, 2018
|
||||||
|
|
||||||
|
|
||||||
# The version number, for release:
|
# The version number, for release:
|
||||||
|
|
||||||
VER_VERSION:=0.9.23c
|
VER_VERSION:=0.9.24
|
||||||
ifdef SOURCE_DATE_EPOCH
|
ifdef SOURCE_DATE_EPOCH
|
||||||
VER_DATE=$(shell date -u -d "@$(SOURCE_DATE_EPOCH)" "+%Y-%m-%d" 2>/dev/null || date -u -r "$(SOURCE_DATE_EPOCH)" "+%Y-%m-%d" 2>/dev/null || date -u "+%Y-%m-%d")
|
VER_DATE=$(shell date -u -d "@$(SOURCE_DATE_EPOCH)" "+%Y-%m-%d" 2>/dev/null || date -u -r "$(SOURCE_DATE_EPOCH)" "+%Y-%m-%d" 2>/dev/null || date -u "+%Y-%m-%d")
|
||||||
else
|
else
|
||||||
|
|
|
||||||
|
|
@ -8,7 +8,7 @@ http://www.tuxpaint.org/
|
||||||
|
|
||||||
$Id$
|
$Id$
|
||||||
|
|
||||||
2018.Oct.7 (0.9.23c)
|
2018.Dec.18 (0.9.24)
|
||||||
* Bug Fixes
|
* Bug Fixes
|
||||||
---------
|
---------
|
||||||
* Correct issue that prevented Tux Paint from lauching on Mac OS X 10.7.
|
* Correct issue that prevented Tux Paint from lauching on Mac OS X 10.7.
|
||||||
|
|
@ -31,6 +31,8 @@ $Id$
|
||||||
* Mended link to MinGW/MSYS instructions at John Popplewell's website.
|
* Mended link to MinGW/MSYS instructions at John Popplewell's website.
|
||||||
(h/t "sechidis")
|
(h/t "sechidis")
|
||||||
|
|
||||||
|
* Improved and expanded usage info (e.g., "tuxpaint --help" output)
|
||||||
|
|
||||||
* Misc
|
* Misc
|
||||||
----
|
----
|
||||||
* Verbose debugging, and "DEBUG_PRINTF()" macro now available;
|
* Verbose debugging, and "DEBUG_PRINTF()" macro now available;
|
||||||
|
|
|
||||||
|
|
@ -1,12 +1,12 @@
|
||||||
Tux Paint
|
Tux Paint
|
||||||
version 0.9.23c
|
version 0.9.24
|
||||||
|
|
||||||
A simple drawing program for children
|
A simple drawing program for children
|
||||||
|
|
||||||
Copyright 2002-2018 by various contributors; see AUTHORS.txt
|
Copyright 2002-2018 by various contributors; see AUTHORS.txt
|
||||||
http://www.tuxpaint.org/
|
http://www.tuxpaint.org/
|
||||||
|
|
||||||
June 14, 2002 - October 7, 2018
|
June 14, 2002 - December 18, 2018
|
||||||
|
|
||||||
----------------------------------------------------------------------
|
----------------------------------------------------------------------
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -12,7 +12,7 @@ alt="Tux Paint"><br>
|
||||||
|
|
||||||
version
|
version
|
||||||
|
|
||||||
0.9.23c
|
0.9.24
|
||||||
|
|
||||||
</h1>
|
</h1>
|
||||||
<h3>A simple drawing program for children</h3>
|
<h3>A simple drawing program for children</h3>
|
||||||
|
|
@ -22,7 +22,7 @@ version
|
||||||
|
|
||||||
<p>June 14, 2002 -
|
<p>June 14, 2002 -
|
||||||
|
|
||||||
October 7, 2018</p>
|
December 18, 2018</p>
|
||||||
|
|
||||||
</center>
|
</center>
|
||||||
|
|
||||||
|
|
|
||||||
139
src/tuxpaint.c
139
src/tuxpaint.c
|
|
@ -22,7 +22,7 @@
|
||||||
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
|
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
|
||||||
(See COPYING.txt)
|
(See COPYING.txt)
|
||||||
|
|
||||||
June 14, 2002 - August 28, 2018
|
June 14, 2002 - December 18, 2018
|
||||||
*/
|
*/
|
||||||
|
|
||||||
|
|
||||||
|
|
@ -6395,80 +6395,91 @@ void show_version(int details)
|
||||||
void show_usage(int exitcode)
|
void show_usage(int exitcode)
|
||||||
{
|
{
|
||||||
FILE *f = exitcode ? stderr : stdout;
|
FILE *f = exitcode ? stderr : stdout;
|
||||||
char *blank;
|
|
||||||
unsigned i;
|
unsigned i;
|
||||||
|
|
||||||
blank = strdup(progname);
|
|
||||||
|
|
||||||
for (i = 0; i < strlen(blank); i++)
|
|
||||||
blank[i] = ' ';
|
|
||||||
|
|
||||||
fprintf(f,
|
fprintf(f,
|
||||||
"\n"
|
"\n"
|
||||||
"Usage: %s {--usage | --help | --version | --verbose-version | --copying}\n"
|
"Usage: %s {--usage | --help | --version | --verbose-version | --copying}\n"
|
||||||
"\n"
|
"\n"
|
||||||
" %s [--windowed | --fullscreen]\n"
|
" Config:\n"
|
||||||
" %s [--WIDTHxHEIGHT | --native]\n"
|
" [--nosysconfig]\n"
|
||||||
" %s [--disablescreensaver | --allowscreensaver ]\n"
|
"\n"
|
||||||
" %s [--orient=landscape | --orient=portrait]\n"
|
" Video/Sound:\n"
|
||||||
" %s [--startblank | --startlast]\n"
|
" [--windowed | --fullscreen]\n"
|
||||||
" %s [--sound | --nosound]\n"
|
" [--WIDTHxHEIGHT | --native]\n"
|
||||||
" %s [--quit | --noquit]\n"
|
" [--orient=landscape | --orient=portrait]\n"
|
||||||
" %s [--print | --noprint]\n"
|
" [--disablescreensaver | --allowscreensaver ]\n"
|
||||||
" %s [--complexshapes | --simpleshapes]\n"
|
" [--sound | --nosound]\n"
|
||||||
" %s [--mixedcase | --uppercase]\n"
|
" [--colorfile FILE]\n"
|
||||||
" %s [--fancycursors | --nofancycursors]\n"
|
"\n"
|
||||||
" %s [--hidecursor | --showcursor]\n"
|
" Mouse/Keyboard:\n"
|
||||||
" %s [--mouse | --keyboard]\n"
|
" [--fancycursors | --nofancycursors]\n"
|
||||||
" %s [--dontgrab | --grab]\n"
|
" [--hidecursor | --showcursor]\n"
|
||||||
" %s [--noshortcuts | --shortcuts]\n"
|
" [--noshortcuts | --shortcuts]\n"
|
||||||
" %s [--wheelmouse | --nowheelmouse]\n"
|
" [--dontgrab | --grab]\n"
|
||||||
" %s [--nobuttondistinction | --buttondistinction]\n"
|
" [--wheelmouse | --nowheelmouse]\n"
|
||||||
" %s [--outlines | --nooutlines]\n"
|
" [--nobuttondistinction | --buttondistinction]\n"
|
||||||
" %s [--stamps | --nostamps]\n"
|
"\n"
|
||||||
" %s [--sysfonts | --nosysfonts]\n"
|
" Simplification:\n"
|
||||||
" %s [--nostampcontrols | --stampcontrols]\n"
|
" [--complexshapes | --simpleshapes]\n"
|
||||||
" %s [--nomagiccontrols | --magiccontrols]\n"
|
" [--outlines | --nooutlines]\n"
|
||||||
" %s [--nolabel | --label]\n"
|
" [--mixedcase | --uppercase]\n"
|
||||||
" %s [--mirrorstamps | --dontmirrorstamps]\n"
|
" [--stampsize=[0-10] | --stampsize=default]\n"
|
||||||
" %s [--stampsize=[0-10] | --stampsize=default]\n"
|
" [--quit | --noquit]\n"
|
||||||
" %s [--saveoverask | --saveover | --saveovernew]\n"
|
" [--stamps | --nostamps]\n"
|
||||||
" %s [--nosave | --save]\n"
|
" [--nostampcontrols | --stampcontrols]\n"
|
||||||
" %s [--autosave | --noautosave]\n" " %s [--savedir DIRECTORY]\n" " %s [--datadir DIRECTORY]\n"
|
" [--nomagiccontrols | --magiccontrols]\n"
|
||||||
|
" [--nolabel | --label]\n"
|
||||||
|
"\n"
|
||||||
|
" Languages:\n"
|
||||||
|
" [--lang LANGUAGE | --locale LOCALE | --lang help]\n"
|
||||||
|
" [--mirrorstamps | --dontmirrorstamps]\n"
|
||||||
|
" [--sysfonts | --nosysfonts]\n"
|
||||||
|
" [--currentlocalefont | --alllocalefonts]\n"
|
||||||
|
"\n"
|
||||||
|
" Printing:\n"
|
||||||
|
" [--print | --noprint]\n"
|
||||||
|
" [--printdelay=SECONDS]\n"
|
||||||
|
" [--altprintmod | --altprintalways | --altprintnever]\n"
|
||||||
#if defined(WIN32) || defined(__APPLE__)
|
#if defined(WIN32) || defined(__APPLE__)
|
||||||
" %s [--printcfg | --noprintcfg]\n"
|
" [--printcfg | --noprintcfg]\n"
|
||||||
#endif
|
#endif
|
||||||
" %s [--printdelay=SECONDS]\n" " %s [--altprintmod | --altprintalways | --altprintnever]\n"
|
|
||||||
#if !defined(WIN32) && !defined(__APPLE__) && !defined(__BEOS__) && !defined(__HAIKU__)
|
#if !defined(WIN32) && !defined(__APPLE__) && !defined(__BEOS__) && !defined(__HAIKU__)
|
||||||
" %s [--papersize PAPERSIZE | --papersize help]\n"
|
" [--printcommand=COMMAND]\n"
|
||||||
|
" [--altprintcommand=COMMAND]\n"
|
||||||
|
" [--papersize PAPERSIZE | --papersize help]\n"
|
||||||
#endif
|
#endif
|
||||||
" %s [--lang LANGUAGE | --locale LOCALE | --lang help]\n"
|
"\n"
|
||||||
" %s [--nosysconfig]\n"
|
" Saving:\n"
|
||||||
" %s [--nolockfile]\n"
|
" [--saveoverask | --saveover | --saveovernew]\n"
|
||||||
" %s [--colorfile FILE]\n"
|
" [--startblank | --startlast]\n"
|
||||||
" %s [--mouse-accessibility]\n"
|
" [--savedir DIRECTORY]\n"
|
||||||
" %s [--onscreen-keyboard]\n"
|
" [--nosave | --save]\n"
|
||||||
" %s [--joystick-dev N] (default=0)\n"
|
" [--autosave | --noautosave]\n"
|
||||||
" %s [--joystick-slowness N] (0-500; default value is 15)\n"
|
"\n"
|
||||||
" %s [--joystick-threshold N] (0-32766; default value is 3200)\n"
|
" Data:\n"
|
||||||
" %s [--joystick-maxsteps N] (1-7; default value is 7)\n"
|
" [--nolockfile]\n"
|
||||||
|
" [--datadir DIRECTORY]\n"
|
||||||
|
"\n"
|
||||||
|
" Accessibility:\n"
|
||||||
|
" [--mouse-accessibility]\n"
|
||||||
|
" [--mouse | --keyboard]\n"
|
||||||
|
" [--onscreen-keyboard]\n"
|
||||||
|
" [--onscreen-keyboard-layout=LAYOUT]\n"
|
||||||
|
" [--onscreen-keyboard-disable-change]\n"
|
||||||
|
"\n"
|
||||||
|
" Joystick:\n"
|
||||||
|
" [--joystick-dev N] (default=0)\n"
|
||||||
|
" [--joystick-slowness N] (0-500; default value is 15)\n"
|
||||||
|
" [--joystick-threshold N] (0-32766; default value is 3200)\n"
|
||||||
|
" [--joystick-maxsteps N] (1-7; default value is 7)\n"
|
||||||
|
" [--joystick-hat-slowness N] (0-500; default value is 15)\n"
|
||||||
|
" [--joystick-hat-timeout N] (0-3000; default value is 1000)\n"
|
||||||
|
" [--joystick-buttons-ignore=BUTTON1,BUTTON2,...]\n"
|
||||||
|
" [--joystick-btn-COMMAND=BUTTON]\n"
|
||||||
|
/* FIXME: "--joystick-btn-help" to list available commands, like "--lang help" */
|
||||||
"\n",
|
"\n",
|
||||||
progname, progname,
|
progname);
|
||||||
blank, blank, blank, blank,
|
|
||||||
blank, blank, blank, blank,
|
|
||||||
blank, blank, blank, blank,
|
|
||||||
blank, blank, blank, blank,
|
|
||||||
blank, blank, blank, blank, blank, blank, blank, blank, blank, blank, blank, blank, blank,
|
|
||||||
#ifdef WIN32
|
|
||||||
blank,
|
|
||||||
#endif
|
|
||||||
blank, blank,
|
|
||||||
#if !defined(WIN32) && !defined(__APPLE__) && !defined(__BEOS__) && !defined(__HAIKU__)
|
|
||||||
blank,
|
|
||||||
#endif
|
|
||||||
blank, blank, blank, blank, blank, blank, blank, blank, blank, blank);
|
|
||||||
|
|
||||||
free(blank);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue