Skip to content

Commit

Permalink
Merge pull request #271 from jim-easterbrook/devel
Browse files Browse the repository at this point in the history 
Devel
  • Loading branch information
@jim-easterbrook
jim-easterbrook committed Sep 12, 2024
2 parents 5cd2c81 + e64e35e commit bbef9f3
Show file tree
Hide file tree
Showing 25 changed files with 97 additions and 24 deletions.
Binary file modified src/doc/images/screenshot_270.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified src/doc/images/screenshot_271.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified src/doc/images/screenshot_272.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified src/doc/images/screenshot_273.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified src/doc/images/screenshot_274.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified src/doc/images/screenshot_275.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified src/doc/images/screenshot_276.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified src/doc/images/screenshot_277.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified src/doc/images/screenshot_278.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified src/doc/images/screenshot_279.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified src/doc/images/screenshot_280.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified src/doc/images/screenshot_281.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
1 change: 1 addition & 0 deletions src/doc/manual/regions.rst
View file
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,7 @@ The entire region can be dragged by clicking within it.
.. image:: ../images/screenshot_275.png

This is made easier if you zoom in by holding down the ``Ctrl`` key while scrolling with the mouse scroll wheel.
(The zoom can also be adjusted with ``Ctrl-Plus`` and ``Ctrl-Minus`` key combinations.)

.. image:: ../images/screenshot_276.png

Expand Down
12 changes: 10 additions & 2 deletions src/lang/ca/LC_MESSAGES/documentation.po
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ msgid ""
msgstr ""
"Project-Id-Version: Photini 2023.4.1\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2024-09-11 15:55+0100\n"
"POT-Creation-Date: 2024-09-12 09:35+0100\n"
"PO-Revision-Date: 2023-04-19 08:54+0000\n"
"Last-Translator: Joan <[email protected]>, 2023\n"
"Language: ca\n"
Expand Down Expand Up @@ -1667,7 +1667,8 @@ msgstr ""

msgid ""
"This is made easier if you zoom in by holding down the ``Ctrl`` key while "
"scrolling with the mouse scroll wheel."
"scrolling with the mouse scroll wheel. (The zoom can also be adjusted with "
"``Ctrl-Plus`` and ``Ctrl-Minus`` key combinations.)"
msgstr ""

msgid ""
Expand Down Expand Up @@ -4604,3 +4605,10 @@ msgstr ""
#~ "``...`` replacing some of the text."
#~ msgstr ""

#~ msgid ""
#~ "This is made easier if you zoom "
#~ "in by holding down the ``Ctrl`` key"
#~ " while scrolling with the mouse scroll"
#~ " wheel."
#~ msgstr ""

12 changes: 10 additions & 2 deletions src/lang/cs/LC_MESSAGES/documentation.po
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ msgid ""
msgstr ""
"Project-Id-Version: Photini 2023.4.1\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2024-09-11 15:55+0100\n"
"POT-Creation-Date: 2024-09-12 09:35+0100\n"
"PO-Revision-Date: 2023-04-19 08:54+0000\n"
"Last-Translator: fri, 2023\n"
"Language: cs@qtfiletype\n"
Expand Down Expand Up @@ -1664,7 +1664,8 @@ msgstr ""

msgid ""
"This is made easier if you zoom in by holding down the ``Ctrl`` key while "
"scrolling with the mouse scroll wheel."
"scrolling with the mouse scroll wheel. (The zoom can also be adjusted with "
"``Ctrl-Plus`` and ``Ctrl-Minus`` key combinations.)"
msgstr ""

msgid ""
Expand Down Expand Up @@ -4610,3 +4611,10 @@ msgstr ""
#~ "``...`` replacing some of the text."
#~ msgstr ""

#~ msgid ""
#~ "This is made easier if you zoom "
#~ "in by holding down the ``Ctrl`` key"
#~ " while scrolling with the mouse scroll"
#~ " wheel."
#~ msgstr ""

