Commit graph

2596 commits

Author SHA1 Message Date
Bill Kendrick
c171500d5e Stamp rotation - Warp mouse to the right, at start
...this ensures that any immediate mouse movement at the
beginning of the rotation process will affect the angle only
slightly.  (As opposed to leaving it in the center of the
stamped shape; moving slightly left would rotate the shape
~180 degrees immediately, for example).

Also, updated date in CHANGES and src/tuxpaint.c, added
new feature to CHANGES, and credited Pere.  (Great work!!!)
2022-09-02 02:05:52 -07:00
Pere Pujal i Carabantes
a433b4c79c Adding stamp rotation. The xor interface seems to work fine if only the mouse is used, still need to adapt it to shortcut key combos. 2022-09-02 02:11:43 +02:00
Pere Pujal i Carabantes
73c1cabac1 Android fix for magic tools under 64 bits devices by Terrence Sheflin, see 345d3cc78a 2022-07-20 23:38:04 +02:00
Bill Kendrick
445fcbb8bf Merge branch 'master' into sdl2.0 2022-07-07 17:55:27 -07:00
Bill Kendrick
da15f8c282 Changing Android save paths to now default to the 'external' dir from the device itself.
Merging the src/tuxpaint.c change from
https://github.com/tux4kids/Tuxpaint-Android/pull/18
(e23803b1f2)

Per Terrence
2022-07-07 17:44:51 -07:00
Karl Ove Hufthammer
fccea4edb4 Add Norwegian Nynorsk translation for two new strings 2022-07-04 21:00:33 +02:00
Bill Kendrick
60120b763c Merge branch 'master' into sdl2.0 2022-07-03 19:58:34 -07:00
Bill Kendrick
faa6746258 test-png: Also read images, to get interlace warnings
Check output for "libpng warning:" lines; the tool also echos
its own "test-png warning" lines about other possible concerns
(e.g. strange bitdepths, etc.) which are not necessarily going
to cause Tux Paint to echo things to STDERR.
2022-07-03 19:42:00 -07:00
Bill Kendrick
4108634b9f test-png: Ensure libpng output _after_ ours 2022-07-03 17:28:03 -07:00
Bill Kendrick
06fafcb6d6 "test-png" tool to find PNGs that cause warnings
New tool, "test-png", which exercises libpng library on
a set of PNG image files, allowing us to find those which
cause Tux Paint (via SDL_image, in turn via libpng) to
report back warnings to STDERR.

h/t Tim Dickson, per https://sourceforge.net/p/tuxpaint/bugs/252/
2022-07-03 17:18:58 -07:00
Bill Kendrick
844db56ab9 Drip - Better full-canvas effect; proper description
h/t Karl, code by Pere (w/ some clean-up by me)

Closes https://sourceforge.net/p/tuxpaint/bugs/256/
2022-07-03 16:39:50 -07:00
Bill Kendrick
95755c7af5 Emboss: Canvas-specific description
Closes https://sourceforge.net/p/tuxpaint/bugs/257/
h/t Karl
2022-07-03 16:31:38 -07:00
Bill Kendrick
e984f23b5f Line: Never say "360 degrees" (say "0")
h/t Karl

Closes https://sourceforge.net/p/tuxpaint/bugs/255/
2022-07-03 16:09:48 -07:00
Karl Ove Hufthammer
d8d67440da Remove trailing period in application summary
For the AppStream metadata (appdata.xml), there is a
rule saying that the summary shouldn’t end with a period
(as confirmed by ‘appstream-util validate-strict’).
For the .desktop file, *most* applications omit the period.

The rule is not language-dependent, so I have also
removed the period from all translations (.po files).
2022-07-03 14:49:12 +02:00
Karl Ove Hufthammer
695d8044d0 Update Norwegian Nynorsk translation 2022-07-03 13:29:41 +02:00
Mark Kim
ed885f887d macOS: move deleted file to Trash
As opposed to permanently deleting it.  As requested:

  https://sourceforge.net/p/tuxpaint/feature-requests/148/
2022-07-02 22:09:55 -04:00
Mark Kim
98198591b5 macOS: move deleted file to Trash
As opposed to permanently deleting it.  As requested:

  https://sourceforge.net/p/tuxpaint/feature-requests/148/
2022-07-02 22:03:41 -04:00
Bill Kendrick
d289d407ad Merge branch 'master' into sdl2.0 2022-06-29 21:04:32 -07:00
Will Thompson
4120af3b5f Rename metainfo file to appdata
gettext 0.19.7 gained support for translating appdata files, whereas
support for metainfo files was added in 0.20. These file formats are
effectively the same: as documented in the AppStream specification,
desktop applications can install files with the suffix .appdata.xml
rather than .metainfo.xml and these will still be handled correctly.

