Commit graph

3952 commits

Author SHA1 Message Date
Pere Pujal i Carabantes
7b53d1583e Making Android compile again, a curly brace displaced and still some problem with labels in Android. 2022-02-19 00:04:00 +01:00
Pere Pujal i Carabantes
701e033a58 Merge branch 'master' into sdl2.0 2022-02-18 22:31:59 +01:00
Bill Kendrick
5c2bcd44a2 OSK: Reposition if cursor overlap zone via [Enter]
Onscreen keyboard repositions itself to the top if you use [Enter]
to move the cursor down, and it begins overlapping the keyboard.

Also, play "carriage return" sound effect, even when entering
a blank 'line' of text.
2022-02-17 22:19:57 -08:00
Bill Kendrick
dfb36d7ef8 Mend OSK sizing bug in SDL 2.0 branch
s/screen/canvas/ in calls to osk_create()
2022-02-17 22:05:48 -08:00
Pere Pujal i Carabantes
b7414433cb Merge branch 'master' into sdl2.0
Catching up with latest devel
Still things to solve/do:
Apply label seems to not work, neither in master
Onscreen keyboard size doesn't perform as in master
Test on other OSs, Windows, Android, ...
2022-02-18 00:29:40 +01:00
Pere Pujal i Carabantes
eb7f55e289 Merge branch 'master' into sdl2.0
Some things are still WIP, they need to be tested and addressed later.
2022-02-17 23:57:28 +01:00
Bill Kendrick
278513979a Compress doc JPEG images 2022-02-16 14:02:03 -08:00
Bill Kendrick
a304460d6d Compressed PNGs in docs folder
Used `pngout`
2022-02-16 01:48:30 -08:00
Bill Kendrick
9702fcae1b Icelandic update
h/t Sveinn í Felli
2022-02-14 23:43:30 -08:00
Mark Kim
c126eb92b5 macOS fix for backspace in text/label tools in some languages
Fixed the issue with the backspace not working in text and label tools
when in certain language modes in macOS.  Mac keyboards have the DELETE
key where PC keyboards have the BACKSPACE key, and the two keys have
different keycodes, so the backspace requires special handling on the
macOS in programs writtens for the PC.
2022-02-13 17:16:12 -05:00
dolphin6k
3d4dd494b5 WIN32: Use WideCharToMultiByte() insted of iconv() for label embeddiing. 2022-02-13 18:51:08 +09:00
Bill Kendrick
afc76bc20a Refreshed zh_TW subset font based on current PO files
It had been ~14 years!
2022-02-13 01:34:47 -08:00
Bill Kendrick
e31f4991d9 Update helper script for zh_TW font regen. 2022-02-13 01:30:36 -08:00
Bill Kendrick
0c6c5fd4b9 Doc'ing Santali translation update 2022-02-12 22:30:01 -08:00
b'William Kendrick
04aae49077 Merge /u/prasantahembram/tuxpaint12/ branch master into master
https://sourceforge.net/p/tuxpaint/tuxpaint/merge-requests/11/
2022-02-13 06:27:22 +00:00
Mark Kim
d47ed30f5c Document the macOS fonts search path addition 2022-02-12 22:16:17 -05:00
Mark Kim
671fba1b44 Merge branch 'master' of ssh://git.code.sf.net/p/tuxpaint/tuxpaint 2022-02-12 22:14:38 -05:00
Mark Kim
2cc4217a0c macOS check for locale fonts in Tux Paint system preferences location 2022-02-12 22:13:26 -05:00
Mark Kim
cf06258947 Fix recent macOS changes to be macOS 10.10 compatible
* macOS language detection has been updated to be backward compatible to macOS
  10.10 Yosemite.

It appears older version(s?) of macOS can just return "en" instead of "en-US"
when queried for the preferred locale.  Updated code to account for this.
2022-02-12 22:03:12 -05:00
Pere Pujal i Carabantes
63fbd45cd1 Merge branch 'master' into sdl2.0 2022-02-13 01:44:39 +01:00
dolphin6k
f4cc875861 Finally fixed space bug with labels on windows correctly 2022-02-12 10:20:18 +09:00
dolphin6k
599e616d13 Fixed space bug with labels also on windows. 2022-02-11 23:26:58 +09:00
prasantahembram
4810d41be7 Added Santali translation. 2022-02-11 18:46:46 +05:30
Bill Kendrick
851f5ffbb7 Win32, loading Label text from drawings: Avoid leak
Avoid leaking memory when loading Label text strings from a saved drawing.

Also, a heck of a lot of comments to explain (as best I understand)
what load_info_about_label_surface() is doing.
2022-02-11 01:18:51 -08:00
dolphin6k
907c739679 Removed mtw() for windows.
Instead, defined windows native functions for mbstowcs()/wcstombs().
2022-02-11 09:40:59 +09:00
dolphin6k
7305768d38 Revert "Removed "#ifdef WIN32" block around label embedding."
This reverts commit c0da1f0e94.
2022-02-11 08:52:37 +09:00
dolphin6k
c0da1f0e94 Removed "#ifdef WIN32" block around label embedding.
It has likely become unneccessary by recent fix for the common part.

