Commit graph

4211 commits

Author SHA1 Message Date
Bill Kendrick
294c42bb3f Merge branch 'master' into sdl2.0 2022-06-14 00:52:44 -07:00
Bill Kendrick
a287d93609 Doc'ing Tux Paint Merge Request #12 in CHANGES.txt
"Add Appstream metadata, and port from intltool to gettext"
https://sourceforge.net/p/tuxpaint/tuxpaint/merge-requests/12/
2022-06-14 00:52:12 -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
8bdcfc3d31 Bump version to 0.9.29 in docs (built) 2022-06-14 00:17:52 -07:00
Bill Kendrick
fbfd609665 Bumping version to 0.9.29; doc'ing recent additions
Some things snuck in to 0.9.28 binary builds, or were added
recently; making sure they're doc'd in CHANGES.txt
2022-06-14 00:15:58 -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
dolphin6k
ff4352d575 Corrected suffix of the system-wide config file 2022-06-10 10:57:06 +09:00
Bill Kendrick
4e298483c5 Merge branch 'master' into sdl2.0 2022-06-06 21:43:20 -07:00
Bill Kendrick
e03e8a7c93 Sync doc's w/ new macOS Install changes
h/t Mark Kim
2022-06-05 13:49:58 -07:00
Mark Kim
9ab896b8df update .gitignore
Add some intermediary files created during macOS build to .gitignore.
2022-06-05 15:51:02 -04:00
Mark Kim
b410a9dbfb update .gitignore
Add some intermediary files created during macOS build to .gitignore.
2022-06-05 15:49:41 -04: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
Mark Kim
62fee7f58a macos build: remove the --openfolder option
`bless` no longer supports the `--openfolder` option.  It appears to be
a change in the March 2022 Xcode update.
2022-06-04 19:20:37 -04:00
Mark Kim
c5c0805d84 macos build: remove the --openfolder option
`bless` no longer supports the `--openfolder` option.  It appears to be
a change in the March 2022 Xcode update.
2022-06-04 13:07:08 -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
1f92d31720 Merge branch 'master' into sdl2.0 2022-06-04 00:28:28 -07:00
Bill Kendrick
2687c55e08 Update dates in macos/Info.plist & win32/resources.rc 2022-06-04 00:26:48 -07:00
Bill Kendrick
be9614f5b5 For release: This is SDL2.0 branch 2022-06-04 00:23:15 -07:00
Bill Kendrick
2af844e40c Merge branch 'master' into sdl2.0 2022-06-04 00:22:54 -07:00
Bill Kendrick
a4c894ac08 Release builds tarballs that denote branch
(SDL1.2 vs SDL2.0)
2022-06-04 00:22:32 -07:00
Bill Kendrick
07c02ce281 Merge branch 'master' into sdl2.0 2022-06-04 00:15:28 -07:00
Bill Kendrick
6a7aa6d840 Refresh docs; get updated date stamps 2022-06-04 00:14:33 -07: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
Bill Kendrick
7e11d08396 Sync docs 2022-06-03 00:16:27 -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
Bill Kendrick
05112612a6 Sync'ing Japanese Docs (re: sort reverse)
h/t Shin-Ichi
2022-05-28 14:53:59 -07: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
Bill Kendrick
23cc59539c Show SDL version in --verbose-version output 2022-05-22 23:52:32 -07:00
Bill Kendrick
f361794eb9 Sync README & INSTALL 2022-05-22 23:48:39 -07:00
Bill Kendrick
b65deaf2d3 Sync README & INSTALL 2022-05-22 23:48:11 -07:00
dolphin6k
57e1eeca4b Changed package name again. 2022-05-22 13:12:18 +09:00
dolphin6k
18850108ec Remove existing package before building. 2022-05-22 09:01:29 +09:00
dolphin6k
602f5e8347 Remove existing package before building. 2022-05-22 09:00:33 +09:00
Mark Kim
f0b2367b3d osk fix for single quote and backtick
Change the behavior of the onscreen keyboard's quote and backtick such
that clicking them once displays the clicked key.

Previously they defaulted to composing an accented character, as
discussed here:

  https://sourceforge.net/p/tuxpaint/mailman/message/37656169/
2022-05-21 10:46:48 -04:00