graphics/gimp
graphics/gimp
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/gimp synced 2024-10-20 19:43:01 +00:00
Code Issues Packages Projects Releases Wiki Activity

app: resurrect the operation tool's title

Browse source
This commit is contained in:
Michael Natterer 2012-04-01 15:45:58 +02:00
parent 1b64710e66
commit 75f2bc1aac
2 changed files with 30 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

34
app/tools/gimpoperationtool.c
View file

@ -142,6 +142,12 @@ gimp_operation_tool_finalize (GObject *object)
tool->config = NULL;
}
if (tool->dialog_desc)
{
g_free (tool->dialog_desc);
tool->dialog_desc = NULL;
}
G_OBJECT_CLASS (parent_class)->finalize (object);
}
@ -206,6 +212,11 @@ gimp_operation_tool_dialog (GimpImageMapTool *image_map_tool)
tool->options_table);
gtk_widget_show (tool->options_table);
}
if (tool->dialog_desc)
g_object_set (GIMP_IMAGE_MAP_TOOL (tool)->dialog,
"description", tool->dialog_desc,
NULL);
}
static void
@ -268,7 +279,7 @@ gimp_operation_tool_config_notify (GObject *object,
void
gimp_operation_tool_set_operation (GimpOperationTool *tool,
const gchar *operation,
const gchar *label)
const gchar *dialog_desc)
{
g_return_if_fail (GIMP_IS_OPERATION_TOOL (tool));
g_return_if_fail (operation != NULL);
@ -312,7 +323,7 @@ gimp_operation_tool_set_operation (GimpOperationTool *tool,
GIMP_IMAGE_MAP_TOOL (tool)->config = g_object_ref (tool->config);
GIMP_VIEWABLE_GET_CLASS (tool->config)->default_stock_id = GIMP_STOCK_GEGL;
GIMP_IMAGE_MAP_TOOL_GET_CLASS (tool)->settings_name = label; /* XXX hack */
GIMP_IMAGE_MAP_TOOL_GET_CLASS (tool)->settings_name = dialog_desc; /* XXX hack */
if (tool->options_table)
{
@ -339,10 +350,21 @@ gimp_operation_tool_set_operation (GimpOperationTool *tool,
}
}
if (label && GIMP_IMAGE_MAP_TOOL (tool)->dialog)
g_object_set (GIMP_IMAGE_MAP_TOOL (tool)->dialog,
"description", label,
NULL);
if (tool->dialog_desc)
{
g_free (tool->dialog_desc);
tool->dialog_desc = NULL;
}
if (dialog_desc)
{
tool->dialog_desc = g_strdup (dialog_desc);
if (GIMP_IMAGE_MAP_TOOL (tool)->dialog)
g_object_set (GIMP_IMAGE_MAP_TOOL (tool)->dialog,
"description", dialog_desc,
NULL);
}
if (GIMP_TOOL (tool)->drawable)
gimp_image_map_tool_preview (GIMP_IMAGE_MAP_TOOL (tool));

3
app/tools/gimpoperationtool.h
View file

@ -41,6 +41,7 @@ struct _GimpOperationTool
GimpObject *config;
/* dialog */
gchar *dialog_desc;
GtkWidget *options_box;
GtkWidget *options_table;
};
@ -58,7 +59,7 @@ GType gimp_operation_tool_get_type (void) G_GNUC_CONST;
void gimp_operation_tool_set_operation (GimpOperationTool *tool,
const gchar *operation,
const gchar *label);
const gchar *dialog_desc);
#endif /* __GIMP_OPERATION_TOOL_H__ */