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

don't draw resize_grip in status bar (patch from Guillermo S. Romero). 

2001-11-23  Sven Neumann  <sven@gimp.org>

	* app/display/gimpdisplayshell.c: don't draw resize_grip in status bar
	(patch from Guillermo S. Romero).

	* app/devices.c
	* app/display/gimpdisplayshell-filter-dialog.c
	* app/display/gimpdisplayshell-qmask.c
	* app/display/gimpdisplayshell.c
	* app/gui/channels-commands.c
	* app/gui/color-notebook.c
	* app/gui/convert-dialog.c
	* app/gui/error-console-dialog.c
	* app/gui/file-new-dialog.c
	* app/gui/gradient-editor.c
	* app/gui/layers-commands.c
	* app/gui/module-browser.c
	* app/gui/offset-dialog.c
	* app/gui/palette-import-dialog.c
	* app/gui/preferences-dialog.c
	* app/gui/resize-dialog.c
	* app/gui/resolution-calibrate-dialog.c
	* app/gui/user-install-dialog.c
	* app/tools/gimpbrightnesscontrasttool.c
	* app/tools/gimpcolorbalancetool.c
	* app/tools/gimpcurvestool.c
	* app/tools/gimphuesaturationtool.c
	* app/tools/gimplevelstool.c
	* app/tools/gimpposterizetool.c
	* app/tools/gimpthresholdtool.c
	* app/widgets/gimpfontselection-dialog.c
	* libgimpwidgets/gimpquerybox.c
	* libgimpwidgets/gimpunitmenu.c
	* modules/cdisplay_gamma.c
	* modules/cdisplay_highcontrast.c: changed button order to follow the
	new GTK+ style: confirmative is right-most (for LTR rendering).
This commit is contained in:
Sven Neumann 2001-11-23 23:04:49 +00:00 committed by Sven Neumann
parent d463a5efdf
commit d3047f570b
60 changed files with 264 additions and 152 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
ChangeLog
View File

@ -1,3 +1,40 @@
2001-11-23 Sven Neumann <sven@gimp.org>
* app/display/gimpdisplayshell.c: don't draw resize_grip in status bar
(patch from Guillermo S. Romero).
* app/devices.c
* app/display/gimpdisplayshell-filter-dialog.c
* app/display/gimpdisplayshell-qmask.c
* app/display/gimpdisplayshell.c
* app/gui/channels-commands.c
* app/gui/color-notebook.c
* app/gui/convert-dialog.c
* app/gui/error-console-dialog.c
* app/gui/file-new-dialog.c
* app/gui/gradient-editor.c
* app/gui/layers-commands.c
* app/gui/module-browser.c
* app/gui/offset-dialog.c
* app/gui/palette-import-dialog.c
* app/gui/preferences-dialog.c
* app/gui/resize-dialog.c
* app/gui/resolution-calibrate-dialog.c
* app/gui/user-install-dialog.c
* app/tools/gimpbrightnesscontrasttool.c
* app/tools/gimpcolorbalancetool.c
* app/tools/gimpcurvestool.c
* app/tools/gimphuesaturationtool.c
* app/tools/gimplevelstool.c
* app/tools/gimpposterizetool.c
* app/tools/gimpthresholdtool.c
* app/widgets/gimpfontselection-dialog.c
* libgimpwidgets/gimpquerybox.c
* libgimpwidgets/gimpunitmenu.c
* modules/cdisplay_gamma.c
* modules/cdisplay_highcontrast.c: changed button order to follow the
new GTK+ style: confirmative is right-most (for LTR rendering).
2001-11-23 Michael Natterer <mitch@gimp.org>
* app/core/gimpcontainer.c: removed a useless g_return_if_fail().

10
app/actions/channels-commands.c
View File

@ -352,11 +352,12 @@ channels_new_channel_query (GimpImage *gimage)
GTK_WIN_POS_MOUSE,
FALSE, TRUE, FALSE,
GTK_STOCK_OK, new_channel_query_ok_callback,
options, NULL, NULL, TRUE, FALSE,
GTK_STOCK_CANCEL, gtk_widget_destroy,
NULL, 1, NULL, FALSE, TRUE,
GTK_STOCK_OK, new_channel_query_ok_callback,
options, NULL, NULL, TRUE, FALSE,
NULL);
g_object_weak_ref (G_OBJECT (options->query_box),
@ -505,11 +506,12 @@ channels_edit_channel_query (GimpChannel *channel)
GTK_WIN_POS_MOUSE,
FALSE, TRUE, FALSE,
GTK_STOCK_OK, edit_channel_query_ok_callback,
options, NULL, NULL, TRUE, FALSE,
GTK_STOCK_CANCEL, gtk_widget_destroy,
NULL, 1, NULL, FALSE, TRUE,
GTK_STOCK_OK, edit_channel_query_ok_callback,
options, NULL, NULL, TRUE, FALSE,
NULL);
g_object_weak_ref (G_OBJECT (options->query_box),

20
app/actions/layers-commands.c
View File

@ -588,11 +588,12 @@ layers_new_layer_query (GimpImage *gimage)
GTK_WIN_POS_MOUSE,
FALSE, TRUE, FALSE,
GTK_STOCK_OK, new_layer_query_ok_callback,
options, NULL, NULL, TRUE, FALSE,
GTK_STOCK_CANCEL, gtk_widget_destroy,
NULL, 1, NULL, FALSE, TRUE,
GTK_STOCK_OK, new_layer_query_ok_callback,
options, NULL, NULL, TRUE, FALSE,
NULL);
g_object_weak_ref (G_OBJECT (options->query_box),
@ -771,11 +772,12 @@ layers_edit_layer_query (GimpLayer *layer)
GTK_WIN_POS_MOUSE,
FALSE, TRUE, FALSE,
GTK_STOCK_OK, edit_layer_query_ok_callback,
options, NULL, NULL, TRUE, FALSE,
GTK_STOCK_CANCEL, gtk_widget_destroy,
NULL, 1, NULL, FALSE, TRUE,
GTK_STOCK_OK, edit_layer_query_ok_callback,
options, NULL, NULL, TRUE, FALSE,
NULL);
g_object_weak_ref (G_OBJECT (options->query_box),
@ -876,11 +878,12 @@ layers_add_mask_query (GimpLayer *layer)
GTK_WIN_POS_MOUSE,
FALSE, TRUE, FALSE,
GTK_STOCK_OK, add_mask_query_ok_callback,
options, NULL, NULL, TRUE, FALSE,
GTK_STOCK_CANCEL, gtk_widget_destroy,
NULL, 1, NULL, FALSE, TRUE,
GTK_STOCK_OK, add_mask_query_ok_callback,
options, NULL, NULL, TRUE, FALSE,
NULL);
g_object_weak_ref (G_OBJECT (options->query_box),
@ -1172,11 +1175,12 @@ layers_layer_merge_query (GimpImage *gimage,
GTK_WIN_POS_MOUSE,
FALSE, TRUE, FALSE,
GTK_STOCK_OK, layer_merge_query_ok_callback,
options, NULL, NULL, TRUE, FALSE,
GTK_STOCK_CANCEL, gtk_widget_destroy,
NULL, 1, NULL, FALSE, TRUE,
GTK_STOCK_OK, layer_merge_query_ok_callback,
options, NULL, NULL, TRUE, FALSE,
NULL);
g_object_weak_ref (G_OBJECT (options->query_box),

5
app/actions/qmask-commands.c
View File

@ -240,11 +240,12 @@ edit_qmask_channel_query (GimpDisplay *gdisp)
GTK_WIN_POS_MOUSE,
FALSE, TRUE, FALSE,
GTK_STOCK_OK, edit_qmask_query_ok_callback,
options, NULL, NULL, TRUE, FALSE,
GTK_STOCK_CANCEL, edit_qmask_query_cancel_callback,
options, NULL, NULL, FALSE, TRUE,
GTK_STOCK_OK, edit_qmask_query_ok_callback,
options, NULL, NULL, TRUE, FALSE,
NULL);
/* The main hbox */

5
app/actions/quick-mask-commands.c
View File

@ -240,11 +240,12 @@ edit_qmask_channel_query (GimpDisplay *gdisp)
GTK_WIN_POS_MOUSE,
FALSE, TRUE, FALSE,
GTK_STOCK_OK, edit_qmask_query_ok_callback,
options, NULL, NULL, TRUE, FALSE,
GTK_STOCK_CANCEL, edit_qmask_query_cancel_callback,
options, NULL, NULL, FALSE, TRUE,
GTK_STOCK_OK, edit_qmask_query_ok_callback,
options, NULL, NULL, TRUE, FALSE,
NULL);
/* The main hbox */

