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

Replace deprecated gtk_image_menu_item in gnumeric popup

Browse Source 
Use a box packed with an icon and label instead. I am not really sure if
 this is necessary and should just be a label.
This commit is contained in:
Robert Fewell 2017-06-28 11:22:44 +01:00
parent 56ca411351
commit a8cdf2410f
1 changed files with 20 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
src/import-export/csv-imp/gnc-csv-gnumeric-popup.c
View File

@ -92,10 +92,8 @@ gnumeric_create_popup_menu_list (GSList *elements,
int sensitive_filter,
GdkEventButton *event)
{
GtkWidget *menu, *item;
char const *trans;
menu = gtk_menu_new ();
GtkWidget *menu = gtk_menu_new ();
GtkWidget *item, *label;
for (; elements != NULL ; elements = elements->next)
{
@ -103,35 +101,41 @@ gnumeric_create_popup_menu_list (GSList *elements,
char const * const name = element->name;
char const * const pix_name = element->pixmap;
item = NULL;
if (element->display_filter != 0 &&
!(element->display_filter & display_filter))
continue;
if (name != NULL && *name != '\0')
{
trans = _(name);
item = gtk_menu_item_new_with_mnemonic (trans);
if (element->sensitive_filter != 0 &&
(element->sensitive_filter & sensitive_filter))
gtk_widget_set_sensitive (GTK_WIDGET (item), FALSE);
GtkWidget *label = gtk_label_new_with_mnemonic (name);
GtkWidget *box = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 2);
item = gtk_menu_item_new();
gtk_box_set_homogeneous (GTK_BOX (box), FALSE);
gtk_widget_set_hexpand (GTK_WIDGET(box), FALSE);
gtk_widget_set_halign (GTK_WIDGET(box), GTK_ALIGN_START);
if (pix_name != NULL)
{
GtkWidget *image = gtk_image_new_from_icon_name (pix_name,
GTK_ICON_SIZE_MENU);
gtk_container_add (GTK_CONTAINER (box), image);
gtk_widget_show (image);
gtk_image_menu_item_set_image (
GTK_IMAGE_MENU_ITEM (item),
image);
}
gtk_box_pack_end (GTK_BOX (box), label, TRUE, TRUE, 0);
gtk_container_add (GTK_CONTAINER (item), box);
if (element->sensitive_filter != 0 &&
(element->sensitive_filter & sensitive_filter))
gtk_widget_set_sensitive (GTK_WIDGET (item), FALSE);
}
else
{
/* separator */
item = gtk_menu_item_new ();
gtk_widget_set_sensitive (item, FALSE);
item = gtk_separator_menu_item_new ();
}
gtk_widget_show_all (item);
if (element->index != 0)
{