Merge pull request #297 from jim-easterbrook/devel

Devel

CHANGELOG.txt

@@ -19,7 +19,8 @@ along with this program.  If not, see
 Changes in v2024.10.0:
   1/ New hierarchical tags editor.
   2/ Multiple map markers can be selected by multiple clicks.
-  3/ Other minor improvements and bug fixes.
+  3/ Added macOS photini-post-install command.
+  4/ Other minor improvements and bug fixes.
 
 Changes in v2024.9.1:
   1/ Fix problem dragging onto map with some Python/Qt combinations.

pyproject.toml

@@ -42,7 +42,7 @@ dependencies = [
   "chardet >= 3.0",
   "exiv2 >= 0.16",
   "filetype >= 1.0",
-  "Pillow >= 2.0",
+  "Pillow >= 5.3",
   "platformdirs >= 2.4",
   "requests >= 2.4",
   "pywin32 >= 302; platform_system == 'Windows'",

src/doc/other/installation.rst

@@ -484,7 +484,7 @@ Although you can run Photini from a command shell, most users would probably pre
 These can be installed with the ``photini-post-install`` command:
 
 .. tabs::
-    .. code-tab:: none Linux
+    .. code-tab:: none Linux/MacOS
 
         (photini) jim@mint22:~$ photini-post-install
         Creating /tmp/tmpj9rn81aj/photini.desktop
@@ -501,23 +501,20 @@ These can be installed with the ``photini-post-install`` command:
         Writing HKEY_CURRENT_USER\Software\Microsoft\Windows\CurrentVersion\App Paths\photini.exe
         Writing HKEY_CURRENT_USER\Software\Classes\Applications\photini.exe
 
+On Linux the ``photini-post-install`` command creates a "desktop" file in the user's ``.local`` directory.
+On macOS it creates a ".app" bundle in the user's ``Applications`` directory.
+On Windows it creates start menu entries in the user's ``AppData`` directory and adds two user registry entries.
+
 The ``photini-post-install`` command also sets "file associations" for some common image file types.
 This allows things like right-clicking on an image in a viewer application and selecting "open with Photini" from the context menu.
 
-MacOS
-"""""
-
-Unfortunately the ``photini-post-install`` command doesn't do anything on MacOS.
-I don't have a MacOS computer to try things out on and have no idea how to set up shortcuts and file associations on a Mac.
-If you'd like to help develop and test a solution, do get in touch with me.
-
 Localisation
 """"""""""""
 
-The ``photini-post-install`` command has an option ``--language`` (or ``-l``) that can set the language used for the description that accompaines a desktop icon (if Photini has been translated into that language).
+The ``photini-post-install`` command has an option ``--language`` (or ``-l``) that can set the language used for the description that accompanies a desktop icon (if Photini has been translated into that language).
 
 .. tabs::
-    .. code-tab:: none Linux
+    .. code-tab:: none Linux/MacOS
 
         (photini) jim@mint22:~$ photini-post-install --language fr
         Creating /tmp/tmpecj_yk1e/photini.desktop
@@ -552,7 +549,7 @@ Only read permission is needed.)
 This is not a very convenient way to run Photini, so most users will want to add it to their start / application menu:
 
 .. tabs::
-    .. code-tab:: none Linux
+    .. code-tab:: none Linux/MacOS
 
         sarah@mint22:~$ /home/jim/photini/bin/photini-post-install
         Creating /tmp/tmplavuaj12/photini.desktop
@@ -569,11 +566,11 @@ This is not a very convenient way to run Photini, so most users will want to add
         Writing HKEY_CURRENT_USER\Software\Microsoft\Windows\CurrentVersion\App Paths\photini.exe
         Writing HKEY_CURRENT_USER\Software\Classes\Applications\photini.exe
 
-To install Photini menu shortcuts for all users (not recommended) you can run the post install command as root (Linux) or in a command window run as administrator (Windows).
+To install Photini menu shortcuts for all users (not recommended) you can run the post install command as root (Linux/MacOS) or in a command window run as administrator (Windows).
 It is important to use the full path to the post install command:
 
 .. tabs::
-    .. code-tab:: none Linux
+    .. code-tab:: none Linux/MacOS
 
         (photini) jim@mint22:~$ sudo /home/jim/photini/bin/photini-post-install 
         Creating /tmp/tmpkbuvvzs6/photini.desktop

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-04 10:50+0100\n"
+"POT-Creation-Date: 2024-10-18 11:17+0100\n"
 "PO-Revision-Date: 2023-04-19 08:54+0000\n"
 "Last-Translator: Joan <sacoo2@hotmail.com>, 2023\n"
 "Language: ca\n"
@@ -2983,29 +2983,27 @@ msgid ""
 "installed with the ``photini-post-install`` command:"
 msgstr ""
 
+msgid ""
+"On Linux the ``photini-post-install`` command creates a \"desktop\" file in "
+"the user's ``.local`` directory. On macOS it creates a \".app\" bundle in "
+"the user's ``Applications`` directory. On Windows it creates start menu "
+"entries in the user's ``AppData`` directory and adds two user registry "
+"entries."
+msgstr ""
+
 msgid ""
 "The ``photini-post-install`` command also sets \"file associations\" for "
 "some common image file types. This allows things like right-clicking on an "
 "image in a viewer application and selecting \"open with Photini\" from the "
 "context menu."
 msgstr ""
 
-msgid "MacOS"
-msgstr ""
-
-msgid ""
-"Unfortunately the ``photini-post-install`` command doesn't do anything on "
-"MacOS. I don't have a MacOS computer to try things out on and have no idea "
-"how to set up shortcuts and file associations on a Mac. If you'd like to "
-"help develop and test a solution, do get in touch with me."
-msgstr ""
-
 msgid "Localisation"
 msgstr ""
 
 msgid ""
 "The ``photini-post-install`` command has an option ``--language`` (or "
-"``-l``) that can set the language used for the description that accompaines "
+"``-l``) that can set the language used for the description that accompanies "
 "a desktop icon (if Photini has been translated into that language)."
 msgstr ""
 
@@ -3026,9 +3024,9 @@ msgstr ""
 
 msgid ""
 "To install Photini menu shortcuts for all users (not recommended) you can "
-"run the post install command as root (Linux) or in a command window run as "
-"administrator (Windows). It is important to use the full path to the post "
-"install command:"
+"run the post install command as root (Linux/MacOS) or in a command window "
+"run as administrator (Windows). It is important to use the full path to the "
+"post install command:"
 msgstr ""
 
 msgid "Uninstalling Photini"
@@ -5553,3 +5551,37 @@ msgstr ""
 #~ "more detail."
 #~ msgstr ""
 
+#~ msgid "MacOS"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "Unfortunately the ``photini-post-install`` "
+#~ "command doesn't do anything on MacOS. "
+#~ "I don't have a MacOS computer to "
+#~ "try things out on and have no "
+#~ "idea how to set up shortcuts and "
+#~ "file associations on a Mac. If you'd"
+#~ " like to help develop and test a"
+#~ " solution, do get in touch with "
+#~ "me."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "The ``photini-post-install`` command has"
+#~ " an option ``--language`` (or ``-l``) "
+#~ "that can set the language used for"
+#~ " the description that accompaines a "
+#~ "desktop icon (if Photini has been "
+#~ "translated into that language)."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "To install Photini menu shortcuts for "
+#~ "all users (not recommended) you can "
+#~ "run the post install command as root"
+#~ " (Linux) or in a command window "
+#~ "run as administrator (Windows). It is "
+#~ "important to use the full path to "
+#~ "the post install command:"
+#~ 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-10-04 10:50+0100\n"
+"POT-Creation-Date: 2024-10-18 11:17+0100\n"
 "PO-Revision-Date: 2023-04-19 08:54+0000\n"
 "Last-Translator: fri, 2023\n"
 "Language: cs@qtfiletype\n"
@@ -3027,30 +3027,27 @@ msgstr ""
 "pravděpodobně raději použije nabídku Start/Aplikace nebo ikonu na ploše. Ty "
 "lze nainstalovat pomocí příkazu ``photini-post-install``:"
 
+msgid ""
+"On Linux the ``photini-post-install`` command creates a \"desktop\" file in "
+"the user's ``.local`` directory. On macOS it creates a \".app\" bundle in "
+"the user's ``Applications`` directory. On Windows it creates start menu "
+"entries in the user's ``AppData`` directory and adds two user registry "
+"entries."
+msgstr ""
+
 msgid ""
 "The ``photini-post-install`` command also sets \"file associations\" for "
 "some common image file types. This allows things like right-clicking on an "
 "image in a viewer application and selecting \"open with Photini\" from the "
 "context menu."
 msgstr ""
 
-#, fuzzy
-msgid "MacOS"
-msgstr "Linux/MacOS"
-
-msgid ""
-"Unfortunately the ``photini-post-install`` command doesn't do anything on "
-"MacOS. I don't have a MacOS computer to try things out on and have no idea "
-"how to set up shortcuts and file associations on a Mac. If you'd like to "
-"help develop and test a solution, do get in touch with me."
-msgstr ""
-
 msgid "Localisation"
 msgstr ""
 
 msgid ""
 "The ``photini-post-install`` command has an option ``--language`` (or "
-"``-l``) that can set the language used for the description that accompaines "
+"``-l``) that can set the language used for the description that accompanies "
 "a desktop icon (if Photini has been translated into that language)."
 msgstr ""
 
@@ -3080,9 +3077,9 @@ msgstr ""
 #, fuzzy
 msgid ""
 "To install Photini menu shortcuts for all users (not recommended) you can "
-"run the post install command as root (Linux) or in a command window run as "
-"administrator (Windows). It is important to use the full path to the post "
-"install command:"
+"run the post install command as root (Linux/MacOS) or in a command window "
+"run as administrator (Windows). It is important to use the full path to the "
+"post install command:"
 msgstr ""
 "Chcete-li nainstalovat zástupce nabídky Photini pro všechny uživatele, "
 "můžete spustit příkaz po instalaci jako root (Linux) nebo v příkazovém okně "
@@ -5533,3 +5530,27 @@ msgstr ""
 #~ "more detail."
 #~ msgstr ""
 
+#~ msgid "MacOS"
+#~ msgstr "Linux/MacOS"
+
+#~ msgid ""
+#~ "Unfortunately the ``photini-post-install`` "
+#~ "command doesn't do anything on MacOS. "
+#~ "I don't have a MacOS computer to "
+#~ "try things out on and have no "
+#~ "idea how to set up shortcuts and "
+#~ "file associations on a Mac. If you'd"
+#~ " like to help develop and test a"
+#~ " solution, do get in touch with "
+#~ "me."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "The ``photini-post-install`` command has"
+#~ " an option ``--language`` (or ``-l``) "
+#~ "that can set the language used for"
+#~ " the description that accompaines a "
+#~ "desktop icon (if Photini has been "
+#~ "translated into that language)."
+#~ msgstr ""
+

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-04 10:50+0100\n"
+"POT-Creation-Date: 2024-10-18 11:17+0100\n"
 "PO-Revision-Date: 2023-04-19 08:54+0000\n"
 "Last-Translator: Jim Easterbrook <jim@jim-easterbrook.me.uk>, 2023\n"
 "Language: de\n"
@@ -2980,30 +2980,27 @@ msgid ""
 "installed with the ``photini-post-install`` command:"
 msgstr ""
 
+msgid ""
+"On Linux the ``photini-post-install`` command creates a \"desktop\" file in "
+"the user's ``.local`` directory. On macOS it creates a \".app\" bundle in "
+"the user's ``Applications`` directory. On Windows it creates start menu "
+"entries in the user's ``AppData`` directory and adds two user registry "
+"entries."
+msgstr ""
+
 msgid ""
 "The ``photini-post-install`` command also sets \"file associations\" for "
 "some common image file types. This allows things like right-clicking on an "
 "image in a viewer application and selecting \"open with Photini\" from the "
 "context menu."
 msgstr ""
 
-#, fuzzy
-msgid "MacOS"
-msgstr "Linux/MacOS"
-
-msgid ""
-"Unfortunately the ``photini-post-install`` command doesn't do anything on "
-"MacOS. I don't have a MacOS computer to try things out on and have no idea "
-"how to set up shortcuts and file associations on a Mac. If you'd like to "
-"help develop and test a solution, do get in touch with me."
-msgstr ""
-
 msgid "Localisation"
 msgstr "Lokalisierung"
 
 msgid ""
 "The ``photini-post-install`` command has an option ``--language`` (or "
-"``-l``) that can set the language used for the description that accompaines "
+"``-l``) that can set the language used for the description that accompanies "
 "a desktop icon (if Photini has been translated into that language)."
 msgstr ""
 
@@ -3024,9 +3021,9 @@ msgstr ""
 
 msgid ""
 "To install Photini menu shortcuts for all users (not recommended) you can "
-"run the post install command as root (Linux) or in a command window run as "
-"administrator (Windows). It is important to use the full path to the post "
-"install command:"
+"run the post install command as root (Linux/MacOS) or in a command window "
+"run as administrator (Windows). It is important to use the full path to the "
+"post install command:"
 msgstr ""
 
 msgid "Uninstalling Photini"
@@ -5551,3 +5548,37 @@ msgstr ""
 #~ "more detail."
 #~ msgstr ""
 
+#~ msgid "MacOS"
+#~ msgstr "Linux/MacOS"
+
+#~ msgid ""
+#~ "Unfortunately the ``photini-post-install`` "
+#~ "command doesn't do anything on MacOS. "
+#~ "I don't have a MacOS computer to "
+#~ "try things out on and have no "
+#~ "idea how to set up shortcuts and "
+#~ "file associations on a Mac. If you'd"
+#~ " like to help develop and test a"
+#~ " solution, do get in touch with "
+#~ "me."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "The ``photini-post-install`` command has"
+#~ " an option ``--language`` (or ``-l``) "
+#~ "that can set the language used for"
+#~ " the description that accompaines a "
+#~ "desktop icon (if Photini has been "
+#~ "translated into that language)."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "To install Photini menu shortcuts for "
+#~ "all users (not recommended) you can "
+#~ "run the post install command as root"
+#~ " (Linux) or in a command window "
+#~ "run as administrator (Windows). It is "
+#~ "important to use the full path to "
+#~ "the post install command:"
+#~ msgstr ""
+