6
app/base/color-balance.c
View File

@ -323,13 +323,15 @@ color_balance_dialog_new (void)
GTK_WIN_POS_NONE,
FALSE, TRUE, FALSE,
GTK_STOCK_OK, color_balance_ok_callback,
cbd, NULL, NULL, TRUE, FALSE,
GIMP_STOCK_RESET, color_balance_reset_callback,
cbd, NULL, NULL, TRUE, FALSE,
GTK_STOCK_CANCEL, color_balance_cancel_callback,
cbd, NULL, NULL, FALSE, TRUE,
GTK_STOCK_OK, color_balance_ok_callback,
cbd, NULL, NULL, TRUE, FALSE,
NULL);
vbox = gtk_vbox_new (FALSE, 4);

6
app/base/curves.c
View File

@ -652,13 +652,15 @@ curves_dialog_new (void)
GTK_WIN_POS_NONE,
FALSE, TRUE, FALSE,
GTK_STOCK_OK, curves_ok_callback,
cd, NULL, NULL, TRUE, FALSE,
GIMP_STOCK_RESET, curves_reset_callback,
cd, NULL, NULL, FALSE, FALSE,
GTK_STOCK_CANCEL, curves_cancel_callback,
cd, NULL, NULL, FALSE, TRUE,
GTK_STOCK_OK, curves_ok_callback,
cd, NULL, NULL, TRUE, FALSE,
NULL);
vbox = gtk_vbox_new (FALSE, 4);

6
app/base/hue-saturation.c
View File

@ -426,13 +426,15 @@ hue_saturation_dialog_new (void)
GTK_WIN_POS_NONE,
FALSE, TRUE, FALSE,
GTK_STOCK_OK, hue_saturation_ok_callback,
hsd, NULL, NULL, TRUE, FALSE,
GIMP_STOCK_RESET, hue_saturation_reset_callback,
hsd, NULL, NULL, FALSE, FALSE,
GTK_STOCK_CANCEL, hue_saturation_cancel_callback,
hsd, NULL, NULL, FALSE, TRUE,
GTK_STOCK_OK, hue_saturation_ok_callback,
hsd, NULL, NULL, TRUE, FALSE,
NULL);
main_vbox = gtk_vbox_new (FALSE, 4);

8
app/base/threshold.c
View File

@ -333,13 +333,15 @@ threshold_dialog_new (void)
GTK_WIN_POS_NONE,
FALSE, TRUE, FALSE,
GTK_STOCK_OK, threshold_ok_callback,
td, NULL, NULL, TRUE, FALSE,
_("Reset"), threshold_reset_callback,
GIMP_STOCK_RESET, threshold_reset_callback,
td, NULL, NULL, TRUE, FALSE,
GTK_STOCK_CANCEL, threshold_cancel_callback,
td, NULL, NULL, FALSE, TRUE,
GTK_STOCK_OK, threshold_ok_callback,
td, NULL, NULL, TRUE, FALSE,
NULL);
vbox = gtk_vbox_new (FALSE, 4);

5
app/core/gimpimage-qmask.c
View File

@ -240,11 +240,12 @@ edit_qmask_channel_query (GimpDisplay *gdisp)
GTK_WIN_POS_MOUSE,
FALSE, TRUE, FALSE,
GTK_STOCK_OK, edit_qmask_query_ok_callback,
options, NULL, NULL, TRUE, FALSE,
GTK_STOCK_CANCEL, edit_qmask_query_cancel_callback,
options, NULL, NULL, FALSE, TRUE,
GTK_STOCK_OK, edit_qmask_query_ok_callback,
options, NULL, NULL, TRUE, FALSE,
NULL);
/* The main hbox */

5
app/core/gimpimage-quick-mask.c
View File

