dnrops
/
gimp
mirror of https://github.com/GNOME/gimp.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

app/tools/gimppaintoptions-gui.c code cleanup. 

2005-11-19  Michael Natterer  <mitch@gimp.org>

	* app/tools/gimppaintoptions-gui.c
	* app/tools/gimpselectionoptions.c: code cleanup.
This commit is contained in:
Michael Natterer 2005-11-19 22:19:14 +00:00 committed by Michael Natterer
parent 68cecb38ff
commit fb3dcfc932
3 changed files with 28 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ChangeLog
View File

@ -1,3 +1,8 @@
2005-11-19 Michael Natterer <mitch@gimp.org>
* app/tools/gimppaintoptions-gui.c
* app/tools/gimpselectionoptions.c: code cleanup.
2005-11-19 Michael Natterer <mitch@gimp.org>
* app/tools/gimpaligntool.c

40
app/tools/gimppaintoptions-gui.c
View File

@ -104,11 +104,6 @@ gimp_paint_options_gui (GimpToolOptions *tool_options)
_("Mode:"), 0.0, 0.5,
menu, 2, FALSE);
/* the opacity scale */
gimp_prop_opacity_entry_new (config, "opacity",
GTK_TABLE (table), 0, table_row++,
_("Opacity:"));
if (tool_type == GIMP_TYPE_ERASER_TOOL ||
tool_type == GIMP_TYPE_CONVOLVE_TOOL ||
tool_type == GIMP_TYPE_DODGE_BURN_TOOL ||
@ -118,6 +113,12 @@ gimp_paint_options_gui (GimpToolOptions *tool_options)
gtk_widget_set_sensitive (label, FALSE);
}
/* the opacity scale */
gimp_prop_opacity_entry_new (config, "opacity",
GTK_TABLE (table), 0, table_row++,
_("Opacity:"));
/* the brush */
if (tool_type != GIMP_TYPE_BUCKET_FILL_TOOL &&
tool_type != GIMP_TYPE_BLEND_TOOL &&
tool_type != GIMP_TYPE_INK_TOOL)
@ -128,6 +129,7 @@ gimp_paint_options_gui (GimpToolOptions *tool_options)
button, 2, FALSE);
}
/* the gradient */
if (tool_type == GIMP_TYPE_BLEND_TOOL)
{
button = gimp_gradient_box_new (NULL, GIMP_CONTEXT (tool_options),
@ -274,8 +276,7 @@ pressure_options_gui (GimpPressureOptions *pressure,
}
/* the size toggle */
if (
tool_type == GIMP_TYPE_CLONE_TOOL ||
if (tool_type == GIMP_TYPE_CLONE_TOOL ||
tool_type == GIMP_TYPE_CONVOLVE_TOOL ||
tool_type == GIMP_TYPE_DODGE_BURN_TOOL ||
tool_type == GIMP_TYPE_ERASER_TOOL ||
@ -316,10 +317,6 @@ fade_options_gui (GimpFadeOptions *fade,
{
GObject *config = G_OBJECT (paint_options);
GtkWidget *frame = NULL;
GtkWidget *table;
GtkWidget *spinbutton;
GtkWidget *button;
GtkWidget *menu;
if (g_type_is_a (tool_type, GIMP_TYPE_PAINTBRUSH_TOOL) ||
tool_type == GIMP_TYPE_CLONE_TOOL ||
@ -328,6 +325,11 @@ fade_options_gui (GimpFadeOptions *fade,
tool_type == GIMP_TYPE_ERASER_TOOL ||
tool_type == GIMP_TYPE_SMUDGE_TOOL)
{
GtkWidget *table;
GtkWidget *spinbutton;
GtkWidget *button;
GtkWidget *menu;
frame = gimp_frame_new (NULL);
button = gimp_prop_check_button_new (config, "use-fade",
@ -374,8 +376,6 @@ jitter_options_gui (GimpJitterOptions *jitter,
{
GObject *config = G_OBJECT (paint_options);
GtkWidget *frame = NULL;
GtkWidget *table;
GtkWidget *button;
if (g_type_is_a (tool_type, GIMP_TYPE_PAINTBRUSH_TOOL) ||
tool_type == GIMP_TYPE_CLONE_TOOL ||
@ -384,6 +384,9 @@ jitter_options_gui (GimpJitterOptions *jitter,
tool_type == GIMP_TYPE_ERASER_TOOL ||
tool_type == GIMP_TYPE_SMUDGE_TOOL)
{
GtkWidget *table;
GtkWidget *button;
frame = gimp_frame_new (NULL);
button = gimp_prop_check_button_new (config, "use-jitter",
@ -420,14 +423,15 @@ gradient_options_gui (GimpGradientOptions *gradient,
{
GObject *config = G_OBJECT (paint_options);
GtkWidget *frame = NULL;
GtkWidget *table;
GtkWidget *spinbutton;
GtkWidget *button;
GtkWidget *menu;
GtkWidget *combo;
if (g_type_is_a (tool_type, GIMP_TYPE_PAINTBRUSH_TOOL))
{
GtkWidget *table;
GtkWidget *spinbutton;
GtkWidget *button;
GtkWidget *menu;
GtkWidget *combo;
frame = gimp_frame_new (NULL);
button = gimp_prop_check_button_new (config, "use-gradient",

2
app/tools/gimpselectionoptions.c
View File

@ -527,7 +527,7 @@ gimp_selection_options_gui (GimpToolOptions *tool_options)
}
/* widgets for fixed size select */
if (tool_options->tool_info->tool_type == GIMP_TYPE_RECT_SELECT_TOOL ||
if (tool_options->tool_info->tool_type == GIMP_TYPE_RECT_SELECT_TOOL ||
tool_options->tool_info->tool_type == GIMP_TYPE_ELLIPSE_SELECT_TOOL)
{
GtkWidget *frame;