Merge pull request #292 from jim-easterbrook/devel

Devel
jim-easterbrook · Oct 4, 2024 · 280e550 · 280e550
2 parents 9d90052 + b4bd04b
commit 280e550
Show file tree

Hide file tree

Showing 24 changed files with 648 additions and 121 deletions.
diff --git a/src/doc/images/screenshot_080.png b/src/doc/images/screenshot_080.png
diff --git a/src/doc/images/screenshot_081.png b/src/doc/images/screenshot_081.png
diff --git a/src/doc/images/screenshot_082.png b/src/doc/images/screenshot_082.png
diff --git a/src/doc/images/screenshot_083.png b/src/doc/images/screenshot_083.png
diff --git a/src/doc/images/screenshot_084.png b/src/doc/images/screenshot_084.png
diff --git a/src/doc/images/screenshot_085.png b/src/doc/images/screenshot_085.png
diff --git a/src/doc/images/screenshot_086.png b/src/doc/images/screenshot_086.png
diff --git a/src/doc/manual/configuration.rst b/src/doc/manual/configuration.rst
@@ -72,6 +72,10 @@ Put these files in the same directory as the English dictionaries installed with
 On my computer the directory is ``C:\Users\Jim\AppData\Local\Programs\Python\Python38\Lib\``
 ``site-packages\enchant\data\mingw64\share\enchant\hunspell`` but this will depend on your Python installation.
 
+.. image:: ../images/screenshot_086.png
+
+The ``Help`` menu has options to display information about Photini, check you are running the latest version, and open this documentation in your web browser.
+
 .. _configuration-file-location:
 
 Configuration file location

diff --git a/src/doc/manual/flickr.rst b/src/doc/manual/flickr.rst
@@ -11,7 +11,7 @@ The Flickr upload tab uses the Flickr API but is not endorsed or certified by Fl
 Unlike some other Flickr uploaders, Photini uses the descriptive metadata you've created to set Flickr's title, description and tags.
 This means you don't have to retype all that information!
 
