Merge pull request #235 from jim-easterbrook/devel

Devel

README.rst

@@ -75,6 +75,11 @@ If you encounter any problems installing or running Photini, please email jim@ji
 There is also an email list or forum for discussions about Photini at https://groups.google.com/forum/#!forum/photini.
 If you discover a bug and have a GitHub account then please file a bug report on the GitHub `"issues" page`_.
 
+If you find a problem with a particular image file then it would be useful for me to have a copy of its metadata.
+You can use the exiv2_ command line program to extract the raw metadata so you don't need to send me the entire image file.
+For example, the command ``exiv2 ex problem_file.jpg`` can reduce a 3 MByte image file to a 20 kByte file called ``problem_file.exv``.
+I promise not to publish or redistribute any file you send me.
+
 Localisation
 ------------
 
@@ -146,6 +151,7 @@ A copy of the license is included in the documentation section entitled "GNU Fre
 
 .. _blog post:
       https://www.jim-easterbrook.me.uk/2012/10/photini-whats-in-a-name/
+.. _exiv2:         https://exiv2.org/manpage.html
 .. _Flickr:        http://www.flickr.com/
 .. _Google Photos: https://photos.google.com/
 .. _Google Maps Terms of Use:

pyproject.toml

@@ -45,6 +45,7 @@ dependencies = [
   "chardet >= 3.0",
   "exiv2 >= 0.16",
   "filetype >= 1.0",
+  "Pillow >= 2.0",
   "requests >= 2.4",
 ]
 dynamic = ["version"]