@ -240,11 +240,12 @@ edit_qmask_channel_query (GimpDisplay *gdisp)
GTK_WIN_POS_MOUSE,
FALSE, TRUE, FALSE,
GTK_STOCK_OK, edit_qmask_query_ok_callback,
options, NULL, NULL, TRUE, FALSE,
GTK_STOCK_CANCEL, edit_qmask_query_cancel_callback,
options, NULL, NULL, FALSE, TRUE,
GTK_STOCK_OK, edit_qmask_query_ok_callback,
options, NULL, NULL, TRUE, FALSE,
NULL);
/* The main hbox */

5
app/devices.c
View File

@ -763,11 +763,12 @@ device_status_create (void)
GTK_WIN_POS_NONE,
FALSE, FALSE, TRUE,
GTK_STOCK_SAVE, devices_write_rc,
NULL, NULL, NULL, FALSE, FALSE,
GTK_STOCK_CLOSE, devices_close_callback,
NULL, NULL, NULL, TRUE, TRUE,
GTK_STOCK_SAVE, devices_write_rc,
NULL, NULL, NULL, FALSE, FALSE,
NULL);
deviceD->num_devices = 0;

6
app/dialogs/color-dialog.c
View File

@ -275,12 +275,12 @@ color_notebook_new (const gchar *title,
GTK_WIN_POS_NONE,
FALSE, TRUE, TRUE,
GTK_STOCK_OK, color_notebook_ok_callback,
cnp, NULL, NULL, TRUE, FALSE,
GTK_STOCK_CANCEL, color_notebook_cancel_callback,
cnp, NULL, NULL, FALSE, TRUE,
GTK_STOCK_OK, color_notebook_ok_callback,
cnp, NULL, NULL, TRUE, FALSE,
NULL);
}

5
app/dialogs/convert-dialog.c
View File

@ -150,11 +150,12 @@ convert_to_indexed (GimpImage *gimage)
GTK_WIN_POS_NONE,
FALSE, FALSE, TRUE,
GTK_STOCK_OK, indexed_ok_callback,
dialog, NULL, NULL, TRUE, FALSE,
GTK_STOCK_CANCEL, indexed_cancel_callback,
dialog, NULL, NULL, FALSE, TRUE,
GTK_STOCK_OK, indexed_ok_callback,
dialog, NULL, NULL, TRUE, FALSE,
NULL);
main_vbox = gtk_vbox_new (FALSE, 2);

6
app/dialogs/image-new-dialog.c
View File

@ -117,13 +117,15 @@ file_new_dialog_create (Gimp *gimp,
GTK_WIN_POS_MOUSE,
FALSE, FALSE, TRUE,
GTK_STOCK_OK, file_new_ok_callback,
info, NULL, NULL, TRUE, FALSE,
GIMP_STOCK_RESET, file_new_reset_callback,
info, NULL, NULL, FALSE, FALSE,
GTK_STOCK_CANCEL, file_new_cancel_callback,
info, NULL, NULL, FALSE, TRUE,
GTK_STOCK_OK, file_new_ok_callback,
info, NULL, NULL, TRUE, FALSE,
NULL);
/* vbox holding the rest of the dialog */

2
app/dialogs/module-dialog.c
View File

@ -111,7 +111,7 @@ module_browser_new (Gimp *gimp)
GTK_WIN_POS_NONE,
FALSE, TRUE, FALSE,
GTK_STOCK_OK, browser_popdown_callback,
GTK_STOCK_CLOSE, browser_popdown_callback,
NULL, NULL, NULL, TRUE, TRUE,
NULL);

5
app/dialogs/offset-dialog.c
View File

@ -87,11 +87,12 @@ offset_dialog_create (GimpDrawable *drawable)
GTK_WIN_POS_NONE,
FALSE, TRUE, FALSE,
GTK_STOCK_OK, offset_ok_callback,
off_d, NULL, NULL, TRUE, FALSE,
GTK_STOCK_CANCEL, offset_cancel_callback,
off_d, NULL, NULL, FALSE, TRUE,
GTK_STOCK_OK, offset_ok_callback,
off_d, NULL, NULL, TRUE, FALSE,
NULL);
/* The vbox for first column of options */

5
app/dialogs/palette-import-dialog.c
View File

@ -679,10 +679,11 @@ palette_import_dialog_new (Gimp *gimp)
GTK_WIN_POS_NONE,
FALSE, TRUE, FALSE,
GTK_STOCK_CANCEL, palette_import_close_callback,
import_dialog, NULL, NULL, TRUE, TRUE,
_("Import"), palette_import_import_callback,
import_dialog, NULL, NULL, FALSE, FALSE,
GTK_STOCK_CLOSE, palette_import_close_callback,
import_dialog, NULL, NULL, TRUE, TRUE,
NULL);

15
app/dialogs/preferences-dialog.c
View File

@ -395,11 +395,12 @@ prefs_restart_notification (void)
GTK_WIN_POS_MOUSE,
FALSE, FALSE, FALSE,
GTK_STOCK_CLOSE, gtk_widget_destroy,
NULL, 1, NULL, FALSE, TRUE,
GTK_STOCK_SAVE,
prefs_restart_notification_save_callback,
NULL, NULL, NULL, TRUE, FALSE,
GTK_STOCK_CLOSE, gtk_widget_destroy,
NULL, 1, NULL, FALSE, TRUE,
NULL);
@ -1594,13 +1595,15 @@ preferences_dialog_create (Gimp *gimp)
GTK_WIN_POS_NONE,
FALSE, TRUE, FALSE,
GTK_STOCK_OK, prefs_ok_callback,
NULL, NULL, NULL, TRUE, FALSE,
GTK_STOCK_SAVE, prefs_save_callback,
NULL, NULL, NULL, FALSE, FALSE,
GTK_STOCK_CANCEL, prefs_cancel_callback,
NULL, NULL, NULL, FALSE, TRUE,
GTK_STOCK_SAVE, prefs_save_callback,
NULL, NULL, NULL, FALSE, FALSE,
GTK_STOCK_OK, prefs_ok_callback,
NULL, NULL, NULL, TRUE, FALSE,
NULL);
g_object_set_data (G_OBJECT (prefs_dialog), "gimp", gimp);

11
app/dialogs/resize-dialog.c
View File

