Merge pull request #308 from jim-easterbrook/devel

Devel

CHANGELOG.txt

@@ -1,6 +1,6 @@
 Photini - a simple photo metadata editor.
 http://github.com/jim-easterbrook/Photini
-Copyright (C) 2012-24  Jim Easterbrook  [email protected]
+Copyright (C) 2012-25  Jim Easterbrook  [email protected]
 
 This program is free software: you can redistribute it and/or
 modify it under the terms of the GNU General Public License as
@@ -16,6 +16,11 @@ You should have received a copy of the GNU General Public License
 along with this program.  If not, see
 <http://www.gnu.org/licenses/>.
 
+Changes in v2025.1.0:
+  1/ Read and write MWG and MS image region metadata.
+  2/ Added "people in image" to descriptive tab.
+  3/ Other minor improvements and bug fixes.
+
 Changes in v2024.11.1:
   1/ Fix bug with case insensitivity of hierarchical keywords.
 

src/photini/data/keys.txt

@@ -65,6 +65,6 @@ client_id = (688, 4)
 client_secret = (692, 40)
 
 [data]
-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
+data = 1e17Q3QMqCWc3rdQ87EetfDQ0mxVQyMAMu4.xw_753dZxx.o4sC7Ko0ArggQaJuMq2ii6cOJEiJGK-Ne7OIJSkB8qfB666fK2No0v5Nrne5oBt5eAbxfIrf2.oNHaM7ec86ecl0p0zmys9PRFz44frw5M6GOZ36KlaZ6cuHfYbJ9yg225wS7aX5o5AJvbErLK2a8t4iNAPAbdN5M73dN0mSKulh9Fa16Km93g2SJ58GAd9KfzMlJ8pHv5xIciH5.Ke_ywtZQ62aAdPA59H7rfnwdmWpNtGiy3274VK5dT7VYwd1uN175lAInC78WvDr4WLwa85GfR3jT10pVn0cO14yJc_Qvx72kW8feT9-Rpo63w98ta4cm.O59jfFUffej78sscHwmxgrKDR09oWaZVsKsOnftk43htEm8ASfzeaT09JcW.Zama68R4.33ioaseavpZqmcWZPaJkJXyRG1.2odEQ1rOfMoNGAaNg28MOhjpINBoFij614ss5LS81ptn9mfmub00yARlF722yqZMycY2ha0ememKbAto0DWrK-HDkJq.416yree6ReenZsI3bVQ-u1Y6Y_EN5Q396zZSfICV5AVn3vXITfjc1tailoiA1u31NNK4a11H1c2WVSR6Qmy.e0tg6_A-RNmzL1h4rUg023lcng976Z18a8f5vAylam8npOpjDYkjMq64l-B6AE1cXlSZhMyhgIq67eMj003ALeM1lT49tb4HS3u72af.CUQ5C7X1yBDK-JF1pZ9l6nt2n0MRqMkkJpAV2nCF36RRilXuuKCzaZ63DnAheWhUWm9HIs4L_nV1115nBpdxPgOuaXroCQeRsLf5RuJ7P9QnfanF6x95buq.n1ZMtsGt0Wq3vgrqWIY11ASqQSZJCRhbyVCi5D8AUbRC659xZK0X2d6CQbCf36Yy80d9e-jpumsa-oXOe6b9UEAdL.w79P24iX0LGp94Ke5W59Bvdn01rR1IgZrkidMQaE9Z3AfNQf076uSywcKWTD7HCMc
+date = 2025-01-03
 

src/photini/exiv2.py

@@ -365,6 +365,9 @@ def get_exif_comment(self, tag, value):
             if charset != exiv2.CommentValue.CharsetId.undefined:
                 logger.warning('%s: %s: unknown charset', self._name, tag)
                 raw_value = data
+        if not raw_value:
+            # no data to decode
+            return None
         result = None
         for encoding in encodings:
             result = self.decode_string(tag, raw_value, encoding)

src/photini/regions.py

@@ -665,7 +665,7 @@ def add_menu_items(self, items, add_separator=True, exclusive=False):
             self.menu.addSeparator()
         self.add_separator = add_separator
         if exclusive:
-            group = QtWidgets.QActionGroup(self)
+            group = QtGui2.QActionGroup(self)
             group.setExclusionPolicy(group.ExclusionPolicy.ExclusiveOptional)
         for item in items:
             label = MD_LangAlt(item['data']['Iptc4xmpExt:Name']).best_match()