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

app/dialogs/Makefile.am the new/edit template dialog. 

2004-10-22  Michael Natterer  <mitch@gimp.org>

	* app/dialogs/Makefile.am
	* app/dialogs/template-options-dialog.[ch]: the new/edit template
	dialog.

	* app/actions/templates-commands.c: removed the code here and use
	template_options_dialog_new(). Removed utility functions. Some
	cleanup.
This commit is contained in:
Michael Natterer 2004-10-22 18:13:46 +00:00 committed by Michael Natterer
parent 59bd430526
commit d1ce0a16bd
5 changed files with 234 additions and 162 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
ChangeLog
View File

@ -1,3 +1,13 @@
2004-10-22 Michael Natterer <mitch@gimp.org>
* app/dialogs/Makefile.am
* app/dialogs/template-options-dialog.[ch]: the new/edit template
dialog.
* app/actions/templates-commands.c: removed the code here and use
template_options_dialog_new(). Removed utility functions. Some
cleanup.
2004-10-22 Michael Natterer <mitch@gimp.org>
* app/widgets/gimpeditor.c (gimp_editor_ensure_button_box): make

230
app/actions/templates-commands.c
View File

@ -40,19 +40,19 @@
#include "widgets/gimpmessagedialog.h"
#include "widgets/gimptemplateeditor.h"
#include "widgets/gimptemplateview.h"
#include "widgets/gimpviewabledialog.h"
#include "dialogs/dialogs.h"
#include "dialogs/image-new-dialog.h"
#include "dialogs/template-options-dialog.h"
#include "templates-commands.h"
#include "gimp-intl.h"
typedef struct _GimpTemplateDeleteData GimpTemplateDeleteData;
typedef struct _TemplateDeleteData TemplateDeleteData;
struct _GimpTemplateDeleteData
struct _TemplateDeleteData
{
GimpContainer *container;
GimpTemplate *template;
@ -61,20 +61,15 @@ struct _GimpTemplateDeleteData
/* local function prototypes */
static void templates_new_template_dialog (Gimp *gimp,
GtkWidget *parent);
static void templates_new_template_response (GtkWidget *widget,
gint response_id,
GtkWidget *dialog);
static void templates_edit_template_dialog (Gimp *gimp,
GimpTemplate *template,
GtkWidget *parent);
static void templates_edit_template_response (GtkWidget *widget,
gint response_id,
GtkWidget *dialog);
static void templates_delete_confirm_response (GtkWidget *dialog,
gint response_id,
GimpTemplateDeleteData *delete_data);
static void templates_new_template_response (GtkWidget *dialog,
gint response_id,
TemplateOptionsDialog *options);
static void templates_edit_template_response (GtkWidget *widget,
gint response_id,
TemplateOptionsDialog *options);
static void templates_delete_template_response (GtkWidget *dialog,
gint response_id,
TemplateDeleteData *delete_data);
/* public functions */
@ -117,21 +112,25 @@ void
templates_new_template_cmd_callback (GtkAction *action,
gpointer data)
{
GimpContainerEditor *editor = GIMP_CONTAINER_EDITOR (data);
GimpContainer *container;
GimpContext *context;
GimpTemplate *template;
GimpContainerEditor *editor = GIMP_CONTAINER_EDITOR (data);
GimpContext *context;
TemplateOptionsDialog *options;
container = gimp_container_view_get_container (editor->view);
context = gimp_container_view_get_context (editor->view);
context = gimp_container_view_get_context (editor->view);
template = gimp_context_get_template (context);
options = template_options_dialog_new (context->gimp, NULL,
GTK_WIDGET (editor),
_("New Template"),
"gimp-template-new",
GIMP_STOCK_TEMPLATE,
_("Create a New Template"),
GIMP_HELP_TEMPLATE_NEW);
if (template && gimp_container_have (container, GIMP_OBJECT (template)))
{
}
g_signal_connect (options->dialog, "response",
G_CALLBACK (templates_new_template_response),
options);
templates_new_template_dialog (context->gimp, GTK_WIDGET (editor));
gtk_widget_show (options->dialog);
}
void
@ -155,14 +154,11 @@ templates_duplicate_template_cmd_callback (GtkAction *action,
new_template = gimp_config_duplicate (GIMP_CONFIG (template));
gimp_container_add (container, GIMP_OBJECT (new_template));
gimp_context_set_by_type (context, container->children_type,
GIMP_OBJECT (new_template));
templates_edit_template_dialog (context->gimp, new_template,
GTK_WIDGET (editor));
g_object_unref (new_template);
templates_edit_template_cmd_callback (action, data);
}
}
@ -182,8 +178,21 @@ templates_edit_template_cmd_callback (GtkAction *action,
if (template && gimp_container_have (container, GIMP_OBJECT (template)))
{
templates_edit_template_dialog (context->gimp, template,
GTK_WIDGET (editor));
TemplateOptionsDialog *options;
options = template_options_dialog_new (context->gimp, template,
GTK_WIDGET (editor),
_("Edit Template"),
"gimp-template-edit",
GIMP_STOCK_EDIT,
_("Edit Template"),
GIMP_HELP_TEMPLATE_EDIT);
g_signal_connect (options->dialog, "response",
G_CALLBACK (templates_edit_template_response),
options);
gtk_widget_show (options->dialog);
}
}
@ -203,10 +212,10 @@ templates_delete_template_cmd_callback (GtkAction *action,
if (template && gimp_container_have (container, GIMP_OBJECT (template)))
{
GimpTemplateDeleteData *delete_data;
GtkWidget *dialog;
TemplateDeleteData *delete_data;
GtkWidget *dialog;
delete_data = g_new0 (GimpTemplateDeleteData, 1);
delete_data = g_new0 (TemplateDeleteData, 1);
delete_data->container = container;
delete_data->template = template;
@ -221,12 +230,13 @@ templates_delete_template_cmd_callback (GtkAction *action,
NULL);
g_object_weak_ref (G_OBJECT (dialog), (GWeakNotify) g_free, delete_data);
g_signal_connect_object (template, "disconnect",
G_CALLBACK (gtk_widget_destroy),
dialog, G_CONNECT_SWAPPED);
g_signal_connect (dialog, "response",
G_CALLBACK (templates_delete_confirm_response),
G_CALLBACK (templates_delete_template_response),
delete_data);
gimp_message_box_set_primary_text (GIMP_MESSAGE_DIALOG (dialog)->box,
@ -238,154 +248,48 @@ templates_delete_template_cmd_callback (GtkAction *action,
}
}
/* private functions */
static void
templates_new_template_dialog (Gimp *gimp,
GtkWidget *parent)
{
GimpTemplate *template;
GtkWidget *dialog;
GtkWidget *main_vbox;
GtkWidget *editor;
dialog = gimp_viewable_dialog_new (NULL,
_("New Template"), "gimp-template-new",
GIMP_STOCK_TEMPLATE,
_("Create a New Template"),
parent,
gimp_standard_help_func,
GIMP_HELP_TEMPLATE_NEW,
GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,
GTK_STOCK_OK, GTK_RESPONSE_OK,
NULL);
g_signal_connect (dialog, "response",
G_CALLBACK (templates_new_template_response),
dialog);
main_vbox = gtk_vbox_new (FALSE, 12);
gtk_container_set_border_width (GTK_CONTAINER (main_vbox), 12);
gtk_box_pack_start (GTK_BOX (GTK_DIALOG (dialog)->vbox), main_vbox,
TRUE, TRUE, 0);
gtk_widget_show (main_vbox);
template = gimp_config_duplicate (GIMP_CONFIG (gimp->config->default_image));
gimp_object_set_name (GIMP_OBJECT (template), _("Unnamed"));
editor = gimp_template_editor_new (template, gimp, TRUE);
g_object_unref (template);
g_object_set_data (G_OBJECT (dialog), "gimp", gimp);
g_object_set_data (G_OBJECT (dialog), "gimp-template", template);
gtk_box_pack_start (GTK_BOX (main_vbox), editor, FALSE, FALSE, 0);
gtk_widget_show (editor);
gtk_widget_show (dialog);
}
static void
templates_new_template_response (GtkWidget *widget,
gint response_id,
GtkWidget *dialog)
templates_new_template_response (GtkWidget *dialog,
gint response_id,
TemplateOptionsDialog *options)
{
if (response_id == GTK_RESPONSE_OK)
{
GimpTemplate *template;
Gimp *gimp;
GimpTemplateEditor *editor = GIMP_TEMPLATE_EDITOR (options->editor);
GimpTemplate *template = editor->template;
template = g_object_get_data (G_OBJECT (dialog), "gimp-template");
gimp = g_object_get_data (G_OBJECT (dialog), "gimp");
gimp_container_add (gimp->templates, GIMP_OBJECT (template));
gimp_context_set_template (gimp_get_user_context (gimp), template);
gimp_container_add (options->gimp->templates, GIMP_OBJECT (template));
gimp_context_set_template (gimp_get_user_context (options->gimp),
template);
}
gtk_widget_destroy (dialog);
}
static void
templates_edit_template_dialog (Gimp *gimp,
GimpTemplate *template,
GtkWidget *parent)
{
GtkWidget *dialog;
GtkWidget *main_vbox;
GtkWidget *editor;
dialog = gimp_viewable_dialog_new (GIMP_VIEWABLE (template),
_("Edit Template"), "gimp-template-edit",
GIMP_STOCK_EDIT,
_("Edit Template"),
parent,
gimp_standard_help_func,
GIMP_HELP_TEMPLATE_EDIT,
GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,
GTK_STOCK_OK, GTK_RESPONSE_OK,
NULL);
g_signal_connect (dialog, "response",
G_CALLBACK (templates_edit_template_response),
dialog);
main_vbox = gtk_vbox_new (FALSE, 12);
gtk_container_set_border_width (GTK_CONTAINER (main_vbox), 12);
gtk_box_pack_start (GTK_BOX (GTK_DIALOG (dialog)->vbox), main_vbox,
TRUE, TRUE, 0);
gtk_widget_show (main_vbox);
g_object_set_data (G_OBJECT (dialog), "gimp", gimp);
g_object_set_data (G_OBJECT (dialog), "gimp-template", template);
template = gimp_config_duplicate (GIMP_CONFIG (template));
editor = gimp_template_editor_new (template, gimp, TRUE);
g_object_unref (template);
gtk_box_pack_start (GTK_BOX (main_vbox), editor, FALSE, FALSE, 0);
gtk_widget_show (editor);
g_object_set_data (G_OBJECT (dialog), "gimp-template-editor", editor);
gtk_widget_show (dialog);
}
static void
templates_edit_template_response (GtkWidget *widget,
gint response_id,
GtkWidget *dialog)
templates_edit_template_response (GtkWidget *dialog,
gint response_id,
TemplateOptionsDialog *options)
{
if (response_id == GTK_RESPONSE_OK)
{
GimpTemplateEditor *editor;
GimpTemplate *template;
Gimp *gimp;
editor = g_object_get_data (G_OBJECT (dialog), "gimp-template-editor");
template = g_object_get_data (G_OBJECT (dialog), "gimp-template");
gimp = g_object_get_data (G_OBJECT (dialog), "gimp");
GimpTemplateEditor *editor = GIMP_TEMPLATE_EDITOR (options->editor);
gimp_config_sync (GIMP_CONFIG (editor->template),
GIMP_CONFIG (template), 0);
GIMP_CONFIG (options->template), 0);
}
gtk_widget_destroy (dialog);
}
static void
templates_delete_confirm_response (GtkWidget *dialog,
gint response_id,
GimpTemplateDeleteData *delete_data)
templates_delete_template_response (GtkWidget *dialog,
gint response_id,
TemplateDeleteData *delete_data)
{
gtk_widget_destroy (dialog);
if (response_id == GTK_RESPONSE_OK)
{
if (gimp_container_have (delete_data->container,
@ -395,4 +299,6 @@ templates_delete_confirm_response (GtkWidget *dialog,
GIMP_OBJECT (delete_data->template));
}
}
gtk_widget_destroy (dialog);
}

2
app/dialogs/Makefile.am
View File

@ -48,6 +48,8 @@ libappdialogs_a_SOURCES = \
scale-dialog.h \
stroke-dialog.c \
stroke-dialog.h \
template-options-dialog.c \
template-options-dialog.h \
tips-dialog.c \
tips-dialog.h \
tips-parser.c \

109
app/dialogs/template-options-dialog.c Normal file
View File

@ -0,0 +1,109 @@
/* The GIMP -- an image manipulation program
* Copyright (C) 1995 Spencer Kimball and Peter Mattis
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation; either version 2 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*/
#include "config.h"
#include <gtk/gtk.h>
#include "libgimpwidgets/gimpwidgets.h"
#include "dialogs-types.h"
#include "config/gimpconfig.h"
#include "config/gimpcoreconfig.h"
#include "core/gimp.h"
#include "core/gimptemplate.h"
#include "widgets/gimptemplateeditor.h"
#include "widgets/gimpviewabledialog.h"
#include "template-options-dialog.h"
#include "gimp-intl.h"
/* public functions */
TemplateOptionsDialog *
template_options_dialog_new (Gimp *gimp,
GimpTemplate *template,
GtkWidget *parent,
const gchar *title,
const gchar *role,
const gchar *stock_id,
const gchar *desc,
const gchar *help_id)
{
TemplateOptionsDialog *options;
GimpViewable *viewable = NULL;
GtkWidget *vbox;
g_return_val_if_fail (GIMP_IS_GIMP (gimp), NULL);
g_return_val_if_fail (template == NULL || GIMP_IS_TEMPLATE (template), NULL);
g_return_val_if_fail (GTK_IS_WIDGET (parent), NULL);
g_return_val_if_fail (title != NULL, NULL);
g_return_val_if_fail (role != NULL, NULL);
g_return_val_if_fail (stock_id != NULL, NULL);
g_return_val_if_fail (desc != NULL, NULL);
g_return_val_if_fail (help_id != NULL, NULL);
options = g_new0 (TemplateOptionsDialog, 1);
options->gimp = gimp;
options->template = template;
if (template)
{
viewable = GIMP_VIEWABLE (template);
template = gimp_config_duplicate (GIMP_CONFIG (template));
}
else
{
template =
gimp_config_duplicate (GIMP_CONFIG (gimp->config->default_image));
gimp_object_set_name (GIMP_OBJECT (template), _("Unnamed"));
}
options->dialog =
gimp_viewable_dialog_new (viewable,
title, role, stock_id, desc,
parent,
gimp_standard_help_func, help_id,
GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,
GTK_STOCK_OK, GTK_RESPONSE_OK,
NULL);
g_object_weak_ref (G_OBJECT (options->dialog),
(GWeakNotify) g_free, options);
vbox = gtk_vbox_new (FALSE, 12);
gtk_container_set_border_width (GTK_CONTAINER (vbox), 12);
gtk_container_add (GTK_CONTAINER (GTK_DIALOG (options->dialog)->vbox), vbox);
gtk_widget_show (vbox);
options->editor = gimp_template_editor_new (template, gimp, TRUE);
gtk_box_pack_start (GTK_BOX (vbox), options->editor, FALSE, FALSE, 0);
gtk_widget_show (options->editor);
g_object_unref (template);
return options;
}

45
app/dialogs/template-options-dialog.h Normal file
View File

@ -0,0 +1,45 @@
/* The GIMP -- an image manipulation program
* Copyright (C) 1995 Spencer Kimball and Peter Mattis
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation; either version 2 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*/
#ifndef __TEMPLATE_OPTIONS_DIALOG_H__
#define __TEMPLATE_OPTIONS_DIALOG_H__
typedef struct _TemplateOptionsDialog TemplateOptionsDialog;
struct _TemplateOptionsDialog
{
GtkWidget *dialog;
GtkWidget *editor;
Gimp *gimp;
GimpTemplate *template;
};
TemplateOptionsDialog * template_options_dialog_new (Gimp *gimp,
GimpTemplate *template,
GtkWidget *parent,
const gchar *title,
const gchar *role,
const gchar *stock_id,
const gchar *desc,
const gchar *help_id);
#endif /* __TEMPLATE_OPTIONS_DIALOG_H__ */