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

app/gdisplay_ops.c app/gradient.c app/palette.c removed the "eek" wilber 

2000-02-12  Michael Natterer  <mitschel@cs.tu-berlin.de>

	* app/gdisplay_ops.c
	* app/gradient.c
	* app/palette.c
	* plug-ins/gflare/gflare.c: removed the "eek" wilber from all
	query boxes except the "Quit the GIMP?" warning.

	* libgimp/gimpfileselection.c
	* libgimp/gimpunitmenu.c: be a bit more clever with widget signals
	(destroy, unmap) which affect the widget's sub-dialogs.

	* libgimp/gimphelpui.c: pass a GtkWindow, not a GtkWidget to
	gimp_dialog_set_icon().

	* libgimp/gimpquerybox.[ch]: added documentation.
This commit is contained in:
Michael Natterer 2000-02-12 13:07:59 +00:00 committed by Michael Natterer
parent 79c6f5cd0c
commit 9f92453c56
28 changed files with 554 additions and 152 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
ChangeLog
View File

@ -1,3 +1,20 @@
2000-02-12 Michael Natterer <mitschel@cs.tu-berlin.de>
* app/gdisplay_ops.c
* app/gradient.c
* app/palette.c
* plug-ins/gflare/gflare.c: removed the "eek" wilber from all
query boxes except the "Quit the GIMP?" warning.
* libgimp/gimpfileselection.c
* libgimp/gimpunitmenu.c: be a bit more clever with widget signals
(destroy, unmap) which affect the widget's sub-dialogs.
* libgimp/gimphelpui.c: pass a GtkWindow, not a GtkWidget to
gimp_dialog_set_icon().
* libgimp/gimpquerybox.[ch]: added documentation.
2000-02-12 Shirasaki Yasuhiro <yasuhiro@gnome.gr.jp>
* plug-ins/maze/maze.c

2
app/display/gimpdisplay-ops.c
View File