@@ -58,7 +59,7 @@ pixelfed = ["photini[keyring,requests-oauthlib,requests-toolbelt]"]
 spelling = ["pyenchant >= 2.0"]
 # install everything except the Qt package
 all = ["""photini[keyring,requests-oauthlib,requests-toolbelt,\
-importer,spelling,gpxpy,Pillow]"""]
+importer,spelling,gpxpy]"""]
 # set versions of common packages
 keyring = ["keyring >= 7.0"]
 requests-oauthlib = ["requests-oauthlib >= 1.0"]
@@ -76,7 +77,7 @@ PySide6 = ["PySide6 >= 6.2",
   "PySide6 != 6.6.1; sys_platform == 'darwin'"
 ]
 gpxpy = ["gpxpy >= 1.3.5, != 1.6.0"]
-Pillow = ["Pillow >= 2.0"]
+Pillow = []
 
 [project.urls]
 homepage = "https://github.com/jim-easterbrook/Photini"

src/doc/conf.py

@@ -158,7 +158,6 @@
 # relative to this directory. They are copied after the builtin static files,
 # so a file named "default.css" will overwrite the builtin "default.css".
 #html_static_path = []
-html_static_path = ['_static']
 
 # If not '', a 'Last updated on:' timestamp is inserted at every page bottom,
 # using the given strftime format.

src/doc/manual/pixelfed.rst

@@ -1,5 +1,5 @@
 .. This is part of the Photini documentation.
-   Copyright (C)  2023  Jim Easterbrook.
+   Copyright (C)  2023-24  Jim Easterbrook.
    See the file ../DOC_LICENSE.txt for copying condidions.
 
 Pixelfed uploader
@@ -75,7 +75,7 @@ This is not available on Mastodon instances, and your updated alt text might not
 
 Pixelfed instances have maximum allowed image sizes, both pixel count and bytes in the file.
 If your image is too large, and is in a format Photini can process, Photini will offer to resize it for you.
-For best picture quality Photini will use Pillow_ if it is installed.
+For best picture quality Photini uses Pillow_ to resize images.
 
 
 .. _focal points:

src/doc/other/installation.rst

@@ -1,5 +1,5 @@
 .. This is part of the Photini documentation.
-   Copyright (C)  2012-23  Jim Easterbrook.
+   Copyright (C)  2012-24  Jim Easterbrook.
    See the file DOC_LICENSE.txt for copying conditions.
 
 .. |nbsp| unicode:: 0xA0
@@ -803,6 +803,7 @@ QtWebEngine_ [2]                                  ``python3-pyside2.qtwebengine`
                                                   or ``python310-PyQt6-WebEngine``
 `python-exiv2`_                0.14.0                                               exiv2
 appdirs                        1.3                ``python3-appdirs``               appdirs
+Pillow_                        2.0                ``python3-Pillow``                pillow
 requests_                      2.4                ``python3-requests``              requests
 =============================  =================  ================================  =================
 
@@ -831,16 +832,15 @@ Flickr upload                 `requests-oauthlib`_ 1.0+, `requests-toolbelt`_ 0.
 Ipernity upload               `requests-toolbelt`_ 0.9+, keyring_ 7.0+
 Pixelfed upload               `requests-oauthlib`_ 1.0+, `requests-toolbelt`_ 0.9+, keyring_ 7.0+
 Google Photos upload          `requests-oauthlib`_ 1.0+, keyring_ 7.0+
-Thumbnail creation[2]         FFmpeg_, Pillow_ 2.0+
+Thumbnail creation[2]         FFmpeg_
 Import photos from camera[3]  `python3-gphoto2`_ 1.8+
 Import GPS logger file        gpxpy_ 1.3.5+
 ============================  =================
 
 [1] Pyenchant requires a C library and dictionaries to be installed.
 See the `pyenchant documentation`_ for detailed instructions.
 
-[2] Photini can create thumbnail images using PyQt, but better quality ones can be made by installing Pillow.
-FFmpeg is needed to generate thumbnails for video files, but it can also make them for some still image formats.
+[2] FFmpeg is needed to generate thumbnails for video files, but it can also make them for some still image formats.
 
 [3]Photini can import pictures from any directory on your computer (e.g. a memory card) but on Linux and MacOS systems it can also import directly from a camera if python-gphoto2 is installed.
 

src/lang/ca/LC_MESSAGES/documentation.po

@@ -11,7 +11,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Photini 2023.4.1\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2024-01-20 11:22+0000\n"
+"POT-Creation-Date: 2024-04-16 15:16+0100\n"
 "PO-Revision-Date: 2023-04-19 08:54+0000\n"
 "Last-Translator: Joan <[email protected]>, 2023\n"
 "Language: ca\n"
@@ -21,7 +21,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Generated-By: Babel 2.11.0\n"
+"Generated-By: Babel 2.14.0\n"
 
 msgid "Photini documentation"
 msgstr "Documentació Photini"
@@ -1612,7 +1612,7 @@ msgid ""
 "Pixelfed instances have maximum allowed image sizes, both pixel count and "
 "bytes in the file. If your image is too large, and is in a format Photini "
 "can process, Photini will offer to resize it for you. For best picture "
-"quality Photini will use Pillow_ if it is installed."
+"quality Photini uses Pillow_ to resize images."
 msgstr ""
 
 msgid "Image regions"
@@ -2888,6 +2888,18 @@ msgstr ""
 msgid "``python3-appdirs``"
 msgstr ""
 
+msgid "Pillow_"
+msgstr ""
+
+msgid "2.0"
+msgstr ""
+
+msgid "``python3-Pillow``"
+msgstr ""
+
+msgid "pillow"
+msgstr ""
+
 msgid "requests_"
 msgstr ""
 
@@ -2960,7 +2972,7 @@ msgstr ""
 msgid "Thumbnail creation[2]"
 msgstr ""
 
-msgid "FFmpeg_, Pillow_ 2.0+"
+msgid "FFmpeg_"
 msgstr ""
 
 msgid "Import photos from camera[3]"
@@ -2981,9 +2993,8 @@ msgid ""
 msgstr ""
 
 msgid ""
-"[2] Photini can create thumbnail images using PyQt, but better quality ones "
-"can be made by installing Pillow. FFmpeg is needed to generate thumbnails "
-"for video files, but it can also make them for some still image formats."
+"[2] FFmpeg is needed to generate thumbnails for video files, but it can also"
+" make them for some still image formats."
 msgstr ""
 
 msgid ""
@@ -3209,6 +3220,15 @@ msgid ""
 "`\"issues\" page`_."
 msgstr ""
 
+msgid ""
+"If you find a problem with a particular image file then it would be useful "
+"for me to have a copy of its metadata. You can use the exiv2_ command line "
+"program to extract the raw metadata so you don't need to send me the entire "
+"image file. For example, the command ``exiv2 ex problem_file.jpg`` can "
+"reduce a 3 MByte image file to a 20 kByte file called ``problem_file.exv``. "
+"I promise not to publish or redistribute any file you send me."
+msgstr ""
+
 msgid "Localisation"
 msgstr ""
 
@@ -4290,3 +4310,27 @@ msgstr ""
 #~ msgid "Spanish translation by Esteban Martinena, Cristos Ruiz, Kamborio"
 #~ msgstr ""
 
+#~ msgid ""
+#~ "Pixelfed instances have maximum allowed "
+#~ "image sizes, both pixel count and "
+#~ "bytes in the file. If your image "
+#~ "is too large, and is in a "
+#~ "format Photini can process, Photini will"
+#~ " offer to resize it for you. For"
+#~ " best picture quality Photini will use"
+#~ " Pillow_ if it is installed."
+#~ msgstr ""
+
+#~ msgid "FFmpeg_, Pillow_ 2.0+"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "[2] Photini can create thumbnail images "
+#~ "using PyQt, but better quality ones "
+#~ "can be made by installing Pillow. "
+#~ "FFmpeg is needed to generate thumbnails "
+#~ "for video files, but it can also "
+#~ "make them for some still image "
+#~ "formats."
+#~ msgstr ""
+

src/lang/cs/LC_MESSAGES/documentation.po

@@ -11,7 +11,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Photini 2023.4.1\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2024-01-20 11:22+0000\n"
+"POT-Creation-Date: 2024-04-16 15:16+0100\n"
 "PO-Revision-Date: 2023-04-19 08:54+0000\n"
 "Last-Translator: fri, 2023\n"
 "Language: cs@qtfiletype\n"
@@ -22,7 +22,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Generated-By: Babel 2.11.0\n"
+"Generated-By: Babel 2.14.0\n"
 
 msgid "Photini documentation"
 msgstr "Dokumentace k Photini"
@@ -1609,7 +1609,7 @@ msgid ""
 "Pixelfed instances have maximum allowed image sizes, both pixel count and "
 "bytes in the file. If your image is too large, and is in a format Photini "
 "can process, Photini will offer to resize it for you. For best picture "
-"quality Photini will use Pillow_ if it is installed."
+"quality Photini uses Pillow_ to resize images."
 msgstr ""
 
 msgid "Image regions"
@@ -2971,6 +2971,19 @@ msgstr "1.3"
 msgid "``python3-appdirs``"
 msgstr ""
 
+msgid "Pillow_"
+msgstr ""
+
+#, fuzzy
+msgid "2.0"
+msgstr "6.2.0"
+
+msgid "``python3-Pillow``"
+msgstr ""
+
+msgid "pillow"
+msgstr ""
+
 msgid "requests_"
 msgstr "requests_"
 
@@ -3047,8 +3060,8 @@ msgstr "`requests-oauthlib`_ 1.0+, keyring_ 7.0+"
 msgid "Thumbnail creation[2]"
 msgstr "Vytváření náhledů[2]"
 
-msgid "FFmpeg_, Pillow_ 2.0+"
-msgstr "FFmpeg_, Pillow_ 2.0+"
+msgid "FFmpeg_"
+msgstr ""
 
 msgid "Import photos from camera[3]"
 msgstr "Zavádění fotografií z fotoaparátu[3]"
@@ -3067,10 +3080,10 @@ msgid ""
 " `pyenchant documentation`_ for detailed instructions."
 msgstr ""
 
+#, fuzzy
 msgid ""
-"[2] Photini can create thumbnail images using PyQt, but better quality ones "
-"can be made by installing Pillow. FFmpeg is needed to generate thumbnails "
-"for video files, but it can also make them for some still image formats."
+"[2] FFmpeg is needed to generate thumbnails for video files, but it can also"
+" make them for some still image formats."
 msgstr ""
 "[2] Photini umí vytvářet náhledy pomocí PyQt, ale kvalitnější náhledy lze "
 "vytvořit instalací aplikace Pillow. FFmpeg je potřeba k vytváření miniatur "
@@ -3303,6 +3316,15 @@ msgid ""
 "`\"issues\" page`_."
 msgstr ""
 
+msgid ""
+"If you find a problem with a particular image file then it would be useful "
+"for me to have a copy of its metadata. You can use the exiv2_ command line "
+"program to extract the raw metadata so you don't need to send me the entire "
+"image file. For example, the command ``exiv2 ex problem_file.jpg`` can "
+"reduce a 3 MByte image file to a 20 kByte file called ``problem_file.exv``. "
+"I promise not to publish or redistribute any file you send me."
+msgstr ""
+
 msgid "Localisation"
 msgstr ""
 
@@ -4312,3 +4334,17 @@ msgstr ""
 #~ msgid "Spanish translation by Esteban Martinena, Cristos Ruiz, Kamborio"
 #~ msgstr ""
 
+#~ msgid ""
+#~ "Pixelfed instances have maximum allowed "
+#~ "image sizes, both pixel count and "
+#~ "bytes in the file. If your image "
+#~ "is too large, and is in a "
+#~ "format Photini can process, Photini will"
+#~ " offer to resize it for you. For"
+#~ " best picture quality Photini will use"
+#~ " Pillow_ if it is installed."
+#~ msgstr ""
+
+#~ msgid "FFmpeg_, Pillow_ 2.0+"
+#~ msgstr "FFmpeg_, Pillow_ 2.0+"
+