callisto-debian/gimp
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

app: remove superfluous frame and label from GEGL tool

Browse Source
This commit is contained in:
Øyvind Kolås
2012-03-31 17:58:13 +01:00
committed by Michael Natterer
parent e437d72468
commit 818739a0e3
3 changed files with 6 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
app/tools/gimpgegltool.c
View File

@ -226,7 +226,6 @@ gimp_gegl_tool_dialog (GimpImageMapTool *image_map_tool)
GtkCellRenderer *cell; GtkCellRenderer *cell;
GtkWidget *main_vbox; GtkWidget *main_vbox;
GtkWidget *hbox; GtkWidget *hbox;
GtkWidget *label;
GtkWidget *combo; GtkWidget *combo;
GList *opclasses; GList *opclasses;
GList *iter; GList *iter;
@ -241,10 +240,6 @@ gimp_gegl_tool_dialog (GimpImageMapTool *image_map_tool)
gtk_box_reorder_child (GTK_BOX (main_vbox), hbox, 0); gtk_box_reorder_child (GTK_BOX (main_vbox), hbox, 0);
gtk_widget_show (hbox); gtk_widget_show (hbox);
label = gtk_label_new_with_mnemonic (_("_Operation:"));
gtk_box_pack_start (GTK_BOX (hbox), label, FALSE, FALSE, 0);
gtk_widget_show (label);
store = gtk_list_store_new (N_COLUMNS, store = gtk_list_store_new (N_COLUMNS,
G_TYPE_STRING, G_TYPE_STRING, G_TYPE_STRING); G_TYPE_STRING, G_TYPE_STRING, G_TYPE_STRING);
@ -297,8 +292,6 @@ gimp_gegl_tool_dialog (GimpImageMapTool *image_map_tool)
tool->operation_combo = combo; tool->operation_combo = combo;
gtk_label_set_mnemonic_widget (GTK_LABEL (label), combo);
/* The options vbox */ /* The options vbox */
o_tool->options_table = o_tool->options_table =
gtk_label_new (_("Select an operation from the list above")); gtk_label_new (_("Select an operation from the list above"));
@ -306,7 +299,7 @@ gimp_gegl_tool_dialog (GimpImageMapTool *image_map_tool)
PANGO_ATTR_STYLE, PANGO_STYLE_ITALIC, PANGO_ATTR_STYLE, PANGO_STYLE_ITALIC,
-1); -1);
gtk_misc_set_padding (GTK_MISC (o_tool->options_table), 0, 4); gtk_misc_set_padding (GTK_MISC (o_tool->options_table), 0, 4);
gtk_container_add (GTK_CONTAINER (o_tool->options_frame), gtk_container_add (GTK_CONTAINER (o_tool->options_box),
o_tool->options_table); o_tool->options_table);
gtk_widget_show (o_tool->options_table); gtk_widget_show (o_tool->options_table);
} }

8
app/tools/gimpoperationtool.c
View File

@ -189,10 +189,10 @@ gimp_operation_tool_dialog (GimpImageMapTool *image_map_tool)
main_vbox = gimp_image_map_tool_dialog_get_vbox (image_map_tool); main_vbox = gimp_image_map_tool_dialog_get_vbox (image_map_tool);
/* The options vbox */ /* The options vbox */
tool->options_frame = gimp_frame_new (_("Operation Settings")); tool->options_box = gtk_vbox_new (FALSE, 0);
gtk_box_pack_start (GTK_BOX (main_vbox), tool->options_frame, gtk_box_pack_start (GTK_BOX (main_vbox), tool->options_box,
FALSE, FALSE, 0); FALSE, FALSE, 0);
gtk_widget_show (tool->options_frame); gtk_widget_show (tool->options_box);
} }
static void static void
@ -266,7 +266,7 @@ gimp_operation_tool_set_operation (GimpOperationTool *tool,
gimp_prop_table_new (G_OBJECT (tool->config), gimp_prop_table_new (G_OBJECT (tool->config),
G_TYPE_FROM_INSTANCE (tool->config), G_TYPE_FROM_INSTANCE (tool->config),
GIMP_CONTEXT (GIMP_TOOL_GET_OPTIONS (tool))); GIMP_CONTEXT (GIMP_TOOL_GET_OPTIONS (tool)));
gtk_container_add (GTK_CONTAINER (tool->options_frame), gtk_container_add (GTK_CONTAINER (tool->options_box),
tool->options_table); tool->options_table);
gtk_widget_show (tool->options_table); gtk_widget_show (tool->options_table);
} }

2
app/tools/gimpoperationtool.h
View File

@ -41,7 +41,7 @@ struct _GimpOperationTool
GimpObject *config; GimpObject *config;
/* dialog */ /* dialog */
GtkWidget *options_frame; GtkWidget *options_box;
GtkWidget *options_table; GtkWidget *options_table;
}; };