@ -206,17 +206,18 @@ resize_widget_new (GimpImage *gimage,
GTK_WIN_POS_MOUSE,
FALSE, FALSE, TRUE,
GTK_STOCK_OK, ok_cb,
user_data, NULL, NULL, TRUE, FALSE,
_("Reset"), reset_callback,
GIMP_STOCK_RESET, reset_callback,
resize, NULL, NULL, FALSE, FALSE,
GTK_STOCK_CANCEL, cancel_cb ? cancel_cb : G_CALLBACK (gtk_widget_destroy),
GTK_STOCK_CANCEL,
cancel_cb ? cancel_cb : G_CALLBACK (gtk_widget_destroy),
cancel_cb ? user_data : NULL,
cancel_cb ? NULL : (gpointer) 1,
NULL, FALSE, TRUE,
GTK_STOCK_OK, ok_cb,
user_data, NULL, NULL, TRUE, FALSE,
NULL);
g_object_weak_ref (G_OBJECT (resize->resize_shell),

5
app/dialogs/resolution-calibrate-dialog.c
View File

@ -110,11 +110,12 @@ resolution_calibrate_dialog (GtkWidget *resolution_entry,
GTK_WIN_POS_CENTER,
FALSE, FALSE, FALSE,
GTK_STOCK_OK, resolution_calibrate_ok,
NULL, NULL, NULL, TRUE, FALSE,
GTK_STOCK_CANCEL, gtk_widget_destroy,
NULL, 1, NULL, FALSE, TRUE,
GTK_STOCK_OK, resolution_calibrate_ok,
NULL, NULL, NULL, TRUE, FALSE,
NULL);
g_signal_connect (G_OBJECT (dialog), "destroy",

5
app/dialogs/user-install-dialog.c
View File

@ -529,11 +529,12 @@ user_install_dialog_create (Gimp *gimp)
GTK_WIN_POS_CENTER,
FALSE, FALSE, FALSE,
_("Continue"), user_install_continue_callback,
gimp, NULL, &continue_button, TRUE, FALSE,
GTK_STOCK_CANCEL, user_install_cancel_callback,
gimp, 1, &cancel_button, FALSE, TRUE,
_("Continue"), user_install_continue_callback,
gimp, NULL, &continue_button, TRUE, FALSE,
NULL);
gimp_dialog_set_icon (GTK_WINDOW (dialog));

2
app/display/gimpdisplayshell-draw.c
View File

@ -722,9 +722,11 @@ gimp_display_shell_new (GimpDisplay *gdisp)
/* the statusbar */
shell->statusbar = gtk_statusbar_new ();
gtk_statusbar_set_has_resize_grip (GTK_STATUSBAR (shell->statusbar), FALSE);
gtk_widget_set_usize (shell->statusbar, 1, -1);
gtk_container_set_resize_mode (GTK_CONTAINER (shell->statusbar),
GTK_RESIZE_QUEUE);
contextid = gtk_statusbar_get_context_id (GTK_STATUSBAR (shell->statusbar),
"title");
gtk_statusbar_push (GTK_STATUSBAR (shell->statusbar),

5
app/display/gimpdisplayshell-filter-dialog.c
View File

@ -156,11 +156,12 @@ make_dialog (ColorDisplayDialog *cdd)
GTK_WIN_POS_NONE,
FALSE, TRUE, FALSE,
GTK_STOCK_OK, color_display_ok_callback,
cdd, NULL, NULL, TRUE, FALSE,
GTK_STOCK_CANCEL, color_display_cancel_callback,
cdd, NULL, NULL, FALSE, TRUE,
GTK_STOCK_OK, color_display_ok_callback,
cdd, NULL, NULL, TRUE, FALSE,
NULL);
dialog_register (cdd->shell);

5
app/display/gimpdisplayshell-qmask.c
View File

@ -240,11 +240,12 @@ edit_qmask_channel_query (GimpDisplay *gdisp)
GTK_WIN_POS_MOUSE,
FALSE, TRUE, FALSE,
GTK_STOCK_OK, edit_qmask_query_ok_callback,
options, NULL, NULL, TRUE, FALSE,
GTK_STOCK_CANCEL, edit_qmask_query_cancel_callback,
options, NULL, NULL, FALSE, TRUE,
GTK_STOCK_OK, edit_qmask_query_ok_callback,
options, NULL, NULL, TRUE, FALSE,
NULL);
/* The main hbox */

2
app/display/gimpdisplayshell.c
View File

@ -722,9 +722,11 @@ gimp_display_shell_new (GimpDisplay *gdisp)
/* the statusbar */
shell->statusbar = gtk_statusbar_new ();
gtk_statusbar_set_has_resize_grip (GTK_STATUSBAR (shell->statusbar), FALSE);
gtk_widget_set_usize (shell->statusbar, 1, -1);
gtk_container_set_resize_mode (GTK_CONTAINER (shell->statusbar),
GTK_RESIZE_QUEUE);
contextid = gtk_statusbar_get_context_id (GTK_STATUSBAR (shell->statusbar),
"title");
gtk_statusbar_push (GTK_STATUSBAR (shell->statusbar),

10
app/gui/channels-commands.c
View File

@ -352,11 +352,12 @@ channels_new_channel_query (GimpImage *gimage)
GTK_WIN_POS_MOUSE,
FALSE, TRUE, FALSE,
GTK_STOCK_OK, new_channel_query_ok_callback,
options, NULL, NULL, TRUE, FALSE,
GTK_STOCK_CANCEL, gtk_widget_destroy,
NULL, 1, NULL, FALSE, TRUE,
GTK_STOCK_OK, new_channel_query_ok_callback,
options, NULL, NULL, TRUE, FALSE,
NULL);
g_object_weak_ref (G_OBJECT (options->query_box),
@ -505,11 +506,12 @@ channels_edit_channel_query (GimpChannel *channel)
GTK_WIN_POS_MOUSE,
FALSE, TRUE, FALSE,
GTK_STOCK_OK, edit_channel_query_ok_callback,
options, NULL, NULL, TRUE, FALSE,
GTK_STOCK_CANCEL, gtk_widget_destroy,
NULL, 1, NULL, FALSE, TRUE,
GTK_STOCK_OK, edit_channel_query_ok_callback,
options, NULL, NULL, TRUE, FALSE,
NULL);
g_object_weak_ref (G_OBJECT (options->query_box),

6
app/gui/color-notebook.c
View File

@ -275,12 +275,12 @@ color_notebook_new (const gchar *title,
GTK_WIN_POS_NONE,
FALSE, TRUE, TRUE,
GTK_STOCK_OK, color_notebook_ok_callback,
cnp, NULL, NULL, TRUE, FALSE,
GTK_STOCK_CANCEL, color_notebook_cancel_callback,
cnp, NULL, NULL, FALSE, TRUE,
GTK_STOCK_OK, color_notebook_ok_callback,
cnp, NULL, NULL, TRUE, FALSE,
NULL);
}

