Merge pull request #291 from jim-easterbrook/devel

Devel
jim-easterbrook · Oct 3, 2024 · 9d90052 · 9d90052
2 parents 8dcba39 + 52b3e58
commit 9d90052
Show file tree

Hide file tree

Showing 36 changed files with 307 additions and 88 deletions.
diff --git a/pyproject.toml b/pyproject.toml
@@ -38,12 +38,12 @@ classifiers = [
     "Topic :: Multimedia :: Graphics",
 ]
 dependencies = [
-  "appdirs >= 1.3",
   "cachetools >= 3.0",
   "chardet >= 3.0",
   "exiv2 >= 0.16",
   "filetype >= 1.0",
   "Pillow >= 2.0",
+  "platformdirs >= 2.4",
   "requests >= 2.4",
   "pywin32 >= 302; platform_system == 'Windows'",
 ]

diff --git a/src/doc/images/screenshot_130.png b/src/doc/images/screenshot_130.png
diff --git a/src/doc/images/screenshot_131.png b/src/doc/images/screenshot_131.png
diff --git a/src/doc/images/screenshot_132.png b/src/doc/images/screenshot_132.png
diff --git a/src/doc/images/screenshot_133.png b/src/doc/images/screenshot_133.png
diff --git a/src/doc/images/screenshot_134.png b/src/doc/images/screenshot_134.png
diff --git a/src/doc/images/screenshot_135.png b/src/doc/images/screenshot_135.png
diff --git a/src/doc/images/screenshot_136.png b/src/doc/images/screenshot_136.png
diff --git a/src/doc/images/screenshot_137.png b/src/doc/images/screenshot_137.png
diff --git a/src/doc/images/screenshot_138.png b/src/doc/images/screenshot_138.png
diff --git a/src/doc/images/screenshot_139.png b/src/doc/images/screenshot_139.png
diff --git a/src/doc/images/screenshot_140.png b/src/doc/images/screenshot_140.png
diff --git a/src/doc/images/screenshot_141.png b/src/doc/images/screenshot_141.png
diff --git a/src/doc/images/screenshot_142.png b/src/doc/images/screenshot_142.png
diff --git a/src/doc/images/screenshot_143.png b/src/doc/images/screenshot_143.png
diff --git a/src/doc/images/screenshot_220.png b/src/doc/images/screenshot_220.png
diff --git a/src/doc/images/screenshot_221.png b/src/doc/images/screenshot_221.png
diff --git a/src/doc/images/screenshot_222.png b/src/doc/images/screenshot_222.png
diff --git a/src/doc/images/screenshot_223.png b/src/doc/images/screenshot_223.png
diff --git a/src/doc/images/screenshot_224.png b/src/doc/images/screenshot_224.png
diff --git a/src/doc/images/screenshot_225.png b/src/doc/images/screenshot_225.png
diff --git a/src/doc/images/screenshot_226.png b/src/doc/images/screenshot_226.png
diff --git a/src/doc/manual/map.rst b/src/doc/manual/map.rst
@@ -81,18 +81,20 @@ A red marker is shown if any of the images is selected, but clicking on the mark
 .. tip::
     If you have several images at one location, but need to move some of them to a different location, select the images to be moved in the image selector, then drag them onto their new position on the map.
 
+.. image:: ../images/screenshot_140.png
+
 Double clicking on a marker will select both it and the nearest marker.
 Clicking three or more times in rapid succession will select three or more markers.
 (Except on the Google map tab, which currently requires three clicks to select two markers, five clicks to select three markers, and so on.)
 
 .. tip::
     If you have two closely spaced markers that you'd like to merge, double click to select both, then right-click on the location coordinates box to select one of the locations from the multiple values context menu.
 
-.. image:: ../images/screenshot_140.png
+.. image:: ../images/screenshot_141.png
 
 Selecting another map tab will show the same location but with data and imagery from a different provider.
 
-.. image:: ../images/screenshot_141.png
+.. image:: ../images/screenshot_142.png
 
 The ``Get altitude from map`` button sets the photograph's altitude (in metres) from its latitude and longitude, using data from the map provider.
 Not all map providers have altitude data, and the accuracy varies quite a lot.
@@ -101,7 +103,7 @@ You can edit the value to correct it.
 Map failures
 ------------
 