12 changes: 10 additions & 2 deletions src/lang/de/LC_MESSAGES/documentation.po
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ msgid ""
msgstr ""
"Project-Id-Version: Photini 2023.4.1\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2024-09-11 15:55+0100\n"
"POT-Creation-Date: 2024-09-12 09:35+0100\n"
"PO-Revision-Date: 2023-04-19 08:54+0000\n"
"Last-Translator: Jim Easterbrook <[email protected]>, 2023\n"
"Language: de\n"
Expand Down Expand Up @@ -1661,7 +1661,8 @@ msgstr ""

msgid ""
"This is made easier if you zoom in by holding down the ``Ctrl`` key while "
"scrolling with the mouse scroll wheel."
"scrolling with the mouse scroll wheel. (The zoom can also be adjusted with "
"``Ctrl-Plus`` and ``Ctrl-Minus`` key combinations.)"
msgstr ""

msgid ""
Expand Down Expand Up @@ -4600,3 +4601,10 @@ msgstr ""
#~ "``...`` replacing some of the text."
#~ msgstr ""

#~ msgid ""
#~ "This is made easier if you zoom "
#~ "in by holding down the ``Ctrl`` key"
#~ " while scrolling with the mouse scroll"
#~ " wheel."
#~ msgstr ""

12 changes: 10 additions & 2 deletions src/lang/es/LC_MESSAGES/documentation.po
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ msgid ""
msgstr ""
"Project-Id-Version: Photini 2023.4.1\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2024-09-11 15:55+0100\n"
"POT-Creation-Date: 2024-09-12 09:35+0100\n"
"PO-Revision-Date: 2023-04-19 08:54+0000\n"
"Last-Translator: Jim Easterbrook <[email protected]>, 2023\n"
"Language: es@qtfiletype\n"
Expand Down Expand Up @@ -1656,7 +1656,8 @@ msgstr ""

msgid ""
"This is made easier if you zoom in by holding down the ``Ctrl`` key while "
"scrolling with the mouse scroll wheel."
"scrolling with the mouse scroll wheel. (The zoom can also be adjusted with "
"``Ctrl-Plus`` and ``Ctrl-Minus`` key combinations.)"
msgstr ""

msgid ""
Expand Down Expand Up @@ -4593,3 +4594,10 @@ msgstr ""
#~ "``...`` replacing some of the text."
#~ msgstr ""

#~ msgid ""
#~ "This is made easier if you zoom "
#~ "in by holding down the ``Ctrl`` key"
#~ " while scrolling with the mouse scroll"
#~ " wheel."
#~ msgstr ""

12 changes: 10 additions & 2 deletions src/lang/fr/LC_MESSAGES/documentation.po
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ msgid ""
msgstr ""
"Project-Id-Version: Photini 2023.4.1\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2024-09-11 15:55+0100\n"
"POT-Creation-Date: 2024-09-12 09:35+0100\n"
"PO-Revision-Date: 2023-04-19 08:54+0000\n"
"Last-Translator: Jim Easterbrook <[email protected]>, 2023\n"
"Language: fr@qtfiletype\n"
Expand Down Expand Up @@ -1651,7 +1651,8 @@ msgstr ""

msgid ""
"This is made easier if you zoom in by holding down the ``Ctrl`` key while "
"scrolling with the mouse scroll wheel."
"scrolling with the mouse scroll wheel. (The zoom can also be adjusted with "
"``Ctrl-Plus`` and ``Ctrl-Minus`` key combinations.)"
msgstr ""

msgid ""
Expand Down Expand Up @@ -4588,3 +4589,10 @@ msgstr ""
#~ "``...`` replacing some of the text."
#~ msgstr ""

#~ msgid ""
#~ "This is made easier if you zoom "
#~ "in by holding down the ``Ctrl`` key"
#~ " while scrolling with the mouse scroll"
#~ " wheel."
#~ msgstr ""

