From c5f0c7a6f0817c9a244dca8b807d9a03535d9665 Mon Sep 17 00:00:00 2001 From: John Ralls Date: Thu, 14 Nov 2013 09:24:35 -0800 Subject: [PATCH] Bug 7191: Cursor keys just beep on PPC with Gramps 3.4.6 It's actually on both PPC and Intel, and it's from forgetting to update gramps.accel after upgrading Gtk past 2.24.10, which changed the mapping of alt/option from Mod5 to Mod1. For gramps40 and master, the problem was masked by the bundler putting the file in the wrong directory. --- mac/gramps.accel | 80 +++++++++++++++++++++++------------------------ mac/gramps.bundle | 4 +-- 2 files changed, 42 insertions(+), 42 deletions(-) diff --git a/mac/gramps.accel b/mac/gramps.accel index fbeba033a..f4fb8b147 100644 --- a/mac/gramps.accel +++ b/mac/gramps.accel @@ -5,23 +5,23 @@ ; (gtk_accel_path "/FileWindow/PluginStatus" "") ; (gtk_accel_path "/ReportWindow/place_report" "") ; (gtk_accel_path "/FileWindow/ViewMenu" "") - (gtk_accel_path "/Pedigree/Forward/Forward" "Right") + (gtk_accel_path "/Pedigree/Forward/Forward" "Right") ; (gtk_accel_path "/ReportWindow/birthday_report" "") ; (gtk_accel_path "/ReportWindow/marker_report" "") ; (gtk_accel_path "/ReportWindow/Graphs" "") ; (gtk_accel_path "/FileWindow/FAQ" "") ; (gtk_accel_path "/ToolWindow/mediaman" "") - (gtk_accel_path "/Families/Forward/Forward" "Right") - (gtk_accel_path "/Events/ChangeOrder/Add" "i") + (gtk_accel_path "/Families/Forward/Forward" "Right") + (gtk_accel_path "/Events/ChangeOrder/Add" "i") ; (gtk_accel_path "/ReportWindow/det_descendant_report" "") ; (gtk_accel_path "/ReportWindow/statistics_chart" "") ; (gtk_accel_path "/Person View/PersonAll/FilterEdit" "") - (gtk_accel_path "/Events/Backward/Back" "Left") + (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 "/People Tree View/PersonEdit/Remove" "Delete") - (gtk_accel_path "/Notes/Forward/Forward" "Right") + (gtk_accel_path "/Notes/Forward/Forward" "Right") (gtk_accel_path "/Undo/Undo" "z") (gtk_accel_path "/MainWindow/Import" "i") ; (gtk_accel_path "/FileWindow/Filter" "") @@ -32,40 +32,40 @@ (gtk_accel_path "/Repositories/Bookmark/EditBook" "b") ; (gtk_accel_path "/ReportWindow/book" "") ; (gtk_accel_path "/FileWindow/FileMenu" "") - (gtk_accel_path "/Person View/Backward/Back" "Left") + (gtk_accel_path "/Person View/Backward/Back" "Left") ; (gtk_accel_path "/ReportWindow/records" "") ; (gtk_accel_path "/ReportWindow/ancestor_report" "") ; (gtk_accel_path "/ToolWindow/chname" "") ; (gtk_accel_path "/Person View/PersonEdit/FastMerge" "") - (gtk_accel_path "/Relationships/Forward/Forward" "Right") + (gtk_accel_path "/Relationships/Forward/Forward" "Right") ; (gtk_accel_path "/Person View/PersonEdit/ExportTab" "") (gtk_accel_path "/Notes/ChangeOrder/Remove" "Delete") ; (gtk_accel_path "/ToolWindow/editowner" "") ; (gtk_accel_path "/ReportWindow/hourglass_graph" "") - (gtk_accel_path "/Repositories/ChangeOrder/Add" "i") - (gtk_accel_path "/Media/Forward/Forward" "Right") + (gtk_accel_path "/Repositories/ChangeOrder/Add" "i") + (gtk_accel_path "/Media/Forward/Forward" "Right") (gtk_accel_path "/AllMainWindow/Delete" "Delete") ; (gtk_accel_path "/FileWindow/Toolbar" "") - (gtk_accel_path "/Place Tree View/ChangeOrder/Add" "i") + (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 "/Families/ChangeOrder/Add" "i") (gtk_accel_path "/Person View/Bookmark/EditBook" "b") (gtk_accel_path "/Relationships/Bookmark/AddBook" "d") ; (gtk_accel_path "/ReportWindow/familylines_graph" "") - (gtk_accel_path "/Person View/Forward/Forward" "Right") + (gtk_accel_path "/Person View/Forward/Forward" "Right") (gtk_accel_path "/Place View/ChangeOrder/Remove" "Delete") (gtk_accel_path "/Sources/ChangeOrder/Remove" "Delete") (gtk_accel_path "/Person View/ChangeOrder/Remove" "Delete") ; (gtk_accel_path "/ToolWindow/relcalc" "") (gtk_accel_path "/AllMainWindow/Export" "e") - (gtk_accel_path "/Pedigree/Backward/Back" "Left") + (gtk_accel_path "/Pedigree/Backward/Back" "Left") (gtk_accel_path "/Relationships/Bookmark/EditBook" "b") ; (gtk_accel_path "/ToolWindow/reorder_ids" "") (gtk_accel_path "/Place Tree View/Bookmark/EditBook" "b") ; (gtk_accel_path "/RecentFiles/RecentMenu0" "") (gtk_accel_path "/Person View/PersonAll/Edit" "Return") ; (gtk_accel_path "/FileWindow/MailingLists" "") - (gtk_accel_path "/Place View/Forward/Forward" "Right") + (gtk_accel_path "/Place View/Forward/Forward" "Right") ; (gtk_accel_path "/ReportWindow/kinship_report" "") ; (gtk_accel_path "/MainWindow/BookMenu" "") ; (gtk_accel_path "/ToolWindow/evname" "") @@ -75,23 +75,23 @@ (gtk_accel_path "/Place Tree View/Bookmark/AddBook" "d") ; (gtk_accel_path "/AllMainWindow/F11" "F11") ; (gtk_accel_path "/ToolWindow/sortevents" "") - (gtk_accel_path "/Fan Chart/Backward/Back" "Left") -; (gtk_accel_path "/Media/Backward/Back" "Left") + (gtk_accel_path "/Fan Chart/Backward/Back" "Left") +; (gtk_accel_path "/Media/Backward/Back" "Left") ; (gtk_accel_path "/Fan Chart/Bookmark/AddBook" "d") ; (gtk_accel_path "/Person View/PersonEdit/CmpMerge" "") ; (gtk_accel_path "/MainWindow/ToolsMenu" "") - (gtk_accel_path "/Events/Forward/Forward" "Right") - (gtk_accel_path "/Families/Backward/Back" "Left") - (gtk_accel_path "/Place View/Backward/Back" "Left") + (gtk_accel_path "/Events/Forward/Forward" "Right") + (gtk_accel_path "/Families/Backward/Back" "Left") + (gtk_accel_path "/Place View/Backward/Back" "Left") ; (gtk_accel_path "/ReportWindow/descend_chart" "") ; (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 "/FileWindow/ReportBug" "") - (gtk_accel_path "/AllMainWindow/Insert" "i") + (gtk_accel_path "/AllMainWindow/Insert" "i") (gtk_accel_path "/Notes/Bookmark/AddBook" "d") - (gtk_accel_path "/People Tree View/ChangeOrder/Add" "i") + (gtk_accel_path "/People Tree View/ChangeOrder/Add" "i") ; (gtk_accel_path "/FileWindow/Sidebar" "") ; (gtk_accel_path "/Person View/PersonAll/Dummy" "") (gtk_accel_path "/Redo/Redo" "z") @@ -99,11 +99,11 @@ ; (gtk_accel_path "/ReportWindow/family_group" "") ; (gtk_accel_path "/ToolWindow/excity" "") (gtk_accel_path "/Repositories/ChangeOrder/Remove" "Delete") - (gtk_accel_path "/Repositories/Forward/Forward" "Right") + (gtk_accel_path "/Repositories/Forward/Forward" "Right") ; (gtk_accel_path "/FileWindow/UserManual" "F1") ; (gtk_accel_path "/FileWindow/OpenRecent" "") (gtk_accel_path "/Families/Bookmark/AddBook" "d") - (gtk_accel_path "/Place Tree View/Forward/Forward" "Right") + (gtk_accel_path "/Place Tree View/Forward/Forward" "Right") ; (gtk_accel_path "/ReportWindow/rel_graph" "") ; (gtk_accel_path "/ReportWindow/Web-Pages" "") ; (gtk_accel_path "/ReportWindow/WebCal" "") @@ -112,7 +112,7 @@ ; (gtk_accel_path "/FileWindow/HomePage" "") (gtk_accel_path "/Relationships/Family/Edit" "Return") ; (gtk_accel_path "/ToolWindow/patchnames" "") - (gtk_accel_path "/Relationships/Backward/Back" "Left") + (gtk_accel_path "/Relationships/Backward/Back" "Left") ; (gtk_accel_path "/ReportWindow/det_ancestor_report" "") (gtk_accel_path "/AllMainWindow/BackSpace" "BackSpace") ; (gtk_accel_path "/ToolWindow/Utilities" "") @@ -128,12 +128,12 @@ ; (gtk_accel_path "/AllMainWindow/F3" "F3") ; (gtk_accel_path "/AllMainWindow/F2" "F2") (gtk_accel_path "/Notes/Bookmark/EditBook" "b") - (gtk_accel_path "/Sources/ChangeOrder/Add" "i") + (gtk_accel_path "/Sources/ChangeOrder/Add" "i") ; (gtk_accel_path "/ReportWindow/Books" "") ; (gtk_accel_path "/FileWindow/About" "") - (gtk_accel_path "/Notes/Backward/Back" "Left") + (gtk_accel_path "/Notes/Backward/Back" "Left") ; (gtk_accel_path "/ReportWindow/endofline_report" "") - (gtk_accel_path "/People Tree View/PersonEdit/Add" "i") + (gtk_accel_path "/People Tree View/PersonEdit/Add" "i") ; (gtk_accel_path "/ToolWindow/dbrowse" "") (gtk_accel_path "/Pedigree/Bookmark/EditBook" "b") ; (gtk_accel_path "/ToolWindow/soundgen" "") @@ -150,12 +150,12 @@ ; (gtk_accel_path "/ReportWindow/timeline" "") ; (gtk_accel_path "/ToolWindow/Database-Repair" "") ; (gtk_accel_path "/ReportWindow/Graphical-Reports" "") - (gtk_accel_path "/Person View/HomePerson" "Home") + (gtk_accel_path "/Person View/HomePerson" "Home") ; (gtk_accel_path "/ReportWindow/ancestor_chart" "") ; (gtk_accel_path "/ToolWindow/check" "") - (gtk_accel_path "/Fan Chart/Forward/Forward" "Right") + (gtk_accel_path "/Fan Chart/Forward/Forward" "Right") ; (gtk_accel_path "/ToolWindow/chtype" "") - (gtk_accel_path "/Notes/ChangeOrder/Add" "i") + (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") @@ -163,26 +163,26 @@ (gtk_accel_path "/Repositories/Bookmark/AddBook" "d") (gtk_accel_path "/Families/ChangeOrder/Remove" "Delete") ; (gtk_accel_path "/ToolWindow/verify" "") - (gtk_accel_path "/People Tree View/Forward/Forward" "Right") - (gtk_accel_path "/Sources/Backward/Back" "Left") + (gtk_accel_path "/People Tree View/Forward/Forward" "Right") + (gtk_accel_path "/Sources/Backward/Back" "Left") ; (gtk_accel_path "/ToolWindow/not_related" "") (gtk_accel_path "/People Tree View/Bookmark/AddBook" "d") ; (gtk_accel_path "/FileWindow/TipOfDay" "") - (gtk_accel_path "/Media/ChangeOrder/Add" "i") + (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 "/Place Tree View/Backward/Back" "Left") + (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 "/MainWindow/ConfigView" "c") - (gtk_accel_path "/People Tree View/Backward/Back" "Left") + (gtk_accel_path "/People Tree View/Backward/Back" "Left") ; (gtk_accel_path "/FileWindow/KeyBindings" "") - (gtk_accel_path "/Repositories/Backward/Back" "Left") + (gtk_accel_path "/Repositories/Backward/Back" "Left") (gtk_accel_path "/Events/Bookmark/AddBook" "d") (gtk_accel_path "/People Tree View/ChangeOrder/Remove" "Delete") (gtk_accel_path "/AllMainWindow/P" "p") - (gtk_accel_path "/Person View/ChangeOrder/Add" "i") + (gtk_accel_path "/Person View/ChangeOrder/Add" "i") (gtk_accel_path "/AllMainWindow/N" "n") (gtk_accel_path "/Place Tree View/ChangeOrder/Remove" "Delete") ; (gtk_accel_path "/AllMainWindow/Abandon" "") @@ -193,8 +193,8 @@ ; (gtk_accel_path "/Person View/PersonOther/SetActive" "") (gtk_accel_path "/categoryviews/personview_1" "2") (gtk_accel_path "/Sources/Bookmark/AddBook" "d") - (gtk_accel_path "/Place View/ChangeOrder/Add" "i") - (gtk_accel_path "/Person View/PersonEdit/Add" "i") - (gtk_accel_path "/Sources/Forward/Forward" "Right") + (gtk_accel_path "/Place View/ChangeOrder/Add" "i") + (gtk_accel_path "/Person View/PersonEdit/Add" "i") + (gtk_accel_path "/Sources/Forward/Forward" "Right") (gtk_accel_path "/Person View/Bookmark/AddBook" "d") ; (gtk_accel_path "/FileWindow/Preferences" "") diff --git a/mac/gramps.bundle b/mac/gramps.bundle index 3500e2cd2..c994efb2e 100644 --- a/mac/gramps.bundle +++ b/mac/gramps.bundle @@ -78,7 +78,7 @@ - ${prefix}/lib/libosmgpsmap.3.dylib + ${prefix}/lib/libosmgpsmap-1.0.0.dylib @@ -210,7 +210,7 @@ ${project}/gramps.icns - + ${project}/gramps.accel