5
app/gui/convert-dialog.c
View File

@ -150,11 +150,12 @@ convert_to_indexed (GimpImage *gimage)
GTK_WIN_POS_NONE,
FALSE, FALSE, TRUE,
GTK_STOCK_OK, indexed_ok_callback,
dialog, NULL, NULL, TRUE, FALSE,
GTK_STOCK_CANCEL, indexed_cancel_callback,
dialog, NULL, NULL, FALSE, TRUE,
GTK_STOCK_OK, indexed_ok_callback,
dialog, NULL, NULL, TRUE, FALSE,
NULL);
main_vbox = gtk_vbox_new (FALSE, 2);

5
app/gui/device-status-dialog.c
View File

@ -763,11 +763,12 @@ device_status_create (void)
GTK_WIN_POS_NONE,
FALSE, FALSE, TRUE,
GTK_STOCK_SAVE, devices_write_rc,
NULL, NULL, NULL, FALSE, FALSE,
GTK_STOCK_CLOSE, devices_close_callback,
NULL, NULL, NULL, TRUE, TRUE,
GTK_STOCK_SAVE, devices_write_rc,
NULL, NULL, NULL, FALSE, FALSE,
NULL);
deviceD->num_devices = 0;

4
app/gui/error-console-dialog.c
View File

@ -139,10 +139,6 @@ error_console_create (void)
gtk_menu_shell_append (GTK_MENU_SHELL (menu), menuitem);
gtk_widget_show (menuitem);
menuitem = gtk_menu_item_new_with_label (_("Write all errors to file..."));
gtk_menu_shell_append (GTK_MENU_SHELL (menu), menuitem);
gtk_widget_show (menuitem);
g_signal_connect_swapped (G_OBJECT (menuitem), "activate",
G_CALLBACK (error_console_write_all_callback),
text_buffer);

6
app/gui/file-new-dialog.c
View File

@ -117,13 +117,15 @@ file_new_dialog_create (Gimp *gimp,
GTK_WIN_POS_MOUSE,
FALSE, FALSE, TRUE,
GTK_STOCK_OK, file_new_ok_callback,
info, NULL, NULL, TRUE, FALSE,
GIMP_STOCK_RESET, file_new_reset_callback,
info, NULL, NULL, FALSE, FALSE,
GTK_STOCK_CANCEL, file_new_cancel_callback,
info, NULL, NULL, FALSE, TRUE,
GTK_STOCK_OK, file_new_ok_callback,
info, NULL, NULL, TRUE, FALSE,
NULL);
/* vbox holding the rest of the dialog */

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

@ -3735,11 +3735,12 @@ cpopup_split_uniform_callback (GtkWidget *widget,
GTK_WIN_POS_MOUSE,
FALSE, TRUE, FALSE,
_("Split"), cpopup_split_uniform_split_callback,
gradient_editor, NULL, NULL, TRUE, FALSE,
GTK_STOCK_CANCEL, cpopup_split_uniform_cancel_callback,
gradient_editor, NULL, NULL, FALSE, TRUE,
_("Split"), cpopup_split_uniform_split_callback,
gradient_editor, NULL, NULL, TRUE, FALSE,
NULL);
/* The main vbox */

5
app/gui/input-dialog.c
View File

@ -763,11 +763,12 @@ device_status_create (void)
GTK_WIN_POS_NONE,
FALSE, FALSE, TRUE,
GTK_STOCK_SAVE, devices_write_rc,
NULL, NULL, NULL, FALSE, FALSE,
GTK_STOCK_CLOSE, devices_close_callback,
NULL, NULL, NULL, TRUE, TRUE,
GTK_STOCK_SAVE, devices_write_rc,
NULL, NULL, NULL, FALSE, FALSE,
NULL);
deviceD->num_devices = 0;

20
app/gui/layers-commands.c
View File

@ -588,11 +588,12 @@ layers_new_layer_query (GimpImage *gimage)
GTK_WIN_POS_MOUSE,
FALSE, TRUE, FALSE,
GTK_STOCK_OK, new_layer_query_ok_callback,
options, NULL, NULL, TRUE, FALSE,
GTK_STOCK_CANCEL, gtk_widget_destroy,
NULL, 1, NULL, FALSE, TRUE,
GTK_STOCK_OK, new_layer_query_ok_callback,
options, NULL, NULL, TRUE, FALSE,
NULL);
g_object_weak_ref (G_OBJECT (options->query_box),
@ -771,11 +772,12 @@ layers_edit_layer_query (GimpLayer *layer)
GTK_WIN_POS_MOUSE,
FALSE, TRUE, FALSE,
GTK_STOCK_OK, edit_layer_query_ok_callback,
options, NULL, NULL, TRUE, FALSE,
GTK_STOCK_CANCEL, gtk_widget_destroy,
NULL, 1, NULL, FALSE, TRUE,
GTK_STOCK_OK, edit_layer_query_ok_callback,
options, NULL, NULL, TRUE, FALSE,
NULL);
g_object_weak_ref (G_OBJECT (options->query_box),
@ -876,11 +878,12 @@ layers_add_mask_query (GimpLayer *layer)
GTK_WIN_POS_MOUSE,
FALSE, TRUE, FALSE,
GTK_STOCK_OK, add_mask_query_ok_callback,
options, NULL, NULL, TRUE, FALSE,
GTK_STOCK_CANCEL, gtk_widget_destroy,
NULL, 1, NULL, FALSE, TRUE,
GTK_STOCK_OK, add_mask_query_ok_callback,
options, NULL, NULL, TRUE, FALSE,
NULL);
g_object_weak_ref (G_OBJECT (options->query_box),
@ -1172,11 +1175,12 @@ layers_layer_merge_query (GimpImage *gimage,
GTK_WIN_POS_MOUSE,
FALSE, TRUE, FALSE,
GTK_STOCK_OK, layer_merge_query_ok_callback,
options, NULL, NULL, TRUE, FALSE,
GTK_STOCK_CANCEL, gtk_widget_destroy,
NULL, 1, NULL, FALSE, TRUE,
GTK_STOCK_OK, layer_merge_query_ok_callback,
options, NULL, NULL, TRUE, FALSE,
NULL);
g_object_weak_ref (G_OBJECT (options->query_box),

2
app/gui/module-browser.c
View File

@ -111,7 +111,7 @@ module_browser_new (Gimp *gimp)
GTK_WIN_POS_NONE,
FALSE, TRUE, FALSE,
GTK_STOCK_OK, browser_popdown_callback,
GTK_STOCK_CLOSE, browser_popdown_callback,
NULL, NULL, NULL, TRUE, TRUE,
NULL);

5
app/gui/offset-dialog.c
View File

@ -87,11 +87,12 @@ offset_dialog_create (GimpDrawable *drawable)
GTK_WIN_POS_NONE,
FALSE, TRUE, FALSE,
GTK_STOCK_OK, offset_ok_callback,
off_d, NULL, NULL, TRUE, FALSE,
GTK_STOCK_CANCEL, offset_cancel_callback,
off_d, NULL, NULL, FALSE, TRUE,
GTK_STOCK_OK, offset_ok_callback,
off_d, NULL, NULL, TRUE, FALSE,
NULL);
/* The vbox for first column of options */

