diff --git a/CHANGELOG.txt b/CHANGELOG.txt index e709e2a6b..d1c9de11c 100644 --- a/CHANGELOG.txt +++ b/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. diff --git a/pyproject.toml b/pyproject.toml index 1b02d9606..4eebced5d 100644 --- a/pyproject.toml +++ b/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'", diff --git a/src/doc/other/installation.rst b/src/doc/other/installation.rst index c9810f7de..3467f3204 100644 --- a/src/doc/other/installation.rst +++ b/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 diff --git a/src/lang/ca/LC_MESSAGES/documentation.po b/src/lang/ca/LC_MESSAGES/documentation.po index b477d1d84..8ebfa7d75 100644 --- 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-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 , 2023\n" "Language: ca\n" @@ -2983,6 +2983,14 @@ 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 " @@ -2990,22 +2998,12 @@ msgid "" "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 "" + diff --git a/src/lang/cs/LC_MESSAGES/documentation.po b/src/lang/cs/LC_MESSAGES/documentation.po index a24f27bcc..42fb730a7 100644 --- 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-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,6 +3027,14 @@ 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 " @@ -3034,23 +3042,12 @@ msgid "" "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 "" + diff --git a/src/lang/de/LC_MESSAGES/documentation.po b/src/lang/de/LC_MESSAGES/documentation.po index de5356629..23a5281e6 100644 --- 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-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 , 2023\n" "Language: de\n" @@ -2980,6 +2980,14 @@ 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 " @@ -2987,23 +2995,12 @@ msgid "" "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 "" + diff --git a/src/lang/es/LC_MESSAGES/documentation.po b/src/lang/es/LC_MESSAGES/documentation.po index 14d540c52..5ddbb3307 100644 --- 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-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 , 2023\n" "Language: es@qtfiletype\n" @@ -2973,6 +2973,14 @@ 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 " @@ -2980,22 +2988,12 @@ msgid "" "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 "" @@ -3016,9 +3014,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" @@ -5537,3 +5535,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 "" + diff --git a/src/lang/fr/LC_MESSAGES/documentation.po b/src/lang/fr/LC_MESSAGES/documentation.po index 41140c08a..e7e661d10 100644 --- 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-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 , 2023\n" "Language: fr@qtfiletype\n" @@ -2967,6 +2967,14 @@ 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 " @@ -2974,22 +2982,12 @@ msgid "" "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 "" @@ -3010,9 +3008,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" @@ -5537,3 +5535,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 "" + diff --git a/src/lang/it/LC_MESSAGES/documentation.po b/src/lang/it/LC_MESSAGES/documentation.po index 5920e26ab..81b4fd1b3 100644 --- a/src/lang/it/LC_MESSAGES/documentation.po +++ b/src/lang/it/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-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: alessio Cadore , 2023\n" "Language: it@qtfiletype\n" @@ -2967,6 +2967,14 @@ 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 " @@ -2974,22 +2982,12 @@ msgid "" "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 "" @@ -3010,9 +3008,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" @@ -5537,3 +5535,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 "" + diff --git a/src/lang/ko/LC_MESSAGES/documentation.po b/src/lang/ko/LC_MESSAGES/documentation.po index 39742a4f6..f8c62474e 100644 --- a/src/lang/ko/LC_MESSAGES/documentation.po +++ b/src/lang/ko/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: Jim Easterbrook , 2023\n" "Language: ko\n" @@ -3492,6 +3492,14 @@ msgstr "" "명령 셸에서 Photini를 실행할 수 있지만 대부분의 사용자는 시작/응용 프로그램 메뉴 또는 바탕 화면 아이콘을 사용하는 것을 선호할 " "것입니다. 이들은 ``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 " @@ -3499,23 +3507,12 @@ msgid "" "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 "" @@ -3543,9 +3540,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 "" "모든 사용자를 위한 Photini 메뉴 바로 가기를 설치하려면 루트(Linux) 또는 명령 창에서 관리자(Windows)로 실행 후 설치" " 명령을 실행할 수 있습니다. 설치 후 명령에 대한 전체 경로를 사용하는 것이 중요합니다." @@ -5568,3 +5565,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 "" + diff --git a/src/lang/nb/LC_MESSAGES/documentation.po b/src/lang/nb/LC_MESSAGES/documentation.po index 1821b6da1..51064067b 100644 --- a/src/lang/nb/LC_MESSAGES/documentation.po +++ b/src/lang/nb/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-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 , 2023\n" "Language: nb\n" @@ -2967,6 +2967,14 @@ 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 " @@ -2974,22 +2982,12 @@ msgid "" "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 "" @@ -3010,9 +3008,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" @@ -5537,3 +5535,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 "" + diff --git a/src/lang/pl/LC_MESSAGES/documentation.po b/src/lang/pl/LC_MESSAGES/documentation.po index 56bf0c9a2..2b4f2aae4 100644 --- a/src/lang/pl/LC_MESSAGES/documentation.po +++ b/src/lang/pl/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: Dawid Głaz, 2023\n" "Language: pl@qtfiletype\n" @@ -2969,6 +2969,14 @@ 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 " @@ -2976,22 +2984,12 @@ msgid "" "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 "" @@ -3012,9 +3010,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" @@ -5539,3 +5537,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 "" + diff --git a/src/lang/templates/gettext/documentation.pot b/src/lang/templates/gettext/documentation.pot index 7de4db0f4..828dbec48 100644 --- a/src/lang/templates/gettext/documentation.pot +++ b/src/lang/templates/gettext/documentation.pot @@ -6,9 +6,9 @@ #, fuzzy msgid "" msgstr "" -"Project-Id-Version: Photini 2024.9.1.post85\n" +"Project-Id-Version: Photini 2024.9.1.post117\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: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -1777,19 +1777,16 @@ msgstr "" msgid "Although you can run Photini from a command shell, most users would probably prefer to use the start / application menu or a desktop icon. These can be installed with the ``photini-post-install`` command:" 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" +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 "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." +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 "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 a desktop icon (if Photini has been translated into that language)." +msgid "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)." msgstr "" msgid "Additional users" @@ -1801,7 +1798,7 @@ msgstr "" msgid "This is not a very convenient way to run Photini, so most users will want to add it to their start / application menu:" 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:" +msgid "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:" msgstr "" msgid "Uninstalling Photini" diff --git a/src/photini/data/icons/linux/128x128/photini.png b/src/photini/data/icons/linux/128x128/photini.png new file mode 100644 index 000000000..336ab7d5b Binary files /dev/null and b/src/photini/data/icons/linux/128x128/photini.png differ diff --git a/src/photini/data/icons/linux/16x16/photini.png b/src/photini/data/icons/linux/16x16/photini.png new file mode 100644 index 000000000..d67f4e748 Binary files /dev/null and b/src/photini/data/icons/linux/16x16/photini.png differ diff --git a/src/photini/data/icons/linux/24x24/photini.png b/src/photini/data/icons/linux/24x24/photini.png new file mode 100644 index 000000000..bd10440b0 Binary files /dev/null and b/src/photini/data/icons/linux/24x24/photini.png differ diff --git a/src/photini/data/icons/linux/256x256/photini.png b/src/photini/data/icons/linux/256x256/photini.png new file mode 100644 index 000000000..1c895eba3 Binary files /dev/null and b/src/photini/data/icons/linux/256x256/photini.png differ diff --git a/src/photini/data/icons/linux/32x32/photini.png b/src/photini/data/icons/linux/32x32/photini.png new file mode 100644 index 000000000..f85131a6e Binary files /dev/null and b/src/photini/data/icons/linux/32x32/photini.png differ diff --git a/src/photini/data/icons/linux/48x48/photini.png b/src/photini/data/icons/linux/48x48/photini.png new file mode 100644 index 000000000..e7b8e01d0 Binary files /dev/null and b/src/photini/data/icons/linux/48x48/photini.png differ diff --git a/src/photini/data/icons/linux/64x64/photini.png b/src/photini/data/icons/linux/64x64/photini.png new file mode 100644 index 000000000..01407e886 Binary files /dev/null and b/src/photini/data/icons/linux/64x64/photini.png differ diff --git a/src/photini/data/icons/photini_128.png b/src/photini/data/icons/photini_128.png deleted file mode 100644 index 2ff2ab265..000000000 Binary files a/src/photini/data/icons/photini_128.png and /dev/null differ diff --git a/src/photini/data/icons/photini_48.png b/src/photini/data/icons/photini_48.png deleted file mode 100644 index a08e87ac2..000000000 Binary files a/src/photini/data/icons/photini_48.png and /dev/null differ diff --git a/src/photini/editor.py b/src/photini/editor.py index 8f9e084c9..fd035d93a 100644 --- a/src/photini/editor.py +++ b/src/photini/editor.py @@ -252,8 +252,8 @@ def set_language(self, action): @catch_all def about(self): data_dir = os.path.join(os.path.dirname(__file__), 'data') - with open(os.path.join( - data_dir, 'icons', 'photini_128.png'), 'rb') as f: + with open(os.path.join(data_dir, 'icons', 'linux', '128x128', + 'photini.png'), 'rb') as f: icon = f.read() text = """ @@ -344,9 +344,13 @@ def __init__(self, options, initial_files): super(MainWindow, self).__init__() self.setWindowTitle(translate( 'MenuBar', "Photini photo metadata editor")) - pixmap = QtGui.QPixmap(os.path.join( - os.path.dirname(__file__), 'data', 'icons', 'photini_48.png')) - icon = QtGui.QIcon(pixmap) + icon = QtGui.QIcon() + root_dir = os.path.join( + os.path.dirname(__file__), 'data', 'icons', 'linux') + for size in os.listdir(root_dir): + path = os.path.join(root_dir, size, 'photini.png') + if os.path.exists(path): + icon.addFile(path) self.setWindowIcon(icon) self.selection = list() # create shared global objects diff --git a/src/photini/linux.py b/src/photini/linux.py index e76571bcb..9e5a391d1 100644 --- a/src/photini/linux.py +++ b/src/photini/linux.py @@ -18,27 +18,55 @@ # along with Photini. If not, see . import os +import shutil import subprocess import tempfile def post_install(exec_path, icon_path, remove, generic_name, comment): - local_dir = os.path.expanduser('~/.local/share/applications') - if remove: - if os.geteuid() != 0: - # not running as root - paths = [local_dir] - else: - paths = ['/usr/share/applications/', - '/usr/local/share/applications/'] - for dir_name in paths: - path = os.path.join(dir_name, 'photini.desktop') + icon_name = 'photini.png' + desktop_name = 'photini.desktop' + + def remove_icons(root): + icon_dir = os.path.join(root, 'icons', 'hicolor') + if not os.path.isdir(icon_dir): + return + for size in os.listdir(icon_dir): + path = os.path.join(icon_dir, size, 'apps', 'photini.png') if os.path.exists(path): print('Deleting', path) os.unlink(path) - return 0 + + def remove_desktop(root): + path = os.path.join(root, 'applications', desktop_name) + if os.path.exists(path): + print('Deleting', path) + os.unlink(path) + return True + return False + + if os.geteuid() == 0: + # running as root + root_dir = '/usr/local/share' + # clean up anything in '/usr/share' + remove_icons('/usr/share') + remove_desktop('/usr/share') + else: + root_dir = os.path.expanduser('~/.local/share') + if remove: + remove_icons(root_dir) + if remove_desktop(root_dir): + return 0 print('No "desktop" file found.') return 1 + # copy icons + for size in os.listdir(icon_path): + src = os.path.join(icon_path, size, 'photini.png') + dst = os.path.join(root_dir, 'icons', 'hicolor', size, 'apps') + os.makedirs(dst, exist_ok=True) + dst = os.path.join(dst, 'photini.png') + print('Writing', dst) + shutil.copy(src, dst) # create desktop file with tempfile.TemporaryDirectory() as temp_dir: path = os.path.join(temp_dir, 'photini.desktop') @@ -52,15 +80,12 @@ def post_install(exec_path, icon_path, remove, generic_name, comment): MimeType=image/jpeg;image/jpeg2000;image/tiff;image/png;image/gif;image/x-dcraw;application/rdf+xml; ''') file.write('Exec={} %F\n'.format(exec_path)) - file.write('Icon={}\n'.format(icon_path)) + file.write('Icon={}\n'.format(os.path.splitext(icon_name)[0])) file.write('GenericName={}\n'.format(generic_name)) file.write('Comment={}\n'.format(comment)) - print('Installing', path) - cmd = ['desktop-file-install'] - if os.geteuid() != 0: - # not running as root - print(' to', local_dir) - cmd.append('--dir={}'.format(local_dir)) - cmd.append(path) + app_dir = os.path.join(root_dir, 'applications') + print('Installing', path, 'to', app_dir) + cmd = ['desktop-file-install', '--rebuild-mime-info-cache', + '--dir={}'.format(app_dir), path] return subprocess.call(cmd) return 0 diff --git a/src/photini/macos.py b/src/photini/macos.py index a6fb824a3..28765fce6 100644 --- a/src/photini/macos.py +++ b/src/photini/macos.py @@ -20,14 +20,16 @@ import os import plistlib import shutil -import subprocess -import tempfile from photini import __version__, __version_tuple__ def post_install(exec_path, icon_path, remove, generic_name, comment): - app_dir = os.path.expanduser('~/Applications/Photini.app') + if os.geteuid() == 0: + # running as root + app_dir = '/Applications/Photini.app' + else: + app_dir = os.path.expanduser('~/Applications/Photini.app') if remove: if os.path.exists(app_dir): print('Deleting', app_dir) diff --git a/src/photini/pyqt.py b/src/photini/pyqt.py index f979adf2f..03267d702 100644 --- a/src/photini/pyqt.py +++ b/src/photini/pyqt.py @@ -54,10 +54,15 @@ # choose Qt package available_packages = [] for _lib in ('PyQt6', 'PyQt5', 'PySide6', 'PySide2'): - if importlib.util.find_spec(_lib): - if importlib.util.find_spec(_lib + '.QtWebEngineWidgets'): - available_packages.append(_lib) - else: + _spec = importlib.util.find_spec(_lib) + if _spec: + for _path in _spec.submodule_search_locations: + for _name in os.listdir(_path): + if (_name.startswith('QtWebEngineWidgets') + and _name != 'QtWebEngineWidgets.pyi'): + available_packages.append(_lib) + break + if _lib not in available_packages: print(_lib, 'is installed without QtWebEngine') if not available_packages: print('') diff --git a/src/photini/scripts.py b/src/photini/scripts.py index 6c2d9e1ed..8dad5cf4b 100644 --- a/src/photini/scripts.py +++ b/src/photini/scripts.py @@ -152,7 +152,7 @@ def post_install(argv=None): return photini.windows.post_install( exec_path, icon_path, options.remove, generic_name) if sys.platform.startswith('linux'): - icon_path = os.path.join(pkg_data, 'icons', 'photini_48.png') + icon_path = os.path.join(pkg_data, 'icons', 'linux') import photini.linux return photini.linux.post_install( exec_path, icon_path, options.remove, generic_name, comment) diff --git a/utils/make_icons/makefile b/utils/make_icons/makefile index 5a8f82307..f37e85281 100644 --- a/utils/make_icons/makefile +++ b/utils/make_icons/makefile @@ -1,7 +1,12 @@ all : \ ../../src/doc/images/photini_logo.png \ - ../../src/photini/data/icons/photini_128.png \ - ../../src/photini/data/icons/photini_48.png \ + ../../src/photini/data/icons/linux/16x16/photini.png \ + ../../src/photini/data/icons/linux/24x24/photini.png \ + ../../src/photini/data/icons/linux/32x32/photini.png \ + ../../src/photini/data/icons/linux/48x48/photini.png \ + ../../src/photini/data/icons/linux/64x64/photini.png \ + ../../src/photini/data/icons/linux/128x128/photini.png \ + ../../src/photini/data/icons/linux/256x256/photini.png \ ../../src/photini/data/icons/photini_win.ico \ ../../src/photini/data/icons/photini.icns @@ -15,6 +20,11 @@ icon_%.pam : icon_master.png pamrgbatopng $< >$@ # create linux icons +../../src/photini/data/icons/linux/%/photini.png : \ + photini.iconset/icon_%.png + mkdir -p ../../src/photini/data/icons/linux/$* + cp $< $@ + ../../src/photini/data/icons/photini_%.png : icon_%.pam mkdir -p $(dir $@) pamrgbatopng $< >$@ @@ -36,7 +46,6 @@ icon_%.pam : icon_master.png %.iconset/icon_256x256.png %.iconset/icon_256x256@2x.png \ %.iconset/icon_512x512.png %.iconset/icon_512x512@2x.png icnsutil -c icns -o $@ $*.iconset - rm -rf $*.iconset photini.iconset/icon_%.png : icon_master.png mkdir -p photini.iconset