-.. image:: ../images/screenshot_142.png
+.. image:: ../images/screenshot_143.png
 
 Some map tabs might fail to load, showing the above error message instead.
 This could be because of problems with WebGL_, a sophisticated graphics system used in HTML |nbsp| 5.

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-02 17:32+0100\n"
+"POT-Creation-Date: 2024-10-03 15:02+0100\n"
 "PO-Revision-Date: 2023-04-19 08:54+0000\n"
 "Last-Translator: Joan <[email protected]>, 2023\n"
 "Language: ca\n"
@@ -390,8 +390,12 @@ msgstr ""
 
 msgid ""
 "The ``Title / Object name`` field has an optional spell checker, enabled "
-"with the ``Spelling`` menu. The word \"Château-Gontier\" is not in the "
-"British English dictionary, as indicated by the red wiggly underlining."
+"with the ``Spelling`` menu."
+msgstr ""
+
+msgid ""
+"The word \"Château-Gontier\" is not in the British English dictionary, as "
+"indicated by the red wiggly underlining."
 msgstr ""
 
 msgid ""
@@ -2433,11 +2437,11 @@ msgid ""
 msgstr ""
 
 msgid ""
-"Clicking on any of the numbers allows them to be adjusted with your keyboard"
-" up & down arrow keys. You can also double click on any of the numbers to "
-"select it and type a new value in directly. Selecting the entire date and "
-"time, e.g. with ``Ctrl+A``, allows it to be deleted which removes the date &"
-" time metadata from the photograph(s)."
+"Clicking on part of the date or time allows it to be adjusted with your "
+"keyboard up & down arrow keys. You can also double click on any of the "
+"numbers to select it and type a new value in directly. Selecting the entire "
+"date and time, e.g. with ``Ctrl+A``, allows it to be deleted which removes "
+"the date & time metadata from the photograph(s)."
 msgstr ""
 
 msgid ""
@@ -5469,3 +5473,25 @@ msgstr ""
 #~ " team and then start translating."
 #~ msgstr ""
 
+#~ msgid ""
+#~ "The ``Title / Object name`` field has"
+#~ " an optional spell checker, enabled with"
+#~ " the ``Spelling`` menu. The word "
+#~ "\"Château-Gontier\" is not in the "
+#~ "British English dictionary, as indicated by"
+#~ " the red wiggly underlining."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "Clicking on any of the numbers allows"
+#~ " them to be adjusted with your "
+#~ "keyboard up & down arrow keys. You"
+#~ " can also double click on any of"
+#~ " the numbers to select it and type"
+#~ " a new value in directly. Selecting "
+#~ "the entire date and time, e.g. with"
+#~ " ``Ctrl+A``, allows it to be deleted "
+#~ "which removes the date & time "
+#~ "metadata from the photograph(s)."
+#~ 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-02 17:32+0100\n"
+"POT-Creation-Date: 2024-10-03 15:02+0100\n"
 "PO-Revision-Date: 2023-04-19 08:54+0000\n"
 "Last-Translator: fri, 2023\n"
 "Language: cs@qtfiletype\n"
@@ -387,8 +387,12 @@ msgstr ""
 
 msgid ""
 "The ``Title / Object name`` field has an optional spell checker, enabled "
-"with the ``Spelling`` menu. The word \"Château-Gontier\" is not in the "
-"British English dictionary, as indicated by the red wiggly underlining."
+"with the ``Spelling`` menu."
+msgstr ""
+
+msgid ""
+"The word \"Château-Gontier\" is not in the British English dictionary, as "
+"indicated by the red wiggly underlining."
 msgstr ""
 
 msgid ""
@@ -2430,11 +2434,11 @@ msgid ""
 msgstr ""
 
 msgid ""
-"Clicking on any of the numbers allows them to be adjusted with your keyboard"
-" up & down arrow keys. You can also double click on any of the numbers to "
-"select it and type a new value in directly. Selecting the entire date and "
-"time, e.g. with ``Ctrl+A``, allows it to be deleted which removes the date &"
-" time metadata from the photograph(s)."
+"Clicking on part of the date or time allows it to be adjusted with your "
+"keyboard up & down arrow keys. You can also double click on any of the "
+"numbers to select it and type a new value in directly. Selecting the entire "
+"date and time, e.g. with ``Ctrl+A``, allows it to be deleted which removes "
+"the date & time metadata from the photograph(s)."
 msgstr ""
 
 msgid ""
@@ -5449,3 +5453,25 @@ msgstr ""
 #~ " team and then start translating."
 #~ msgstr ""
 