5
app/gui/palette-import-dialog.c
View File

@ -679,10 +679,11 @@ palette_import_dialog_new (Gimp *gimp)
GTK_WIN_POS_NONE,
FALSE, TRUE, FALSE,
GTK_STOCK_CANCEL, palette_import_close_callback,
import_dialog, NULL, NULL, TRUE, TRUE,
_("Import"), palette_import_import_callback,
import_dialog, NULL, NULL, FALSE, FALSE,
GTK_STOCK_CLOSE, palette_import_close_callback,
import_dialog, NULL, NULL, TRUE, TRUE,
NULL);

15
app/gui/preferences-dialog.c
View File

@ -395,11 +395,12 @@ prefs_restart_notification (void)
GTK_WIN_POS_MOUSE,
FALSE, FALSE, FALSE,
GTK_STOCK_CLOSE, gtk_widget_destroy,
NULL, 1, NULL, FALSE, TRUE,
GTK_STOCK_SAVE,
prefs_restart_notification_save_callback,
NULL, NULL, NULL, TRUE, FALSE,
GTK_STOCK_CLOSE, gtk_widget_destroy,
NULL, 1, NULL, FALSE, TRUE,
NULL);
@ -1594,13 +1595,15 @@ preferences_dialog_create (Gimp *gimp)
GTK_WIN_POS_NONE,
FALSE, TRUE, FALSE,
GTK_STOCK_OK, prefs_ok_callback,
NULL, NULL, NULL, TRUE, FALSE,
GTK_STOCK_SAVE, prefs_save_callback,
NULL, NULL, NULL, FALSE, FALSE,
GTK_STOCK_CANCEL, prefs_cancel_callback,
NULL, NULL, NULL, FALSE, TRUE,
GTK_STOCK_SAVE, prefs_save_callback,
NULL, NULL, NULL, FALSE, FALSE,
GTK_STOCK_OK, prefs_ok_callback,
NULL, NULL, NULL, TRUE, FALSE,
NULL);
g_object_set_data (G_OBJECT (prefs_dialog), "gimp", gimp);

5
app/gui/qmask-commands.c
View File

@ -240,11 +240,12 @@ edit_qmask_channel_query (GimpDisplay *gdisp)
GTK_WIN_POS_MOUSE,
FALSE, TRUE, FALSE,
GTK_STOCK_OK, edit_qmask_query_ok_callback,
options, NULL, NULL, TRUE, FALSE,
GTK_STOCK_CANCEL, edit_qmask_query_cancel_callback,
options, NULL, NULL, FALSE, TRUE,
GTK_STOCK_OK, edit_qmask_query_ok_callback,
options, NULL, NULL, TRUE, FALSE,
NULL);
/* The main hbox */

11
app/gui/resize-dialog.c
View File

@ -206,17 +206,18 @@ resize_widget_new (GimpImage *gimage,
GTK_WIN_POS_MOUSE,
FALSE, FALSE, TRUE,
GTK_STOCK_OK, ok_cb,
user_data, NULL, NULL, TRUE, FALSE,
_("Reset"), reset_callback,
GIMP_STOCK_RESET, reset_callback,
resize, NULL, NULL, FALSE, FALSE,
GTK_STOCK_CANCEL, cancel_cb ? cancel_cb : G_CALLBACK (gtk_widget_destroy),
GTK_STOCK_CANCEL,
cancel_cb ? cancel_cb : G_CALLBACK (gtk_widget_destroy),
cancel_cb ? user_data : NULL,
cancel_cb ? NULL : (gpointer) 1,
NULL, FALSE, TRUE,
GTK_STOCK_OK, ok_cb,
user_data, NULL, NULL, TRUE, FALSE,
NULL);
g_object_weak_ref (G_OBJECT (resize->resize_shell),

5
app/gui/resolution-calibrate-dialog.c
View File

@ -110,11 +110,12 @@ resolution_calibrate_dialog (GtkWidget *resolution_entry,
GTK_WIN_POS_CENTER,
FALSE, FALSE, FALSE,
GTK_STOCK_OK, resolution_calibrate_ok,
NULL, NULL, NULL, TRUE, FALSE,
GTK_STOCK_CANCEL, gtk_widget_destroy,
NULL, 1, NULL, FALSE, TRUE,
GTK_STOCK_OK, resolution_calibrate_ok,
NULL, NULL, NULL, TRUE, FALSE,
NULL);
g_signal_connect (G_OBJECT (dialog), "destroy",

5
app/gui/user-install-dialog.c
View File

@ -529,11 +529,12 @@ user_install_dialog_create (Gimp *gimp)
GTK_WIN_POS_CENTER,
FALSE, FALSE, FALSE,
_("Continue"), user_install_continue_callback,
gimp, NULL, &continue_button, TRUE, FALSE,
GTK_STOCK_CANCEL, user_install_cancel_callback,
gimp, 1, &cancel_button, FALSE, TRUE,
_("Continue"), user_install_continue_callback,
gimp, NULL, &continue_button, TRUE, FALSE,
NULL);
gimp_dialog_set_icon (GTK_WINDOW (dialog));

8
app/tools/gimpbrightnesscontrasttool.c
View File

@ -263,13 +263,15 @@ brightness_contrast_dialog_new (void)
GTK_WIN_POS_NONE,
FALSE, TRUE, FALSE,
GTK_STOCK_OK, brightness_contrast_ok_callback,
bcd, NULL, NULL, TRUE, FALSE,
_("Reset"), brightness_contrast_reset_callback,
GIMP_STOCK_RESET, brightness_contrast_reset_callback,
bcd, NULL, NULL, TRUE, FALSE,
GTK_STOCK_CANCEL, brightness_contrast_cancel_callback,
bcd, NULL, NULL, FALSE, TRUE,
GTK_STOCK_OK, brightness_contrast_ok_callback,
bcd, NULL, NULL, TRUE, FALSE,
NULL);
vbox = gtk_vbox_new (FALSE, 4);

