debian/midori
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Align app proxy icons, catch missing icons and respect should show

Browse source
This commit is contained in:
Christian Dywan 2009-11-29 14:06:52 +01:00
parent 5a3bd9e15f
commit a589c2a5bc
1 changed files with 13 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
katze/katze-utils.c
View file

@ -616,12 +616,16 @@ katze_property_proxy (gpointer object,
GtkComboBox* combo; GtkComboBox* combo;
GList* apps; GList* apps;
const gchar* app_type = &hint[12]; const gchar* app_type = &hint[12];
gint icon_width = 16;
gtk_icon_size_lookup (GTK_ICON_SIZE_MENU, &icon_width, NULL);
model = gtk_list_store_new (3, G_TYPE_APP_INFO, G_TYPE_STRING, G_TYPE_STRING); model = gtk_list_store_new (4, G_TYPE_APP_INFO, G_TYPE_STRING,
G_TYPE_STRING, G_TYPE_INT);
widget = gtk_combo_box_new_with_model (GTK_TREE_MODEL (model)); widget = gtk_combo_box_new_with_model (GTK_TREE_MODEL (model));
renderer = gtk_cell_renderer_pixbuf_new (); renderer = gtk_cell_renderer_pixbuf_new ();
gtk_cell_layout_pack_start (GTK_CELL_LAYOUT (widget), renderer, FALSE); gtk_cell_layout_pack_start (GTK_CELL_LAYOUT (widget), renderer, FALSE);
gtk_cell_layout_add_attribute (GTK_CELL_LAYOUT (widget), renderer, "icon-name", 1); gtk_cell_layout_add_attribute (GTK_CELL_LAYOUT (widget), renderer, "icon-name", 1);
gtk_cell_layout_add_attribute (GTK_CELL_LAYOUT (widget), renderer, "width", 3);
renderer = gtk_cell_renderer_text_new (); renderer = gtk_cell_renderer_text_new ();
gtk_cell_layout_pack_start (GTK_CELL_LAYOUT (widget), renderer, TRUE); gtk_cell_layout_pack_start (GTK_CELL_LAYOUT (widget), renderer, TRUE);
gtk_cell_layout_add_attribute (GTK_CELL_LAYOUT (widget), renderer, "text", 2); gtk_cell_layout_add_attribute (GTK_CELL_LAYOUT (widget), renderer, "text", 2);
@ -641,17 +645,21 @@ katze_property_proxy (gpointer object,
GAppInfo* info; GAppInfo* info;
gtk_list_store_insert_with_values (model, &iter_none, 0, gtk_list_store_insert_with_values (model, &iter_none, 0,
0, NULL, 1, NULL, 2, _("None"), -1); 0, NULL, 1, NULL, 2, _("None"), 3, icon_width, -1);
while ((info = g_list_nth_data (apps, i++))) while ((info = g_list_nth_data (apps, i++)))
{ {
const gchar* name = g_app_info_get_name (info); const gchar* name = g_app_info_get_name (info);
GIcon* icon = g_app_info_get_icon (info); GIcon* icon = g_app_info_get_icon (info);
gchar* icon_name = g_icon_to_string (icon); gchar* icon_name;
GtkTreeIter iter; GtkTreeIter iter;
if (!g_app_info_should_show (info))
continue;
icon_name = icon ? g_icon_to_string (icon) : NULL;
gtk_list_store_insert_with_values (model, &iter, G_MAXINT, gtk_list_store_insert_with_values (model, &iter, G_MAXINT,
0, info, 1, icon_name, 2, name, -1); 0, info, 1, icon_name, 2, name, 3, icon_width, -1);
if (string && !strcmp (katze_app_info_get_commandline (info), string)) if (string && !strcmp (katze_app_info_get_commandline (info), string))
gtk_combo_box_set_active_iter (combo, &iter); gtk_combo_box_set_active_iter (combo, &iter);
@ -661,7 +669,7 @@ katze_property_proxy (gpointer object,
info = g_app_info_create_from_commandline ("", info = g_app_info_create_from_commandline ("",
"", G_APP_INFO_CREATE_NONE, NULL); "", G_APP_INFO_CREATE_NONE, NULL);
gtk_list_store_insert_with_values (model, NULL, G_MAXINT, gtk_list_store_insert_with_values (model, NULL, G_MAXINT,
0, info, 1, NULL, 2, _("Custom..."), -1); 0, info, 1, NULL, 2, _("Custom..."), 3, icon_width, -1);
g_object_unref (info); g_object_unref (info);
if (gtk_combo_box_get_active (combo) == -1) if (gtk_combo_box_get_active (combo) == -1)