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

Applied gimp-simon-980331-0. Cosmetic change to the Layers&Channels-dialog.

Browse Source 
I will hopefully finish my changes to the dialog tonight and will upload a
new version of my patch. Could you (the core developers) please make up your
mind whether to include it in 1.0 or not...

The Blend-Tool dialog now changes the repeat_mode_menu to insensitive when
the Gradient-Type is one of the Shapeburst-types.


--Sven
This commit is contained in:
Sven Neumann
1998-04-01 18:48:34 +00:00
parent f992be951f
commit abdc50068d
7 changed files with 38 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
ChangeLog
View File

@ -1,3 +1,9 @@
Wed Apr 1 20:04:26 MEST 1998 Sven Neumann <sven@gimp.org>
* app/layers_dialog.c: applied gimp-simon-980331-0
* app/blend.c: change the repeat_mode_menu to insensitive when
gradient_type is Shapeburst*
Wed Apr 01 04:07:29 EST 1998 Matthew Wilson <msw@gimp.org> Wed Apr 01 04:07:29 EST 1998 Matthew Wilson <msw@gimp.org>
* app/disp_callbacks.c: Only destroy the current tool if you change * app/disp_callbacks.c: Only destroy the current tool if you change

5
app/blend.c
View File

@ -100,6 +100,7 @@ struct _BlendOptions
int paint_mode; int paint_mode;
GradientType gradient_type; GradientType gradient_type;
RepeatMode repeat; RepeatMode repeat;
GtkWidget *repeat_mode_menu;
int supersample; int supersample;
GtkWidget *frame; GtkWidget *frame;
int max_depth; int max_depth;
@ -250,6 +251,8 @@ gradient_type_callback (GtkWidget *w,
gpointer client_data) gpointer client_data)
{ {
blend_options->gradient_type = (GradientType) client_data; blend_options->gradient_type = (GradientType) client_data;
gtk_widget_set_sensitive (blend_options->repeat_mode_menu,
(blend_options->gradient_type < 6));
} }
static void static void
@ -444,6 +447,8 @@ create_blend_options ()
gtk_widget_show(label); gtk_widget_show(label);
gtk_widget_show(rt_option_menu); gtk_widget_show(rt_option_menu);
options->repeat_mode_menu = rt_option_menu;
/* show the whole table */ /* show the whole table */
gtk_widget_show (table); gtk_widget_show (table);

5
app/core/gimpdrawable-blend.c
View File

@ -100,6 +100,7 @@ struct _BlendOptions
int paint_mode; int paint_mode;
GradientType gradient_type; GradientType gradient_type;
RepeatMode repeat; RepeatMode repeat;
GtkWidget *repeat_mode_menu;
int supersample; int supersample;
GtkWidget *frame; GtkWidget *frame;
int max_depth; int max_depth;
@ -250,6 +251,8 @@ gradient_type_callback (GtkWidget *w,
gpointer client_data) gpointer client_data)
{ {
blend_options->gradient_type = (GradientType) client_data; blend_options->gradient_type = (GradientType) client_data;
gtk_widget_set_sensitive (blend_options->repeat_mode_menu,
(blend_options->gradient_type < 6));
} }
static void static void
@ -444,6 +447,8 @@ create_blend_options ()
gtk_widget_show(label); gtk_widget_show(label);
gtk_widget_show(rt_option_menu); gtk_widget_show(rt_option_menu);
options->repeat_mode_menu = rt_option_menu;
/* show the whole table */ /* show the whole table */
gtk_widget_show (table); gtk_widget_show (table);

11
app/gui/layers-dialog.c
View File

@ -286,8 +286,8 @@ lc_dialog_create (int gimage_id)
&lc_shell); &lc_shell);
gtk_quit_add_destroy (1, GTK_OBJECT (lc_shell)); gtk_quit_add_destroy (1, GTK_OBJECT (lc_shell));
lc_subshell = gtk_vbox_new(FALSE, 1); lc_subshell = gtk_vbox_new(FALSE, 2);
gtk_box_pack_start (GTK_BOX(GTK_DIALOG(lc_shell)->vbox), lc_subshell, TRUE, TRUE, 0); gtk_box_pack_start (GTK_BOX(GTK_DIALOG(lc_shell)->vbox), lc_subshell, TRUE, TRUE, 2);
/* The hbox to hold the image option menu box */ /* The hbox to hold the image option menu box */
util_box = gtk_hbox_new (FALSE, 1); util_box = gtk_hbox_new (FALSE, 1);
@ -309,7 +309,7 @@ lc_dialog_create (int gimage_id)
gtk_widget_show (util_box); gtk_widget_show (util_box);
separator = gtk_hseparator_new (); separator = gtk_hseparator_new ();
gtk_box_pack_start (GTK_BOX(lc_subshell), separator, FALSE, TRUE, 5); gtk_box_pack_start (GTK_BOX(lc_subshell), separator, FALSE, TRUE, 2);
gtk_widget_show (separator); gtk_widget_show (separator);
/* The notebook widget */ /* The notebook widget */
@ -332,15 +332,16 @@ lc_dialog_create (int gimage_id)
gtk_widget_show (lc_subshell); gtk_widget_show (lc_subshell);
gtk_container_border_width (GTK_CONTAINER (GTK_DIALOG(lc_shell)->action_area), 1);
/* The close button */ /* The close button */
button = gtk_button_new_with_label ("Close"); button = gtk_button_new_with_label ("Close");
gtk_box_pack_start (GTK_BOX (GTK_DIALOG(lc_shell)->vbox), button, FALSE, FALSE, 2); gtk_box_pack_start (GTK_BOX (GTK_DIALOG(lc_shell)->action_area), button, TRUE, TRUE, 0);
gtk_signal_connect_object (GTK_OBJECT (button), "clicked", gtk_signal_connect_object (GTK_OBJECT (button), "clicked",
(GtkSignalFunc) lc_dialog_close_callback, (GtkSignalFunc) lc_dialog_close_callback,
GTK_OBJECT (lc_shell)); GTK_OBJECT (lc_shell));
gtk_widget_show (button); gtk_widget_show (button);
gtk_widget_hide (GTK_DIALOG(lc_shell)->action_area); gtk_widget_show (GTK_DIALOG(lc_shell)->action_area);
gtk_widget_show (lc_shell); gtk_widget_show (lc_shell);