6
app/tools/gimpcolorbalancetool.c
View File

@ -323,13 +323,15 @@ color_balance_dialog_new (void)
GTK_WIN_POS_NONE,
FALSE, TRUE, FALSE,
GTK_STOCK_OK, color_balance_ok_callback,
cbd, NULL, NULL, TRUE, FALSE,
GIMP_STOCK_RESET, color_balance_reset_callback,
cbd, NULL, NULL, TRUE, FALSE,
GTK_STOCK_CANCEL, color_balance_cancel_callback,
cbd, NULL, NULL, FALSE, TRUE,
GTK_STOCK_OK, color_balance_ok_callback,
cbd, NULL, NULL, TRUE, FALSE,
NULL);
vbox = gtk_vbox_new (FALSE, 4);

6
app/tools/gimpcurvestool.c
View File

@ -652,13 +652,15 @@ curves_dialog_new (void)
GTK_WIN_POS_NONE,
FALSE, TRUE, FALSE,
GTK_STOCK_OK, curves_ok_callback,
cd, NULL, NULL, TRUE, FALSE,
GIMP_STOCK_RESET, curves_reset_callback,
cd, NULL, NULL, FALSE, FALSE,
GTK_STOCK_CANCEL, curves_cancel_callback,
cd, NULL, NULL, FALSE, TRUE,
GTK_STOCK_OK, curves_ok_callback,
cd, NULL, NULL, TRUE, FALSE,
NULL);
vbox = gtk_vbox_new (FALSE, 4);

6
app/tools/gimphuesaturationtool.c
View File

@ -426,13 +426,15 @@ hue_saturation_dialog_new (void)
GTK_WIN_POS_NONE,
FALSE, TRUE, FALSE,
GTK_STOCK_OK, hue_saturation_ok_callback,
hsd, NULL, NULL, TRUE, FALSE,
GIMP_STOCK_RESET, hue_saturation_reset_callback,
hsd, NULL, NULL, FALSE, FALSE,
GTK_STOCK_CANCEL, hue_saturation_cancel_callback,
hsd, NULL, NULL, FALSE, TRUE,
GTK_STOCK_OK, hue_saturation_ok_callback,
hsd, NULL, NULL, TRUE, FALSE,
NULL);
main_vbox = gtk_vbox_new (FALSE, 4);

6
app/tools/gimplevelstool.c
View File

@ -403,13 +403,15 @@ levels_dialog_new (void)
GTK_WIN_POS_NONE,
FALSE, TRUE, FALSE,
GTK_STOCK_OK, levels_ok_callback,
ld, NULL, NULL, TRUE, FALSE,
GIMP_STOCK_RESET, levels_reset_callback,
ld, NULL, NULL, FALSE, FALSE,
GTK_STOCK_CANCEL, levels_cancel_callback,
ld, NULL, NULL, FALSE, TRUE,
GTK_STOCK_OK, levels_ok_callback,
ld, NULL, NULL, TRUE, FALSE,
NULL);
main_vbox = gtk_vbox_new (FALSE, 4);

6
app/tools/gimpposterizetool.c
View File

@ -244,13 +244,15 @@ posterize_dialog_new (void)
GTK_WIN_POS_NONE,
FALSE, TRUE, FALSE,
GTK_STOCK_OK, posterize_ok_callback,
pd, NULL, NULL, TRUE, FALSE,
GIMP_STOCK_RESET, posterize_reset_callback,
pd, NULL, NULL, TRUE, FALSE,
GTK_STOCK_CANCEL, posterize_cancel_callback,
pd, NULL, NULL, FALSE, TRUE,
GTK_STOCK_OK, posterize_ok_callback,
pd, NULL, NULL, TRUE, FALSE,
NULL);
vbox = gtk_vbox_new (FALSE, 2);

8
app/tools/gimpthresholdtool.c
View File

@ -333,13 +333,15 @@ threshold_dialog_new (void)
GTK_WIN_POS_NONE,
FALSE, TRUE, FALSE,
GTK_STOCK_OK, threshold_ok_callback,
td, NULL, NULL, TRUE, FALSE,
_("Reset"), threshold_reset_callback,
GIMP_STOCK_RESET, threshold_reset_callback,
td, NULL, NULL, TRUE, FALSE,
GTK_STOCK_CANCEL, threshold_cancel_callback,
td, NULL, NULL, FALSE, TRUE,
GTK_STOCK_OK, threshold_ok_callback,
td, NULL, NULL, TRUE, FALSE,
NULL);
vbox = gtk_vbox_new (FALSE, 4);

6
app/widgets/gimpcolordialog.c
View File

@ -275,12 +275,12 @@ color_notebook_new (const gchar *title,
GTK_WIN_POS_NONE,
FALSE, TRUE, TRUE,
GTK_STOCK_OK, color_notebook_ok_callback,
cnp, NULL, NULL, TRUE, FALSE,
GTK_STOCK_CANCEL, color_notebook_cancel_callback,
cnp, NULL, NULL, FALSE, TRUE,
GTK_STOCK_OK, color_notebook_ok_callback,
cnp, NULL, NULL, TRUE, FALSE,
NULL);
}

