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 2022-05-17 00:30:17 +02:00
commit 99eb47a72e
70 changed files with 417 additions and 243 deletions
Download patch file Download diff file Expand all files Collapse all files

14
docs/en/ADVANCED-STAMPS-HOWTO.txt
View file

@ -4,7 +4,7 @@
Copyright © 2006-2022 by Albert Cahalan and others; see AUTHORS.txt.
https://tuxpaint.org/
January 20, 2022
May 15, 2022
----------------------------------------------------------------------
@ -127,12 +127,12 @@ Prepare the image
Prepare the mask
Get used to doing [Ctrl]-click and [Alt]-click on the thumbnail images
in the layers dialog. You will need this to control what you are looking
at and what you are editing. Sometimes you will be editing things you
can't see. For example, you might edit the mask of the WIP layer while
looking at the unmodified image. Pay attention so you don't screw up.
Always verify that you are editing the right thing.
Get used to doing [Control]-click and [Alt]-click on the thumbnail
images in the layers dialog. You will need this to control what you are
looking at and what you are editing. Sometimes you will be editing
things you can't see. For example, you might edit the mask of the WIP
layer while looking at the unmodified image. Pay attention so you don't
screw up. Always verify that you are editing the right thing.
Set an unmodified image as what you will view (the top one is easiest).
Set the WIP mask as what you will edit. At some point, perhaps not

2
docs/en/EXTENDING.txt
View file

@ -5,7 +5,7 @@
Copyright © 2002-2022 by various contributors; see AUTHORS.txt.
https://tuxpaint.org/
March 30, 2022
May 15, 2022
+------------------------------------------+
|Table of Contents |

14
docs/en/FAQ.txt
View file

@ -4,7 +4,7 @@
Copyright © 2002-2022 by various contributors; see AUTHORS.txt.
https://tuxpaint.org/
January 20, 2022
May 15, 2022
----------------------------------------------------------------------
@ -253,16 +253,11 @@ Saving
the "savedir" option), Tux Paint saves into a standard location on
your local drive:
Windows Vista, Windows 8, Windows 10
Windows Vista, Windows 8, Windows 10, Windows 11
In the user's "AppData" folder:
e.g.,
C:\Users\Username\AppData\Roaming\TuxPaint\saved
Windows 95, 98, ME, 2000, XP
In the user's "Application Data" folder:
e.g., C:\Documents and Settings\Username\Application
Data\TuxPaint\saved
macOS
In the user's "Application Support" folder:
e.g., /Users/Username/Library/Applicaton
@ -450,8 +445,9 @@ Fullscreen Mode Problems
Linux users - Your X-Window server is probably not set with the
ability to switch to the desired resolution: 800×600. (or whatever
resolution you have Tux Paint set to run at.) (This is typically
done manually under the X-Window server by pressing [Ctrl] + [Alt]
+ [Keypad Plus] and [Ctrl] + [Alt] + [Keypad Minus].)
done manually under the X-Window server by pressing [Control] +
[Alt] + [Keypad Plus (+)] and [Control] + [Alt] + [Keypad Minus
(-)].)
For this to work, your monitor must support that resolution, and
you need to have it listed in your X server configuration.

4
docs/en/INSTALL.txt
View file

@ -5,7 +5,7 @@
Copyright © 2002-2022 by various contributors; see AUTHORS.txt.
https://tuxpaint.org/
March 31, 2022
May 15, 2022
+----------------------------------------------------+
|Table of Contents |
@ -402,7 +402,7 @@ Windows
(See the main documentation for a full list of available command-line
options.)
If you make a mistake or it all disappears use [Ctrl] + [Z] to undo or
If you make a mistake or it all disappears use [Control] + [Z] to undo or
just hit the [Esc] key and the box will close with no changes made (unless
you pushed the "Apply" button!).

14
docs/en/OPTIONS.txt
View file