+#~ msgid ""
+#~ "The ``Title / Object name`` field has"
+#~ " an optional spell checker, enabled with"
+#~ " the ``Spelling`` menu. The word "
+#~ "\"Château-Gontier\" is not in the "
+#~ "British English dictionary, as indicated by"
+#~ " the red wiggly underlining."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "Clicking on any of the numbers allows"
+#~ " them to be adjusted with your "
+#~ "keyboard up & down arrow keys. You"
+#~ " can also double click on any of"
+#~ " the numbers to select it and type"
+#~ " a new value in directly. Selecting "
+#~ "the entire date and time, e.g. with"
+#~ " ``Ctrl+A``, allows it to be deleted "
+#~ "which removes the date & time "
+#~ "metadata from the photograph(s)."
+#~ msgstr ""
+
diff --git a/src/lang/de/LC_MESSAGES/documentation.po b/src/lang/de/LC_MESSAGES/documentation.po
@@ -12,7 +12,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Photini 2023.4.1\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2024-10-02 17:32+0100\n"
+"POT-Creation-Date: 2024-10-03 15:02+0100\n"
 "PO-Revision-Date: 2023-04-19 08:54+0000\n"
 "Last-Translator: Jim Easterbrook <[email protected]>, 2023\n"
 "Language: de\n"
@@ -383,8 +383,12 @@ msgstr ""
 
 msgid ""
 "The ``Title / Object name`` field has an optional spell checker, enabled "
-"with the ``Spelling`` menu. The word \"Château-Gontier\" is not in the "
-"British English dictionary, as indicated by the red wiggly underlining."
+"with the ``Spelling`` menu."
+msgstr ""
+
+msgid ""
+"The word \"Château-Gontier\" is not in the British English dictionary, as "
+"indicated by the red wiggly underlining."
 msgstr ""
 
 msgid ""
@@ -2427,11 +2431,11 @@ msgid ""
 msgstr ""
 
 msgid ""
-"Clicking on any of the numbers allows them to be adjusted with your keyboard"
-" up & down arrow keys. You can also double click on any of the numbers to "
-"select it and type a new value in directly. Selecting the entire date and "
-"time, e.g. with ``Ctrl+A``, allows it to be deleted which removes the date &"
-" time metadata from the photograph(s)."
+"Clicking on part of the date or time allows it to be adjusted with your "
+"keyboard up & down arrow keys. You can also double click on any of the "
+"numbers to select it and type a new value in directly. Selecting the entire "
+"date and time, e.g. with ``Ctrl+A``, allows it to be deleted which removes "
+"the date & time metadata from the photograph(s)."
 msgstr ""
 
 msgid ""
@@ -5467,3 +5471,25 @@ msgstr ""
 #~ " team and then start translating."
 #~ msgstr ""
 
+#~ msgid ""
+#~ "The ``Title / Object name`` field has"
+#~ " an optional spell checker, enabled with"
+#~ " the ``Spelling`` menu. The word "
+#~ "\"Château-Gontier\" is not in the "
+#~ "British English dictionary, as indicated by"
+#~ " the red wiggly underlining."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "Clicking on any of the numbers allows"
+#~ " them to be adjusted with your "
+#~ "keyboard up & down arrow keys. You"
+#~ " can also double click on any of"
+#~ " the numbers to select it and type"
+#~ " a new value in directly. Selecting "
+#~ "the entire date and time, e.g. with"
+#~ " ``Ctrl+A``, allows it to be deleted "
+#~ "which removes the date & time "
+#~ "metadata from the photograph(s)."
+#~ msgstr ""
+
diff --git a/src/lang/es/LC_MESSAGES/documentation.po b/src/lang/es/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-02 17:32+0100\n"
+"POT-Creation-Date: 2024-10-03 15:02+0100\n"
 "PO-Revision-Date: 2023-04-19 08:54+0000\n"
 "Last-Translator: Jim Easterbrook <[email protected]>, 2023\n"
 "Language: es@qtfiletype\n"
@@ -380,8 +380,12 @@ msgstr ""
 
 msgid ""
 "The ``Title / Object name`` field has an optional spell checker, enabled "
-"with the ``Spelling`` menu. The word \"Château-Gontier\" is not in the "
-"British English dictionary, as indicated by the red wiggly underlining."
+"with the ``Spelling`` menu."
+msgstr ""
+
+msgid ""
+"The word \"Château-Gontier\" is not in the British English dictionary, as "
+"indicated by the red wiggly underlining."
 msgstr ""
 
 msgid ""
@@ -2423,11 +2427,11 @@ msgid ""
 msgstr ""
 
 msgid ""