12 changes: 10 additions & 2 deletions src/lang/it/LC_MESSAGES/documentation.po
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ msgid ""
msgstr ""
"Project-Id-Version: Photini 2023.4.1\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2024-09-11 15:55+0100\n"
"POT-Creation-Date: 2024-09-12 09:35+0100\n"
"PO-Revision-Date: 2023-04-19 08:54+0000\n"
"Last-Translator: alessio Cadore <[email protected]>, 2023\n"
"Language: it@qtfiletype\n"
Expand Down Expand Up @@ -1651,7 +1651,8 @@ msgstr ""

msgid ""
"This is made easier if you zoom in by holding down the ``Ctrl`` key while "
"scrolling with the mouse scroll wheel."
"scrolling with the mouse scroll wheel. (The zoom can also be adjusted with "
"``Ctrl-Plus`` and ``Ctrl-Minus`` key combinations.)"
msgstr ""

msgid ""
Expand Down Expand Up @@ -4588,3 +4589,10 @@ msgstr ""
#~ "``...`` replacing some of the text."
#~ msgstr ""

#~ msgid ""
#~ "This is made easier if you zoom "
#~ "in by holding down the ``Ctrl`` key"
#~ " while scrolling with the mouse scroll"
#~ " wheel."
#~ msgstr ""

12 changes: 10 additions & 2 deletions src/lang/ko/LC_MESSAGES/documentation.po
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ msgid ""
msgstr ""
"Project-Id-Version: Photini 2023.4.1\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2024-09-11 15:55+0100\n"
"POT-Creation-Date: 2024-09-12 09:35+0100\n"
"PO-Revision-Date: 2023-04-19 08:54+0000\n"
"Last-Translator: Jim Easterbrook <[email protected]>, 2023\n"
"Language: ko\n"
Expand Down Expand Up @@ -2001,7 +2001,8 @@ msgstr ""

msgid ""
"This is made easier if you zoom in by holding down the ``Ctrl`` key while "
"scrolling with the mouse scroll wheel."
"scrolling with the mouse scroll wheel. (The zoom can also be adjusted with "
"``Ctrl-Plus`` and ``Ctrl-Minus`` key combinations.)"
msgstr ""

msgid ""
Expand Down Expand Up @@ -4965,3 +4966,10 @@ msgstr ""
#~ " Photini installation."
#~ msgstr ""

#~ msgid ""
#~ "This is made easier if you zoom "
#~ "in by holding down the ``Ctrl`` key"
#~ " while scrolling with the mouse scroll"
#~ " wheel."
#~ msgstr ""

12 changes: 10 additions & 2 deletions src/lang/nb/LC_MESSAGES/documentation.po
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ msgid ""
msgstr ""
"Project-Id-Version: Photini 2023.4.1\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2024-09-11 15:55+0100\n"
"POT-Creation-Date: 2024-09-12 09:35+0100\n"
"PO-Revision-Date: 2023-04-19 08:54+0000\n"
"Last-Translator: Jim Easterbrook <[email protected]>, 2023\n"
"Language: nb\n"
Expand Down Expand Up @@ -1651,7 +1651,8 @@ msgstr ""

msgid ""
"This is made easier if you zoom in by holding down the ``Ctrl`` key while "
"scrolling with the mouse scroll wheel."
"scrolling with the mouse scroll wheel. (The zoom can also be adjusted with "
"``Ctrl-Plus`` and ``Ctrl-Minus`` key combinations.)"
msgstr ""

msgid ""
Expand Down Expand Up @@ -4588,3 +4589,10 @@ msgstr ""
#~ "``...`` replacing some of the text."
#~ msgstr ""

#~ msgid ""
#~ "This is made easier if you zoom "
#~ "in by holding down the ``Ctrl`` key"
#~ " while scrolling with the mouse scroll"
#~ " wheel."
#~ msgstr ""

