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

app/tools/gimpmagnifyoptions.[ch] applied a patch from William Skaggs that

Browse Source 
2004-05-10  Sven Neumann  <sven@gimp.org>

	* app/tools/gimpmagnifyoptions.[ch]
	* app/tools/gimpmagnifytool.c: applied a patch from William Skaggs
	that changes a misleading option label. Fixes bug #137508.
This commit is contained in:
Sven Neumann
2004-05-10 17:02:20 +00:00
committed by Sven Neumann
parent 6a4733b8ae
commit 486ccb33d7
4 changed files with 19 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
ChangeLog
View File

@ -1,3 +1,9 @@
2004-05-10 Sven Neumann <sven@gimp.org>
* app/tools/gimpmagnifyoptions.[ch]
* app/tools/gimpmagnifytool.c: applied a patch from William Skaggs
that changes a misleading option label. Fixes bug #137508.
2004-05-10 Sven Neumann <sven@gimp.org>
* app/config/gimpdisplayconfig.c (DEFAULT_IMAGE_TITLE_FORMAT):

22
app/tools/gimpmagnifyoptions.c
View File

@ -42,7 +42,7 @@
enum
{
PROP_0,
PROP_ALLOW_RESIZE,
PROP_AUTO_RESIZE,
PROP_ZOOM_TYPE,
PROP_THRESHOLD
};
@ -111,8 +111,8 @@ gimp_magnify_options_class_init (GimpMagnifyOptionsClass *klass)
options_class->reset = gimp_magnify_options_reset;
GIMP_CONFIG_INSTALL_PROP_BOOLEAN (object_class, PROP_ALLOW_RESIZE,
"allow-resize", NULL,
GIMP_CONFIG_INSTALL_PROP_BOOLEAN (object_class, PROP_AUTO_RESIZE,
"auto-resize", NULL,
FALSE,
0);
GIMP_CONFIG_INSTALL_PROP_ENUM (object_class, PROP_ZOOM_TYPE,
@ -143,8 +143,8 @@ gimp_magnify_options_set_property (GObject *object,
switch (property_id)
{
case PROP_ALLOW_RESIZE:
options->allow_resize = g_value_get_boolean (value);
case PROP_AUTO_RESIZE:
options->auto_resize = g_value_get_boolean (value);
break;
case PROP_ZOOM_TYPE:
options->zoom_type = g_value_get_enum (value);
@ -170,8 +170,8 @@ gimp_magnify_options_get_property (GObject *object,
switch (property_id)
{
case PROP_ALLOW_RESIZE:
g_value_set_boolean (value, options->allow_resize);
case PROP_AUTO_RESIZE:
g_value_set_boolean (value, options->auto_resize);
break;
case PROP_ZOOM_TYPE:
g_value_set_enum (value, options->zoom_type);
@ -199,7 +199,7 @@ gimp_magnify_options_set_defaults (GimpToolOptions *tool_options)
GParamSpec *pspec;
pspec = g_object_class_find_property (G_OBJECT_GET_CLASS (tool_options),
"allow-resize");
"auto-resize");
if (pspec)
G_PARAM_SPEC_BOOLEAN (pspec)->default_value =
@ -220,9 +220,9 @@ gimp_magnify_options_gui (GimpToolOptions *tool_options)
vbox = gimp_tool_options_gui (tool_options);
/* the allow_resize toggle button */
button = gimp_prop_check_button_new (config, "allow-resize",
_("Allow Window Resizing"));
/* the auto_resize toggle button */
button = gimp_prop_check_button_new (config, "auto-resize",
_("Auto-Resize Window"));
gtk_box_pack_start (GTK_BOX (vbox), button, FALSE, FALSE, 0);
gtk_widget_show (button);

2
app/tools/gimpmagnifyoptions.h
View File

@ -38,7 +38,7 @@ struct _GimpMagnifyOptions
{
GimpToolOptions parent_instance;
gboolean allow_resize;
gboolean auto_resize;
GimpZoomType zoom_type;
gdouble threshold;
};

2
app/tools/gimpmagnifytool.c
View File

@ -281,7 +281,7 @@ gimp_magnify_tool_button_release (GimpTool *tool,
gimp_display_shell_scale_by_values (shell,
new_scale,
offset_x, offset_y,
options->allow_resize);
options->auto_resize);
}
}