diff --git a/gramps/plugins/drawreport/ancestortree.py b/gramps/plugins/drawreport/ancestortree.py index 2b8956432..beee2e614 100644 --- a/gramps/plugins/drawreport/ancestortree.py +++ b/gramps/plugins/drawreport/ancestortree.py @@ -142,6 +142,7 @@ class CalcItems(object): """ def __init__(self, dbase): __gui = GUIConnect() + self._gui = __gui #calculate the printed lines for each box #str = "" @@ -170,12 +171,14 @@ class CalcItems(object): working_lines = "" if index[1] % 2 == 0 or (index[1] == 1 and self.center_use == 0): if indi_handle == fams_handle == None: - working_lines = self.__blank_father + working_lines = self.__calc_l.calc_lines( + None, None, self._gui.get_val("father_disp")) else: working_lines = self.disp_father else: if indi_handle == fams_handle == None: - working_lines = self.__blank_mother + working_lines = self.__calc_l.calc_lines( + None, None, self._gui.get_val("mother_disp")) else: working_lines = self.disp_mother @@ -228,9 +231,11 @@ class MakeAncestorTree(AscendPerson): myself.text = self.calc_items.calc_person( index, indi_handle, fams_handle) + # myself.text[0] = myself.text[0] + ' ' + repr(index) # for debugging - myself.add_mark(self.database, - self.database.get_person_from_handle(indi_handle)) + if indi_handle is not None: # None is legal for an empty box + myself.add_mark(self.database, + self.database.get_person_from_handle(indi_handle)) self.canvas.add_box(myself) diff --git a/gramps/plugins/lib/librecurse.py b/gramps/plugins/lib/librecurse.py index cc0db8333..c1ead68c1 100644 --- a/gramps/plugins/lib/librecurse.py +++ b/gramps/plugins/lib/librecurse.py @@ -446,13 +446,13 @@ class AscendPerson(_StopRecurse, _PersonSeen): # Recursively call the function. It is okay if the handle is None, # since routine handles a handle of None - self.__fill(index*2, generation+1, mx_fill-1) + self.__fill(generation+1, index*2, mx_fill-1) if mx_fill > 1: # marriage of parents self.add_marriage((generation+1, index*2), None, None) if not self.can_recurse(): self.continue_recursion() return - self.__fill((index*2)+1, generation+1, mx_fill-1) + self.__fill(generation+1, (index*2)+1, mx_fill-1) def __iterate(self, person_handle, generation, index): """ diff --git a/mac/gramps.accel b/mac/gramps.accel index f4fb8b147..66b7b744f 100644 --- a/mac/gramps.accel +++ b/mac/gramps.accel @@ -19,7 +19,7 @@ (gtk_accel_path "/Events/Backward/Back" "Left") ; (gtk_accel_path "/ToolWindow/rebuild_refmap" "") ; (gtk_accel_path "/ToolWindow/Database-Processing" "") - (gtk_accel_path "/Events/Bookmark/EditBook" "b") + (gtk_accel_path "/Events/Bookmark/EditBook" "d") (gtk_accel_path "/People Tree View/PersonEdit/Remove" "Delete") (gtk_accel_path "/Notes/Forward/Forward" "Right") (gtk_accel_path "/Undo/Undo" "z") @@ -29,7 +29,7 @@ (gtk_accel_path "/Media/ChangeOrder/Remove" "Delete") ; (gtk_accel_path "/FileWindow/HelpMenu" "") (gtk_accel_path "/Place View/Bookmark/AddBook" "d") - (gtk_accel_path "/Repositories/Bookmark/EditBook" "b") + (gtk_accel_path "/Repositories/Bookmark/EditBook" "d") ; (gtk_accel_path "/ReportWindow/book" "") ; (gtk_accel_path "/FileWindow/FileMenu" "") (gtk_accel_path "/Person View/Backward/Back" "Left") @@ -49,7 +49,7 @@ (gtk_accel_path "/Place Tree View/ChangeOrder/Add" "i") ; (gtk_accel_path "/ReportWindow/number_of_ancestors" "") (gtk_accel_path "/Families/ChangeOrder/Add" "i") - (gtk_accel_path "/Person View/Bookmark/EditBook" "b") + (gtk_accel_path "/Person View/Bookmark/EditBook" "d") (gtk_accel_path "/Relationships/Bookmark/AddBook" "d") ; (gtk_accel_path "/ReportWindow/familylines_graph" "") (gtk_accel_path "/Person View/Forward/Forward" "Right") @@ -59,9 +59,9 @@ ; (gtk_accel_path "/ToolWindow/relcalc" "") (gtk_accel_path "/AllMainWindow/Export" "e") (gtk_accel_path "/Pedigree/Backward/Back" "Left") - (gtk_accel_path "/Relationships/Bookmark/EditBook" "b") + (gtk_accel_path "/Relationships/Bookmark/EditBook" "d") ; (gtk_accel_path "/ToolWindow/reorder_ids" "") - (gtk_accel_path "/Place Tree View/Bookmark/EditBook" "b") + (gtk_accel_path "/Place Tree View/Bookmark/EditBook" "d") ; (gtk_accel_path "/RecentFiles/RecentMenu0" "") (gtk_accel_path "/Person View/PersonAll/Edit" "Return") ; (gtk_accel_path "/FileWindow/MailingLists" "") @@ -87,7 +87,7 @@ ; (gtk_accel_path "/ToolWindow/dupfind" "") ; (gtk_accel_path "/MainWindow/EditMenu" "") (gtk_accel_path "/UndoHistory/UndoHistory" "h") - (gtk_accel_path "/Sources/Bookmark/EditBook" "b") + (gtk_accel_path "/Sources/Bookmark/EditBook" "d") ; (gtk_accel_path "/FileWindow/ReportBug" "") (gtk_accel_path "/AllMainWindow/Insert" "i") (gtk_accel_path "/Notes/Bookmark/AddBook" "d") @@ -117,7 +117,7 @@ (gtk_accel_path "/AllMainWindow/BackSpace" "BackSpace") ; (gtk_accel_path "/ToolWindow/Utilities" "") ; (gtk_accel_path "/AllMainWindow/WindowsMenu" "") - (gtk_accel_path "/Families/Bookmark/EditBook" "b") + (gtk_accel_path "/Families/Bookmark/EditBook" "d") ; (gtk_accel_path "/AllMainWindow/F9" "F9") ; (gtk_accel_path "/AllMainWindow/F8" "F8") ; (gtk_accel_path "/AllMainWindow/F7" "F7") @@ -127,7 +127,7 @@ ; (gtk_accel_path "/AllMainWindow/F4" "F4") ; (gtk_accel_path "/AllMainWindow/F3" "F3") ; (gtk_accel_path "/AllMainWindow/F2" "F2") - (gtk_accel_path "/Notes/Bookmark/EditBook" "b") + (gtk_accel_path "/Notes/Bookmark/EditBook" "d") (gtk_accel_path "/Sources/ChangeOrder/Add" "i") ; (gtk_accel_path "/ReportWindow/Books" "") ; (gtk_accel_path "/FileWindow/About" "") @@ -135,7 +135,7 @@ ; (gtk_accel_path "/ReportWindow/endofline_report" "") (gtk_accel_path "/People Tree View/PersonEdit/Add" "i") ; (gtk_accel_path "/ToolWindow/dbrowse" "") - (gtk_accel_path "/Pedigree/Bookmark/EditBook" "b") + (gtk_accel_path "/Pedigree/Bookmark/EditBook" "d") ; (gtk_accel_path "/ToolWindow/soundgen" "") ; (gtk_accel_path "/FileWindow/ExtraPlugins" "") ; (gtk_accel_path "/AllMainWindow/ReportsMenu" "") @@ -158,7 +158,7 @@ (gtk_accel_path "/Notes/ChangeOrder/Add" "i") ; (gtk_accel_path "/ReportWindow/calendar" "") ; (gtk_accel_path "/FileWindow/Fullscreen" "F11") - (gtk_accel_path "/Fan Chart/Bookmark/EditBook" "b") + (gtk_accel_path "/Fan Chart/Bookmark/EditBook" "d") ; (gtk_accel_path "/ReportWindow/navwebpage" "") (gtk_accel_path "/Repositories/Bookmark/AddBook" "d") (gtk_accel_path "/Families/ChangeOrder/Remove" "Delete") @@ -170,11 +170,11 @@ ; (gtk_accel_path "/FileWindow/TipOfDay" "") (gtk_accel_path "/Media/ChangeOrder/Add" "i") (gtk_accel_path "/FileWindow/Quit" "q") - (gtk_accel_path "/People Tree View/Bookmark/EditBook" "b") + (gtk_accel_path "/People Tree View/Bookmark/EditBook" "d") (gtk_accel_path "/Place Tree View/Backward/Back" "Left") (gtk_accel_path "/FileWindow/Open" "o") - (gtk_accel_path "/Place View/Bookmark/EditBook" "b") - (gtk_accel_path "/Media/Bookmark/EditBook" "b") + (gtk_accel_path "/Place View/Bookmark/EditBook" "d") + (gtk_accel_path "/Media/Bookmark/EditBook" "d") (gtk_accel_path "/MainWindow/ConfigView" "c") (gtk_accel_path "/People Tree View/Backward/Back" "Left") ; (gtk_accel_path "/FileWindow/KeyBindings" "")