IntenseFinance/gnucash
3
0
Fork 0
mirror of https://github.com/Gnucash/gnucash.git synced 2025-02-25 18:55:30 -06:00
Code Issues Packages Projects Releases Wiki Activity

Change gnc_menubar_model_update_item to also update accelerator keys

Browse Source
This commit is contained in:
Robert Fewell 2023-03-10 11:33:33 +00:00
parent 0098b047d5
commit e8b0d4dd87
4 changed files with 57 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

72
gnucash/gnome-utils/gnc-gtk-utils.c
View File

@ -749,20 +749,22 @@ gnc_menubar_model_find_menu_item (GMenuModel *menu_model, GtkWidget *menu, const
*
* @param label The new menu label text.
*
* @param accel_name The accelerator string
*
* @param tooltip The new tooltip text if any.
*
* @return TRUE if item found and updated or FALSE if not.
*/
gboolean
gnc_menubar_model_update_item (GMenuModel *menu_model, const gchar *action_name,
const gchar *label, const gchar *tooltip)
const gchar *label, const gchar *accel_name,
const gchar *tooltip)
{
GncMenuModelSearch *gsm;
gboolean found = FALSE;
g_return_val_if_fail (menu_model != NULL, FALSE);
g_return_val_if_fail (action_name != NULL, FALSE);
g_return_val_if_fail (label != NULL, FALSE);
gsm = g_new0 (GncMenuModelSearch, 1);
@ -778,7 +780,7 @@ gnc_menubar_model_update_item (GMenuModel *menu_model, const gchar *action_name,
const gchar *old_action = NULL;
const gchar *old_temp = NULL;
const gchar *old_accel = NULL;
GMenuItem *item;
const gchar *old_tooltip = NULL;
iter = g_menu_model_iterate_item_attributes (gsm->model, gsm->index);
while (g_menu_attribute_iter_get_next (iter, &key, &value))
@ -792,31 +794,61 @@ gnc_menubar_model_update_item (GMenuModel *menu_model, const gchar *action_name,
else if (g_str_equal (key, GNC_MENU_ATTRIBUTE_ACCELERATOR) &&
g_variant_is_of_type (value, G_VARIANT_TYPE_STRING))
old_accel = g_variant_get_string (value, NULL);
else if (g_str_equal (key, GNC_MENU_ATTRIBUTE_TOOLTIP) &&
g_variant_is_of_type (value, G_VARIANT_TYPE_STRING))
old_tooltip = g_variant_get_string (value, NULL);
else if (g_str_equal (key, G_MENU_ATTRIBUTE_TARGET))
old_target = g_variant_ref (value);
g_variant_unref (value);
}
item = g_menu_item_new (label, old_action);
if (tooltip)
g_menu_item_set_attribute (item, GNC_MENU_ATTRIBUTE_TOOLTIP, "s", tooltip);
if (old_temp)
g_menu_item_set_attribute (item, GNC_MENU_ATTRIBUTE_TEMPORARY, "s", old_temp);
if (old_accel)
g_menu_item_set_attribute (item, GNC_MENU_ATTRIBUTE_ACCELERATOR, "s", old_accel);
if (old_target)
if (!label && !gsm->search_action_label)
{
g_menu_item_set_attribute_value (item, G_MENU_ATTRIBUTE_TARGET, old_target);
g_variant_unref (old_target);
if (old_target)
g_variant_unref (old_target);
g_free (gsm);
return found;
}
g_menu_remove (G_MENU(gsm->model), gsm->index);
g_menu_insert_item (G_MENU(gsm->model), gsm->index, item);
found = TRUE;
if ((accel_name && g_strcmp0 (old_accel, accel_name) != 0) ||
(tooltip && g_strcmp0 (old_tooltip, tooltip) != 0) ||
(label && g_strcmp0 (gsm->search_action_label, label) != 0))
{
GMenuItem *item = NULL;
if (label)
item = g_menu_item_new (label, old_action);
else
item = g_menu_item_new (gsm->search_action_label, old_action);
if (tooltip)
g_menu_item_set_attribute (item, GNC_MENU_ATTRIBUTE_TOOLTIP, "s", tooltip);
else
{
if (old_tooltip)
g_menu_item_set_attribute (item, GNC_MENU_ATTRIBUTE_TOOLTIP, "s", old_tooltip);
}
if (accel_name)
g_menu_item_set_attribute (item, GNC_MENU_ATTRIBUTE_ACCELERATOR, "s", accel_name);
else
{
if (old_accel)
g_menu_item_set_attribute (item, GNC_MENU_ATTRIBUTE_ACCELERATOR, "s", old_accel);
}
if (old_temp)
g_menu_item_set_attribute (item, GNC_MENU_ATTRIBUTE_TEMPORARY, "s", old_temp);
if (old_target)
g_menu_item_set_attribute_value (item, G_MENU_ATTRIBUTE_TARGET, old_target);
g_menu_remove (G_MENU(gsm->model), gsm->index);
g_menu_insert_item (G_MENU(gsm->model), gsm->index, item);
found = TRUE;
}
if (old_target)
g_variant_unref (old_target);
}
g_free (gsm);
return found;

3
gnucash/gnome-utils/gnc-gtk-utils.h
View File

@ -94,7 +94,8 @@ gboolean gnc_menubar_model_find_item (GMenuModel *menu_model, GncMenuModelSearch
GtkWidget *gnc_menubar_model_find_menu_item (GMenuModel *menu_model, GtkWidget *menu, const gchar *action_name);
gboolean gnc_menubar_model_update_item (GMenuModel *menu_model, const gchar *action_name,
const gchar *label, const gchar *tooltip);
const gchar *label, const gchar *accel_name,
const gchar *tooltip);
void gnc_menubar_model_remove_items_with_attrib (GMenuModel *menu_model, const gchar *attrib);

2
gnucash/gnome-utils/gnc-main-window.cpp
View File

@ -3639,7 +3639,7 @@ gnc_main_window_update_menu_for_action (GncMainWindow *window,
priv = GNC_MAIN_WINDOW_GET_PRIVATE(window);
found = gnc_menubar_model_update_item (priv->menubar_model, action_name,
_(label), _(tooltip));
_(label), nullptr, _(tooltip));
// add tooltip redirect call backs
gnc_plugin_add_menu_tooltip_callbacks (priv->menubar,

4
gnucash/gnome/gnc-plugin-page-register.c
View File

@ -1057,7 +1057,7 @@ gnc_plugin_page_register_ui_update (gpointer various,
{
/* Adjust the action's label and tooltip */
found = gnc_menubar_model_update_item (gnc_window_get_menubar_model (gnc_window),
*iter, _(*label_iter), _(*tooltip_iter));
*iter, _(*label_iter), NULL, _(*tooltip_iter));
PINFO("split model_item action '%s', found is %d, iter label is '%s'",
*iter, found, _(*label_iter));
@ -1075,7 +1075,7 @@ gnc_plugin_page_register_ui_update (gpointer various,
{
/* Adjust the action's label and tooltip */
found = gnc_menubar_model_update_item (gnc_window_get_menubar_model (gnc_window),
*iter, _(*label_iter), _(*tooltip_iter));
*iter, _(*label_iter), NULL, _(*tooltip_iter));
PINFO("trans model_item action '%s', found is %d, iter label is '%s'",
*iter, found, _(*label_iter));