removed our own action_area API and use GtkDialog's one. Create all
2003-11-06 Michael Natterer <mitch@gimp.org> * libgimpwidgets/gimpdialog.[ch]: removed our own action_area API and use GtkDialog's one. Create all dialogs without separator. Changed almost everything else too. Fixes bug #125143. * libgimpwidgets/gimpquerybox.c * libgimpwidgets/gimpunitmenu.c: changed accordingly. * libgimp/gimpexport.[ch]: ditto. Renamed enum GimpExportReturnType to GimpExportReturn. * libgimp/gimpcompat.h: added a #define for the old name. * themes/Default/gtkrc: increased action_area border to 6 pixels. * app/display/gimpdisplayshell-filter-dialog.c * app/display/gimpdisplayshell-scale.c * app/display/gimpprogress.c * app/gui/brush-select.c * app/gui/channels-commands.c * app/gui/color-notebook.c * app/gui/convert-dialog.c * app/gui/file-new-dialog.c * app/gui/font-select.c * app/gui/gradient-editor-commands.c * app/gui/gradient-select.c * app/gui/grid-dialog.c * app/gui/image-commands.c * app/gui/info-window.c * app/gui/layers-commands.c * app/gui/module-browser.c * app/gui/offset-dialog.c * app/gui/palette-import-dialog.c * app/gui/palette-select.c * app/gui/pattern-select.c * app/gui/preferences-dialog.c * app/gui/qmask-commands.c * app/gui/resize-dialog.c * app/gui/resolution-calibrate-dialog.c * app/gui/stroke-dialog.c * app/gui/templates-commands.c * app/gui/user-install-dialog.c * app/gui/vectors-commands.c * app/tools/gimpcolorpickertool.c * app/tools/gimpcroptool.c * app/tools/gimpimagemaptool.c * app/tools/gimpmeasuretool.c * app/tools/gimptransformtool.c * app/widgets/gimptexteditor.c * app/widgets/gimptooldialog.[ch] * app/widgets/gimpviewabledialog.[ch] * app/widgets/gimpwidgets-utils.c: changed accordingly and increased the dialogs' outer borders to 6 pixels all over the place. * plug-ins/*/*.c: changed accordingly. The plug-ins may be arbitrarily broken, I tested none of them.
This commit is contained in:
Michael Natterer
committed by
Michael Natterer
Michael Natterer
parent
5648130ad3
commit
66c5dd8772
@ -32,119 +32,112 @@
|
||||
|
||||
|
||||
static void
|
||||
dialog_cancel(GtkWidget *widget, gpointer data)
|
||||
dialog_response (GtkWidget *widget,
|
||||
gint response_id,
|
||||
DefaultDialog_t *dialog)
|
||||
{
|
||||
DefaultDialog_t *dialog = (DefaultDialog_t*) data;
|
||||
gtk_widget_hide(dialog->dialog);
|
||||
if (dialog->cancel_cb)
|
||||
dialog->cancel_cb(dialog->cancel_cb_data);
|
||||
switch (response_id)
|
||||
{
|
||||
case GTK_RESPONSE_APPLY:
|
||||
if (dialog->apply_cb)
|
||||
dialog->apply_cb (dialog->apply_cb_data);
|
||||
else if (dialog->ok_cb)
|
||||
dialog->ok_cb (dialog->ok_cb_data);
|
||||
break;
|
||||
|
||||
case GTK_RESPONSE_OK:
|
||||
gtk_widget_hide (dialog->dialog);
|
||||
if (dialog->ok_cb)
|
||||
dialog->ok_cb (dialog->ok_cb_data);
|
||||
break;
|
||||
|
||||
default:
|
||||
gtk_widget_hide (dialog->dialog);
|
||||
if (dialog->cancel_cb)
|
||||
dialog->cancel_cb (dialog->cancel_cb_data);
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
||||
static gboolean
|
||||
dialog_destroy(GtkWidget *widget, GdkEvent *event, gpointer data)
|
||||
{
|
||||
dialog_cancel(widget, data);
|
||||
return TRUE;
|
||||
}
|
||||
|
||||
static void
|
||||
dialog_apply(GtkWidget *widget, gpointer data)
|
||||
{
|
||||
DefaultDialog_t *dialog = (DefaultDialog_t*) data;
|
||||
if (dialog->apply_cb)
|
||||
dialog->apply_cb(dialog->apply_cb_data);
|
||||
else if (dialog->ok_cb)
|
||||
dialog->ok_cb(dialog->ok_cb_data);
|
||||
}
|
||||
|
||||
static void
|
||||
dialog_ok(GtkWidget *widget, gpointer data)
|
||||
{
|
||||
DefaultDialog_t *dialog = (DefaultDialog_t*) data;
|
||||
gtk_widget_hide(dialog->dialog);
|
||||
if (dialog->ok_cb)
|
||||
dialog->ok_cb(dialog->ok_cb_data);
|
||||
}
|
||||
|
||||
void
|
||||
default_dialog_set_ok_cb(DefaultDialog_t *dialog, void (*ok_cb)(gpointer),
|
||||
void
|
||||
default_dialog_set_ok_cb(DefaultDialog_t *dialog, void (*ok_cb)(gpointer),
|
||||
gpointer ok_cb_data)
|
||||
{
|
||||
dialog->ok_cb = ok_cb;
|
||||
dialog->ok_cb_data = ok_cb_data;
|
||||
}
|
||||
|
||||
void
|
||||
default_dialog_set_apply_cb(DefaultDialog_t *dialog,
|
||||
void (*apply_cb)(gpointer),
|
||||
void
|
||||
default_dialog_set_apply_cb(DefaultDialog_t *dialog,
|
||||
void (*apply_cb)(gpointer),
|
||||
gpointer apply_cb_data)
|
||||
{
|
||||
dialog->apply_cb = apply_cb;
|
||||
dialog->apply_cb_data = apply_cb_data;
|
||||
}
|
||||
|
||||
void
|
||||
default_dialog_set_cancel_cb(DefaultDialog_t *dialog,
|
||||
void (*cancel_cb)(gpointer),
|
||||
void
|
||||
default_dialog_set_cancel_cb(DefaultDialog_t *dialog,
|
||||
void (*cancel_cb)(gpointer),
|
||||
gpointer cancel_cb_data)
|
||||
{
|
||||
dialog->cancel_cb = cancel_cb;
|
||||
dialog->cancel_cb_data = cancel_cb_data;
|
||||
}
|
||||
|
||||
DefaultDialog_t*
|
||||
make_default_dialog(const gchar *title)
|
||||
DefaultDialog_t *
|
||||
make_default_dialog (const gchar *title)
|
||||
{
|
||||
DefaultDialog_t *data = g_new(DefaultDialog_t, 1);
|
||||
GtkWidget *dialog;
|
||||
DefaultDialog_t *data = g_new0 (DefaultDialog_t, 1);
|
||||
|
||||
data->ok_cb = NULL;
|
||||
data->apply_cb = NULL;
|
||||
data->cancel_cb = NULL;
|
||||
dialog = gimp_dialog_new (title, "imagemap",
|
||||
gimp_standard_help_func, "filters/imagemap.html",
|
||||
GTK_WIN_POS_MOUSE,
|
||||
FALSE, TRUE, FALSE,
|
||||
|
||||
GTK_STOCK_APPLY, dialog_apply,
|
||||
data, NULL, &data->apply, FALSE, FALSE,
|
||||
data->dialog = gimp_dialog_new (title, "imagemap",
|
||||
NULL, 0,
|
||||
gimp_standard_help_func,
|
||||
"filters/imagemap.html",
|
||||
NULL);
|
||||
|
||||
GTK_STOCK_CANCEL, dialog_cancel,
|
||||
data, NULL, &data->cancel, FALSE, FALSE,
|
||||
data->apply = gtk_dialog_add_button (GTK_DIALOG (data->dialog),
|
||||
GTK_STOCK_APPLY, GTK_RESPONSE_APPLY);
|
||||
|
||||
GTK_STOCK_OK, dialog_ok,
|
||||
data, NULL, &data->ok, TRUE, FALSE,
|
||||
data->cancel = gtk_dialog_add_button (GTK_DIALOG (data->dialog),
|
||||
GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL);
|
||||
|
||||
NULL);
|
||||
data->dialog = dialog;
|
||||
data->ok = gtk_dialog_add_button (GTK_DIALOG (data->dialog),
|
||||
GTK_STOCK_OK, GTK_RESPONSE_OK);
|
||||
|
||||
g_signal_connect (data->dialog, "response",
|
||||
G_CALLBACK (dialog_response),
|
||||
data);
|
||||
g_signal_connect (data->dialog, "destroy",
|
||||
G_CALLBACK (gtk_widget_destroyed),
|
||||
&data->dialog);
|
||||
|
||||
g_signal_connect (dialog, "destroy",
|
||||
G_CALLBACK(gtk_widget_destroyed), &data->dialog);
|
||||
g_signal_connect(dialog, "delete_event",
|
||||
G_CALLBACK(dialog_destroy), (gpointer) data);
|
||||
|
||||
return data;
|
||||
}
|
||||
|
||||
void
|
||||
void
|
||||
default_dialog_show(DefaultDialog_t *dialog)
|
||||
{
|
||||
gtk_widget_show(dialog->dialog);
|
||||
}
|
||||
|
||||
void
|
||||
void
|
||||
default_dialog_hide_cancel_button(DefaultDialog_t *dialog)
|
||||
{
|
||||
gtk_widget_hide(dialog->cancel);
|
||||
gtk_widget_hide(dialog->cancel);
|
||||
}
|
||||
|
||||
void
|
||||
void
|
||||
default_dialog_hide_apply_button(DefaultDialog_t *dialog)
|
||||
{
|
||||
gtk_widget_hide(dialog->apply);
|
||||
gtk_widget_hide(dialog->apply);
|
||||
}
|
||||
|
||||
void
|
||||
void
|
||||
default_dialog_hide_help_button(DefaultDialog_t *dialog)
|
||||
{
|
||||
/* gtk_widget_hide(dialog->help); */
|
||||
@ -156,17 +149,11 @@ default_dialog_set_title(DefaultDialog_t *dialog, const gchar *title)
|
||||
gtk_window_set_title(GTK_WINDOW(dialog->dialog), title);
|
||||
}
|
||||
|
||||
void
|
||||
default_dialog_set_ok_sensitivity(DefaultDialog_t *dialog, gboolean sensitive)
|
||||
{
|
||||
gtk_widget_set_sensitive(dialog->ok, sensitive);
|
||||
}
|
||||
|
||||
void
|
||||
default_dialog_set_label(DefaultDialog_t *dialog, gchar *text)
|
||||
{
|
||||
GtkWidget *label = gtk_label_new(text);
|
||||
gtk_box_pack_start(GTK_BOX(GTK_DIALOG(dialog->dialog)->vbox), label,
|
||||
gtk_box_pack_start(GTK_BOX(GTK_DIALOG(dialog->dialog)->vbox), label,
|
||||
TRUE, TRUE, 5);
|
||||
gtk_widget_show(label);
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user