It is desirable for this project to support RHEL 7, which has gettext
0.19.8.1, so let's use the older filename.

As noted in the same section of the specification, appdata files were
previously installed to /usr/share/appdata rather than
/usr/share/metainfo, but the spec asserts that the newer metainfo path
works all the way back to RHEL 7, so we keep the newer installation
path.

Thanks to Shin-ichi TOYAMA for flagging this issue.

https://www.freedesktop.org/software/appstream/docs/chap-Metadata.html#spec-component-location
2022-06-29 13:05:40 +01:00
Pere Pujal i Carabantes
31594dfa62 Android tweaks coming from the Tuxpaint-Android repo at github by Terrence Sheflin. 2022-06-25 10:37:17 +02:00
Pere Pujal i Carabantes
b612fcb881 Something weird happened in load_info_about_label_surface() in some merge, fixing the merge. 2022-06-20 23:08:02 +02:00
Bill Kendrick
934f500584 Merge branch 'master' into sdl2.0 2022-06-14 01:20:23 -07:00
Bill Kendrick
416462935c Rebuilt POT/PO under new system
(See https://sourceforge.net/p/tuxpaint/tuxpaint/merge-requests/12/)

Also, updated RELEASE.txt to denote where changelog info
should be added into the new "metainfo" file for software repos.
2022-06-14 01:17:57 -07:00
Bill Kendrick
1068a33167 Mended Color Mixer random color bug
If you set a color, then come back to Color Mixer and immediately
dismiss the dialog (without setting a color), an indeterminate
color could appear due to uninitialized variables (new_r, _g, _b).

Closes https://sourceforge.net/p/tuxpaint/bugs/251/
h/t @kentonyanamin on Twitter
2022-06-14 01:14:39 -07:00
Bill Kendrick
7e6f848994 check_translations.sh FIXME: Check LINGUAS 2022-06-14 00:55:31 -07:00
Bill Kendrick
294c42bb3f Merge branch 'master' into sdl2.0 2022-06-14 00:52:44 -07:00
Bill Kendrick
a7151c7b43 Merge commit '21bdf7de11' 2022-06-14 00:49:25 -07:00
Bill Kendrick
5532ddd2fd Merge branch 'master' into sdl2.0 2022-06-14 00:38:27 -07:00
Bill Kendrick
cdba8ffbbd Adding an auto option for button sizes
Merge 333f4b05a4 sdl2.0->master

(See https://sourceforge.net/p/tuxpaint/feature-requests/218/)
2022-06-14 00:14:02 -07:00
Pere Pujal i Carabantes
333f4b05a4 Adding an auto option for button sizes, see https://sourceforge.net/p/tuxpaint/feature-requests/218/ 2022-06-13 08:13:21 +02:00
Will Thompson
21bdf7de11 Add additional .desktop file categories
These are taken from Fedora, which replaces Art with Graphics and adds
KidsGame.

In my opinion, Art is appropriate, but so are 2DGraphics (hence
Graphics) and KidsGame (hence Game).
2022-06-10 21:46:03 +01:00
Will Thompson
74506214e7 Add appstream metainfo file
This is used by software centres such as GNOME Software to display
information about the app, both before and after it is installed.

The <id> used here follows the recommendations in the Appstream
specification, with the exception of violating the spec's strong
encouragement to use only lowercase characters. This is because the
version that is already published by Flathub uses an uppercase T in the
final component of the ID.[0] The file shipped by Fedora followed an older
convention of using the desktop file name as the ID. This is
acknowledged by the <provides> section near the bottom of the file,
which will allow software centres to associate the reverse-domain-name
ID with the older ID.[1]

Many fields in this file are translatable.  This was the motivation for
the preceeding two changes:

- By using xgettext rather than intltool, the untranslated template may
  be written using the normal appstream XML tags, rather than needing to
  use (for example) <_name>Tux Paint</_name> to mark that field for
  translation, which renders the template not valid for tools like
  'appstreamcli validate'.
- Merging translations at build time, rather than committing the
  translated XML to the repo as well, avoids another potentially
  error-prone manual step when updating the source file or translations.

The release notes are taken from the press releases on the Tuxpaint
website. They will be extracted for translation. Another option is to
replace the <description> with <url type="details">...</url>, but AFAIK
no software centres currently show these URLs.[2]

[0]: https://www.freedesktop.org/software/appstream/docs/chap-Metadata.html#tag-id-generic
[1]: https://www.freedesktop.org/software/appstream/docs/sect-Metadata-Application.html#tag-id-desktopapp
[2]: https://www.freedesktop.org/software/appstream/docs/chap-Metadata.html#tag-releases

TODO:

- align comment

Fixes: https://sourceforge.net/p/tuxpaint/feature-requests/172/
2022-06-10 21:45:44 +01:00
dolphin6k
f838704282 Fixed jugged upscaling in full screen mode 2022-06-10 20:46:48 +09:00
Will Thompson
b4aa697474 Merge desktop file at build time
Previously, both the .desktop.in template and the final .desktop file
were checked into source control.

While in some ways convenient, the manual step of updating it may be
forgotten after updating a translation or adjusting the template. It
also potentially introduces confusion as to which file to modify.

Instead, generate the .desktop file at build time. Since this is now
done using msgfmt rather than intltool, there is no additional
dependency beyond gettext, which is already used at build time to
compile .po files to .mo files.
2022-06-10 10:36:56 +01:00
Will Thompson
3141249969 Remove intltool dependency
Since gettext 0.19, gettext itself has been able to extract strings from
and merge translations to .desktop files. As a result, there is no need
to use intltool.  More details are available on
https://wiki.gnome.org/MigratingFromIntltoolToGettext, though that page
assumes a project using Autotools, which this project does not.

One advantage of using xgettext rather than intltool is that there is no
need to prefix translatable keys in the .desktop.in file with _. This
patch adjusts tuxpaint.desktop.in accordingly, which makes the input
file itself a valid desktop file.

The LINGUAS file contains the list of supported languages. This could
in principle be generated automatically from one of the other places in
the source tree that has a manually-maintained list of languages; but in
my experience it is generally maintained by hand and checked into the
source tree.

POTFILES.in.in must be updated to remove the intltool-specific file
encoding annotation; instead this is passed to xgettext.

Finally, update-po.sh is rewritten to invoke xgettext and msgfmt rather
than intltool commands.

The mangling of POTFILES.in.in to prefix all filenames with '../' is
only necessary to minimize the churn when updating the .pot and .po
files, to simplify review of this change. The alternative is to pass
--directory=.. to xgettext. This would cause all .po files to be updated
as follows when regenerated:

     #. Response to Black (0, 0, 0) color selected
    -#: ../colors.h:86
    +#: colors.h:86
     msgid "Black!"
     msgstr "Noir !"
2022-06-10 10:36:56 +01:00
Will Thompson
e7ec1efdc8 Remove unused, no-op create_pot_file.sh
614f6573e7 made this "a no-op script, for
now", in September 2006. It seems safe to assume, 16 years later, that
if it is needed it can be recovered from the Git history.
2022-06-10 10:36:56 +01:00
Bill Kendrick
4e298483c5 Merge branch 'master' into sdl2.0 2022-06-06 21:43:20 -07:00
Mark Kim
f041db9c4d Localization of SDL2.0 menu on macOS.
SDL2 initializes the macOS menu later than SDL1 (appears to be done
around the video initialization time), so we also need to call later our
routine to override the SDL menu with our localizable version.
2022-06-04 22:34:16 -04:00
Pere Pujal i Carabantes
937e99f6c2 Updating Catalan. 2022-06-04 10:06:48 +02:00
Pere Pujal i Carabantes
1d0ea00d95 Updating Catalan. 2022-06-04 10:03:42 +02:00
Bill Kendrick
45a26483fa Merge branch 'master' into sdl2.0 2022-06-04 00:11:14 -07:00
Bill Kendrick
a3f915be1c Happy 20th Anniversary! 2022-06-04 00:06:00 -07:00
dolphin6k
f21018282c Updated Japanese translation (tile zoom) 2022-06-03 14:09:23 +09:00
Bill Kendrick
ff470263a0 Different description for Tile Zoom than plain Zoom
Oops, had committed to sdl2.0 only :eyeroll:
2022-06-02 21:17:23 -07:00
Bill Kendrick
040884f3f3 Different description for Tile Zoom than plain Zoom
h/t Pere for the suggestion
2022-06-02 21:09:23 -07:00
Bill Kendrick
5369bca3b9 Merge branch 'master' into sdl2.0 2022-06-02 21:06:27 -07:00
Pere Pujal i Carabantes
f4977c31dc Updating Catalan translation. 2022-05-31 00:06:01 +02:00
Pere Pujal i Carabantes
78586144ab Updating Catalan translation. 2022-05-31 00:04:28 +02:00
dolphin6k
8babe0e4ee Updated Japanese translation 2022-05-28 18:06:07 +09:00
Bill Kendrick
8eeb860183 Show SDL version in --verbose-version output 2022-05-22 23:53:23 -07:00