Sync addons-source@maintenance/gramps60 with upstream/gramps-project (2026-06-05)

Author: github-actions[bot]

ChatWithTree/ChatWithTree.gpr.py

@@ -8,7 +8,7 @@
     id="ChatWithTree",  # Unique ID for your addon
     name=_("Chat With Tree Interactive Addon"),  # Display name in Gramps, translatable
     description=_("Chat With Tree with the help of AI Large Language Model, needs litellm module"),
-    version = '0.0.28',
+    version = '0.0.29',
     gramps_target_version="6.0",  # Specify the Gramps version you are targeting
     status=STABLE,
     audience=EVERYONE,

ChatWithTree/ChatWithTree.py

@@ -171,27 +171,41 @@ def _apply_css_styles(self):
         Defines and applies CSS styles to the Gramplet's widgets.
         """
         css_provider = Gtk.CssProvider()
+        # The message-bubble backgrounds are intentionally light pastels
+        # (Mantis 14143) -- they colour-code message type and were chosen
+        # against a white parent. The foreground was implicitly the GTK
+        # theme's default, which is LIGHT under a dark theme -- so the
+        # result was light-on-light text. Lock the foreground to black
+        # for the bubble classes so the contrast holds regardless of the
+        # active GTK theme. The chat listbox background is also locked
+        # so the empty-chat area doesn't go dark-on-white in dark mode.
         css = """
         #chat-listbox {
             background-color: white;