@ -349,7 +349,7 @@ gdisplay_close_warning_dialog (gchar *image_name,
gimp_query_boolean_box (image_name,
gimp_standard_help_func,
"dialogs/really_close.html",
TRUE,
FALSE,
warning_buf,
_("Close"), _("Cancel"),
NULL, NULL,

2
app/gdisplay_ops.c
View File

@ -349,7 +349,7 @@ gdisplay_close_warning_dialog (gchar *image_name,
gimp_query_boolean_box (image_name,
gimp_standard_help_func,
"dialogs/really_close.html",
TRUE,
FALSE,
warning_buf,
_("Close"), _("Cancel"),
NULL, NULL,

2
app/gradient.c
View File

@ -1784,7 +1784,7 @@ ed_delete_gradient_callback (GtkWidget *widget,
gimp_query_boolean_box (_("Delete Gradient"),
gimp_standard_help_func,
"dialogs/gradient_editor/delete_gradient.html",
TRUE,
FALSE,
str,
_("Delete"), _("Cancel"),
NULL, NULL,

2
app/gradient_editor.c
View File

@ -1784,7 +1784,7 @@ ed_delete_gradient_callback (GtkWidget *widget,
gimp_query_boolean_box (_("Delete Gradient"),
gimp_standard_help_func,
"dialogs/gradient_editor/delete_gradient.html",
TRUE,
FALSE,
str,
_("Delete"), _("Cancel"),
NULL, NULL,

2
app/gui/gradient-editor.c
View File

@ -1784,7 +1784,7 @@ ed_delete_gradient_callback (GtkWidget *widget,
gimp_query_boolean_box (_("Delete Gradient"),
gimp_standard_help_func,
"dialogs/gradient_editor/delete_gradient.html",
TRUE,
FALSE,
str,
_("Delete"), _("Cancel"),
NULL, NULL,

2
app/gui/palette-editor.c
View File

@ -1839,7 +1839,7 @@ palette_dialog_delete_callback (GtkWidget *widget,
dialog = gimp_query_boolean_box (_("Delete Palette"),
gimp_standard_help_func,
"dialogs/palette_editor/delete_palette.html",
TRUE,
FALSE,
str,
_("Delete"), _("Cancel"),
NULL, NULL,

2
app/palette.c
View File

@ -1839,7 +1839,7 @@ palette_dialog_delete_callback (GtkWidget *widget,
dialog = gimp_query_boolean_box (_("Delete Palette"),
gimp_standard_help_func,
"dialogs/palette_editor/delete_palette.html",
TRUE,
FALSE,
str,
_("Delete"), _("Cancel"),
NULL, NULL,

2
app/widgets/gimpgradienteditor.c
View File

@ -1784,7 +1784,7 @@ ed_delete_gradient_callback (GtkWidget *widget,
gimp_query_boolean_box (_("Delete Gradient"),
gimp_standard_help_func,
"dialogs/gradient_editor/delete_gradient.html",
TRUE,
FALSE,
str,
_("Delete"), _("Cancel"),
NULL, NULL,

2
app/widgets/gimppaletteeditor.c
View File

@ -1839,7 +1839,7 @@ palette_dialog_delete_callback (GtkWidget *widget,
dialog = gimp_query_boolean_box (_("Delete Palette"),
gimp_standard_help_func,
"dialogs/palette_editor/delete_palette.html",
TRUE,
FALSE,
str,
_("Delete"), _("Cancel"),
NULL, NULL,

9
devel-docs/ChangeLog
View File

@ -1,3 +1,12 @@
2000-02-12 Michael Natterer <mitch@gimp.org>
* libgimp/Makefile.am
* libgimp/tmpl/gimpquerybox.sgml: new file.
* libgimp/libgimp-decl.txt
* libgimp/libgimp-docs.sgml
* libgimp/libgimp-sections.txt: updated from the libgimp sources.
Sat Feb 12 03:14:38 CET 2000 Sven Neumann <sven@gimp.org>
* devel-docs/libgimp/tmpl/gimpchainbutton.sgml: documented

1
devel-docs/libgimp/Makefile.am
View File

@ -36,6 +36,7 @@ tmpl_sources = \
tmpl/gimpmodule.sgml \
tmpl/gimppatheditor.sgml \
tmpl/gimpprotocol.sgml \
tmpl/gimpquerybox.sgml \
tmpl/gimpsizeentry.sgml \
tmpl/gimpui.sgml \
tmpl/gimpunit.sgml \

99
devel-docs/libgimp/libgimp-decl.txt
View File

@ -2272,7 +2272,7 @@ gint32 *image_ID,gint32 *drawable_ID,gchar
<NAME>GimpFileSelection</NAME>
struct GimpFileSelection
{
GtkVBox hbox;
GtkHBox hbox;
GtkWidget *file_exists;
GtkWidget *entry;
@ -3478,43 +3478,43 @@ GSerialDescription *d, void *output, void *serial
</MACRO>
<FUNCTION>
<NAME>parasite_new</NAME>
<RETURNS>Parasite *</RETURNS>
const char *name, guint32 flags,guint32 size, const void *data
<RETURNS>Parasite *</RETURNS>
const gchar *name,guint32 flags,guint32 size,const gpointer data
</FUNCTION>
<FUNCTION>
<NAME>parasite_free</NAME>
<RETURNS>void </RETURNS>
Parasite *parasite
Parasite *parasite
</FUNCTION>
<FUNCTION>
<NAME>parasite_copy</NAME>
<RETURNS>Parasite *</RETURNS>
<RETURNS>Parasite *</RETURNS>
const Parasite *parasite
</FUNCTION>
<FUNCTION>
<NAME>parasite_compare</NAME>
<RETURNS>int </RETURNS>
const Parasite *a, const Parasite *b
<RETURNS>gboolean </RETURNS>
const Parasite *a,const Parasite *b
</FUNCTION>
<FUNCTION>
<NAME>parasite_is_type</NAME>
<RETURNS>int </RETURNS>
const Parasite *parasite,const char *name
<RETURNS>gboolean </RETURNS>
const Parasite *parasite,const gchar *name
</FUNCTION>
<FUNCTION>
<NAME>parasite_is_persistent</NAME>
<RETURNS>int </RETURNS>
<RETURNS>gboolean </RETURNS>
const Parasite *p
</FUNCTION>
<FUNCTION>
<NAME>parasite_is_undoable</NAME>
<RETURNS>int </RETURNS>
<RETURNS>gboolean </RETURNS>
const Parasite *p
</FUNCTION>
<FUNCTION>
<NAME>parasite_has_flag</NAME>
<RETURNS>int </RETURNS>
const Parasite *p, gulong flag
<RETURNS>gboolean </RETURNS>
const Parasite *p,gulong flag
</FUNCTION>
<FUNCTION>
<NAME>parasite_flags</NAME>
@ -3523,17 +3523,17 @@ const Parasite *p
</FUNCTION>
<FUNCTION>
<NAME>parasite_name</NAME>
<RETURNS>const char *</RETURNS>
<RETURNS>const gchar *</RETURNS>
const Parasite *p
</FUNCTION>
<FUNCTION>
<NAME>parasite_data</NAME>
<RETURNS>void *</RETURNS>
<RETURNS>void *</RETURNS>
const Parasite *p
</FUNCTION>
<FUNCTION>
<NAME>parasite_data_size</NAME>
<RETURNS>long </RETURNS>
<RETURNS>glong </RETURNS>
const Parasite *p
</FUNCTION>
<STRUCT>
@ -3596,11 +3596,11 @@ PixPipeParams *params
</MACRO>
<MACRO>
<NAME>GIMP_MICRO_VERSION</NAME>
#define GIMP_MICRO_VERSION (16)
#define GIMP_MICRO_VERSION (17)
</MACRO>
<MACRO>
<NAME>GIMP_VERSION</NAME>
#define GIMP_VERSION "1.1.16"
#define GIMP_VERSION "1.1.17"
</MACRO>
<MACRO>
<NAME>GIMP_CHECK_VERSION</NAME>
@ -3884,7 +3884,7 @@ const gchar *title,const gchar *wmclass_name,GimpHelpFunc h
<FUNCTION>
<NAME>gimp_dialog_set_icon</NAME>
<RETURNS>void </RETURNS>
GtkWidget *dialog
GtkWindow *dialog
</FUNCTION>
<FUNCTION>
<NAME>gimp_dialog_create_action_area</NAME>
@ -3976,3 +3976,64 @@ GtkWidget *widget,gpointer data
<RETURNS>void </RETURNS>
GtkTable *table,gint column,gint row,gchar *label_text,gfloat xalign,gfloat yalign,GtkWidget *widget,gint colspan,gboolean left_align
</FUNCTION>
<USER_FUNCTION>
<NAME>GimpQueryStringCallback</NAME>
<RETURNS>void </RETURNS>
GtkWidget *query_box,
gchar *string,
gpointer data
</USER_FUNCTION>
<USER_FUNCTION>
<NAME>GimpQueryIntCallback</NAME>
<RETURNS>void </RETURNS>
GtkWidget *query_box,
gint value,
gpointer data
</USER_FUNCTION>
<USER_FUNCTION>
<NAME>GimpQueryDoubleCallback</NAME>
<RETURNS>void </RETURNS>
GtkWidget *query_box,
gdouble value,
gpointer data
</USER_FUNCTION>
<USER_FUNCTION>
<NAME>GimpQuerySizeCallback</NAME>
<RETURNS>void </RETURNS>
GtkWidget *query_box,
gdouble size,
GimpUnit unit,
gpointer data
</USER_FUNCTION>
<USER_FUNCTION>
<NAME>GimpQueryBooleanCallback</NAME>
<RETURNS>void </RETURNS>
GtkWidget *query_box,
gboolean value,
gpointer data
</USER_FUNCTION>
<FUNCTION>
<NAME>gimp_query_string_box</NAME>
<RETURNS>GtkWidget *</RETURNS>
gchar *title,GimpHelpFunc help_func,gchar *help_data,gchar *message,gchar *initial,GtkObject *object,gchar *signal,GimpQueryStringCallback callback,gpointer data
</FUNCTION>
<FUNCTION>
<NAME>gimp_query_int_box</NAME>
<RETURNS>GtkWidget *</RETURNS>
gchar *title,GimpHelpFunc help_func,gchar *help_data,char *message,gint initial,gint lower,gint upper,GtkObject *object,gchar *signal,GimpQueryIntCallback callback,gpointer data
</FUNCTION>
<FUNCTION>
<NAME>gimp_query_double_box</NAME>
<RETURNS>GtkWidget *</RETURNS>
gchar *title,GimpHelpFunc help_func,gchar *help_data,gchar *message,gdouble initial,gdouble lower,gdouble upper,gint digits,GtkObject *object,gchar *signal,GimpQueryDoubleCallback callback,gpointer data
</FUNCTION>
<FUNCTION>
<NAME>gimp_query_size_box</NAME>
<RETURNS>GtkWidget *</RETURNS>
gchar *title,GimpHelpFunc help_func,gchar *help_data,gchar *message,gdouble initial,gdouble lower,gdouble upper,gint digits,GimpUnit unit,gdouble resolution,gboolean dot_for_dot,GtkObject *object,gchar *signal,GimpQuerySizeCallback callback,gpointer data
</FUNCTION>
<FUNCTION>
<NAME>gimp_query_boolean_box</NAME>
<RETURNS>GtkWidget *</RETURNS>
gchar *title,GimpHelpFunc help_func,gchar *help_data,gboolean eek,gchar *message,gchar *true_button,gchar *false_button,GtkObject *object,gchar *signal,GimpQueryBooleanCallback callback,gpointer data
</FUNCTION>

2
devel-docs/libgimp/libgimp-docs.sgml
View File

@ -28,6 +28,7 @@
<!entity libgimp-gimpdialog SYSTEM "sgml/gimpdialog.sgml">
<!entity libgimp-gimphelpui SYSTEM "sgml/gimphelpui.sgml">
<!entity libgimp-gimpmenu SYSTEM "sgml/gimpmenu.sgml">
<!entity libgimp-gimpquerybox SYSTEM "sgml/gimpquerybox.sgml">
<!entity libgimp-gimpunit SYSTEM "sgml/gimpunit.sgml">
<!entity libgimp-gimpwidgets SYSTEM "sgml/gimpwidgets.sgml">
]>
@ -72,6 +73,7 @@
&libgimp-gimpexport;
&libgimp-gimphelpui;
&libgimp-gimpmenu;
&libgimp-gimpquerybox;
&libgimp-gimpunit;
&libgimp-gimpwidgets;
</chapter>

14
devel-docs/libgimp/libgimp-sections.txt
View File

@ -690,6 +690,20 @@ GIMP_PATH_EDITOR_CLASS
GIMP_IS_PATH_EDITOR_CLASS
</SECTION>
<SECTION>
<FILE>gimpquerybox</FILE>
GimpQueryStringCallback
GimpQueryIntCallback
GimpQueryDoubleCallback
GimpQuerySizeCallback
GimpQueryBooleanCallback
gimp_query_string_box
gimp_query_int_box
gimp_query_double_box
gimp_query_size_box
gimp_query_boolean_box
</SECTION>
<SECTION>
<FILE>gimpsizeentry</FILE>
GimpSizeEntry

179
devel-docs/libgimp/tmpl/gimpquerybox.sgml Normal file
View File

@ -0,0 +1,179 @@
<!-- ##### SECTION Title ##### -->
gimpquerybox
<!-- ##### SECTION Short_Description ##### -->
Some simple dialogs to enter a single int, double, string or boolean value.
<!-- ##### SECTION Long_Description ##### -->
<para>
These functions provide simple dialogs for entering a single string,
integer, double, boolean or pixel size value.
</para>
<para>
They return a pointer to a #GtkDialog which has to be shown with
gtk_widget_show() by the caller.
</para>
<para>
The dialogs contain an entry widget for the kind of value they ask for
and "OK" and "Cancel" buttons. On "Cancel", all query boxes except the
boolean one silently destroy themselves. On "OK" the user defined
callback function is called and returns the entered value.
</para>
<!-- ##### SECTION See_Also ##### -->
<para>
GimpSizeEntry
</para>
<para>
GimpUnitMenu
</para>
<!-- ##### USER_FUNCTION GimpQueryStringCallback ##### -->
<para>
Note that you have to g_free() the returned string.
</para>
@query_box: The query box.
@string: The entered string.
@data: The user data.
<!-- ##### USER_FUNCTION GimpQueryIntCallback ##### -->
<para>
</para>
@query_box: The query box.
@value: The entered integer value.
@data: The user data.
<!-- ##### USER_FUNCTION GimpQueryDoubleCallback ##### -->
<para>
</para>
@query_box: The query box.
@value: The entered double value.
@data: The user data.
<!-- ##### USER_FUNCTION GimpQuerySizeCallback ##### -->
<para>
</para>
@query_box: The query box.
@size: The entered size in pixels.
@unit: The selected unit from the #GimpUnitMenu.
@data: The user data.
<!-- ##### USER_FUNCTION GimpQueryBooleanCallback ##### -->
<para>
</para>
@query_box: The query box.
@value: The entered boolean value.
@data: The user data.
<!-- ##### FUNCTION gimp_query_string_box ##### -->
<para>
</para>
@title:
@help_func:
@help_data:
@message:
@initial:
@object:
@signal:
@callback:
@data:
@Returns:
<!-- ##### FUNCTION gimp_query_int_box ##### -->
<para>
</para>
@title:
@help_func:
@help_data:
@message:
@initial:
@lower:
@upper:
@object:
@signal:
@callback:
@data:
@Returns:
<!-- ##### FUNCTION gimp_query_double_box ##### -->
<para>
</para>
@title:
@help_func:
@help_data:
@message:
@initial:
@lower:
@upper:
@digits:
@object:
@signal:
@callback:
@data:
@Returns:
<!-- ##### FUNCTION gimp_query_size_box ##### -->
<para>
</para>
@title:
@help_func:
@help_data:
@message:
@initial:
@lower:
@upper:
@digits:
@unit:
@resolution:
@dot_for_dot:
@object:
@signal:
@callback:
@data:
@Returns:
<!-- ##### FUNCTION gimp_query_boolean_box ##### -->
<para>
</para>
@title:
@help_func:
@help_data:
@eek:
@message:
@true_button:
@false_button:
@object:
@signal:
@callback:
@data:
@Returns:

45
libgimp/gimpfileselection.c
View File

@ -348,23 +348,6 @@ gimp_file_selection_filesel_ok_callback (GtkWidget *widget,
gimp_file_selection_entry_callback (gfs->entry, data);
}
static void
gimp_file_selection_filesel_cancel_callback (GtkWidget *widget,
gpointer data)
{
gtk_widget_hide (GIMP_FILE_SELECTION (data)->file_selection);
}
static int
gimp_file_selection_filesel_delete_callback (GtkWidget *widget,
GdkEvent *event,
gpointer data)
{
gimp_file_selection_filesel_cancel_callback (NULL, data);
return TRUE;
}
static void
gimp_file_selection_browse_callback (GtkWidget *widget,
gpointer data)
@ -404,7 +387,7 @@ gimp_file_selection_browse_callback (GtkWidget *widget,
gtk_label_set_text (GTK_LABEL (GTK_BIN (GTK_FILE_SELECTION (gfs->file_selection)->ok_button)->child), _("Select"));
gtk_label_set_text (GTK_LABEL (GTK_BIN (GTK_FILE_SELECTION (gfs->file_selection)->cancel_button)->child), _("Close"));
gtk_signal_connect
gtk_signal_connect
(GTK_OBJECT (GTK_FILE_SELECTION (gfs->file_selection)->ok_button),
"clicked",
GTK_SIGNAL_FUNC (gimp_file_selection_filesel_ok_callback),
@ -414,23 +397,23 @@ gimp_file_selection_browse_callback (GtkWidget *widget,
"activate",
GTK_SIGNAL_FUNC (gimp_file_selection_filesel_ok_callback),
gfs);
gtk_signal_connect
(GTK_OBJECT (GTK_FILE_SELECTION (gfs->file_selection)->cancel_button),
"clicked",
GTK_SIGNAL_FUNC (gimp_file_selection_filesel_cancel_callback),
gfs);
gtk_signal_connect
(GTK_OBJECT (gfs), "unmap",
GTK_SIGNAL_FUNC (gimp_file_selection_filesel_cancel_callback),
gfs);
gtk_signal_connect
(GTK_OBJECT (gfs->file_selection), "delete_event",
GTK_SIGNAL_FUNC (gimp_file_selection_filesel_delete_callback),
gfs);
gtk_signal_connect_object (GTK_OBJECT (GTK_FILE_SELECTION (gfs->file_selection)->cancel_button),
"clicked",
GTK_SIGNAL_FUNC (gtk_widget_hide),
GTK_OBJECT (gfs->file_selection));
gtk_signal_connect_object (GTK_OBJECT (gfs), "unmap",
GTK_SIGNAL_FUNC (gtk_widget_hide),
GTK_OBJECT (gfs->file_selection));
gtk_signal_connect_object (GTK_OBJECT (gfs->file_selection),
"delete_event",
GTK_SIGNAL_FUNC (gtk_widget_hide),
GTK_OBJECT (gfs->file_selection));
}
gtk_file_selection_set_filename (GTK_FILE_SELECTION (gfs->file_selection),
filename);
if (! GTK_WIDGET_VISIBLE (gfs->file_selection))
gtk_widget_show (gfs->file_selection);
else

2
libgimp/gimphelpui.c
View File

@ -89,7 +89,7 @@ gimp_help_connect_help_accel (GtkWidget *widget,
* this function is called for almost all gimp windows
*/
if (GTK_IS_WINDOW (widget))
gimp_dialog_set_icon (widget);
gimp_dialog_set_icon (GTK_WINDOW (widget));
/* set up the help signals and tips query widget */
if (!tips_query)

91
libgimp/gimpquerybox.c
View File

@ -139,6 +139,21 @@ create_query_box (gchar *title,
return query_box;
}
/**
* gimp_query_string_box:
* @title: The query box dialog's title.
* @help_func: The help function to show this dialog's help page.
* @help_data: A string pointing to this dialog's html help page.
* @message: A string which will be shown above the dialog's entry widget.
* @initial: The initial value.
* @object: The object this query box is associated with.
* @signal: The object's signal which will cause the query box to be closed.
* @callback: The function which will be called when the user selects "OK".
* @data: The callback's user data.
*
* Returns: A pointer to the new #GtkDialog.
*
*/
GtkWidget *
gimp_query_string_box (gchar *title,
GimpHelpFunc help_func,
@ -173,6 +188,23 @@ gimp_query_string_box (gchar *title,
return query_box->qbox;
}
/**
* gimp_query_int_box:
* @title: The query box dialog's title.
* @help_func: The help function to show this dialog's help page.
* @help_data: A string pointing to this dialog's html help page.
* @message: A string which will be shown above the dialog's entry widget.
* @initial: The initial value.
* @lower: The lower boundary of the range of possible values.
* @upper: The upper boundray of the range of possible values.
* @object: The object this query box is associated with.
* @signal: The object's signal which will cause the query box to be closed.
* @callback: The function which will be called when the user selects "OK".
* @data: The callback's user data.
*
* Returns: A pointer to the new #GtkDialog.
*
*/
GtkWidget *
gimp_query_int_box (gchar *title,
GimpHelpFunc help_func,
@ -210,6 +242,24 @@ gimp_query_int_box (gchar *title,
return query_box->qbox;
}
/**
* gimp_query_double_box:
* @title: The query box dialog's title.
* @help_func: The help function to show this dialog's help page.
* @help_data: A string pointing to this dialog's html help page.
* @message: A string which will be shown above the dialog's entry widget.
* @initial: The initial value.
* @lower: The lower boundary of the range of possible values.
* @upper: The upper boundray of the range of possible values.
* @digits: The number of decimal digits the #GtkSpinButton will provide.
* @object: The object this query box is associated with.
* @signal: The object's signal which will cause the query box to be closed.
* @callback: The function which will be called when the user selects "OK".
* @data: The callback's user data.
*
* Returns: A pointer to the new #GtkDialog.
*
*/
GtkWidget *
gimp_query_double_box (gchar *title,
GimpHelpFunc help_func,
@ -248,6 +298,29 @@ gimp_query_double_box (gchar *title,
return query_box->qbox;
}
/**
* gimp_query_size_box:
* @title: The query box dialog's title.
* @help_func: The help function to show this dialog's help page.
* @help_data: A string pointing to this dialog's html help page.
* @message: A string which will be shown above the dialog's entry widget.
* @initial: The initial value.
* @lower: The lower boundary of the range of possible values.
* @upper: The upper boundray of the range of possible values.
* @digits: The number of decimal digits the #GimpSizeEntry provide in
* "pixel" mode.
* @unit: The unit initially shown by the #GimpUnitMenu.
* @resolution: The resolution (in dpi) which will be used for pixel/unit
* calculations.
* @dot_for_dot: #TRUE if the #GimpUnitMenu's initial unit should be "pixels".
* @object: The object this query box is associated with.
* @signal: The object's signal which will cause the query box to be closed.
* @callback: The function which will be called when the user selects "OK".
* @data: The callback's user data.
*
* Returns: A pointer to the new #GtkDialog.
*
*/
GtkWidget *
gimp_query_size_box (gchar *title,
GimpHelpFunc help_func,
@ -296,6 +369,24 @@ gimp_query_size_box (gchar *title,
return query_box->qbox;
}
/**
* gimp_query_boolean_box:
* @title: The query box dialog's title.
* @help_func: The help function to show this dialog's help page.
* @help_data: A string pointing to this dialog's html help page.
* @eek: #TRUE if you want the "Eek" wilber to appear left of the dialog's
* message.
* @message: A string which will be shown in the query box.
* @true_button: The string to be shown in the dialog's left button.
* @false_button: The string to be shown in the dialog's right button.
* @object: The object this query box is associated with.
* @signal: The object's signal which will cause the query box to be closed.
* @callback: The function which will be called when the user selects "OK".
* @data: The callback's user data.
*
* Returns: A pointer to the new #GtkDialog.
*
*/
GtkWidget *
gimp_query_boolean_box (gchar *title,
GimpHelpFunc help_func,

8
libgimp/gimpquerybox.h
View File

@ -47,13 +47,7 @@ typedef void (* GimpQueryBooleanCallback) (GtkWidget *query_box,
gboolean value,
gpointer data);
/* some simple query dialogs
* if object != NULL then the query boxes will connect their cancel callback
* to the provided signal of this object
*
* it's the caller's job to show the returned widgets
*/
/* some simple query dialogs */
GtkWidget * gimp_query_string_box (gchar *title,
GimpHelpFunc help_func,
gchar *help_data,

14
libgimp/gimpunitmenu.c
View File

@ -2,7 +2,7 @@
* Copyright (C) 1995-1999 Peter Mattis and Spencer Kimball
*
* gimpunitmenu.c
* Copyright (C) 1999 Michael Natterer <mitschel@cs.tu-berlin.de>
* Copyright (C) 1999 Michael Natterer <mitch@gimp.org>
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
@ -492,12 +492,12 @@ gimp_unit_menu_create_selection (GimpUnitMenu *gum)
GTK_SIGNAL_FUNC (gtk_widget_destroyed),
&gum->selection);
gtk_signal_connect_object (GTK_OBJECT (gum), "destroy",
GTK_SIGNAL_FUNC (gtk_widget_destroy),
GTK_OBJECT (gum->selection));
gtk_signal_connect_object (GTK_OBJECT (gum), "unmap",
GTK_SIGNAL_FUNC (gtk_widget_destroy),
GTK_OBJECT (gum->selection));
gtk_signal_connect_object_while_alive (GTK_OBJECT (gum), "destroy",
GTK_SIGNAL_FUNC (gtk_widget_destroy),
GTK_OBJECT (gum->selection));
gtk_signal_connect_object_while_alive (GTK_OBJECT (gum), "unmap",
GTK_SIGNAL_FUNC (gtk_widget_destroy),
GTK_OBJECT (gum->selection));
/* the main vbox */
vbox = gtk_vbox_new (FALSE, 0);

45
libgimpwidgets/gimpfileentry.c
View File

@ -348,23 +348,6 @@ gimp_file_selection_filesel_ok_callback (GtkWidget *widget,
gimp_file_selection_entry_callback (gfs->entry, data);
}
static void
gimp_file_selection_filesel_cancel_callback (GtkWidget *widget,
gpointer data)
{
gtk_widget_hide (GIMP_FILE_SELECTION (data)->file_selection);
}
static int
gimp_file_selection_filesel_delete_callback (GtkWidget *widget,
GdkEvent *event,
gpointer data)
{
gimp_file_selection_filesel_cancel_callback (NULL, data);
return TRUE;
}
static void
gimp_file_selection_browse_callback (GtkWidget *widget,
gpointer data)
@ -404,7 +387,7 @@ gimp_file_selection_browse_callback (GtkWidget *widget,
gtk_label_set_text (GTK_LABEL (GTK_BIN (GTK_FILE_SELECTION (gfs->file_selection)->ok_button)->child), _("Select"));
gtk_label_set_text (GTK_LABEL (GTK_BIN (GTK_FILE_SELECTION (gfs->file_selection)->cancel_button)->child), _("Close"));
gtk_signal_connect
gtk_signal_connect
(GTK_OBJECT (GTK_FILE_SELECTION (gfs->file_selection)->ok_button),
"clicked",
GTK_SIGNAL_FUNC (gimp_file_selection_filesel_ok_callback),
@ -414,23 +397,23 @@ gimp_file_selection_browse_callback (GtkWidget *widget,
"activate",
GTK_SIGNAL_FUNC (gimp_file_selection_filesel_ok_callback),
gfs);
gtk_signal_connect
(GTK_OBJECT (GTK_FILE_SELECTION (gfs->file_selection)->cancel_button),
"clicked",
GTK_SIGNAL_FUNC (gimp_file_selection_filesel_cancel_callback),
gfs);
gtk_signal_connect
(GTK_OBJECT (gfs), "unmap",
GTK_SIGNAL_FUNC (gimp_file_selection_filesel_cancel_callback),
gfs);
gtk_signal_connect
(GTK_OBJECT (gfs->file_selection), "delete_event",
GTK_SIGNAL_FUNC (gimp_file_selection_filesel_delete_callback),
gfs);
gtk_signal_connect_object (GTK_OBJECT (GTK_FILE_SELECTION (gfs->file_selection)->cancel_button),
"clicked",
GTK_SIGNAL_FUNC (gtk_widget_hide),
GTK_OBJECT (gfs->file_selection));
gtk_signal_connect_object (GTK_OBJECT (gfs), "unmap",
GTK_SIGNAL_FUNC (gtk_widget_hide),
GTK_OBJECT (gfs->file_selection));
gtk_signal_connect_object (GTK_OBJECT (gfs->file_selection),
"delete_event",
GTK_SIGNAL_FUNC (gtk_widget_hide),
GTK_OBJECT (gfs->file_selection));
}
gtk_file_selection_set_filename (GTK_FILE_SELECTION (gfs->file_selection),
filename);
if (! GTK_WIDGET_VISIBLE (gfs->file_selection))
gtk_widget_show (gfs->file_selection);
else

45
libgimpwidgets/gimpfileselection.c
View File

@ -348,23 +348,6 @@ gimp_file_selection_filesel_ok_callback (GtkWidget *widget,
gimp_file_selection_entry_callback (gfs->entry, data);
}
static void
gimp_file_selection_filesel_cancel_callback (GtkWidget *widget,
gpointer data)
{
gtk_widget_hide (GIMP_FILE_SELECTION (data)->file_selection);
}
static int
gimp_file_selection_filesel_delete_callback (GtkWidget *widget,
GdkEvent *event,
gpointer data)
{
gimp_file_selection_filesel_cancel_callback (NULL, data);
return TRUE;
}
static void
gimp_file_selection_browse_callback (GtkWidget *widget,
gpointer data)
@ -404,7 +387,7 @@ gimp_file_selection_browse_callback (GtkWidget *widget,
gtk_label_set_text (GTK_LABEL (GTK_BIN (GTK_FILE_SELECTION (gfs->file_selection)->ok_button)->child), _("Select"));
gtk_label_set_text (GTK_LABEL (GTK_BIN (GTK_FILE_SELECTION (gfs->file_selection)->cancel_button)->child), _("Close"));
gtk_signal_connect
gtk_signal_connect
(GTK_OBJECT (GTK_FILE_SELECTION (gfs->file_selection)->ok_button),
"clicked",
GTK_SIGNAL_FUNC (gimp_file_selection_filesel_ok_callback),
@ -414,23 +397,23 @@ gimp_file_selection_browse_callback (GtkWidget *widget,
"activate",
GTK_SIGNAL_FUNC (gimp_file_selection_filesel_ok_callback),
gfs);
gtk_signal_connect
(GTK_OBJECT (GTK_FILE_SELECTION (gfs->file_selection)->cancel_button),
"clicked",
GTK_SIGNAL_FUNC (gimp_file_selection_filesel_cancel_callback),
gfs);
gtk_signal_connect
(GTK_OBJECT (gfs), "unmap",
GTK_SIGNAL_FUNC (gimp_file_selection_filesel_cancel_callback),
gfs);
gtk_signal_connect
(GTK_OBJECT (gfs->file_selection), "delete_event",
GTK_SIGNAL_FUNC (gimp_file_selection_filesel_delete_callback),
gfs);
gtk_signal_connect_object (GTK_OBJECT (GTK_FILE_SELECTION (gfs->file_selection)->cancel_button),
"clicked",
GTK_SIGNAL_FUNC (gtk_widget_hide),
GTK_OBJECT (gfs->file_selection));
gtk_signal_connect_object (GTK_OBJECT (gfs), "unmap",
GTK_SIGNAL_FUNC (gtk_widget_hide),
GTK_OBJECT (gfs->file_selection));
gtk_signal_connect_object (GTK_OBJECT (gfs->file_selection),
"delete_event",
GTK_SIGNAL_FUNC (gtk_widget_hide),
GTK_OBJECT (gfs->file_selection));
}
gtk_file_selection_set_filename (GTK_FILE_SELECTION (gfs->file_selection),
filename);
if (! GTK_WIDGET_VISIBLE (gfs->file_selection))
gtk_widget_show (gfs->file_selection);
else

2
libgimpwidgets/gimphelpui.c
View File

@ -89,7 +89,7 @@ gimp_help_connect_help_accel (GtkWidget *widget,
* this function is called for almost all gimp windows
*/
if (GTK_IS_WINDOW (widget))
gimp_dialog_set_icon (widget);
gimp_dialog_set_icon (GTK_WINDOW (widget));
/* set up the help signals and tips query widget */
if (!tips_query)

91
libgimpwidgets/gimpquerybox.c
View File

@ -139,6 +139,21 @@ create_query_box (gchar *title,
return query_box;
}
/**
* gimp_query_string_box:
* @title: The query box dialog's title.
* @help_func: The help function to show this dialog's help page.
* @help_data: A string pointing to this dialog's html help page.
* @message: A string which will be shown above the dialog's entry widget.
* @initial: The initial value.
* @object: The object this query box is associated with.
* @signal: The object's signal which will cause the query box to be closed.
* @callback: The function which will be called when the user selects "OK".
* @data: The callback's user data.
*
* Returns: A pointer to the new #GtkDialog.
*
*/
GtkWidget *
gimp_query_string_box (gchar *title,
GimpHelpFunc help_func,
@ -173,6 +188,23 @@ gimp_query_string_box (gchar *title,
return query_box->qbox;
}
/**
* gimp_query_int_box:
* @title: The query box dialog's title.
* @help_func: The help function to show this dialog's help page.
* @help_data: A string pointing to this dialog's html help page.
* @message: A string which will be shown above the dialog's entry widget.
* @initial: The initial value.
* @lower: The lower boundary of the range of possible values.
* @upper: The upper boundray of the range of possible values.
* @object: The object this query box is associated with.
* @signal: The object's signal which will cause the query box to be closed.
* @callback: The function which will be called when the user selects "OK".
* @data: The callback's user data.
*
* Returns: A pointer to the new #GtkDialog.
*
*/
GtkWidget *
gimp_query_int_box (gchar *title,
GimpHelpFunc help_func,
@ -210,6 +242,24 @@ gimp_query_int_box (gchar *title,
return query_box->qbox;
}
/**
* gimp_query_double_box:
* @title: The query box dialog's title.
* @help_func: The help function to show this dialog's help page.
* @help_data: A string pointing to this dialog's html help page.
* @message: A string which will be shown above the dialog's entry widget.
* @initial: The initial value.
* @lower: The lower boundary of the range of possible values.
* @upper: The upper boundray of the range of possible values.
* @digits: The number of decimal digits the #GtkSpinButton will provide.
* @object: The object this query box is associated with.
* @signal: The object's signal which will cause the query box to be closed.
* @callback: The function which will be called when the user selects "OK".
* @data: The callback's user data.
*
* Returns: A pointer to the new #GtkDialog.
*
*/
GtkWidget *
gimp_query_double_box (gchar *title,
GimpHelpFunc help_func,
@ -248,6 +298,29 @@ gimp_query_double_box (gchar *title,
return query_box->qbox;
}
/**
* gimp_query_size_box:
* @title: The query box dialog's title.
* @help_func: The help function to show this dialog's help page.
* @help_data: A string pointing to this dialog's html help page.
* @message: A string which will be shown above the dialog's entry widget.
* @initial: The initial value.
* @lower: The lower boundary of the range of possible values.
* @upper: The upper boundray of the range of possible values.
* @digits: The number of decimal digits the #GimpSizeEntry provide in
* "pixel" mode.
* @unit: The unit initially shown by the #GimpUnitMenu.
* @resolution: The resolution (in dpi) which will be used for pixel/unit
* calculations.
* @dot_for_dot: #TRUE if the #GimpUnitMenu's initial unit should be "pixels".
* @object: The object this query box is associated with.
* @signal: The object's signal which will cause the query box to be closed.
* @callback: The function which will be called when the user selects "OK".
* @data: The callback's user data.
*
* Returns: A pointer to the new #GtkDialog.
*
*/
GtkWidget *
gimp_query_size_box (gchar *title,
GimpHelpFunc help_func,
@ -296,6 +369,24 @@ gimp_query_size_box (gchar *title,
return query_box->qbox;
}
/**
* gimp_query_boolean_box:
* @title: The query box dialog's title.
* @help_func: The help function to show this dialog's help page.
* @help_data: A string pointing to this dialog's html help page.
* @eek: #TRUE if you want the "Eek" wilber to appear left of the dialog's
* message.
* @message: A string which will be shown in the query box.
* @true_button: The string to be shown in the dialog's left button.
* @false_button: The string to be shown in the dialog's right button.
* @object: The object this query box is associated with.
* @signal: The object's signal which will cause the query box to be closed.
* @callback: The function which will be called when the user selects "OK".
* @data: The callback's user data.
*
* Returns: A pointer to the new #GtkDialog.
*
*/
GtkWidget *
gimp_query_boolean_box (gchar *title,
GimpHelpFunc help_func,

8
libgimpwidgets/gimpquerybox.h
View File

@ -47,13 +47,7 @@ typedef void (* GimpQueryBooleanCallback) (GtkWidget *query_box,
gboolean value,
gpointer data);
/* some simple query dialogs
* if object != NULL then the query boxes will connect their cancel callback
* to the provided signal of this object
*
* it's the caller's job to show the returned widgets
*/
/* some simple query dialogs */
GtkWidget * gimp_query_string_box (gchar *title,
GimpHelpFunc help_func,
gchar *help_data,

14
libgimpwidgets/gimpunitmenu.c
View File

@ -2,7 +2,7 @@
* Copyright (C) 1995-1999 Peter Mattis and Spencer Kimball
*
* gimpunitmenu.c
* Copyright (C) 1999 Michael Natterer <mitschel@cs.tu-berlin.de>
* Copyright (C) 1999 Michael Natterer <mitch@gimp.org>
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
@ -492,12 +492,12 @@ gimp_unit_menu_create_selection (GimpUnitMenu *gum)
GTK_SIGNAL_FUNC (gtk_widget_destroyed),
&gum->selection);
gtk_signal_connect_object (GTK_OBJECT (gum), "destroy",
GTK_SIGNAL_FUNC (gtk_widget_destroy),
GTK_OBJECT (gum->selection));
gtk_signal_connect_object (GTK_OBJECT (gum), "unmap",
GTK_SIGNAL_FUNC (gtk_widget_destroy),
GTK_OBJECT (gum->selection));
gtk_signal_connect_object_while_alive (GTK_OBJECT (gum), "destroy",
GTK_SIGNAL_FUNC (gtk_widget_destroy),
GTK_OBJECT (gum->selection));
gtk_signal_connect_object_while_alive (GTK_OBJECT (gum), "unmap",
GTK_SIGNAL_FUNC (gtk_widget_destroy),
GTK_OBJECT (gum->selection));
/* the main vbox */
vbox = gtk_vbox_new (FALSE, 0);

2
plug-ins/gflare/gflare.c
View File

@ -3390,7 +3390,7 @@ dlg_selector_delete_callback (GtkWidget *widget,
dialog = gimp_query_boolean_box (_("Delete GFlare"),
gimp_plugin_help_func,
"filters/gflare.html",
TRUE,
FALSE,
str,
_("Delete"), _("Cancel"),
NULL, NULL,