notgne2/tuxpaint-pencil-sharpener
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'master' into sdl2.0

Browse source
This commit is contained in:
Pere Pujal i Carabantes 2018-08-30 01:37:00 +02:00
commit 1a5308226c
37 changed files with 1696 additions and 771 deletions
Download patch file Download diff file Expand all files Collapse all files

11
docs/en/EXTENDING.txt
View file

@ -2,13 +2,10 @@
version 0.9.23
Extending Tux Paint
Copyright 2002-2016 by Bill Kendrick and others
New Breed Software
bill@newbreedsoftware.com
Copyright (c) 2002-2018 by various contributors; see AUTHORS.txt
http://www.tuxpaint.org/
June 14, 2002 - December 11, 2016
June 14, 2002 - August 28, 2018
----------------------------------------------------------------------
@ -379,8 +376,8 @@ Stamps
Tinting Options:
Depending on the contents of your stamp, you might want to have
Tux Paint use one of a numer of methods when tinting it. Add one
of the following lines to the stamp's data file:
Tux Paint use one of a number of methods when tinting it. Add
one of the following lines to the stamp's data file:
"tinter=normal" (default)
This is the normal tinting mode. (Hue range is

7
docs/en/FAQ.txt
View file

@ -2,13 +2,10 @@
version 0.9.23
Frequently Asked Questions
Copyright 2002-2017 by Bill Kendrick and others
New Breed Software
bill@newbreedsoftware.com
Copyright (c) 2002-2018 by various contributors; see AUTHORS.txt
http://www.tuxpaint.org/
September 14, 2002 - December, 2017
September 14, 2002 - August 28, 2018
Drawing-related

112
docs/en/INSTALL.txt
View file

@ -2,11 +2,11 @@ INSTALL.txt for Tux Paint
Tux Paint - A simple drawing program for children.
Copyright 2002-2007 by Bill Kendrick and others
bill@newbreedsoftware.com
Copyright (c) 2002-2018
Various contributors (see below, and AUTHORS.txt)
http://www.tuxpaint.org/
June 27, 2002 - July 12, 2007
June 27, 2002 - August 19, 2018
$Id$
@ -17,7 +17,7 @@ Requirements:
The Windows version of Tux Paint comes pre-packaged with the
necessary pre-compiled libraries (in ".DLL" form), so no extra
downloading is needed.
libSDL
------
Tux Paint requires the Simple DirectMedia Layer Library (libSDL),
@ -55,7 +55,7 @@ Requirements:
free, LGPL'd libraries. Under Linux, just like SDL, they should
either already be installed, or are readily available for installation
as part of your Linux distribution.
libPNG
------
Tux Paint uses PNG (Portable Network Graphics) format for its
@ -127,7 +127,7 @@ Requirements:
tools.)
http://netpbm.sourceforge.net/
Compiling and Installation:
---------------------------
@ -141,25 +141,25 @@ Compiling and Installation:
----------
Tux Paint comes pre-compiled for Windows, so no compilation is
necessary.
As of February 2005 (starting with Tux Paint 0.9.15), the Makefile
includes support for building on a Windows system using MinGW/MSYS.
( http://www.mingw.org/ )
After configuring the environment and building and installing all the
dependencies, use these commands, in MSYS, to build, install and run:
Prior to version 0.9.20:
$ make win32
$ make install-win32
$ tuxpaint
$ make win32
$ make install-win32
$ tuxpaint
Version 0.9.20 and beyond:
$ make
$ make install
$ tuxpaint
$ make
$ make install
$ tuxpaint
Use the following command to build a version suitable for
redistribution with the installer or in a zip-file:
@ -176,7 +176,7 @@ Compiling and Installation:
here:
http://johnnypops.demon.co.uk/mingw/index.html
Read the relevant notes if building for Win9X/ME.
Installer:
@ -202,7 +202,7 @@ Compiling and Installation:
-----------------------------------------
To change program settings, right-click on the TuxPaint shortcut
and select 'Properties' (at the bottom).
Make sure the 'Shortcut' tab is selected in the window that
appears, and examine the 'Target:' field. You should see
something like this :
@ -211,7 +211,7 @@ Compiling and Installation:
You can now add command-line options which will be enabled when
you double-click the icon.
For example, to make the game run in fullscreen mode,
with simple shapes (no rotation option) and in French,
add the options (after 'TuxPaint.exe'), like so:
@ -219,11 +219,11 @@ Compiling and Installation:
"C:\Program Files\TuxPaint\TuxPaint.exe" -f -s --lang french
(See "README.txt" for a full list of available command-line options.)
If you make a mistake or it all disappears use Ctrl-Z to undo or
just hit the [ESC] key and the box will close with no changes made
(unless you pushed the "Apply" button!).
When you have finished, click "OK."
If Something Goes Wrong
@ -232,12 +232,12 @@ Compiling and Installation:
nothing happens, it is probably because some of these command-line
options are wrong. Open an Explorer like before, and look for a file
called 'stderr.txt' in the TuxPaint folder.
It will contain a description of what was wrong. Usually it will
just be due to incorrect character-case (capital 'Z' instead
of lowercase 'z') or a missing (or extra) '-' (dash).
Linux/Unix Users:
-----------------
Compiling:
@ -277,6 +277,11 @@ Compiling and Installation:
$ make SDL_MIXER_LIB=
Other options:
--------------
Various other options (e.g., installation paths) may be overridden;
see them in "Makefile" for further details.
If you get errors:
------------------
If you receive any errors during compile-time, make sure you have
@ -328,40 +333,40 @@ Compiling and Installation:
Other variables are:
BIN_PREFIX
Where the "tuxpaint" binary will be installed.
(Set to "$(PREFIX)/bin" by default - e.g., "/usr/local/bin")
DATA_PREFIX
Where the data files (sound, graphics, brushes, stamps, fonts)
will go, and where Tux Paint will look for them when it's run.
(Set to "$(PREFIX)/share/tuxpaint")
DOC_PREFIX
Where the documentation text files (the "docs" directory) will go.
(Set to "$(PREFIX)/share/doc/tuxpaint")
MAN_PREFIX
Where the manual page for Tux Paint will go.
(Set to "$(PREFIX)/share/man")
ICON_PREFIX $(PREFIX)/share/pixmaps
X11_ICON_PREFIX $(PREFIX)/X11R6/include/X11/pixmaps
GNOME_PREFIX $(PREFIX)/share/gnome/apps/Graphics
KDE_PREFIX $(PREFIX)/share/applnk/Graphics
Where the icons and launchers (for GNOME and KDE) will go.
LOCALE_PREFIX
Where the translation files for Tux Paint will go, and where
Tux Paint will look for them.
(Set to "$(PREFIX)/share/locale/")
(Final location of a translation file will be
under the locale's directory (e.g., "es" for Spanish),
within the "LC_MESSAGES" subdirectory.)
Where the "tuxpaint" binary will be installed.
(Set to "$(PREFIX)/bin" by default - e.g., "/usr/local/bin")
DATA_PREFIX
Where the data files (sound, graphics, brushes, stamps, fonts)
will go, and where Tux Paint will look for them when it's run.
(Set to "$(PREFIX)/share/tuxpaint")
DOC_PREFIX
Where the documentation text files (the "docs" directory) will go.
(Set to "$(PREFIX)/share/doc/tuxpaint")
MAN_PREFIX
Where the manual page for Tux Paint will go.
(Set to "$(PREFIX)/share/man")
ICON_PREFIX $(PREFIX)/share/pixmaps
X11_ICON_PREFIX $(PREFIX)/X11R6/include/X11/pixmaps
GNOME_PREFIX $(PREFIX)/share/gnome/apps/Graphics
KDE_PREFIX $(PREFIX)/share/applnk/Graphics
Where the icons and launchers (for GNOME and KDE) will go.
LOCALE_PREFIX
Where the translation files for Tux Paint will go, and where
Tux Paint will look for them.
(Set to "$(PREFIX)/share/locale/")
(Final location of a translation file will be
under the locale's directory (e.g., "es" for Spanish),
within the "LC_MESSAGES" subdirectory.)
FIXME: This list is out of date. See Makefile and Makefile-i18n for
a complete list.
Uninstalling Tux Paint:
-----------------------
Windows
@ -404,4 +409,3 @@ Uninstalling Tux Paint:
superuser mode:
# exit

7
docs/en/OPTIONS.txt
View file

@ -3,13 +3,10 @@
Options Documentation
Copyright 2002-2016 by Bill Kendrick and others
New Breed Software
bill@newbreedsoftware.com
Copyright (c) 2002-2018 by various contributors; see AUTHORS.txt
http://www.tuxpaint.org/
December 11, 2016
August 28, 2018
----------------------------------------------------------------------

7
docs/en/README.txt
View file

@ -3,13 +3,10 @@
A simple drawing program for children
Copyright 2002-2017 by Bill Kendrick and others
New Breed Software & Tux4Kids
bill@newbreedsoftware.com
Copyright 2002-2018 by various contributors; see AUTHORS.txt
http://www.tuxpaint.org/
June 14, 2002 - December 3, 2017
June 14, 2002 - August 28, 2018
----------------------------------------------------------------------

9
docs/en/html/EXTENDING.html
View file

@ -17,13 +17,10 @@ version
<br>
Extending Tux Paint</h1>
<p>Copyright 2002-2016 by Bill Kendrick and others<br>
New Breed Software</p>
<p><a href="mailto:bill@newbreedsoftware.com">bill@newbreedsoftware.com</a><br>
<p>Copyright (c) 2002-2018 by various contributors; see AUTHORS.txt<br/>
<a href="http://www.tuxpaint.org/">http://www.tuxpaint.org/</a></p>
<p>June 14, 2002 - December 11, 2016</p>
<p>June 14, 2002 - August 28, 2018</p>
</center>
<hr size=2 noshade>
@ -495,7 +492,7 @@ effect.</p>
<h6>Tinting Options:</h6>
<blockquote>
<p>Depending on the contents of your stamp, you might want to
have Tux&nbsp;Paint use one of a numer of methods when tinting it.
have Tux&nbsp;Paint use one of a number of methods when tinting it.
Add one of the following lines to the stamp's data file:</p>
<dl>

7
docs/en/html/FAQ.html
View file

@ -16,13 +16,10 @@ version
<br>
Frequently Asked Questions</h1>
<p>Copyright 2002-2017 by Bill Kendrick and others<br>
New Breed Software</p>
<p><a href="mailto:bill@newbreedsoftware.com">bill@newbreedsoftware.com</a><br>
<p>Copyright (c) 2002-2018 by various contributors; see AUTHORS.txt<br/>
<a href="http://www.tuxpaint.org/">http://www.tuxpaint.org/</a></p>
<p>September 14, 2002 - December, 2017</p>
<p>September 14, 2002 - August 28, 2018</p>
</center>
<h2>Drawing-related</h2>

7
docs/en/html/OPTIONS.html
View file

@ -16,13 +16,10 @@ version
</h1>
<h2>Options Documentation</h2>
<p>Copyright 2002-2016 by Bill Kendrick and others<br>
New Breed Software</p>
<p><a href="mailto:bill@newbreedsoftware.com">bill@newbreedsoftware.com</a><br>
<p>Copyright (c) 2002-2018 by various contributors; see AUTHORS.txt<br/>
<a href="http://www.tuxpaint.org/">http://www.tuxpaint.org/</a></p>
<p>December 11, 2016</p>
<p>August 28, 2018</p>
</center>

8
docs/en/html/README.html
View file

@ -17,16 +17,12 @@ version
</h1>
<h3>A simple drawing program for children</h3>
<p>Copyright 2002-2017 by Bill Kendrick and others<br>
<a href="http://www.newbreedsoftware.com/">New Breed Software &amp;
<a href="http://tux4kids.alioth.debian.org/">Tux4Kids</a></p>
<p><a href="mailto:bill@newbreedsoftware.com">bill@newbreedsoftware.com</a><br>
<p>Copyright 2002-2018 by various contributors; see AUTHORS.txt<br>
<a href="http://www.tuxpaint.org/">http://www.tuxpaint.org/</a></p>
<p>June 14, 2002 -
December 3, 2017</p>
August 28, 2018</p>
</center>