When a form action is activated, call EditForm.action_callback to exec the actions command implementation

Author: stevenyoungs

Form/editform.py

@@ -307,7 +307,8 @@ def __populate_gui(self, event):
                              self.track,
                              self.event,
                              self.citation,
-                             form_id)
+                             form_id,
+                             self.action_callback)
 
         self.headings = HeadingsTab(self.dbstate,
                                        self.uistate,
@@ -370,6 +371,9 @@ def help_clicked(self, obj):
         """
         display_help(webpage='Form_Addons')
 
+    def action_callback(self, section, object, row, column, value, command):
+        exec(command)
+
 #------------------------------------------------------------------------
 #
 # Headings Tab
@@ -477,11 +481,12 @@ class DetailsTab(GrampsTab):
     """
     Details tab in the form editor.
     """
-    def __init__(self, dbstate, uistate, track, event, citation, form_id):
+    def __init__(self, dbstate, uistate, track, event, citation, form_id, action_callback):
         self.db = dbstate.db
         self.event = event
         self.citation = citation
         self.form_id = form_id
+        self._action_callback = action_callback
         GrampsTab.__init__(self, dbstate, uistate, track, _('Details'))
 
         self.populate_gui(event)
@@ -502,7 +507,7 @@ def build_interface(self):
             if section_type == 'multi':
                 section = MultiSection(self.dbstate, self.uistate, self.track,
                                        self.event, self.citation, self.form_id,
-                                       role)
+                                       role, self._action_callback)
             elif section_type == 'person':
                 section = PersonSection(self.dbstate, self.uistate, self.track,
                                         self.event, self.citation, self.form_id,
@@ -555,7 +560,7 @@ class MultiSection(Gtk.Box):
     SelectPerson = SelectorFactory('Person')
 
     def __init__(self, dbstate, uistate, track, event, citation, form_id,
-                 section):
+                 section, action_callback):
         Gtk.Box.__init__(self, orientation=Gtk.Orientation.VERTICAL)
 
         self.dbstate = dbstate
@@ -567,6 +572,8 @@ def __init__(self, dbstate, uistate, track, event, citation, form_id,
         self.event = event
         self.citation = citation
 
+        self._action_callback = action_callback
+
         self.model = None
         self.columns = []
         self.initial_people = []
@@ -626,7 +633,7 @@ def __init__(self, dbstate, uistate, track, event, citation, form_id,
         down_btn.connect('clicked', self.__move_person, 'down')
         hbox.pack_start(down_btn, expand=False, fill=True, padding=0)
 
-        self.entry_grid = EntryGrid(callback=self.change_person)
+        self.entry_grid = EntryGrid(callback=self.change_person, action_callback=self.action_callback)
 
         self.pack_start(hbox, expand=False, fill=True, padding=0)
         self.pack_start(self.entry_grid, expand=True, fill=True, padding=0)
@@ -701,6 +708,9 @@ def change_person(self, model, iter_):
         if person:
             self.model.set_value(iter_, 0, person.get_handle())
 
+    def action_callback(self, row, column, command):
+        self._action_callback(self, self.model[row][0], row, column, self.model[row][column], command)
+
     def __new_person_row(self, person):
         """
         Create a new model entry for a person.

Form/entrygrid.py

@@ -69,7 +69,7 @@ def _draw(self, widget, cr):
 #------------------------------------------------------------------------
 class EntryGrid(Gtk.Grid):
 
-    def __init__(self, headings=None, tooltips=None, actions=None, model=None, callback=None):
+    def __init__(self, headings=None, tooltips=None, actions=None, model=None, callback=None, action_callback=None):
         Gtk.Grid.__init__(self)
 
         self.headings = headings
@@ -80,6 +80,7 @@ def __init__(self, headings=None, tooltips=None, actions=None, model=None, callb
         self.indicators = []
         self.selected = None
         self.callback = callback
+        self.action_callback = action_callback
 
     def set_model(self, model):
         self.model = model
@@ -142,6 +143,7 @@ def build(self):
                 entry.set_tooltip_text(self.tooltips[column - 1])
                 entry.connect('changed', self.changed, row, column)
                 entry.connect('focus-in-event', self.got_focus, row)
+                entry.connect('populate_popup', self.populate_popup, row, column)
                 entry.show()
                 self.attach(entry, column + 1, row + 1, 1, 1)
                 entry_row.append(entry)
@@ -161,7 +163,7 @@ def got_focus(self, entry, event, row):
         self.indicators[row].set_active(True)
 
     def activate_action(self, widget, row, column, action):
-        pass
+        self.action_callback(row, column, action.command)
 
     def populate_popup(self, entry, menu, row, column):
         if self.actions[column - 1]:
@@ -214,6 +216,7 @@ def clean_up(self):
         self.indicators = None
         self.selected = None
         self.callback = None
+        self.callback_action = None
 
 def set_size(entry):
     layout = entry.get_layout()