12 changes: 10 additions & 2 deletions src/lang/pl/LC_MESSAGES/documentation.po
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ msgid ""
msgstr ""
"Project-Id-Version: Photini 2023.4.1\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2024-09-11 15:55+0100\n"
"POT-Creation-Date: 2024-09-12 09:35+0100\n"
"PO-Revision-Date: 2023-04-19 08:54+0000\n"
"Last-Translator: Dawid Głaz, 2023\n"
"Language: pl@qtfiletype\n"
Expand Down Expand Up @@ -1653,7 +1653,8 @@ msgstr ""

msgid ""
"This is made easier if you zoom in by holding down the ``Ctrl`` key while "
"scrolling with the mouse scroll wheel."
"scrolling with the mouse scroll wheel. (The zoom can also be adjusted with "
"``Ctrl-Plus`` and ``Ctrl-Minus`` key combinations.)"
msgstr ""

msgid ""
Expand Down Expand Up @@ -4590,3 +4591,10 @@ msgstr ""
#~ "``...`` replacing some of the text."
#~ msgstr ""

#~ msgid ""
#~ "This is made easier if you zoom "
#~ "in by holding down the ``Ctrl`` key"
#~ " while scrolling with the mouse scroll"
#~ " wheel."
#~ msgstr ""

6 changes: 3 additions & 3 deletions src/lang/templates/gettext/documentation.pot
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,9 @@
#, fuzzy
msgid ""
msgstr ""
"Project-Id-Version: Photini 2024.8.2.post118\n"
"Project-Id-Version: Photini 2024.8.2.post121\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2024-09-11 15:55+0100\n"
"POT-Creation-Date: 2024-09-12 09:35+0100\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <[email protected]>\n"
Expand Down Expand Up @@ -865,7 +865,7 @@ msgstr ""
msgid "The small squares at each corner of the rectangle can be dragged to change the size and shape. The entire region can be dragged by clicking within it."
msgstr ""

msgid "This is made easier if you zoom in by holding down the ``Ctrl`` key while scrolling with the mouse scroll wheel."
msgid "This is made easier if you zoom in by holding down the ``Ctrl`` key while scrolling with the mouse scroll wheel. (The zoom can also be adjusted with ``Ctrl-Plus`` and ``Ctrl-Minus`` key combinations.)"
msgstr ""

msgid "The most important metadata for a region is probably its \"role_\". This is chosen from a \"controlled vocabulary\" defined by the IPTC. Photini shows the IPTC names and definitions (as \"tooltips\") in a drop down menu when you click on the ``Role`` entry. You can select one or more roles from the list."
Expand Down
4 changes: 2 additions & 2 deletions src/photini/data/keys.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -65,6 +65,6 @@ client_id = (688, 4)
client_secret = (692, 40)