-"Clicking on any of the numbers allows them to be adjusted with your keyboard"
-" up & down arrow keys. You can also double click on any of the numbers to "
-"select it and type a new value in directly. Selecting the entire date and "
-"time, e.g. with ``Ctrl+A``, allows it to be deleted which removes the date &"
-" time metadata from the photograph(s)."
+"Clicking on part of the date or time allows it to be adjusted with your "
+"keyboard up & down arrow keys. You can also double click on any of the "
+"numbers to select it and type a new value in directly. Selecting the entire "
+"date and time, e.g. with ``Ctrl+A``, allows it to be deleted which removes "
+"the date & time metadata from the photograph(s)."
 msgstr ""
 
 msgid ""
@@ -5453,3 +5457,25 @@ msgstr ""
 #~ " team and then start translating."
 #~ msgstr ""
 
+#~ msgid ""
+#~ "The ``Title / Object name`` field has"
+#~ " an optional spell checker, enabled with"
+#~ " the ``Spelling`` menu. The word "
+#~ "\"Château-Gontier\" is not in the "
+#~ "British English dictionary, as indicated by"
+#~ " the red wiggly underlining."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "Clicking on any of the numbers allows"
+#~ " them to be adjusted with your "
+#~ "keyboard up & down arrow keys. You"
+#~ " can also double click on any of"
+#~ " the numbers to select it and type"
+#~ " a new value in directly. Selecting "
+#~ "the entire date and time, e.g. with"
+#~ " ``Ctrl+A``, allows it to be deleted "
+#~ "which removes the date & time "
+#~ "metadata from the photograph(s)."
+#~ msgstr ""
+
diff --git a/src/lang/fr/LC_MESSAGES/documentation.po b/src/lang/fr/LC_MESSAGES/documentation.po
@@ -10,7 +10,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Photini 2023.4.1\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2024-10-02 17:32+0100\n"
+"POT-Creation-Date: 2024-10-03 15:02+0100\n"
 "PO-Revision-Date: 2023-04-19 08:54+0000\n"
 "Last-Translator: Jim Easterbrook <[email protected]>, 2023\n"
 "Language: fr@qtfiletype\n"
@@ -374,8 +374,12 @@ msgstr ""
 
 msgid ""
 "The ``Title / Object name`` field has an optional spell checker, enabled "
-"with the ``Spelling`` menu. The word \"Château-Gontier\" is not in the "
-"British English dictionary, as indicated by the red wiggly underlining."
+"with the ``Spelling`` menu."
+msgstr ""
+
+msgid ""
+"The word \"Château-Gontier\" is not in the British English dictionary, as "
+"indicated by the red wiggly underlining."
 msgstr ""
 
 msgid ""
@@ -2417,11 +2421,11 @@ msgid ""
 msgstr ""
 
 msgid ""
-"Clicking on any of the numbers allows them to be adjusted with your keyboard"
-" up & down arrow keys. You can also double click on any of the numbers to "
-"select it and type a new value in directly. Selecting the entire date and "
-"time, e.g. with ``Ctrl+A``, allows it to be deleted which removes the date &"
-" time metadata from the photograph(s)."
+"Clicking on part of the date or time allows it to be adjusted with your "
+"keyboard up & down arrow keys. You can also double click on any of the "
+"numbers to select it and type a new value in directly. Selecting the entire "
+"date and time, e.g. with ``Ctrl+A``, allows it to be deleted which removes "
+"the date & time metadata from the photograph(s)."
 msgstr ""
 
 msgid ""
@@ -5453,3 +5457,25 @@ msgstr ""
 #~ " team and then start translating."
 #~ msgstr ""
 
+#~ msgid ""
+#~ "The ``Title / Object name`` field has"
+#~ " an optional spell checker, enabled with"
+#~ " the ``Spelling`` menu. The word "
+#~ "\"Château-Gontier\" is not in the "
+#~ "British English dictionary, as indicated by"
+#~ " the red wiggly underlining."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "Clicking on any of the numbers allows"
+#~ " them to be adjusted with your "
+#~ "keyboard up & down arrow keys. You"
+#~ " can also double click on any of"
+#~ " the numbers to select it and type"
+#~ " a new value in directly. Selecting "
+#~ "the entire date and time, e.g. with"
+#~ " ``Ctrl+A``, allows it to be deleted "
+#~ "which removes the date & time "
+#~ "metadata from the photograph(s)."
+#~ msgstr ""
+