From 17b74e36a81f87255483eeb1407b4bf9e0c885e5 Mon Sep 17 00:00:00 2001 From: John Ralls Date: Sat, 5 Jun 2010 23:59:22 +0000 Subject: [PATCH] Default key accelerator map for OSX, using Command instead of Control git-svn-id: svn+ssh://svn.gnucash.org/repo/gnucash/trunk@19233 57a11ea4-9604-0410-9ed3-97b8803252fd --- src/bin/Makefile.am | 3 +- src/bin/gnucash-bin.c | 12 +- src/gnome-utils/ui/Makefile.am | 3 +- src/gnome-utils/ui/osx_accel_map | 223 +++++++++++++++++++++++++++++++ 4 files changed, 238 insertions(+), 3 deletions(-) create mode 100644 src/gnome-utils/ui/osx_accel_map diff --git a/src/bin/Makefile.am b/src/bin/Makefile.am index 5bb94c7d1a..ee272100d6 100644 --- a/src/bin/Makefile.am +++ b/src/bin/Makefile.am @@ -15,7 +15,8 @@ AM_CPPFLAGS = -I${top_builddir} ${GLIB_CFLAGS} ${GNOME_CFLAGS} ${GTK_CFLAGS} \ -I${top_builddir}/src/gnome-utils \ -I${top_srcdir}/src/gnc-module \ -I${top_srcdir}/src/libqof/qof \ - ${GUILE_INCS} + ${GUILE_INCS} \ + ${IGE_MAC_CFLAGS} if PLATFORM_WIN32 GNUCASH_RESOURCE_FILE = gnucash.rc diff --git a/src/bin/gnucash-bin.c b/src/bin/gnucash-bin.c index 15d41ec288..116943b120 100644 --- a/src/bin/gnucash-bin.c +++ b/src/bin/gnucash-bin.c @@ -586,7 +586,7 @@ inner_main (void *closure, int argc, char **argv) SCM main_mod; char* fn; GError *error = NULL; - + scm_c_eval_string("(debug-set! stack 200000)"); main_mod = scm_c_resolve_module("gnucash main"); @@ -635,6 +635,16 @@ inner_main (void *closure, int argc, char **argv) gnc_destroy_splash_screen(); +#ifdef MAC_INTEGRATION + { + gchar *data_dir = gnc_path_get_pkgdatadir(); + gchar *accelmap = g_build_filename(data_dir, "ui", "osx_accel_map", NULL); + gtk_accel_map_load (accelmap); + g_free(data_dir); + g_free(accelmap); + } +#endif /* MAC_INTEGRATION */ + gnc_main_window_show_all_windows(); gnc_hook_run(HOOK_UI_POST_STARTUP, NULL); diff --git a/src/gnome-utils/ui/Makefile.am b/src/gnome-utils/ui/Makefile.am index 899734e06e..01901c6c87 100644 --- a/src/gnome-utils/ui/Makefile.am +++ b/src/gnome-utils/ui/Makefile.am @@ -1,5 +1,6 @@ uidir = $(GNC_UI_DIR) ui_DATA = \ - gnc-main-window-ui.xml + gnc-main-window-ui.xml \ + osx_accel_map EXTRA_DIST = $(ui_DATA) diff --git a/src/gnome-utils/ui/osx_accel_map b/src/gnome-utils/ui/osx_accel_map new file mode 100644 index 0000000000..05da33e4e9 --- /dev/null +++ b/src/gnome-utils/ui/osx_accel_map @@ -0,0 +1,223 @@ +; gnucash GtkAccelMap rc-file -*- scheme -*- +; this file is an automated accelerator map dump +; +; (gtk_accel_path "/MenuAdditions/BudgetReportAction" "") +; (gtk_accel_path "/GncPluginPageRegisterActions/UnvoidTransactionAction" "") +; (gtk_accel_path "/MenuAdditions/IncomevsDayofWeekAction" "") +; (gtk_accel_path "/MenuAdditions/BudgetBalanceSheetAction" "") +; (gtk_accel_path "/MenuAdditions/AverageBalanceAction" "") +; (gtk_accel_path "/gnc-plugin-aqbanking-actions/DtausImportAction" "") +; (gtk_accel_path "/gnc-plugin-file-history-actions/RecentFile8Action" "") +; (gtk_accel_path "/gnc-plugin-budget-actions/OpenBudgetAction" "") +; (gtk_accel_path "/MainWindowActions/ViewSummaryAction" "") +; (gtk_accel_path "/gnc-plugin-business-actions/EmployeeProcessPaymentAction" "") + (gtk_accel_path "/MainWindowActions/FileOpenMenuAction" "o") +; (gtk_accel_path "/gnc-plugin-business-actions/BusinessAction" "") +; (gtk_accel_path "/MenuAdditions/BalanceSheetAction" "") +(gtk_accel_path "/gnc-plugin-basic-commands-actions/FileOpenAction" "o") +(gtk_accel_path "/gnc-plugin-basic-commands-actions/FileSaveAction" "s") +; (gtk_accel_path "/MainWindowActions/ActionsRenamePageAction" "") +; (gtk_accel_path "/MenuAdditions/InvestmentPortfolioAction" "") +; (gtk_accel_path "/gnc-plugin-basic-commands-actions/FileExportAccountsAction" "") +; (gtk_accel_path "/gnc-plugin-business-actions/BusinessTestReloadInvoiceAction" "") +; (gtk_accel_path "/MenuAdditions/ExpensesvsDayofWeekAction" "") +; (gtk_accel_path "/gnc-plugin-csv-actions/CsvImportAction" "") +; (gtk_accel_path "/MainWindowActions/FilePropertiesAction" "Return") +; (gtk_accel_path "/gnc-plugin-basic-commands-actions/EditTaxOptionsAction" "") +; (gtk_accel_path "/MainWindowActions/FileNewMenuAction" "") +; (gtk_accel_path "/gnc-plugin-business-actions/CustomerProcessPaymentAction" "") +; (gtk_accel_path "/MenuAdditions/TrialBalanceAction" "") +; (gtk_accel_path "/MainWindowActions/ActionsAction" "") +; (gtk_accel_path "/MenuAdditions/AccountSummaryAction" "") +; (gtk_accel_path "/MainWindowActions/HelpAction" "") +; (gtk_accel_path "/gnc-plugin-business-actions/BusinessTestReloadReceivableAction" "") +; (gtk_accel_path "/MenuAdditions/SampleCustomAction" "") +; (gtk_accel_path "/gnc-plugin-business-actions/EmployeeNewEmployeeOpenAction" "") +; (gtk_accel_path "/GncPluginPageAccountTreeActions/ScrubAllAction" "") +; (gtk_accel_path "/GncPluginPageRegisterActions/ScheduleTransactionAction" "") +; (gtk_accel_path "/gnc-plugin-aqbanking-actions/ABIssueIntTransAction" "") +; (gtk_accel_path "/MenuAdditions/ProfitLossAction" "") +; (gtk_accel_path "/gnc-plugin-log-replay-actions/LogReplayAction" "") +; (gtk_accel_path "/gnc-plugin-business-actions/CustomerNewJobOpenAction" "") +; (gtk_accel_path "/MenuAdditions/PayableAgingAction" "") +; (gtk_accel_path "/MenuAdditions/GeneralLedgerAction" "") +; (gtk_accel_path "/MainWindowActions/HelpTutorialAction" "") +; (gtk_accel_path "/gnc-plugin-basic-commands-actions/ActionsSinceLastRunAction" "") +; (gtk_accel_path "/gnc-plugin-business-actions/BusinessTestReloadOwnerAction" "") +; (gtk_accel_path "/MenuAdditions/ReceivableAgingAction" "") +; (gtk_accel_path "/gnc-plugin-basic-commands-actions/ToolsPriceEditorAction" "") +; (gtk_accel_path "/gnc-plugin-business-actions/VendorFindJobOpenAction" "") +(gtk_accel_path "/gnc-plugin-basic-commands-actions/FileNewAction" "n") +; (gtk_accel_path "/gnc-plugin-aqbanking-actions/ABSetupAction" "") +; (gtk_accel_path "/MenuAdditions/BalanceSheetusingeguilegncAction" "") +; (gtk_accel_path "/MainWindowActions/ScrubMenuAction" "") +; (gtk_accel_path "/GncPluginPageRegisterActions/CancelTransactionAction" "") +; (gtk_accel_path "/GncPluginPageRegisterActions/ReverseTransactionAction" "") +; (gtk_accel_path "/GncPluginPageRegisterActions/CutTransactionAction" "") +; (gtk_accel_path "/MenuAdditions/JobReportAction" "") +; (gtk_accel_path "/gnc-plugin-business-actions/VendorNewJobOpenAction" "") +; (gtk_accel_path "/gnc-plugin-file-history-actions/RecentFile5Action" "") +(gtk_accel_path "/GncPluginPageRegisterActions/EditFindTransactionsAction" "f") +(gtk_accel_path "/GncPluginPageAccountTreeActions/EditEditAccountAction" "e") +; (gtk_accel_path "/GncPluginPageRegisterActions/EditExchangeRateAction" "") +; (gtk_accel_path "/gnc-plugin-budget-actions/NewBudgetAction" "") +; (gtk_accel_path "/MenuAdditions/BudgetIncomeStatementAction" "") +(gtk_accel_path "/GncPluginPageRegisterActions/ActionsTransferAction" "t") +; (gtk_accel_path "/MenuAdditions/IncomeExpenseChartAction" "") +; (gtk_accel_path "/MenuAdditions/LiabilityPiechartAction" "") +; (gtk_accel_path "/gnc-plugin-business-actions/EmployeeMenuAction" "") +(gtk_accel_path "/GncPluginPageAccountTreeActions/ActionsTransferAction" "t") +; (gtk_accel_path "/gnc-plugin-business-actions/BillsDueReminderOpenAction" "") +; (gtk_accel_path "/MainWindowActions/ActionsForgetWarningsAction" "") +(gtk_accel_path "/MainWindowActions/FilePrintAction" "p") +; (gtk_accel_path "/gnc-plugin-business-actions/BillingTermsOpenAction" "") +; (gtk_accel_path "/MenuAdditions/BusinessAction" "") +; (gtk_accel_path "/MainWindowActions/FileAction" "") +; (gtk_accel_path "/gnc-plugin-business-actions/VendorNewVendorOpenAction" "") +; (gtk_accel_path "/GncPluginPageRegisterActions/ActionsLotsAction" "") +; (gtk_accel_path "/MenuAdditions/CustomerReportAction" "") +; (gtk_accel_path "/GncPluginPageAccountTreeActions/ActionsReconcileAction" "") +; (gtk_accel_path "/MenuAdditions/CustomReportsAction" "") +; (gtk_accel_path "/gnc-plugin-aqbanking-actions/ABIssueTransAction" "") +; (gtk_accel_path "/MenuAdditions/IncomeExpenseAction" "") +; (gtk_accel_path "/MenuAdditions/IncomePiechartAction" "") +; (gtk_accel_path "/MainWindowActions/ReportsAction" "") +; (gtk_accel_path "/MainWindowActions/TransactionAction" "") +; (gtk_accel_path "/GncPluginPageRegisterActions/ViewStyleAutoSplitAction" "") +; (gtk_accel_path "/GncPluginPageRegisterActions/ActionsStockSplitAction" "") +; (gtk_accel_path "/gnc-plugin-business-actions/VendorFindVendorOpenAction" "") +; (gtk_accel_path "/GncPluginPageAccountTreeActions/ScrubAction" "") +(gtk_accel_path "/MainWindowActions/EditCutAction" "x") +; (gtk_accel_path "/gnc-plugin-aqbanking-actions/OnlineActionsAction" "") +; (gtk_accel_path "/GncPluginPageRegisterActions/ActionsReconcileAction" "") +; (gtk_accel_path "/gnc-plugin-basic-commands-actions/ToolsFinancialCalculatorAction" "") +(gtk_accel_path "/MainWindowActions/FilePageSetupAction" "p") +(gtk_accel_path "/MainWindowActions/FileCloseAction" "w") +; (gtk_accel_path "/MenuAdditions/TransactionReportAction" "") +; (gtk_accel_path "/MenuAdditions/BudgetProfitLossAction" "") +; (gtk_accel_path "/GncPluginPageRegisterActions/ScrubAllAction" "") +; (gtk_accel_path "/gnc-plugin-basic-commands-actions/ActionsMortgageLoanAction" "") +; (gtk_accel_path "/gnc-plugin-register-actions/ToolsGeneralLedgerAction" "") +; (gtk_accel_path "/GncPluginPageAccountTreeActions/EditDeleteAccountAction" "Delete") +; (gtk_accel_path "/MenuAdditions/VendorReportAction" "") +; (gtk_accel_path "/gnc-plugin-business-actions/CustomerFindCustomerOpenAction" "") +; (gtk_accel_path "/gnc-plugin-file-history-actions/RecentFile2Action" "") +; (gtk_accel_path "/gnc-plugin-qif-import-actions/QIFImportAction" "") +; (gtk_accel_path "/GncPluginPageRegisterActions/RecordTransactionAction" "") +; (gtk_accel_path "/gnc-plugin-file-history-actions/RecentFile4Action" "") +; (gtk_accel_path "/MenuAdditions/BudgetFlowAction" "") +; (gtk_accel_path "/gnc-plugin-business-actions/VendorFindBillOpenAction" "") +; (gtk_accel_path "/GncPluginPageRegisterActions/ViewStyleJournalAction" "") +; (gtk_accel_path "/gnc-plugin-basic-commands-actions/ActionsScheduledTransactionsAction" "") +; (gtk_accel_path "/gnc-plugin-business-actions/EmployeeFindEmployeeOpenAction" "") +; (gtk_accel_path "/GncPluginPageRegisterActions/JumpTransactionAction" "") +; (gtk_accel_path "/GncPluginPageRegisterActions/PasteTransactionAction" "") +; (gtk_accel_path "/gnc-plugin-business-actions/BusinessTestInitDataAction" "") +; (gtk_accel_path "/MainWindowActions/WindowMovePageAction" "") +; (gtk_accel_path "/gnc-plugin-aqbanking-actions/ABGetTransAction" "") +; (gtk_accel_path "/gnc-plugin-business-actions/EmployeeFindExpenseVoucherOpenAction" "") +; (gtk_accel_path "/MainWindowActions/HelpContentsAction" "F1") +; (gtk_accel_path "/MenuAdditions/CustomMulticolumnReportAction" "") +; (gtk_accel_path "/MenuAdditions/WelcomeSampleReportAction" "") +(gtk_accel_path "/GncPluginPageRegisterActions/EditCutAction" "x") +; (gtk_accel_path "/GncPluginPageRegisterActions/ViewStyleDoubleLineAction" "") +; (gtk_accel_path "/GncPluginPageRegisterActions/ScrubCurrentAction" "") +; (gtk_accel_path "/MainWindowActions/ViewAction" "") +; (gtk_accel_path "/MenuAdditions/AdvancedPortfolioAction" "") +; (gtk_accel_path "/gnc-plugin-basic-commands-actions/HelpTipsOfTheDayAction" "") +; (gtk_accel_path "/MenuAdditions/BudgetAction" "") +; (gtk_accel_path "/gnc-plugin-business-actions/CustomerFindInvoiceOpenAction" "") +; (gtk_accel_path "/gnc-plugin-business-actions/CustomerFindJobOpenAction" "") +(gtk_accel_path "/MainWindowActions/EditCopyAction" "c") +; (gtk_accel_path "/gnc-plugin-business-actions/BusinessTestSearchAction" "") +; (gtk_accel_path "/gnc-plugin-aqbanking-actions/Mt940ImportAction" "") +; (gtk_accel_path "/MenuAdditions/IncomeBarchartAction" "") +; (gtk_accel_path "/GncPluginPageAccountTreeActions/ActionsLotsAction" "") +; (gtk_accel_path "/GncPluginPageRegisterActions/ViewFilterByAction" "") +; (gtk_accel_path "/GncPluginPageAccountTreeActions/EditRenumberSubaccountsAction" "") +; (gtk_accel_path "/GncPluginPageRegisterActions/CopyTransactionAction" "") +; (gtk_accel_path "/MainWindowActions/ToolsAction" "") +; (gtk_accel_path "/MenuAdditions/ExpensePiechartAction" "") +; (gtk_accel_path "/GncPluginPageAccountTreeActions/FileOpenSubaccountsAction" "") +; (gtk_accel_path "/MainWindowActions/WindowsAction" "") +; (gtk_accel_path "/gnc-plugin-ofx-actions/OfxImportAction" "") +; (gtk_accel_path "/gnc-plugin-business-actions/BusinessTestAction" "") +(gtk_accel_path "/gnc-plugin-basic-commands-actions/EditFindTransactionsAction" "f") +; (gtk_accel_path "/MenuAdditions/ExpenseBarchartAction" "") +; (gtk_accel_path "/MenuAdditions/BudgetBarchartAction" "") +; (gtk_accel_path "/GncPluginPageRegisterActions/DeleteTransactionAction" "") +; (gtk_accel_path "/MenuAdditions/IncomeStatementAction" "") +; (gtk_accel_path "/gnc-plugin-aqbanking-actions/Mt942ImportAction" "") +; (gtk_accel_path "/gnc-plugin-basic-commands-actions/ActionsScheduledTransactionEditorAction" "") +; (gtk_accel_path "/GncPluginPageRegisterActions/RemoveTransactionSplitsAction" "") +; (gtk_accel_path "/GncPluginPageAccountTreeActions/ScrubSubAction" "") +; (gtk_accel_path "/gnc-plugin-file-history-actions/RecentFile1Action" "") +(gtk_accel_path "/GncPluginPageRegisterActions/FilePrintAction" "p") +; (gtk_accel_path "/GncPluginPageAccountTreeActions/FileNewAccountAction" "") +; (gtk_accel_path "/gnc-plugin-file-history-actions/RecentFile3Action" "") +(gtk_accel_path "/GncPluginPageRegisterActions/EditEditAccountAction" "e") +(gtk_accel_path "/MainWindowActions/EditPreferencesAction" ",") +; (gtk_accel_path "/GncPluginPageAccountTreeActions/ActionsStockSplitAction" "") +; (gtk_accel_path "/MainWindowActions/HelpAboutAction" "") +; (gtk_accel_path "/MainWindowActions/ViewFilterByAction" "") +; (gtk_accel_path "/GncPluginPageRegisterActions/ReportsAccountReportAction" "") +; (gtk_accel_path "/MainWindowActions/ViewToolbarAction" "") +; (gtk_accel_path "/gnc-plugin-file-history-actions/RecentFile7Action" "") +; (gtk_accel_path "/gnc-plugin-aqbanking-actions/ABGetBalanceAction" "") +; (gtk_accel_path "/GncPluginPageAccountTreeActions/FileAddAccountHierarchyDruidAction" "") +; (gtk_accel_path "/MainWindowActions/WindowNewAction" "") +; (gtk_accel_path "/gnc-plugin-file-history-actions/RecentFile9Action" "") +; (gtk_accel_path "/MainWindowActions/ViewSortByAction" "") +; (gtk_accel_path "/MainWindowActions/EditAction" "") +; (gtk_accel_path "/gnc-plugin-business-actions/CustomerNewInvoiceOpenAction" "") +; (gtk_accel_path "/GncPluginPageRegisterActions/DuplicateTransactionAction" "") +; (gtk_accel_path "/GncPluginPageRegisterActions/SplitTransactionAction" "") +; (gtk_accel_path "/MenuAdditions/LiabilityBarchartAction" "") +; (gtk_accel_path "/GncPluginPageRegisterActions/BlankTransactionAction" "") +; (gtk_accel_path "/GncPluginPageRegisterActions/ViewSortByAction" "") +; (gtk_accel_path "/gnc-plugin-business-actions/EmployeeNewExpenseVoucherOpenAction" "") +; (gtk_accel_path "/GncPluginPageAccountTreeActions/ViewFilterByAction" "") +; (gtk_accel_path "/MenuAdditions/EmployeeReportAction" "") +; (gtk_accel_path "/MenuAdditions/FancyInvoiceAction" "") +(gtk_accel_path "/GncPluginPageRegisterActions/EditPasteAction" "v") +; (gtk_accel_path "/gnc-plugin-aqbanking-actions/ABIssueDirectDebitAction" "") +(gtk_accel_path "/gnc-plugin-basic-commands-actions/FileSaveAsAction" "s") +; (gtk_accel_path "/MenuAdditions/AssetsLiabilitiesAction" "") +; (gtk_accel_path "/MenuAdditions/PrintableInvoiceAction" "") +; (gtk_accel_path "/MenuAdditions/EasyInvoiceAction" "") +; (gtk_accel_path "/MenuAdditions/TaxInvoiceAction" "") +; (gtk_accel_path "/GncPluginPageRegisterActions/ViewStyleBasicAction" "") +; (gtk_accel_path "/MenuAdditions/EquityStatementAction" "") +; (gtk_accel_path "/gnc-plugin-business-actions/VendorNewBillOpenAction" "") +; (gtk_accel_path "/MenuAdditions/PriceScatterplotAction" "") +(gtk_accel_path "/MainWindowActions/ViewRefreshAction" "r") +; (gtk_accel_path "/gnc-plugin-aqbanking-actions/DtausImportSendAction" "") +; (gtk_accel_path "/GncPluginPageRegisterActions/VoidTransactionAction" "") +; (gtk_accel_path "/gnc-plugin-business-actions/VendorProcessPaymentAction" "") +; (gtk_accel_path "/GncPluginPageAccountTreeActions/ActionsAutoClearAction" "") +; (gtk_accel_path "/MenuAdditions/NetWorthBarchartAction" "") +; (gtk_accel_path "/GncPluginPageRegisterActions/ReportsAcctTransReportAction" "") +; (gtk_accel_path "/GncPluginPageAccountTreeActions/FileOpenAccountAction" "") +; (gtk_accel_path "/gnc-plugin-business-actions/CustomerMenuAction" "") +; (gtk_accel_path "/gnc-plugin-basic-commands-actions/ToolsBookCloseAction" "") +; (gtk_accel_path "/MenuAdditions/TaxScheduleReportTXFExportAction" "") +; (gtk_accel_path "/MainWindowActions/ViewStatusbarAction" "") +; (gtk_accel_path "/gnc-plugin-basic-commands-actions/ToolsCommodityEditorAction" "") +(gtk_accel_path "/MainWindowActions/EditPasteAction" "v") +; (gtk_accel_path "/gnc-plugin-business-actions/VendorMenuAction" "") +; (gtk_accel_path "/MainWindowActions/ExtensionsAction" "") +; (gtk_accel_path "/gnc-plugin-file-history-actions/RecentFile0Action" "") +(gtk_accel_path "/GncPluginPageRegisterActions/EditCopyAction" "c") +; (gtk_accel_path "/MenuAdditions/CashFlowAction" "") +; (gtk_accel_path "/MainWindowActions/FileImportAction" "") +; (gtk_accel_path "/gnc-plugin-business-actions/CustomerNewCustomerOpenAction" "") +; (gtk_accel_path "/MainWindowActions/FileQuitAction" "q") +; (gtk_accel_path "/gnc-plugin-business-actions/TaxTablesOpenAction" "") +; (gtk_accel_path "/MenuAdditions/AssetPiechartAction" "") +; (gtk_accel_path "/MenuAdditions/SampleReportwithExamplesAction" "") +; (gtk_accel_path "/MenuAdditions/GeneralJournalAction" "") +; (gtk_accel_path "/MenuAdditions/AssetBarchartAction" "") +; (gtk_accel_path "/gnc-plugin-stylesheets-actions/EditStyleSheetsAction" "") +; (gtk_accel_path "/gnc-plugin-account-tree-actions/ViewAccountTreeAction" "") +; (gtk_accel_path "/MainWindowActions/FileExportAction" "") +; (gtk_accel_path "/gnc-plugin-file-history-actions/RecentFile6Action" "")