[data]
data = 101Toi2vm4iBPKeKey5iQ5rxSV1UAaDPtJoOaObIk6iZK5g9OpjSgLbSo9f5ThfifuFD61gr1R42s9bM3oVu1pdi50280rZ6q4pY5KnInuQw6yAGCt8FYYNC3AjQeQUPTLKummIf0cLL9klsio0ZArr0sbaNl9Ad89f640T49Z3lkLJ2WNPYbwzzi9f74iPApV7VCUegy4db3I98CaB_rh7REJfko6BT12mQ6hJp9GzqHCopJ0WfJ5x9..YaprN9CofQlME1yH7bIz47Z8evE7Cga7T1rIr64NuPAnFRa31bft0zcv5dneC02qO8A7Ne18ky5jv0uN4_2t0hyALztb3SJx2jQhAAAUDnfL1redV6nywY7-L4EhcSGwcA4I3Eqz6EAIzI21J5wae7iQfS8deB5p3qP71Ka92xaWJ6Ja4cam7u2czmxXn23fYLAldQ9mM9uiHn1Vw1V6A9zfC156M6mYH2c5Jic18dKRJOicwcKdtDWIa3L0aS9K3AeTtKokV79OjS27O5eUbUfKTWJysGy.jNkZ3CTMRpqmcyewAb5yGKe81VdX0e5VX9CeX4f21pgdJ0WdOxyHO3mdIVphAyns0z-XBGl2z6B0IisIwlxmDpdcJFdmcLiW8-P06LOx0j2VZ3044ekp4bN97lfg3Z7MmamQHoH1Xy6HNU73O4LabvNVufNxK.eKx33obiOf42AQtxNygd6KqO6a7O26MOfsVI67-yYxa0o-inN.1UN4QHnh5CrL3AccaMy69dFsS3T9846wdaPdt3ZSh15Sy457rUg1PbpnIahL60yF9Q5gPMkM7Ee-lbV74WiDP4nh1ehfbhHKpNdhV9wOpyAZb54G6F2dbXwV8J2rf4fF8a.PsJYD3Yufk40Xu3eZQPWj0jCso1oQU87rz3g9yriHBwS4hn1nLN0LqUEYdSEYa3AXn46lciFyOCoe2g6cQ2sCtK2emgenYPuiZu9.5NRg69jFNewJFMYBrc-K-7kUfxcJAhyCg0o31gGIz2wkxy
date = 2024-08-28
data = 42c5j5fep5MZHSQcwxoezfi9A3Q0smOtcXat2gdOaeOvXkkKWldHucAq9cM9Jy26IR52fI3g30CA2MlpMYbdmp4AAbwbTV61719ay1K7aQtODc1fcpDRLoJYRv33Jd4m.Be42h61q2wteOs_4A2JwG1W64Q9Ug4Fwf2uq26E-koyt3WaqM1X81dKIRf3f5DIyv53Pg72vRfA6I.Fam69k17Ln97frWKcpFK8f8766c1N4VW10JE3TQ8QV5Z3H6wYLbty3954cgDsZe9xe5-QJem9bFnmbxjGP1vYdJLvw6fv79J2NA92oxyOG0076Cr.NwlVrsWQKXynBn1u6y_Kz8f49QQ1vy_5g44x36QusldopAdc3eAjO76K4MfKUzp3wxeszmFjyq2VOq1t4ZQaTg7nL49504p8aM6Mu28-1zpuuAufves0e81Xw94f7guXc4PLtrCo8Xq61A5NY9S4CXTS0C6MHmf62AgMcPYLPImvjYntwuTtJKo7YkmROA7WUJGU497MT1q1fYWHnlfTgv9egIveU0iWA_GjEn0wiAydfYN7YxPmy4vKKk1F5dVpRH2oWRmMdbHE8mbriR9032AJfxDPuffG8rg2vbYuaqK-0HdXaI0J2Phx5NJacT4aPe9H-eHno14XgekLiNHdshdnMadFfAye9Aa5xmt3kAEK6PwJYcIh1m00aV69lsb6Cyh9r6jHAxaF7MAGNZmVeM25JQN90o6W0va5hgyOrU8a4r2y0f.r9ZmeI796BfFIu9jRQ8Mdi40aa0K2TVQ0bHcyYUkso1M5naxTQu5bg19toKk70rFBG.bhXQw9L6J6aa89-Z_Rea.dGPMfxJa2H.NQgsevRz6gKnUypoDw.iLTbZ.hb2ZxfXYptvtZ7osFNuern2s_xI0jY70ay73fLhc4-coOm65daVWI4bjzyQ7iii36d7w6B5VpOKZrcmpKw1olcXn6DrPbEctafnhIwoMcXnj2yvfxJl8krS5UQAjy5J6lO4.PopR5UNyUmJ9i
date = 2024-09-12

2 changes: 1 addition & 1 deletion src/photini/regions.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1028,7 +1028,7 @@ def new_value(self, idx, value):
md.image_region = md.image_region.new_region(region, idx)
if key == 'Iptc4xmpExt:rRole':
# aspect ratio constraint may have changed
self.new_regions.emit(idx, md.image_region)
self.new_regions.emit(idx, list(md.image_region))


class TabWidget(QtWidgets.QWidget):
Expand Down

0 comments on commit bbef9f3

Please sign in to comment.