5
app/widgets/gimpcolordisplayeditor.c
View File

@ -156,11 +156,12 @@ make_dialog (ColorDisplayDialog *cdd)
GTK_WIN_POS_NONE,
FALSE, TRUE, FALSE,
GTK_STOCK_OK, color_display_ok_callback,
cdd, NULL, NULL, TRUE, FALSE,
GTK_STOCK_CANCEL, color_display_cancel_callback,
cdd, NULL, NULL, FALSE, TRUE,
GTK_STOCK_OK, color_display_ok_callback,
cdd, NULL, NULL, TRUE, FALSE,
NULL);
dialog_register (cdd->shell);

5
app/widgets/gimpdeviceinfo.c
View File

@ -763,11 +763,12 @@ device_status_create (void)
GTK_WIN_POS_NONE,
FALSE, FALSE, TRUE,
GTK_STOCK_SAVE, devices_write_rc,
NULL, NULL, NULL, FALSE, FALSE,
GTK_STOCK_CLOSE, devices_close_callback,
NULL, NULL, NULL, TRUE, TRUE,
GTK_STOCK_SAVE, devices_write_rc,
NULL, NULL, NULL, FALSE, FALSE,
NULL);
deviceD->num_devices = 0;

5
app/widgets/gimpdevices.c
View File

@ -763,11 +763,12 @@ device_status_create (void)
GTK_WIN_POS_NONE,
FALSE, FALSE, TRUE,
GTK_STOCK_SAVE, devices_write_rc,
NULL, NULL, NULL, FALSE, FALSE,
GTK_STOCK_CLOSE, devices_close_callback,
NULL, NULL, NULL, TRUE, TRUE,
GTK_STOCK_SAVE, devices_write_rc,
NULL, NULL, NULL, FALSE, FALSE,
NULL);
deviceD->num_devices = 0;

8
app/widgets/gimpfontselection-dialog.c
View File

@ -124,14 +124,14 @@ gimp_font_selection_dialog_new (GimpFontSelection *fontsel)
GTK_WIN_POS_MOUSE,
FALSE, TRUE, TRUE,
GTK_STOCK_OK, gimp_font_selection_dialog_ok,
dialog, NULL, NULL, TRUE, FALSE,
GTK_STOCK_CANCEL, gtk_widget_hide,
NULL, (gpointer) 1, NULL, FALSE, TRUE,
GTK_STOCK_APPLY, gimp_font_selection_dialog_apply,
dialog, NULL, NULL, TRUE, FALSE,
GTK_STOCK_CANCEL, gtk_widget_hide,
NULL, (gpointer) 1, NULL, FALSE, TRUE,
GTK_STOCK_OK, gimp_font_selection_dialog_ok,
dialog, NULL, NULL, TRUE, FALSE,
NULL);

5
app/widgets/gimpgradienteditor.c
View File

@ -3735,11 +3735,12 @@ cpopup_split_uniform_callback (GtkWidget *widget,
GTK_WIN_POS_MOUSE,
FALSE, TRUE, FALSE,
_("Split"), cpopup_split_uniform_split_callback,
gradient_editor, NULL, NULL, TRUE, FALSE,
GTK_STOCK_CANCEL, cpopup_split_uniform_cancel_callback,
gradient_editor, NULL, NULL, FALSE, TRUE,
_("Split"), cpopup_split_uniform_split_callback,
gradient_editor, NULL, NULL, TRUE, FALSE,
NULL);
/* The main vbox */

5
libgimpwidgets/gimpquerybox.c
View File

@ -121,11 +121,12 @@ create_query_box (const gchar *title,
GTK_WIN_POS_MOUSE,
FALSE, TRUE, FALSE,
ok_button, ok_callback,
query_box, NULL, NULL, TRUE, FALSE,
cancel_button, cancel_callback,
query_box, NULL, NULL, FALSE, TRUE,
ok_button, ok_callback,
query_box, NULL, NULL, TRUE, FALSE,
NULL);
g_signal_connect (G_OBJECT (query_box->qbox), "destroy",

5
libgimpwidgets/gimpunitmenu.c
View File

@ -528,11 +528,12 @@ gimp_unit_menu_create_selection (GimpUnitMenu *gum)
GTK_WIN_POS_MOUSE,
FALSE, TRUE, FALSE,
GTK_STOCK_OK, gimp_unit_menu_selection_ok_callback,
gum, NULL, NULL, TRUE, FALSE,
GTK_STOCK_CANCEL, gtk_widget_destroy,
NULL, 1, NULL, FALSE, TRUE,
GTK_STOCK_OK, gimp_unit_menu_selection_ok_callback,
gum, NULL, NULL, TRUE, FALSE,
NULL);
g_object_add_weak_pointer (G_OBJECT (gum->selection),

5
modules/cdisplay_gamma.c
View File

@ -327,11 +327,12 @@ gamma_configure (gpointer cd_ID,
GTK_WIN_POS_MOUSE,
FALSE, TRUE, FALSE,
GTK_STOCK_OK, gamma_configure_ok_callback,
cd_ID, NULL, NULL, TRUE, FALSE,
GTK_STOCK_CANCEL, gamma_configure_cancel_callback,
cd_ID, NULL, NULL, FALSE, TRUE,
GTK_STOCK_OK, gamma_configure_ok_callback,
cd_ID, NULL, NULL, TRUE, FALSE,
NULL);
dialog_register (context->shell);

5
modules/cdisplay_highcontrast.c
View File

@ -320,11 +320,12 @@ contrast_configure (gpointer cd_ID,
GTK_WIN_POS_MOUSE,
FALSE, TRUE, FALSE,
GTK_STOCK_OK, contrast_configure_ok_callback,
cd_ID, NULL, NULL, TRUE, FALSE,
GTK_STOCK_CANCEL, contrast_configure_cancel_callback,
cd_ID, NULL, NULL, FALSE, TRUE,
GTK_STOCK_OK, contrast_configure_ok_callback,
cd_ID, NULL, NULL, TRUE, FALSE,
NULL);
dialog_register (context->shell);