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

app: fix the PDB GimpBrushSelect dialog

Browse Source 
It was warning like crazy and not showing opacity and paint mode
widgets.
This commit is contained in:
Michael Natterer
2011-11-25 13:57:28 +01:00
parent 2d260e8de1
commit 9cd3e005aa
1 changed files with 24 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

40
app/widgets/gimpbrushselect.c
View File

@ -38,6 +38,7 @@
#include "gimpbrushfactoryview.h" #include "gimpbrushfactoryview.h"
#include "gimpbrushselect.h" #include "gimpbrushselect.h"
#include "gimpcontainerbox.h" #include "gimpcontainerbox.h"
#include "gimpspinscale.h"
#include "gimpwidgets-constructors.h" #include "gimpwidgets-constructors.h"
#include "gimp-intl.h" #include "gimp-intl.h"
@ -127,7 +128,10 @@ gimp_brush_select_constructed (GObject *object)
GimpPdbDialog *dialog = GIMP_PDB_DIALOG (object); GimpPdbDialog *dialog = GIMP_PDB_DIALOG (object);
GimpBrushSelect *select = GIMP_BRUSH_SELECT (object); GimpBrushSelect *select = GIMP_BRUSH_SELECT (object);
GtkWidget *content_area; GtkWidget *content_area;
GtkWidget *table; GtkWidget *vbox;
GtkWidget *scale;
GtkWidget *hbox;
GtkWidget *label;
GtkAdjustment *spacing_adj; GtkAdjustment *spacing_adj;
if (G_OBJECT_CLASS (parent_class)->constructed) if (G_OBJECT_CLASS (parent_class)->constructed)
@ -161,29 +165,35 @@ gimp_brush_select_constructed (GObject *object)
gtk_box_pack_start (GTK_BOX (content_area), dialog->view, TRUE, TRUE, 0); gtk_box_pack_start (GTK_BOX (content_area), dialog->view, TRUE, TRUE, 0);
gtk_widget_show (dialog->view); gtk_widget_show (dialog->view);
/* Create the frame and the table for the options */ vbox = GTK_WIDGET (GIMP_CONTAINER_EDITOR (dialog->view)->view);
table = gtk_widget_get_parent (GIMP_BRUSH_FACTORY_VIEW (dialog->view)->spacing_scale);
gtk_table_set_col_spacings (GTK_TABLE (table), 6);
gtk_table_set_row_spacings (GTK_TABLE (table), 2);
/* Create the opacity scale widget */ /* Create the opacity scale widget */
select->opacity_data = select->opacity_data =
GTK_ADJUSTMENT (gimp_scale_entry_new (GTK_TABLE (table), 0, 1, GTK_ADJUSTMENT (gtk_adjustment_new (gimp_context_get_opacity (dialog->context) * 100.0,
_("Opacity:"), -1, 5, 0.0, 100.0,
gimp_context_get_opacity (dialog->context) * 100.0, 1.0, 10.0, 0.0));
0.0, 100.0, 1.0, 10.0, 1,
TRUE, 0.0, 0.0, scale = gimp_spin_scale_new (select->opacity_data,
NULL, NULL)); _("Opacity"), 1);
gtk_box_pack_end (GTK_BOX (vbox), scale, FALSE, FALSE, 0);
gtk_widget_show (scale);
g_signal_connect (select->opacity_data, "value-changed", g_signal_connect (select->opacity_data, "value-changed",
G_CALLBACK (gimp_brush_select_opacity_update), G_CALLBACK (gimp_brush_select_opacity_update),
select); select);
/* Create the paint mode option menu */ /* Create the paint mode option menu */
hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 4);
gtk_box_pack_end (GTK_BOX (vbox), hbox, FALSE, FALSE, 0);
gtk_widget_show (hbox);
label = gtk_label_new (_("Mode:"));
gtk_box_pack_start (GTK_BOX (hbox), label, FALSE, FALSE, 0);
gtk_widget_show (label);
select->paint_mode_menu = gimp_paint_mode_menu_new (TRUE, FALSE); select->paint_mode_menu = gimp_paint_mode_menu_new (TRUE, FALSE);
gimp_table_attach_aligned (GTK_TABLE (table), 0, 2, gtk_box_pack_start (GTK_BOX (hbox), select->paint_mode_menu, TRUE, TRUE, 0);
_("Mode:"), 0.0, 0.5, gtk_widget_show (select->paint_mode_menu);
select->paint_mode_menu, 2, FALSE);
gimp_int_combo_box_connect (GIMP_INT_COMBO_BOX (select->paint_mode_menu), gimp_int_combo_box_connect (GIMP_INT_COMBO_BOX (select->paint_mode_menu),
gimp_context_get_paint_mode (dialog->context), gimp_context_get_paint_mode (dialog->context),
@ -199,8 +209,6 @@ gimp_brush_select_constructed (GObject *object)
g_signal_connect (spacing_adj, "value-changed", g_signal_connect (spacing_adj, "value-changed",
G_CALLBACK (gimp_brush_select_spacing_update), G_CALLBACK (gimp_brush_select_spacing_update),
select); select);
gtk_widget_show (table);
} }
static void static void