+            color: black;
         }
         .message-box {
             background-color: #f0f0f0; /* Default background */
+            color: black;
             padding: 10px;
             margin: 5px;
             border-radius: 15px;
         }
         .user-message-box {
             background-color: #dcf8c6; /* Light green for user messages */
+            color: black;
         }
         .tree-reply-box {
             background-color: #d1e2f4; /* Light blue for replies */
+            color: black;
         }
         .error-reply-box {
             background-color: #f4e2d1; /* Light red for errors */
+            color: black;
         }
         .tree-toolcall-box {
             background-color: #fce8b2; /* Light yellow for tool calls */
+            color: black;
         }
 
         """

DynamicWeb/dynamicweb.gpr.py

@@ -15,7 +15,7 @@
     id="DynamicWeb",
     name=_("Dynamic Web Report"),
     description=_("Produces dynamic web pages for the database"),
-    version = '0.0.101',
+    version = '0.0.102',
     gramps_target_version="6.0",
     status=STABLE,
     fname="dynamicweb.py",

DynamicWeb/templates/dwr_default/data/dwr.js

@@ -3601,7 +3601,15 @@ function mapUpdate()
 	{
 		var OsmPointStyle = function(feature, resolution)
 		{
-			var x_marker = parseInt(feature.values_.name.replace('OsmPopup', ''));
+			// Mantis 12544: use the documented OpenLayers feature.get(prop)
+			// API rather than reaching into the private feature.values_
+			// state. OpenLayers renamed/restructured the internal property
+			// store, so feature.values_.name became undefined and the
+			// .replace() call below raised "Cannot read properties of
+			// undefined (reading 'name')" -- breaking OSM markers entirely.
+			// The OsmClick handler below already uses feature.get('name')
+			// for the same property; this aligns the style callback with it.
+			var x_marker = parseInt(feature.get('name').replace('OsmPopup', ''));
 			var ip = GetIconProps(x_marker);
 			var iconStyle = new ol.style.Style({
 				image: new ol.style.Icon(({

Form/CensusCheckQuickview.gpr.py

@@ -8,7 +8,7 @@
          id    = 'censuscheckquickview',
          name  = _("CensusCheck"),
          description= _("Check whether any Census events are missing for a person and some of their descendents"),
-         version = '1.0.4',
+         version = '1.0.5',
          gramps_target_version = '6.0',
          status = STABLE,
          fname = 'CensusCheckQuickview.py',
@@ -22,7 +22,7 @@
          id    = 'censuscheckupquickview',
          name  = _("CensusCheckUp"),
          description= _("Check whether any Census events are missing for a person and some of their ancestors"),
-         version = '1.0.4',
+         version = '1.0.5',
          gramps_target_version = '6.0',
          status = STABLE,
          fname = 'CensusCheckUpQuickview.py',

Form/editform.py

@@ -63,6 +63,7 @@
     Person,
     Family,
     Attribute,
+    Source,
 )
 from gramps.gen.db import DbTxn
 from gramps.gen.display.name import displayer as name_displayer
@@ -380,6 +381,20 @@ def save(self, button):
             if not self.event.get_handle():
                 self.db.add_event(self.event, trans)
 
+            # Mantis 11054 (nick_h's narrow guard): if the source the
+            # citation references was deleted while this form was open,
+            # write a replacement source rather than committing a
+            # dangling-reference citation. No behaviour change when the
+            # reference is intact.
+            source_handle = self.citation.get_reference_handle()
+            if source_handle and self.db.get_source_from_handle(source_handle) is None:
+                replacement = Source()
+                replacement.set_title(
+                    _("[Source recreated after deletion mid-form-edit]")
+                )
+                self.db.add_source(replacement, trans)
+                self.citation.set_reference_handle(replacement.get_handle())
+
             citation_handle = self.citation.get_handle()
             if not self.citation.get_handle():
                 self.db.add_citation(self.citation, trans)
@@ -891,6 +906,12 @@ def save(self, trans):
         for order, row in enumerate(self.model):
             all_people.append(row[0])
             person = self.db.get_person_from_handle(row[0])
+            # Mantis 11054 (nick_h's narrow guard): if the person was
+            # deleted while this form was open, drop the row rather than
+            # commit a None-target reference. No behaviour change when
+            # the reference is intact.
+            if person is None:
+                continue
             event_ref = get_event_ref(self.event, person, self.role)
 
             # Write attributes
@@ -903,6 +924,10 @@ def save(self, trans):
         # Remove links to people no longer on form
         for handle in set(self.initial_people) - set(all_people):
             person = self.db.get_person_from_handle(handle)
+            # Mantis 11054: same narrow guard — the person we tried to
+            # detach is already gone, nothing to commit.
+            if person is None:
+                continue
             ref_list = [
                 event_ref
                 for event_ref in person.get_event_ref_list()
@@ -1061,6 +1086,11 @@ def save(self, trans):
             return
 
         obj = self.dbstate.db.get_person_from_handle(self.handle)
+        # Mantis 11054 (nick_h's narrow guard): the person the form is
+        # attached to was deleted while the form was open — skip this
+        # section entirely rather than commit a None-target reference.
+        if obj is None:
+            return
         event_ref = get_event_ref(self.event, obj, self.role)
 
         row = []
@@ -1072,6 +1102,10 @@ def save(self, trans):
         # Remove link to person no longer on form
         if self.initial_handle and self.handle != self.initial_handle:
             person = self.db.get_person_from_handle(self.initial_handle)
+            # Mantis 11054: the previously-attached person is already
+            # gone, nothing to detach.
+            if person is None:
+                return
             ref_list = [
                 event_ref
                 for event_ref in obj.get_event_ref_list()
@@ -1259,6 +1293,11 @@ def save(self, trans):
             return
 
         obj = self.dbstate.db.get_family_from_handle(self.handle)
+        # Mantis 11054 (nick_h's narrow guard): the family the form is
+        # attached to was deleted while the form was open — skip this
+        # section entirely rather than commit a None-target reference.
+        if obj is None:
+            return
         event_ref = get_event_ref(self.event, obj, self.role)
 
         row = []
@@ -1274,6 +1313,10 @@ def save(self, trans):
         # Remove link to family no longer on form
         if self.initial_handle and self.handle != self.initial_handle:
             family = self.db.get_family_from_handle(self.initial_handle)
+            # Mantis 11054: the previously-attached family is already
+            # gone, nothing to detach.
+            if family is None:
+                return
             ref_list = [
                 event_ref
                 for event_ref in obj.get_event_ref_list()

Form/formgramplet.gpr.py

@@ -31,7 +31,7 @@
     name=_("Form Gramplet"),
     description=_("Gramplet interface for Forms"),
     status=STABLE,
-    version = '2.0.54',
+    version = '2.0.55',
     gramps_target_version="6.0",
     navtypes=["Person"],
     fname="formgramplet.py",