gnc-plugin-page-register.c (gnucash-5.0.tar.bz2) | : | gnc-plugin-page-register.c (gnucash-5.1.tar.bz2) | ||
---|---|---|---|---|
skipping to change at line 1050 | skipping to change at line 1050 | |||
{ | { | |||
GncMenuModelSearch *gsm = g_new0 (GncMenuModelSearch, 1); | GncMenuModelSearch *gsm = g_new0 (GncMenuModelSearch, 1); | |||
gboolean found = FALSE; | gboolean found = FALSE; | |||
const char** iter, **label_iter, **tooltip_iter; | const char** iter, **label_iter, **tooltip_iter; | |||
gboolean curr_label_trans = FALSE; | gboolean curr_label_trans = FALSE; | |||
iter = tran_vs_split_actions; | iter = tran_vs_split_actions; | |||
label_iter = tran_action_labels; | label_iter = tran_action_labels; | |||
gsm->search_action_label = NULL; | gsm->search_action_label = NULL; | |||
gsm->search_action_name = *iter; | gsm->search_action_name = *iter; | |||
gsm->search_action_target = NULL; | ||||
found = gnc_menubar_model_find_item (gnc_window_get_menubar_model (gnc_w indow), gsm); | found = gnc_menubar_model_find_item (gnc_window_get_menubar_model (gnc_w indow), gsm); | |||
PINFO("Test for action '%s', found is %d, iter label is '%s'", *iter, fo und, _(*label_iter)); | PINFO("Test for action '%s', found is %d, iter label is '%s'", *iter, fo und, _(*label_iter)); | |||
if (!found) | if (!found) | |||
{ | { | |||
g_free (gsm); | g_free (gsm); | |||
return; | return; | |||
} | } | |||
skipping to change at line 1075 | skipping to change at line 1076 | |||
if ((cursor_class == CURSOR_CLASS_SPLIT) && curr_label_trans) | if ((cursor_class == CURSOR_CLASS_SPLIT) && curr_label_trans) | |||
{ | { | |||
gboolean found = FALSE; | gboolean found = FALSE; | |||
label_iter = split_action_labels; | label_iter = split_action_labels; | |||
tooltip_iter = split_action_tips; | tooltip_iter = split_action_tips; | |||
for (iter = tran_vs_split_actions; *iter; ++iter) | for (iter = tran_vs_split_actions; *iter; ++iter) | |||
{ | { | |||
/* Adjust the action's label and tooltip */ | /* Adjust the action's label and tooltip */ | |||
found = gnc_menubar_model_update_item (gnc_window_get_menubar_mo del (gnc_window), | found = gnc_menubar_model_update_item (gnc_window_get_menubar_mo del (gnc_window), | |||
*iter, _(*label_iter), NU LL, _(*tooltip_iter)); | *iter, NULL, _(*label_ite r), NULL, _(*tooltip_iter)); | |||
PINFO("split model_item action '%s', found is %d, iter label is '%s'", | PINFO("split model_item action '%s', found is %d, iter label is '%s'", | |||
*iter, found, _(*label_iter)); | *iter, found, _(*label_iter)); | |||
++label_iter; | ++label_iter; | |||
++tooltip_iter; | ++tooltip_iter; | |||
} | } | |||
} | } | |||
else if ((cursor_class == CURSOR_CLASS_TRANS) && !curr_label_trans) | else if ((cursor_class == CURSOR_CLASS_TRANS) && !curr_label_trans) | |||
{ | { | |||
gboolean found = FALSE; | gboolean found = FALSE; | |||
label_iter = tran_action_labels; | label_iter = tran_action_labels; | |||
tooltip_iter = tran_action_tips; | tooltip_iter = tran_action_tips; | |||
for (iter = tran_vs_split_actions; *iter; ++iter) | for (iter = tran_vs_split_actions; *iter; ++iter) | |||
{ | { | |||
/* Adjust the action's label and tooltip */ | /* Adjust the action's label and tooltip */ | |||
found = gnc_menubar_model_update_item (gnc_window_get_menubar_mo del (gnc_window), | found = gnc_menubar_model_update_item (gnc_window_get_menubar_mo del (gnc_window), | |||
*iter, _(*label_iter), NU LL, _(*tooltip_iter)); | *iter, NULL, _(*label_ite r), NULL, _(*tooltip_iter)); | |||
PINFO("trans model_item action '%s', found is %d, iter label is '%s'", | PINFO("trans model_item action '%s', found is %d, iter label is '%s'", | |||
*iter, found, _(*label_iter)); | *iter, found, _(*label_iter)); | |||
++label_iter; | ++label_iter; | |||
++tooltip_iter; | ++tooltip_iter; | |||
} | } | |||
} | } | |||
// now add the callbacks to the replaced menu items. | // now add the callbacks to the replaced menu items. | |||
gnc_plugin_add_menu_tooltip_callbacks (gnc_window_get_menubar (gnc_windo w), | gnc_plugin_add_menu_tooltip_callbacks (gnc_window_get_menubar (gnc_windo w), | |||
gnc_window_get_menubar_model (gnc _window), | gnc_window_get_menubar_model (gnc _window), | |||
gnc_window_get_statusbar (gnc_win dow)); | gnc_window_get_statusbar (gnc_win dow)); | |||
// need to add any accelerator keys, default or user added | ||||
gnc_add_accelerator_keys_for_menu (gnc_window_get_menubar (gnc_window), | ||||
gnc_window_get_menubar_model (gnc_win | ||||
dow), | ||||
gnc_window_get_accel_group (gnc_windo | ||||
w)); | ||||
} | } | |||
} | } | |||
static void | static void | |||
gnc_plugin_page_register_ui_initial_state (GncPluginPageRegister* page) | gnc_plugin_page_register_ui_initial_state (GncPluginPageRegister* page) | |||
{ | { | |||
GncPluginPageRegisterPrivate* priv ; | GncPluginPageRegisterPrivate* priv ; | |||
GSimpleActionGroup *simple_action_group; | GSimpleActionGroup *simple_action_group; | |||
GAction *action; | GAction *action; | |||
Account* account; | Account* account; | |||
End of changes. 4 change blocks. | ||||
2 lines changed or deleted | 10 lines changed or added |