Also backported a fix for uppercase issue from sdl2.0 branch (Define Windows native
function for mbstowcs/wcstombs).
2022-02-11 08:33:29 +09:00
Pere Pujal i Carabantes
18c6835a2d Adapting latest cherry-pick to SDL2. I am later 2022-02-11 00:28:11 +01:00
Bill Kendrick
dc6a7f2244 Color mixer working okay now!
I'd like to add undo/redo, and the trash button needs a label,
but it's usable!
2022-02-11 00:09:08 +01:00
Bill Kendrick
59965e83fe WIP More work on color mixer
Tweaks to icon. Further modularized how color button rendering works,
so it can handle selector (pipette) and mixer overlay icons.
Mixer function is basically identical to color picker (rainbow palette)
as a placeholder. WORK IN PROGRESS.
2022-02-11 00:08:45 +01:00
Bill Kendrick
0a8f18050c WIP Starting to make a color mixer tool
Also, modularize color picker's & color selector's method of
generating a fresh version of their active/inactive buttons,
after a color has been chosen by their tool.
2022-02-11 00:07:15 +01:00
Bill Kendrick
ad5ab713dd Syncing docs, re: pipette shortcut (Ctrl+Click) 2022-02-10 23:45:48 +01:00
Pere Pujal i Carabantes
0f7054d118 Adapting/curing previous cherry-pic for SDL2. 2022-02-10 23:44:05 +01:00
Bill Kendrick
3b4d2fc8f2 Ctrl+click to pick colors immediately
A keyboard shortcut is now available for picking colors from
the canvas more quickly.  Hold either (left or right) [Ctrl] key
while clicking, and the color selector option will appear.
Release the mouse button over a color on the canvas to choose it
(or outside the canvas to abort).
Closes https://sourceforge.net/p/tuxpaint/feature-requests/209/

Also,
 * Don't play 'bubble' paint sound when color picker or selector
   are aborted (e.g., via their "Back" buttons).
 * Replace many instances of "NUM_COLOR - 1" and "NUM_COLOR - 2"
   (which correspond to color chose via picker (palette) and
   selector (canvas), respectively) with #define's that
   represent them. (Avoid magic numbers.)
2022-02-10 23:42:23 +01:00
dolphin6k
6a414961b8 Do not copy dll(s) if already exist. 2022-02-10 20:02:08 +09:00
Bill Kendrick
4ec43dcff2 Address fscanf eating space at beginning of Labels
When reading label text (on non-Windows, at least), fscanf("%lc")
was being used.  It seemed to be skipping the initial space,
causing strings to be shifted left one, and end up with garbage
bytes at the far right.

Fixes https://sourceforge.net/p/tuxpaint/bugs/247/ I hope!
2022-02-10 02:28:50 -08:00
Bill Kendrick
ce4b8b9040 POT/PO refresh after more work on Label tool 2022-02-10 01:02:39 -08:00
Bill Kendrick
5d064297d4 WIP: More work on Apply Label functionality
"Apply Label" mode of Label tool can be activated/deactivated,
though it doesn't currently do the work yet.

Also

* Modularized routine to select a Label (via click or [Enter] key):
   `select_label_node()`

 * Starting routine for applying a Label to the canvas
   (via click or [Enter] key): `apply_label_node()`

 * Modularized routine for repositioning the on-screen keyboard based on
   where we're typing: `reposition_onscreen_keyboard()`

Seems likely that I broke some things.
2022-02-10 01:01:40 -08:00
Bill Kendrick
e0922a14e1 WIP Apply label: Show apply label button 2022-02-09 23:25:46 -08:00
Bill Kendrick
d682044ce0 Commentary for text input handling routines
Also, sound effect when deleting a Label (select existing label (node),
[Backspace] to delete every character, then [Enter] or [Tab] to commit).
2022-02-09 22:58:54 -08:00
Bill Kendrick
f787cb0f75 WIP Label "apply" option
Starting work towards
https://sourceforge.net/p/tuxpaint/feature-requests/213/

The ability to 'apply' a label to the canvas, making it permanent
(as if added using the "Text" tool instead).

Removed unused "label rotate" option's code (and hence addressed
a bug we didn't relalize when choosing the "Label" tool while in
in "--nostampcontrols" mode; the unused "rotate" button would appear).
2022-02-09 22:41:13 -08:00
Bill Kendrick
b60a4ec4d1 Mend compile-time warnings in locale_to_closest_locale
Also, not currently used except for macOS, so wrapping in #ifdef
to avoid "defined but not used" warning.
2022-02-09 22:06:14 -08:00
dolphin6k
110cdeaa6a Documented stdout/stderr redirection for windows. 2022-02-10 12:29:37 +09:00
dolphin6k
d0699bdbc9 Redirect stdout and stderror to User's save directory. 2022-02-10 12:24:46 +09:00
dolphin6k
b71955c150 Use "<dynamic full path of current dir>\\locale" to bindtextdomain() only for the target "bdist-win32" 2022-02-09 23:12:12 +09:00
Bill Kendrick
e9fdbe9373 POT/PO update for brush tips
(Also catching a Label tool tip edit.)
2022-02-09 02:15:30 -08:00
Bill Kendrick
9f9a25f98a Brush tips - show when anim/rotate/dir, and spacing
Show tips when choosing brushes, to remind the user when they
are animated, and or rotational/directional.

Show tips when brush spacing is changed, specifying the approximate
spacing.  Output is fuzzy, to avoid being overly technical (e.g., it
will never say "2 345/1000 times as big as" or "1/103 the size of")
2022-02-09 02:12:40 -08:00
Bill Kendrick
5330fea44c Doc'ing Label tool improvement in CHANGES.txt 2022-02-07 23:59:37 -08:00
Bill Kendrick
7313f269ac Show tips & play sound effects w/ Label selector
Closes https://sourceforge.net/p/tuxpaint/bugs/245/
2022-02-07 23:57:36 -08:00
dolphin6k
f1519a2a39 Better way to install dll files and .mo files for tpconf only for the target "bdist-win32" 2022-02-07 22:26:54 +09:00