diff options
| -rw-r--r-- | ChangeLog | 13 | ||||
| -rwxr-xr-x | lib/egg/egg-editable-toolbar.c | 21 | ||||
| -rwxr-xr-x | lib/egg/egg-toolbar-editor.c | 51 | ||||
| -rwxr-xr-x | src/toolbar.c | 1 |
4 files changed, 77 insertions, 9 deletions
@@ -1,3 +1,16 @@ +2003-12-09 Jorn Baayen <jorn@nl.linux.org> + + * lib/egg/egg-editable-toolbar.c: (set_item_drag_source): + * lib/egg/egg-toolbar-editor.c: (compare_func), (sort_list), + (editor_drag_data_received_cb), (editor_drag_data_delete_cb), + (editor_create_item), (update_editor_sheet), + (egg_toolbar_editor_add_action), (egg_toolbar_editor_load_actions): + * src/toolbar.c: (toolbar_setup_actions): + + Make toolbar editing drag icons use the same icon size as the + actual toolbar icons; sort actions in the toolbar editor; give + the zoom action a zoom icon. + 2003-12-09 Marco Pesenti Gritti <marco@gnome.org> * autogen.sh: diff --git a/lib/egg/egg-editable-toolbar.c b/lib/egg/egg-editable-toolbar.c index 73e1188cc..aef7aac60 100755 --- a/lib/egg/egg-editable-toolbar.c +++ b/lib/egg/egg-editable-toolbar.c @@ -298,13 +298,26 @@ set_item_drag_source (GtkWidget *item, { const char *stock_id; GValue value = { 0, }; - + GdkPixbuf *pixbuf; + g_value_init (&value, G_TYPE_STRING); g_object_get_property (G_OBJECT (action), "stock_id", &value); - stock_id = g_value_get_string (&value); - gtk_drag_source_set_icon_stock - (item, stock_id ? stock_id : GTK_STOCK_DND); + + if (stock_id != NULL) + { + pixbuf = gtk_widget_render_icon (item, stock_id, + GTK_ICON_SIZE_LARGE_TOOLBAR, NULL); + } + else + { + pixbuf = gtk_widget_render_icon (item, GTK_STOCK_DND, + GTK_ICON_SIZE_LARGE_TOOLBAR, NULL); + } + + gtk_drag_source_set_icon_pixbuf (item, pixbuf); + g_object_unref (pixbuf); + g_value_unset (&value); } } diff --git a/lib/egg/egg-toolbar-editor.c b/lib/egg/egg-toolbar-editor.c index 6259f265d..297251481 100755 --- a/lib/egg/egg-toolbar-editor.c +++ b/lib/egg/egg-toolbar-editor.c @@ -94,6 +94,36 @@ egg_toolbar_editor_get_type (void) return egg_toolbar_editor_type; } +static int +compare_func (GtkAction *a, GtkAction *b) +{ + GValue value_a = { 0, }, value_b = { 0, }; + const char *short_label_a, *short_label_b; + int ret; + + g_value_init (&value_a, G_TYPE_STRING); + g_object_get_property (G_OBJECT (a), "short_label", &value_a); + short_label_a = g_value_get_string (&value_a); + + g_value_init (&value_b, G_TYPE_STRING); + g_object_get_property (G_OBJECT (b), "short_label", &value_b); + short_label_b = g_value_get_string (&value_b); + + ret = g_utf8_collate (short_label_a, short_label_b); + + g_value_unset (&value_a); + g_value_unset (&value_b); + + return ret; +} + +static void +sort_list (EggToolbarEditor *editor) +{ + editor->priv->actions_list = g_list_sort (editor->priv->actions_list, + (GCompareFunc) compare_func); +} + static GtkAction * find_action (EggToolbarEditor *t, const char *name) @@ -268,6 +298,7 @@ editor_drag_data_received_cb (GtkWidget *widget, editor->priv->actions_list = g_list_append (editor->priv->actions_list, action); } + sort_list (editor); update_editor_sheet (editor); } @@ -286,6 +317,7 @@ editor_drag_data_delete_cb (GtkWidget *widget, editor->priv->actions_list = g_list_remove (editor->priv->actions_list, action); } + sort_list (editor); update_editor_sheet (editor); } @@ -399,12 +431,16 @@ editor_create_item (EggToolbarEditor *editor, if (type == GTK_IMAGE_STOCK) { gchar *stock_id; - gtk_image_get_stock (icon, &stock_id, NULL); - gtk_drag_source_set_icon_stock (event_box, stock_id); + GdkPixbuf *pixbuf; + gtk_image_get_stock (icon, &stock_id, NULL); + pixbuf = gtk_widget_render_icon (event_box, stock_id, + GTK_ICON_SIZE_LARGE_TOOLBAR, NULL); + gtk_drag_source_set_icon_pixbuf (event_box, pixbuf); + g_object_unref (pixbuf); } else if (type == GTK_IMAGE_PIXBUF) { - GdkPixbuf *pixbuf = gtk_image_get_pixbuf (icon); + GdkPixbuf *pixbuf = gtk_image_get_pixbuf (icon); gtk_drag_source_set_icon_pixbuf (event_box, pixbuf); } @@ -427,7 +463,7 @@ static void update_editor_sheet (EggToolbarEditor *editor) { GList *l; - GList *to_drag = editor->priv->actions_list; + GList *to_drag; int x, y, height, width; GtkWidget *table; GtkWidget *viewport; @@ -453,6 +489,8 @@ update_editor_sheet (EggToolbarEditor *editor) g_signal_connect (table, "drag_data_received", G_CALLBACK (editor_drag_data_received_cb), editor); + to_drag = editor->priv->actions_list; + x = y = 0; width = 4; height = (g_list_length (to_drag) - 1) / width + 1; @@ -463,7 +501,7 @@ update_editor_sheet (EggToolbarEditor *editor) GtkAction *action = (l->data); const char *stock_id, *short_label; GValue value = { 0, }; - + g_value_init (&value, G_TYPE_STRING); g_object_get_property (G_OBJECT (action), "stock_id", &value); stock_id = g_value_get_string (&value); @@ -551,6 +589,8 @@ egg_toolbar_editor_add_action (EggToolbarEditor *editor, editor->priv->default_actions_list = g_list_append (editor->priv->default_actions_list, action); + + sort_list (editor); } static void @@ -631,6 +671,7 @@ egg_toolbar_editor_load_actions (EggToolbarEditor *editor, (editor->priv->actions_list, action); } } + sort_list (editor); update_editor_sheet (editor); } diff --git a/src/toolbar.c b/src/toolbar.c index 14ff23cd7..dae06f522 100755 --- a/src/toolbar.c +++ b/src/toolbar.c @@ -384,6 +384,7 @@ toolbar_setup_actions (Toolbar *t) action = g_object_new (EPHY_TYPE_ZOOM_ACTION, "name", "Zoom", "label", _("Zoom"), + "stock_id", GTK_STOCK_ZOOM_IN, "tooltip", _("Adjust the text size"), "zoom", 1.0, NULL); |