Skip to content

Commit

Permalink
Consolidate accelerator map loading for OSX with the others. Accelera…
Browse files Browse the repository at this point in the history 
…tor maps can't be modified interactively in OSX so there's no point to reloading the saved map.

git-svn-id: svn+ssh://svn.gnucash.org/repo/gnucash/trunk@19527 57a11ea4-9604-0410-9ed3-97b8803252fd
  • Loading branch information
@jralls
jralls committed Aug 31, 2010
1 parent 6440e20 commit 90e985d
Show file tree
Hide file tree
Showing 3 changed files with 38 additions and 37 deletions.
11 changes: 0 additions & 11 deletions src/bin/gnucash-bin.c
View file
Expand Up @@ -719,17 +719,6 @@ 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);
Expand Down
7 changes: 7 additions & 0 deletions src/gnome-utils/gnc-gnome-utils.c
View file
Expand Up @@ -587,6 +587,7 @@ gnc_gui_init(void)
{
static GncMainWindow *main_window;
gchar *map;
gchar *data_dir;

if (gnome_is_initialized)
{
Expand Down Expand Up @@ -618,7 +619,13 @@ gnc_gui_init(void)
// gtk_widget_show (GTK_WIDGET (main_window));
gnc_window_set_progressbar_window (GNC_WINDOW(main_window));

#ifdef MAC_INTEGRATION
data_dir = gnc_path_get_pkgdatadir();
map = g_build_filename(data_dir, "ui", "osx_accel_map", NULL);
g_free(data_dir);
#else
map = gnc_build_dotgnucash_path(ACCEL_MAP_NAME);
#endif /* MAC_INTEGRATION */
gtk_accel_map_load(map);
g_free(map);

Expand Down
57 changes: 31 additions & 26 deletions src/gnome-utils/ui/osx_accel_map
View file
Expand Up @@ -11,11 +11,11 @@
; (gtk_accel_path "<Actions>/gnc-plugin-budget-actions/OpenBudgetAction" "")
; (gtk_accel_path "<Actions>/MainWindowActions/ViewSummaryAction" "")
; (gtk_accel_path "<Actions>/gnc-plugin-business-actions/EmployeeProcessPaymentAction" "")
(gtk_accel_path "<Actions>/MainWindowActions/FileOpenMenuAction" "<Alt>o")
; (gtk_accel_path "<Actions>/MainWindowActions/FileOpenMenuAction" "")
; (gtk_accel_path "<Actions>/gnc-plugin-business-actions/BusinessAction" "")
; (gtk_accel_path "<Actions>/MenuAdditions/BalanceSheetAction" "")
(gtk_accel_path "<Actions>/gnc-plugin-basic-commands-actions/FileOpenAction" "<Alt>o")
(gtk_accel_path "<Actions>/gnc-plugin-basic-commands-actions/FileSaveAction" "<Alt>s")
(gtk_accel_path "<Actions>/gnc-plugin-basic-commands-actions/FileOpenAction" "<Meta>o")
(gtk_accel_path "<Actions>/gnc-plugin-basic-commands-actions/FileSaveAction" "<Meta>s")
; (gtk_accel_path "<Actions>/MainWindowActions/ActionsRenamePageAction" "")
; (gtk_accel_path "<Actions>/MenuAdditions/InvestmentPortfolioAction" "")
; (gtk_accel_path "<Actions>/gnc-plugin-basic-commands-actions/FileExportAccountsAction" "")
Expand Down Expand Up @@ -47,29 +47,29 @@
; (gtk_accel_path "<Actions>/MenuAdditions/ReceivableAgingAction" "")
; (gtk_accel_path "<Actions>/gnc-plugin-basic-commands-actions/ToolsPriceEditorAction" "")
; (gtk_accel_path "<Actions>/gnc-plugin-business-actions/VendorFindJobOpenAction" "")
(gtk_accel_path "<Actions>/gnc-plugin-basic-commands-actions/FileNewAction" "<Alt>n")
(gtk_accel_path "<Actions>/gnc-plugin-basic-commands-actions/FileNewAction" "<Meta>n")
; (gtk_accel_path "<Actions>/gnc-plugin-aqbanking-actions/ABSetupAction" "")
; (gtk_accel_path "<Actions>/MenuAdditions/BalanceSheetusingeguilegncAction" "")
; (gtk_accel_path "<Actions>/MainWindowActions/ScrubMenuAction" "")
; (gtk_accel_path "<Actions>/GncPluginPageRegisterActions/CancelTransactionAction" "")
; (gtk_accel_path "<Actions>/GncPluginPageRegisterActions/ReverseTransactionAction" "")
; (gtk_accel_path "<Actions>/GncPluginPageRegisterActions/CutTransactionAction" "")
(gtk_accel_path "<Actions>/GncPluginPageRegisterActions/CutTransactionAction" "<Control><Meta>x")
; (gtk_accel_path "<Actions>/MenuAdditions/JobReportAction" "")
; (gtk_accel_path "<Actions>/gnc-plugin-business-actions/VendorNewJobOpenAction" "")
; (gtk_accel_path "<Actions>/gnc-plugin-file-history-actions/RecentFile5Action" "")
(gtk_accel_path "<Actions>/GncPluginPageRegisterActions/EditFindTransactionsAction" "<Alt>f")
(gtk_accel_path "<Actions>/GncPluginPageAccountTreeActions/EditEditAccountAction" "<Alt>e")
(gtk_accel_path "<Actions>/GncPluginPageRegisterActions/EditFindTransactionsAction" "<Meta>f")
(gtk_accel_path "<Actions>/GncPluginPageAccountTreeActions/EditEditAccountAction" "<Meta>e")
; (gtk_accel_path "<Actions>/GncPluginPageRegisterActions/EditExchangeRateAction" "")
; (gtk_accel_path "<Actions>/gnc-plugin-budget-actions/NewBudgetAction" "")
; (gtk_accel_path "<Actions>/MenuAdditions/BudgetIncomeStatementAction" "")
(gtk_accel_path "<Actions>/GncPluginPageRegisterActions/ActionsTransferAction" "<Alt>t")
(gtk_accel_path "<Actions>/GncPluginPageRegisterActions/ActionsTransferAction" "<Meta>t")
; (gtk_accel_path "<Actions>/MenuAdditions/IncomeExpenseChartAction" "")
; (gtk_accel_path "<Actions>/MenuAdditions/LiabilityPiechartAction" "")
; (gtk_accel_path "<Actions>/gnc-plugin-business-actions/EmployeeMenuAction" "")
(gtk_accel_path "<Actions>/GncPluginPageAccountTreeActions/ActionsTransferAction" "<Alt>t")
(gtk_accel_path "<Actions>/GncPluginPageAccountTreeActions/ActionsTransferAction" "<<Meta>t")
; (gtk_accel_path "<Actions>/gnc-plugin-business-actions/BillsDueReminderOpenAction" "")
; (gtk_accel_path "<Actions>/MainWindowActions/ActionsForgetWarningsAction" "")
(gtk_accel_path "<Actions>/MainWindowActions/FilePrintAction" "<Alt>p")
(gtk_accel_path "<Actions>/MainWindowActions/FilePrintAction" "<Meta>p")
; (gtk_accel_path "<Actions>/gnc-plugin-business-actions/BillingTermsOpenAction" "")
; (gtk_accel_path "<Actions>/MenuAdditions/BusinessAction" "")
; (gtk_accel_path "<Actions>/MainWindowActions/FileAction" "")
Expand All @@ -87,12 +87,12 @@
; (gtk_accel_path "<Actions>/GncPluginPageRegisterActions/ActionsStockSplitAction" "")
; (gtk_accel_path "<Actions>/gnc-plugin-business-actions/VendorFindVendorOpenAction" "")
; (gtk_accel_path "<Actions>/GncPluginPageAccountTreeActions/ScrubAction" "")
(gtk_accel_path "<Actions>/MainWindowActions/EditCutAction" "<Alt>x")
(gtk_accel_path "<Actions>/MainWindowActions/EditCutAction" "<Meta>x")
; (gtk_accel_path "<Actions>/gnc-plugin-aqbanking-actions/OnlineActionsAction" "")
; (gtk_accel_path "<Actions>/GncPluginPageRegisterActions/ActionsReconcileAction" "")
; (gtk_accel_path "<Actions>/gnc-plugin-basic-commands-actions/ToolsFinancialCalculatorAction" "")
(gtk_accel_path "<Actions>/MainWindowActions/FilePageSetupAction" "<Shift><Alt>p")
(gtk_accel_path "<Actions>/MainWindowActions/FileCloseAction" "<Alt>w")
(gtk_accel_path "<Actions>/MainWindowActions/FilePageSetupAction" "<Shift><Meta>p")
(gtk_accel_path "<Actions>/MainWindowActions/FileCloseAction" "<Meta>w")
; (gtk_accel_path "<Actions>/MenuAdditions/TransactionReportAction" "")
; (gtk_accel_path "<Actions>/MenuAdditions/BudgetProfitLossAction" "")
; (gtk_accel_path "<Actions>/GncPluginPageRegisterActions/ScrubAllAction" "")
Expand All @@ -111,15 +111,15 @@
; (gtk_accel_path "<Actions>/gnc-plugin-basic-commands-actions/ActionsScheduledTransactionsAction" "")
; (gtk_accel_path "<Actions>/gnc-plugin-business-actions/EmployeeFindEmployeeOpenAction" "")
; (gtk_accel_path "<Actions>/GncPluginPageRegisterActions/JumpTransactionAction" "")
(gtk_accel_path "<Actions>/GncPluginPageRegisterActions/PasteTransactionAction" "<Alt>v")
(gtk_accel_path "<Actions>/GncPluginPageRegisterActions/PasteTransactionAction" "<Control><Meta>v")
; (gtk_accel_path "<Actions>/gnc-plugin-business-actions/BusinessTestInitDataAction" "")
; (gtk_accel_path "<Actions>/MainWindowActions/WindowMovePageAction" "")
; (gtk_accel_path "<Actions>/gnc-plugin-aqbanking-actions/ABGetTransAction" "")
; (gtk_accel_path "<Actions>/gnc-plugin-business-actions/EmployeeFindExpenseVoucherOpenAction" "")
; (gtk_accel_path "<Actions>/MainWindowActions/HelpContentsAction" "F1")
; (gtk_accel_path "<Actions>/MenuAdditions/CustomMulticolumnReportAction" "")
; (gtk_accel_path "<Actions>/MenuAdditions/WelcomeSampleReportAction" "")
(gtk_accel_path "<Actions>/GncPluginPageRegisterActions/EditCutAction" "<Alt>x")
(gtk_accel_path "<Actions>/GncPluginPageRegisterActions/EditCutAction" "<Meta>x")
; (gtk_accel_path "<Actions>/GncPluginPageRegisterActions/ViewStyleDoubleLineAction" "")
; (gtk_accel_path "<Actions>/GncPluginPageRegisterActions/ScrubCurrentAction" "")
; (gtk_accel_path "<Actions>/MainWindowActions/ViewAction" "")
Expand All @@ -128,21 +128,21 @@
; (gtk_accel_path "<Actions>/MenuAdditions/BudgetAction" "")
; (gtk_accel_path "<Actions>/gnc-plugin-business-actions/CustomerFindInvoiceOpenAction" "")
; (gtk_accel_path "<Actions>/gnc-plugin-business-actions/CustomerFindJobOpenAction" "")
(gtk_accel_path "<Actions>/MainWindowActions/EditCopyAction" "<Alt>c")
(gtk_accel_path "<Actions>/MainWindowActions/EditCopyAction" "<Meta>c")
; (gtk_accel_path "<Actions>/gnc-plugin-business-actions/BusinessTestSearchAction" "")
; (gtk_accel_path "<Actions>/gnc-plugin-aqbanking-actions/Mt940ImportAction" "")
; (gtk_accel_path "<Actions>/MenuAdditions/IncomeBarchartAction" "")
; (gtk_accel_path "<Actions>/GncPluginPageAccountTreeActions/ActionsLotsAction" "")
; (gtk_accel_path "<Actions>/GncPluginPageRegisterActions/ViewFilterByAction" "")
; (gtk_accel_path "<Actions>/GncPluginPageAccountTreeActions/EditRenumberSubaccountsAction" "")
(gtk_accel_path "<Actions>/GncPluginPageRegisterActions/CopyTransactionAction" "<Alt>c")
(gtk_accel_path "<Actions>/GncPluginPageRegisterActions/CopyTransactionAction" "<Control><Meta>c")
; (gtk_accel_path "<Actions>/MainWindowActions/ToolsAction" "")
; (gtk_accel_path "<Actions>/MenuAdditions/ExpensePiechartAction" "")
; (gtk_accel_path "<Actions>/GncPluginPageAccountTreeActions/FileOpenSubaccountsAction" "")
; (gtk_accel_path "<Actions>/MainWindowActions/WindowsAction" "")
; (gtk_accel_path "<Actions>/gnc-plugin-ofx-actions/OfxImportAction" "")
; (gtk_accel_path "<Actions>/gnc-plugin-business-actions/BusinessTestAction" "")
(gtk_accel_path "<Actions>/gnc-plugin-basic-commands-actions/EditFindTransactionsAction" "<Alt>f")
(gtk_accel_path "<Actions>/gnc-plugin-basic-commands-actions/EditFindTransactionsAction" "<Meta>f")
; (gtk_accel_path "<Actions>/MenuAdditions/ExpenseBarchartAction" "")
; (gtk_accel_path "<Actions>/MenuAdditions/BudgetBarchartAction" "")
; (gtk_accel_path "<Actions>/GncPluginPageRegisterActions/DeleteTransactionAction" "")
Expand All @@ -152,11 +152,11 @@
; (gtk_accel_path "<Actions>/GncPluginPageRegisterActions/RemoveTransactionSplitsAction" "")
; (gtk_accel_path "<Actions>/GncPluginPageAccountTreeActions/ScrubSubAction" "")
; (gtk_accel_path "<Actions>/gnc-plugin-file-history-actions/RecentFile1Action" "")
(gtk_accel_path "<Actions>/GncPluginPageRegisterActions/FilePrintAction" "<Alt>p")
(gtk_accel_path "<Actions>/GncPluginPageRegisterActions/FilePrintAction" "<Meta>p")
; (gtk_accel_path "<Actions>/GncPluginPageAccountTreeActions/FileNewAccountAction" "")
; (gtk_accel_path "<Actions>/gnc-plugin-file-history-actions/RecentFile3Action" "")
(gtk_accel_path "<Actions>/GncPluginPageRegisterActions/EditEditAccountAction" "<Alt>e")
(gtk_accel_path "<Actions>/MainWindowActions/EditPreferencesAction" "<alt>,")
(gtk_accel_path "<Actions>/GncPluginPageRegisterActions/EditEditAccountAction" "<Meta>e")
;(gtk_accel_path "<Actions>/MainWindowActions/EditPreferencesAction" "<alt>,")
; (gtk_accel_path "<Actions>/GncPluginPageAccountTreeActions/ActionsStockSplitAction" "")
; (gtk_accel_path "<Actions>/MainWindowActions/HelpAboutAction" "")
; (gtk_accel_path "<Actions>/MainWindowActions/ViewFilterByAction" "")
Expand All @@ -179,9 +179,9 @@
; (gtk_accel_path "<Actions>/GncPluginPageAccountTreeActions/ViewFilterByAction" "")
; (gtk_accel_path "<Actions>/MenuAdditions/EmployeeReportAction" "")
; (gtk_accel_path "<Actions>/MenuAdditions/FancyInvoiceAction" "")
(gtk_accel_path "<Actions>/GncPluginPageRegisterActions/EditPasteAction" "<Alt>v")
(gtk_accel_path "<Actions>/GncPluginPageRegisterActions/EditPasteAction" "<Meta>v")
; (gtk_accel_path "<Actions>/gnc-plugin-aqbanking-actions/ABIssueDirectDebitAction" "")
(gtk_accel_path "<Actions>/gnc-plugin-basic-commands-actions/FileSaveAsAction" "<Shift><Alt>s")
(gtk_accel_path "<Actions>/gnc-plugin-basic-commands-actions/FileSaveAsAction" "<Shift><Meta>s")
; (gtk_accel_path "<Actions>/MenuAdditions/AssetsLiabilitiesAction" "")
; (gtk_accel_path "<Actions>/MenuAdditions/PrintableInvoiceAction" "")
; (gtk_accel_path "<Actions>/MenuAdditions/EasyInvoiceAction" "")
Expand All @@ -190,7 +190,7 @@
; (gtk_accel_path "<Actions>/MenuAdditions/EquityStatementAction" "")
; (gtk_accel_path "<Actions>/gnc-plugin-business-actions/VendorNewBillOpenAction" "")
; (gtk_accel_path "<Actions>/MenuAdditions/PriceScatterplotAction" "")
(gtk_accel_path "<Actions>/MainWindowActions/ViewRefreshAction" "<Alt>r")
(gtk_accel_path "<Actions>/MainWindowActions/ViewRefreshAction" "<Meta>r")
; (gtk_accel_path "<Actions>/gnc-plugin-aqbanking-actions/DtausImportSendAction" "")
; (gtk_accel_path "<Actions>/GncPluginPageRegisterActions/VoidTransactionAction" "")
; (gtk_accel_path "<Actions>/gnc-plugin-business-actions/VendorProcessPaymentAction" "")
Expand All @@ -203,11 +203,11 @@
; (gtk_accel_path "<Actions>/MenuAdditions/TaxScheduleReportTXFExportAction" "")
; (gtk_accel_path "<Actions>/MainWindowActions/ViewStatusbarAction" "")
; (gtk_accel_path "<Actions>/gnc-plugin-basic-commands-actions/ToolsCommodityEditorAction" "")
(gtk_accel_path "<Actions>/MainWindowActions/EditPasteAction" "<Alt>v")
(gtk_accel_path "<Actions>/MainWindowActions/EditPasteAction" "<Meta>v")
; (gtk_accel_path "<Actions>/gnc-plugin-business-actions/VendorMenuAction" "")
; (gtk_accel_path "<Actions>/MainWindowActions/ExtensionsAction" "")
; (gtk_accel_path "<Actions>/gnc-plugin-file-history-actions/RecentFile0Action" "")
(gtk_accel_path "<Actions>/GncPluginPageRegisterActions/EditCopyAction" "<Alt>c")
(gtk_accel_path "<Actions>/GncPluginPageRegisterActions/EditCopyAction" "<Meta>c")
; (gtk_accel_path "<Actions>/MenuAdditions/CashFlowAction" "")
; (gtk_accel_path "<Actions>/MainWindowActions/FileImportAction" "")
; (gtk_accel_path "<Actions>/gnc-plugin-business-actions/CustomerNewCustomerOpenAction" "")
Expand All @@ -221,3 +221,8 @@
; (gtk_accel_path "<Actions>/gnc-plugin-account-tree-actions/ViewAccountTreeAction" "")
; (gtk_accel_path "<Actions>/MainWindowActions/FileExportAction" "")
; (gtk_accel_path "<Actions>/gnc-plugin-file-history-actions/RecentFile6Action" "")
(gtk_accel_path "<Actions>/GncPluginPageReportActions/FilePrintAction" "<Meta>p")
(gtk_accel_path "<Actions>/GncPluginPageReportActions/EditCutAction" "<Meta>x")
(gtk_accel_path "<Actions>/GncPluginPageReportActions/EditPasteAction" "<Meta>v")
(gtk_accel_path "<Actions>/GncPluginPageReportActions/ViewRefreshAction" "<Meta>r")
(gtk_accel_path "<Actions>/GncPluginPageReportActions/EditCopyAction" "<Meta>c")

0 comments on commit 90e985d

Please sign in to comment.