@ -6,7 +6,7 @@ Options Documentation
Copyright © 2002-2022 by various contributors; see AUTHORS.txt.
https://tuxpaint.org/
March 30, 2022
May 15, 2022
+---------------------------------------------+
|Table of Contents |
@ -1010,6 +1010,16 @@ Saving
or "noautosave=yes". In both cases, may be overridden by the
command-line option "--noautosave".
reversesort=yes
This reverses the sorting of the Open and Slideshow dialogs,
placing the newest images at the top of the list.
⚙ Note: If used in a system-wide configuration file, may be
overridden by the user's configuration file using
"reversesort=no" or "noreversesort=yes". In both cases, may be
overridden by the command-line option "--noreversesort".
Data
Lockfile
@ -1412,6 +1422,7 @@ Joystick
--saveovernew
--nosave
--autosave
--reversesort
--lang LANGUAGE
--colorfile FILE
@ -1454,6 +1465,7 @@ Joystick
--saveoverask
--save
--noautosave
--noreversesort
These options can be used to override any settings made in the
configuration file. (If the option isn't set in the

4
docs/en/SIGNALS.txt
View file

@ -5,12 +5,12 @@
Copyright © 2019-2022 by various contributors; see AUTHORS.txt.
https://tuxpaint.org/
March 31, 2022
May 15, 2022
Tux Paint responds to the following signals (which can be sent to the
program's process via `kill` or `killall`, for example).
SIGTERM (also, [Ctrl] + [C] from a terminal running `tuxpaint`)
SIGTERM (also, [Control] + [C] from a terminal running `tuxpaint`)
Tux Paint responds as if the "Quit" button were pressed, or the
desktop environment was told to close Tux Paint (e.g., by clicking

4
docs/en/html/ADVANCED-STAMPS-HOWTO.html
View file

@ -25,7 +25,7 @@
</p>
<p>
January 20, 2022 </p>
May 15, 2022 </p>
</center>
<hr size="2"
@ -180,7 +180,7 @@
<blockquote>
<p>
Get used to doing <b>[Ctrl]</b>-click and <b>[Alt]</b>-click on the thumbnail images in the layers dialog. You will need this to control what you are looking at and what you are editing. Sometimes you will be editing things you can't see. For example, you might edit the mask of the WIP layer while looking at the unmodified image. Pay attention so you don't screw up. Always verify that you are editing the right thing. </p>
Get used to doing <b>[Control]</b>-click and <b>[Alt]</b>-click on the thumbnail images in the layers dialog. You will need this to control what you are looking at and what you are editing. Sometimes you will be editing things you can't see. For example, you might edit the mask of the WIP layer while looking at the unmodified image. Pay attention so you don't screw up. Always verify that you are editing the right thing. </p>
<p>
Set an unmodified image as what you will view (the top one is easiest). Set the WIP mask as what you will edit. At some point, perhaps not immediately, you should magnify the image to about 400% (each pixel of the image is seen and edited as a 4x4 block of pixels on your screen). </p>

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

@ -98,7 +98,7 @@
</p>
<p>
March 30, 2022 </p>
May 15, 2022 </p>
</center>
</header>
@ -192,7 +192,7 @@
Tux Paint stores its data files inside the "Tux Paint" application icon (which is actually a special kind of folder on macOS &amp; Mac OS X before it). The following steps explain how to get to the folders within it: </p>
<ol>
<li>
Bring up a 'context' menu by holding the <b>[Control]</b> key and clicking the Tux Paint icon the in <cite>Finder</cite>. (If you have a mouse with more than one button, you can simply right-click the icon.) </li>
Bring up a 'context' menu by holding the <b><code>[Control]</code></b> key and clicking the Tux Paint icon the in <cite>Finder</cite>. (If you have a mouse with more than one button, you can simply right-click the icon.) </li>
<li>
Select "Show Contents" from the menu that appears. A new <cite>Finder</cite> window will appear with a folder inside called "Contents". </li>
<li>

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

@ -25,7 +25,7 @@
</p>
<p>
January 20, 2022 </p>
May 15, 2022 </p>
</center>
<hr size="2"
@ -353,19 +353,12 @@
<dl>
<dt>
Windows Vista, Windows 8, Windows 10
Windows Vista, Windows 8, Windows 10, Windows 11
</dt>
<dd>
In the user's "AppData" folder:<br> e.g., <code>C:\Users\<i>Username</i>\AppData\Roaming\TuxPaint\saved</code> </dd>
<dt>
Windows 95, 98, ME, 2000, XP
</dt>
<dd>
In the user's "Application Data" folder:<br> e.g., <code>C:\Documents and Settings\<i>Username</i>\Application Data\TuxPaint\saved</code> </dd>
<dt>
macOS
</dt>
@ -586,7 +579,7 @@
<dd>
<p>
Linux users - Your X-Window server is probably not set with the ability to switch to the desired resolution: 800×600. (or whatever resolution you have Tux Paint set to run at.) (This is typically done manually under the X-Window server by pressing <b>[Ctrl]</b> + <b>[Alt]</b> + <b>[Keypad Plus]</b> and <b>[Ctrl]</b> + <b>[Alt]</b> + <b>[Keypad Minus]</b>.) </p>
Linux users - Your X-Window server is probably not set with the ability to switch to the desired resolution: 800×600. (or whatever resolution you have Tux Paint set to run at.) (This is typically done manually under the X-Window server by pressing <span style="white-space: nowrap;"><b><code>[Control]</code></b> + <b><code>[Alt]</code></b> + <b><code>[<span style="white-space: nowrap;">Keypad Plus (+)</span>]</code></b></span> and <span style="white-space: nowrap;"><b><code>[Control]</code></b> + <b><code>[Alt]</code></b> + <b><code>[<span style="white-space: nowrap;">Keypad Minus (-)</span>]</code></b></span>.) </p>
<p>
For this to work, your monitor must support that resolution, and you need to have it listed in your X server configuration. </p>

4
docs/en/html/INSTALL.html
View file

@ -96,7 +96,7 @@
</p>
<p>
March 31, 2022 </p>
May 15, 2022 </p>
</center>
</header>
@ -642,7 +642,7 @@
(See the main documentation for a full list of available command-line options.) </p>
<p>
If you make a mistake or it all disappears use <b><code>[Ctrl]</code></b> + <b><code>[Z]</code></b> to undo or just hit the <b><code>[Esc]</code></b> key and the box will close with no changes made (unless you pushed the "Apply" button!). </p>
If you make a mistake or it all disappears use <b><code>[Control]</code></b> + <b><code>[Z]</code></b> to undo or just hit the <b><code>[Esc]</code></b> key and the box will close with no changes made (unless you pushed the "Apply" button!). </p>
<p>
When you have finished, click "OK." </p>

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

@ -100,7 +100,7 @@
</p>
<p>
March 30, 2022 </p>
May 15, 2022 </p>
</center>
</header>
@ -345,7 +345,7 @@
<dd>
<p>
Disable sound effects. (Note: Pressing <b>[Alt]</b> + <b>[S]</b> cannot be used to reenable sounds if they were disabled using this option.) </p>
Disable sound effects. (Note: Pressing <code><b>[Alt]</b></code> + <b>[S]</b> cannot be used to reenable sounds if they were disabled using this option.) </p>
<p class="note">
<span title="Configuration option">&#9881;</span> <strong>Note:</strong> If used in a system-wide configuration file, may be overridden by the user's configuration file using "<code>nosound=no</code>" or "<code>sound=yes</code>". In both cases, may be overridden by the command-line option "<code>--sound</code>". </p>
</dd>
@ -587,7 +587,7 @@
Disable the on-screen "Quit" button and prevent the <b>[Escape]</b> key from quitting Tux Paint. </p>
<p>
Using the <b>[Alt]</b> + <b>[F4]</b> keyboard combination or clicking the window's close button (assuming you're not in fullscreen mode) still works to quit Tux Paint. </p>
Using the <code><b>[Alt]</b></code> + <code><b>[F4]</b></code> keyboard combination or clicking the window's close button (assuming you're not in fullscreen mode) still works to quit Tux Paint. </p>
<p>
You can also use the following keyboard combination to quit: <b>[Shift]</b> + <b>[Control]</b> + <b>[Escape]</b>. </p>
@ -1439,7 +1439,7 @@
<dd>
<p>
This causes Tux Paint to always show the printer dialog (or, on Linux/Unix, run the "altprintcommand") when the 'Print' button is clicked. In other words, it's like clicking 'Print' while holding <b>[Alt]</b>, except you don't need to hold <b>[Alt]</b> every time. </p>
This causes Tux Paint to always show the printer dialog (or, on Linux/Unix, run the "altprintcommand") when the 'Print' button is clicked. In other words, it's like clicking 'Print' while holding <code><b>[Alt]</b></code>, except you don't need to hold <code><b>[Alt]</b></code> every time. </p>
</dd>
<dt>
@ -1448,7 +1448,7 @@
<dd>
<p>
This prevents Tux Paint from <i>ever</i> showing the printer dialog (or, on Linux/Unix, run the "altprintcommand") when the 'Print' button is clicked. In other words, it makes the <b>[Alt]</b> key have no effect when clicking the 'Print' button. </p>
This prevents Tux Paint from <i>ever</i> showing the printer dialog (or, on Linux/Unix, run the "altprintcommand") when the 'Print' button is clicked. In other words, it makes the <code><b>[Alt]</b></code> key have no effect when clicking the 'Print' button. </p>
</dd>
<dt>
@ -1457,7 +1457,7 @@
<dd>
<p>
This is the normal, default behavior. Tux Paint shows a printer dialog (or, on Linux/Unix, runs the "altprintcommand"), when the <b>[Alt]</b> key is pressed while the 'Print' button is clicked. Clicking 'Print' without holding <b>[Alt]</b> prints without showing a dialog. </p>
This is the normal, default behavior. Tux Paint shows a printer dialog (or, on Linux/Unix, runs the "altprintcommand"), when the <code><b>[Alt]</b></code> key is pressed while the 'Print' button is clicked. Clicking 'Print' without holding <code><b>[Alt]</b></code> prints without showing a dialog. </p>
</dd>
</dl>
@ -1478,7 +1478,7 @@
</p>
<p>
Tux Paint will use a printer configuration file when printing. Push the <b>[Alt]</b> key while clicking the 'Print' button in Tux Paint to cause a Windows print dialog window to appear. </p>
Tux Paint will use a printer configuration file when printing. Push the <code><b>[Alt]</b></code> key while clicking the 'Print' button in Tux Paint to cause a Windows print dialog window to appear. </p>
<p>
Any configuration changes made in this dialog will be saved to the file "<code>userdata/print.cfg</code>" , and used again, as long as the "printcfg" option is set. </p>
@ -1532,7 +1532,7 @@
</p>
<p>
Use the command <i>COMMAND</i> to print a PostScript format file when the 'Print' button is clicked while the <b>[Alt]</b> modifier key is being held. (This is typically used for providing a print dialog, similar to when pressing <b>[Alt]</b>+'Print' in Windows and macOS.) </p>
Use the command <i>COMMAND</i> to print a PostScript format file when the 'Print' button is clicked while the <code><b>[Alt]</b></code> modifier key is being held. (This is typically used for providing a print dialog, similar to when pressing <code><b>[Alt]</b></code>+'Print' in Windows and macOS.) </p>
<p>
If this option is not specifically not set, the default command is KDE's graphical print dialog: </p>
@ -1747,6 +1747,17 @@
<span title="Configuration option">&#9881;</span> <strong>Note:</strong> If used in a system-wide configuration file, may be overridden by the user's configuration file using "<code>autosave=no</code>" or "<code>noautosave=yes</code>". In both cases, may be overridden by the command-line option "<code>--noautosave</code>". </p>
</dd>
<dt>
<code><b>reversesort=yes</b></code>
</dt>
<dd>
<p>
This reverses the sorting of the Open and Slideshow dialogs, placing the newest images at the top of the list. </p>
<p class="note">
<span title="Configuration option">&#9881;</span> <strong>Note:</strong> If used in a system-wide configuration file, may be overridden by the user's configuration file using "<code>reversesort=no</code>" or "<code>noreversesort=yes</code>". In both cases, may be overridden by the command-line option "<code>--noreversesort</code>". </p>
</dd>
</dl>
</section>
</section>
@ -2329,6 +2340,7 @@
--saveovernew<br>
--nosave<br>
--autosave<br>
--reversesort<br>
--lang <i>LANGUAGE</i><br>
--colorfile <i>FILE</i><br></b></code>
</dt>
@ -2374,7 +2386,9 @@
--mouse<br>
--saveoverask<br>
--save<br>
--noautosave<br></b></code>
--noautosave<br>
--noreversesort<br>
</b></code>
</dt>
<dd>

4
docs/en/html/SIGNALS.html
View file

@ -96,7 +96,7 @@
</p>
<p>
March 31, 2022 </p>
May 15, 2022 </p>
</header>
</center>
</section>
@ -108,7 +108,7 @@
<dl>
<dt>
<code>SIGTERM</code>
(also, <b><code>[Ctrl]</code></b> + <b><code>[C]</code></b> from a terminal running `<code>tuxpaint</code>`) </dt>
(also, <b><code>[Control]</code></b> + <b><code>[C]</code></b> from a terminal running `<code>tuxpaint</code>`) </dt>
<dd>
<p>