11
app/layers_dialog.c
View File

@ -286,8 +286,8 @@ lc_dialog_create (int gimage_id)
&lc_shell); &lc_shell);
gtk_quit_add_destroy (1, GTK_OBJECT (lc_shell)); gtk_quit_add_destroy (1, GTK_OBJECT (lc_shell));
lc_subshell = gtk_vbox_new(FALSE, 1); lc_subshell = gtk_vbox_new(FALSE, 2);
gtk_box_pack_start (GTK_BOX(GTK_DIALOG(lc_shell)->vbox), lc_subshell, TRUE, TRUE, 0); gtk_box_pack_start (GTK_BOX(GTK_DIALOG(lc_shell)->vbox), lc_subshell, TRUE, TRUE, 2);
/* The hbox to hold the image option menu box */ /* The hbox to hold the image option menu box */
util_box = gtk_hbox_new (FALSE, 1); util_box = gtk_hbox_new (FALSE, 1);
@ -309,7 +309,7 @@ lc_dialog_create (int gimage_id)
gtk_widget_show (util_box); gtk_widget_show (util_box);
separator = gtk_hseparator_new (); separator = gtk_hseparator_new ();
gtk_box_pack_start (GTK_BOX(lc_subshell), separator, FALSE, TRUE, 5); gtk_box_pack_start (GTK_BOX(lc_subshell), separator, FALSE, TRUE, 2);
gtk_widget_show (separator); gtk_widget_show (separator);
/* The notebook widget */ /* The notebook widget */
@ -332,15 +332,16 @@ lc_dialog_create (int gimage_id)
gtk_widget_show (lc_subshell); gtk_widget_show (lc_subshell);
gtk_container_border_width (GTK_CONTAINER (GTK_DIALOG(lc_shell)->action_area), 1);
/* The close button */ /* The close button */
button = gtk_button_new_with_label ("Close"); button = gtk_button_new_with_label ("Close");
gtk_box_pack_start (GTK_BOX (GTK_DIALOG(lc_shell)->vbox), button, FALSE, FALSE, 2); gtk_box_pack_start (GTK_BOX (GTK_DIALOG(lc_shell)->action_area), button, TRUE, TRUE, 0);
gtk_signal_connect_object (GTK_OBJECT (button), "clicked", gtk_signal_connect_object (GTK_OBJECT (button), "clicked",
(GtkSignalFunc) lc_dialog_close_callback, (GtkSignalFunc) lc_dialog_close_callback,
GTK_OBJECT (lc_shell)); GTK_OBJECT (lc_shell));
gtk_widget_show (button); gtk_widget_show (button);
gtk_widget_hide (GTK_DIALOG(lc_shell)->action_area); gtk_widget_show (GTK_DIALOG(lc_shell)->action_area);
gtk_widget_show (lc_shell); gtk_widget_show (lc_shell);

5
app/tools/blend.c
View File

@ -100,6 +100,7 @@ struct _BlendOptions
int paint_mode; int paint_mode;
GradientType gradient_type; GradientType gradient_type;
RepeatMode repeat; RepeatMode repeat;
GtkWidget *repeat_mode_menu;
int supersample; int supersample;
GtkWidget *frame; GtkWidget *frame;
int max_depth; int max_depth;
@ -250,6 +251,8 @@ gradient_type_callback (GtkWidget *w,
gpointer client_data) gpointer client_data)
{ {
blend_options->gradient_type = (GradientType) client_data; blend_options->gradient_type = (GradientType) client_data;
gtk_widget_set_sensitive (blend_options->repeat_mode_menu,
(blend_options->gradient_type < 6));
} }
static void static void
@ -444,6 +447,8 @@ create_blend_options ()
gtk_widget_show(label); gtk_widget_show(label);
gtk_widget_show(rt_option_menu); gtk_widget_show(rt_option_menu);
options->repeat_mode_menu = rt_option_menu;
/* show the whole table */ /* show the whole table */
gtk_widget_show (table); gtk_widget_show (table);

5
app/tools/gimpblendtool.c
View File

@ -100,6 +100,7 @@ struct _BlendOptions
int paint_mode; int paint_mode;
GradientType gradient_type; GradientType gradient_type;
RepeatMode repeat; RepeatMode repeat;
GtkWidget *repeat_mode_menu;
int supersample; int supersample;
GtkWidget *frame; GtkWidget *frame;
int max_depth; int max_depth;
@ -250,6 +251,8 @@ gradient_type_callback (GtkWidget *w,
gpointer client_data) gpointer client_data)
{ {
blend_options->gradient_type = (GradientType) client_data; blend_options->gradient_type = (GradientType) client_data;
gtk_widget_set_sensitive (blend_options->repeat_mode_menu,
(blend_options->gradient_type < 6));
} }
static void static void
@ -444,6 +447,8 @@ create_blend_options ()
gtk_widget_show(label); gtk_widget_show(label);
gtk_widget_show(rt_option_menu); gtk_widget_show(rt_option_menu);
options->repeat_mode_menu = rt_option_menu;
/* show the whole table */ /* show the whole table */
gtk_widget_show (table); gtk_widget_show (table);