-Note that the Flickr upload tab is only enabled if you have installed some extra software packages::
+Note that the Flickr upload tab is only enabled if you have installed some extra software packages (after activating your virtual environment, if you're using one)::
 
     pip install photini[flickr]
 

diff --git a/src/doc/manual/google_photos.rst b/src/doc/manual/google_photos.rst
@@ -8,7 +8,10 @@ Google Photos uploader
 The ``Google Photos upload`` tab (keyboard shortcut ``Alt+P``) allows you to upload your photographs to `Google Photos`_.
 The Google Photos API is quite restrictive, so 3rd party software such as Photini is rather limited in its abilities.
 
-Note that the Google Photos upload tab is only enabled if you have installed some extra software packages.
+Note that the Google Photos upload tab is only enabled if you have installed some extra software packages (after activating your virtual environment, if you're using one)::
+
+    pip install photini[google]
+
 See :ref:`installation <installation-optional>` for more detail.
 
 .. image:: ../images/screenshot_170.png

diff --git a/src/doc/manual/importer.rst b/src/doc/manual/importer.rst
@@ -9,6 +9,10 @@ The ``Import photos`` tab (keyboard shortcut ``Alt+I``) allows you to copy photo
 Whilst there are many other programs to do this, I've never found one that does things the way I want, so I added one to Photini.
 
 Note that you can only import directly from cameras if you have installed python-gphoto2 (which is not available on Windows).
+This is easily done with ``pip`` (after activating your virtual environment, if you're using one)::
+
+    pip install photini[importer]
+
 See :ref:`installation <installation-optional>` for more detail.
 
 The key part of the importer is the ``Target format`` field.

diff --git a/src/doc/manual/ipernity.rst b/src/doc/manual/ipernity.rst
@@ -11,7 +11,10 @@ The Ipernity upload tab uses the Ipernity API but is not endorsed or certified b
 Unlike some other uploaders, Photini uses the descriptive metadata you've created to set Ipernity's title, description and keywords.
 This means you don't have to retype all that information!
 
-Note that the Ipernity upload tab is only enabled if you have installed some extra software packages.
+Note that the Ipernity upload tab is only enabled if you have installed some extra software packages (after activating your virtual environment, if you're using one)::
+
+    pip install photini[ipernity]
+
 See :ref:`installation <installation-optional>` for more detail.
 
 .. image:: ../images/screenshot_230.png

diff --git a/src/doc/manual/map.rst b/src/doc/manual/map.rst
@@ -117,7 +117,11 @@ GPX file import
 ---------------
 
 If you have a mobile phone or other device with a GPS logger you may be able to set the approximate locations of photographs from logged GPS positions.
-If you have installed gpxpy_ then the map pages have a button to import GPX files.
+This requires an optional package gpxpy_, which is easily installed with ``pip`` (after activating your virtual environment, if you're using one)::
+
+    pip install photini[gpxpy]
+
+When gpxpy is available the map tabs have a button to import GPX files.
 
 .. image:: ../images/screenshot_220.png
 

diff --git a/src/doc/manual/pixelfed.rst b/src/doc/manual/pixelfed.rst
@@ -8,7 +8,10 @@ Pixelfed uploader
 The ``Pixelfed upload`` tab (keyboard shortcut ``Alt+P``) allows you to upload your photographs to Pixelfed_, an open source decentralised photo sharing system.
 Pixelfed is built on the same federated publishing system as Mastodon_ and the uploader can also be used with Mastodon, but with some features disabled.
 
-Note that the Pixelfed upload tab is only enabled if you have installed some extra software packages.
+Note that the Pixelfed upload tab is only enabled if you have installed some extra software packages (after activating your virtual environment, if you're using one)::
+
+    pip install photini[pixelfed]
+
 See :ref:`installation <installation-optional>` for more detail.
 
 .. image:: ../images/screenshot_250.png

diff --git a/src/lang/ca/LC_MESSAGES/documentation.po b/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-10-03 15:02+0100\n"
+"POT-Creation-Date: 2024-10-04 10:50+0100\n"
 "PO-Revision-Date: 2023-04-19 08:54+0000\n"
 "Last-Translator: Joan <[email protected]>, 2023\n"
 "Language: ca\n"
@@ -243,6 +243,12 @@ msgid ""
 " will depend on your Python installation."
 msgstr ""
 
+msgid ""
+"The ``Help`` menu has options to display information about Photini, check "
+"you are running the latest version, and open this documentation in your web "
+"browser."
+msgstr ""
+
 msgid "Configuration file location"
 msgstr ""
 
@@ -608,7 +614,8 @@ msgstr ""
 
 msgid ""
 "Note that the Flickr upload tab is only enabled if you have installed some "
-"extra software packages::"
+"extra software packages (after activating your virtual environment, if "
+"you're using one)::"
 msgstr ""
 
 msgid "See :ref:`installation <installation-optional>` for more detail."
@@ -734,8 +741,8 @@ msgstr ""
 
 msgid ""
 "Note that the Google Photos upload tab is only enabled if you have installed"
-" some extra software packages. See :ref:`installation <installation-"
-"optional>` for more detail."
+" some extra software packages (after activating your virtual environment, if"
+" you're using one)::"
 msgstr ""
 
 msgid ""
@@ -926,8 +933,8 @@ msgstr ""
 
 msgid ""
 "Note that you can only import directly from cameras if you have installed "
-"python-gphoto2 (which is not available on Windows). See :ref:`installation "
-"<installation-optional>` for more detail."
+"python-gphoto2 (which is not available on Windows). This is easily done with"
+" ``pip`` (after activating your virtual environment, if you're using one)::"
 msgstr ""
 
 #, python-format
@@ -1104,8 +1111,8 @@ msgstr ""
 
 msgid ""
 "Note that the Ipernity upload tab is only enabled if you have installed some"
-" extra software packages. See :ref:`installation <installation-optional>` "
-"for more detail."
+" extra software packages (after activating your virtual environment, if "
+"you're using one)::"
 msgstr ""
 
 msgid ""
@@ -1467,8 +1474,11 @@ msgstr ""
 msgid ""
 "If you have a mobile phone or other device with a GPS logger you may be able"
 " to set the approximate locations of photographs from logged GPS positions. "
-"If you have installed gpxpy_ then the map pages have a button to import GPX "
-"files."
+"This requires an optional package gpxpy_, which is easily installed with "
+"``pip`` (after activating your virtual environment, if you're using one)::"
+msgstr ""
+
+msgid "When gpxpy is available the map tabs have a button to import GPX files."
 msgstr ""
 
 msgid ""
@@ -1700,8 +1710,8 @@ msgstr ""
 
 msgid ""
 "Note that the Pixelfed upload tab is only enabled if you have installed some"
-" extra software packages. See :ref:`installation <installation-optional>` "
-"for more detail."
+" extra software packages (after activating your virtual environment, if "
+"you're using one)::"
 msgstr ""
 
 msgid ""
@@ -5495,3 +5505,51 @@ msgstr ""
 #~ "metadata from the photograph(s)."
 #~ msgstr ""
 
+#~ msgid ""
+#~ "Note that the Flickr upload tab is"
+#~ " only enabled if you have installed "
+#~ "some extra software packages::"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "Note that the Google Photos upload "
+#~ "tab is only enabled if you have "
+#~ "installed some extra software packages. See"
+#~ " :ref:`installation <installation-optional>` for "
+#~ "more detail."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "Note that you can only import "
+#~ "directly from cameras if you have "
+#~ "installed python-gphoto2 (which is not "
+#~ "available on Windows). See :ref:`installation "
+#~ "<installation-optional>` for more detail."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "Note that the Ipernity upload tab is"
+#~ " only enabled if you have installed "
+#~ "some extra software packages. See "
+#~ ":ref:`installation <installation-optional>` for "
+#~ "more detail."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "If you have a mobile phone or "
+#~ "other device with a GPS logger you"
+#~ " may be able to set the "
+#~ "approximate locations of photographs from "
+#~ "logged GPS positions. If you have "
+#~ "installed gpxpy_ then the map pages "
+#~ "have a button to import GPX files."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "Note that the Pixelfed upload tab is"
+#~ " only enabled if you have installed "
+#~ "some extra software packages. See "
+#~ ":ref:`installation <installation-optional>` for "
+#~ "more detail."
+#~ msgstr ""
+
diff --git a/src/lang/cs/LC_MESSAGES/documentation.po b/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-10-03 15:02+0100\n"
+"POT-Creation-Date: 2024-10-04 10:50+0100\n"
 "PO-Revision-Date: 2023-04-19 08:54+0000\n"
 "Last-Translator: fri, 2023\n"
 "Language: cs@qtfiletype\n"
@@ -240,6 +240,12 @@ msgid ""
 " will depend on your Python installation."
 msgstr ""
 
+msgid ""
+"The ``Help`` menu has options to display information about Photini, check "
+"you are running the latest version, and open this documentation in your web "
+"browser."
+msgstr ""
+
 msgid "Configuration file location"
 msgstr ""
 
@@ -605,7 +611,8 @@ msgstr ""
 
 msgid ""
 "Note that the Flickr upload tab is only enabled if you have installed some "
-"extra software packages::"
+"extra software packages (after activating your virtual environment, if "
+"you're using one)::"
 msgstr ""
 
 msgid "See :ref:`installation <installation-optional>` for more detail."
@@ -731,8 +738,8 @@ msgstr ""
 
 msgid ""
 "Note that the Google Photos upload tab is only enabled if you have installed"
-" some extra software packages. See :ref:`installation <installation-"
-"optional>` for more detail."
+" some extra software packages (after activating your virtual environment, if"
+" you're using one)::"
 msgstr ""
 
 msgid ""
@@ -923,8 +930,8 @@ msgstr ""
 
 msgid ""
 "Note that you can only import directly from cameras if you have installed "
-"python-gphoto2 (which is not available on Windows). See :ref:`installation "
-"<installation-optional>` for more detail."
+"python-gphoto2 (which is not available on Windows). This is easily done with"
+" ``pip`` (after activating your virtual environment, if you're using one)::"
 msgstr ""
 
 #, python-format
@@ -1101,8 +1108,8 @@ msgstr ""
 
 msgid ""
 "Note that the Ipernity upload tab is only enabled if you have installed some"
-" extra software packages. See :ref:`installation <installation-optional>` "
-"for more detail."
+" extra software packages (after activating your virtual environment, if "
+"you're using one)::"
 msgstr ""
 
 msgid ""
@@ -1464,8 +1471,11 @@ msgstr ""
 msgid ""
 "If you have a mobile phone or other device with a GPS logger you may be able"
 " to set the approximate locations of photographs from logged GPS positions. "
-"If you have installed gpxpy_ then the map pages have a button to import GPX "
-"files."
+"This requires an optional package gpxpy_, which is easily installed with "
+"``pip`` (after activating your virtual environment, if you're using one)::"
+msgstr ""
+
+msgid "When gpxpy is available the map tabs have a button to import GPX files."
 msgstr ""
 
 msgid ""
@@ -1697,8 +1707,8 @@ msgstr ""
 
 msgid ""
 "Note that the Pixelfed upload tab is only enabled if you have installed some"
-" extra software packages. See :ref:`installation <installation-optional>` "
-"for more detail."
+" extra software packages (after activating your virtual environment, if "
+"you're using one)::"
 msgstr ""
 
 msgid ""
@@ -5475,3 +5485,51 @@ msgstr ""
 #~ "metadata from the photograph(s)."
 #~ msgstr ""
 
+#~ msgid ""
+#~ "Note that the Flickr upload tab is"
+#~ " only enabled if you have installed "
+#~ "some extra software packages::"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "Note that the Google Photos upload "
+#~ "tab is only enabled if you have "
+#~ "installed some extra software packages. See"
+#~ " :ref:`installation <installation-optional>` for "
+#~ "more detail."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "Note that you can only import "
+#~ "directly from cameras if you have "
+#~ "installed python-gphoto2 (which is not "
+#~ "available on Windows). See :ref:`installation "
+#~ "<installation-optional>` for more detail."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "Note that the Ipernity upload tab is"
+#~ " only enabled if you have installed "
+#~ "some extra software packages. See "
+#~ ":ref:`installation <installation-optional>` for "
+#~ "more detail."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "If you have a mobile phone or "
+#~ "other device with a GPS logger you"
+#~ " may be able to set the "
+#~ "approximate locations of photographs from "
+#~ "logged GPS positions. If you have "
+#~ "installed gpxpy_ then the map pages "
+#~ "have a button to import GPX files."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "Note that the Pixelfed upload tab is"
+#~ " only enabled if you have installed "
+#~ "some extra software packages. See "
+#~ ":ref:`installation <installation-optional>` for "
+#~ "more detail."
+#~ msgstr ""
+