mirror of
https://gitlab.gnome.org/GNOME/gimp
synced 2024-10-20 09:21:50 +00:00
app: get rid of icons in dialog buttons (use labels not stock IDs)
Nobody has them anymore, and they are deprecated in GTK+ 3.x. This also fixes all conflicting mnemonics except those I missed, but we can fix them now.
This commit is contained in:
parent
a0a5eda068
commit
7da7bab09c
|
@ -227,8 +227,8 @@ documents_clear_cmd_callback (GtkAction *action,
|
||||||
GTK_DIALOG_DESTROY_WITH_PARENT,
|
GTK_DIALOG_DESTROY_WITH_PARENT,
|
||||||
gimp_standard_help_func, NULL,
|
gimp_standard_help_func, NULL,
|
||||||
|
|
||||||
GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,
|
_("_Cancel"), GTK_RESPONSE_CANCEL,
|
||||||
GTK_STOCK_CLEAR, GTK_RESPONSE_OK,
|
_("Cl_ear"), GTK_RESPONSE_OK,
|
||||||
|
|
||||||
NULL);
|
NULL);
|
||||||
|
|
||||||
|
|
|
@ -158,8 +158,8 @@ edit_undo_clear_cmd_callback (GtkAction *action,
|
||||||
gimp_standard_help_func,
|
gimp_standard_help_func,
|
||||||
GIMP_HELP_EDIT_UNDO_CLEAR,
|
GIMP_HELP_EDIT_UNDO_CLEAR,
|
||||||
|
|
||||||
GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,
|
_("_Cancel"), GTK_RESPONSE_CANCEL,
|
||||||
GTK_STOCK_CLEAR, GTK_RESPONSE_OK,
|
_("Cl_ear"), GTK_RESPONSE_OK,
|
||||||
|
|
||||||
NULL);
|
NULL);
|
||||||
|
|
||||||
|
|
|
@ -93,8 +93,8 @@ error_console_save_cmd_callback (GtkAction *action,
|
||||||
gtk_file_chooser_dialog_new (_("Save Error Log to File"), NULL,
|
gtk_file_chooser_dialog_new (_("Save Error Log to File"), NULL,
|
||||||
GTK_FILE_CHOOSER_ACTION_SAVE,
|
GTK_FILE_CHOOSER_ACTION_SAVE,
|
||||||
|
|
||||||
GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,
|
_("_Cancel"), GTK_RESPONSE_CANCEL,
|
||||||
GTK_STOCK_SAVE, GTK_RESPONSE_OK,
|
_("_Save"), GTK_RESPONSE_OK,
|
||||||
|
|
||||||
NULL);
|
NULL);
|
||||||
|
|
||||||
|
|
|
@ -438,8 +438,8 @@ file_revert_cmd_callback (GtkAction *action,
|
||||||
0,
|
0,
|
||||||
gimp_standard_help_func, GIMP_HELP_FILE_REVERT,
|
gimp_standard_help_func, GIMP_HELP_FILE_REVERT,
|
||||||
|
|
||||||
GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,
|
_("_Cancel"), GTK_RESPONSE_CANCEL,
|
||||||
GTK_STOCK_REVERT_TO_SAVED, GTK_RESPONSE_OK,
|
_("_Revert"), GTK_RESPONSE_OK,
|
||||||
|
|
||||||
NULL);
|
NULL);
|
||||||
|
|
||||||
|
|
|
@ -479,8 +479,8 @@ gradient_editor_replicate_cmd_callback (GtkAction *action,
|
||||||
gimp_standard_help_func,
|
gimp_standard_help_func,
|
||||||
GIMP_HELP_GRADIENT_EDITOR_REPLICATE,
|
GIMP_HELP_GRADIENT_EDITOR_REPLICATE,
|
||||||
|
|
||||||
GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,
|
_("_Cancel"), GTK_RESPONSE_CANCEL,
|
||||||
_("Replicate"), GTK_RESPONSE_OK,
|
_("_Replicate"), GTK_RESPONSE_OK,
|
||||||
|
|
||||||
NULL);
|
NULL);
|
||||||
|
|
||||||
|
@ -581,8 +581,8 @@ gradient_editor_split_uniformly_cmd_callback (GtkAction *action,
|
||||||
gimp_standard_help_func,
|
gimp_standard_help_func,
|
||||||
GIMP_HELP_GRADIENT_EDITOR_SPLIT_UNIFORM,
|
GIMP_HELP_GRADIENT_EDITOR_SPLIT_UNIFORM,
|
||||||
|
|
||||||
GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,
|
_("_Cancel"), GTK_RESPONSE_CANCEL,
|
||||||
_("Split"), GTK_RESPONSE_OK,
|
_("_Split"), GTK_RESPONSE_OK,
|
||||||
|
|
||||||
NULL);
|
NULL);
|
||||||
|
|
||||||
|
|
|
@ -75,8 +75,8 @@ gradients_save_as_pov_ray_cmd_callback (GtkAction *action,
|
||||||
dialog = gtk_file_chooser_dialog_new (title, NULL,
|
dialog = gtk_file_chooser_dialog_new (title, NULL,
|
||||||
GTK_FILE_CHOOSER_ACTION_SAVE,
|
GTK_FILE_CHOOSER_ACTION_SAVE,
|
||||||
|
|
||||||
GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,
|
_("_Cancel"), GTK_RESPONSE_CANCEL,
|
||||||
GTK_STOCK_SAVE, GTK_RESPONSE_OK,
|
_("_Save"), GTK_RESPONSE_OK,
|
||||||
|
|
||||||
NULL);
|
NULL);
|
||||||
|
|
||||||
|
|
|
@ -177,8 +177,8 @@ plug_in_reset_all_cmd_callback (GtkAction *action,
|
||||||
NULL, 0,
|
NULL, 0,
|
||||||
gimp_standard_help_func, NULL,
|
gimp_standard_help_func, NULL,
|
||||||
|
|
||||||
GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,
|
_("_Cancel"), GTK_RESPONSE_CANCEL,
|
||||||
GIMP_STOCK_RESET, GTK_RESPONSE_OK,
|
_("_Reset"), GTK_RESPONSE_OK,
|
||||||
|
|
||||||
NULL);
|
NULL);
|
||||||
|
|
||||||
|
|
|
@ -241,8 +241,8 @@ templates_delete_cmd_callback (GtkAction *action,
|
||||||
GTK_WIDGET (editor), 0,
|
GTK_WIDGET (editor), 0,
|
||||||
gimp_standard_help_func, NULL,
|
gimp_standard_help_func, NULL,
|
||||||
|
|
||||||
GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,
|
_("_Cancel"), GTK_RESPONSE_CANCEL,
|
||||||
GTK_STOCK_DELETE, GTK_RESPONSE_OK,
|
_("_Delete"), GTK_RESPONSE_OK,
|
||||||
|
|
||||||
NULL);
|
NULL);
|
||||||
|
|
||||||
|
|
|
@ -61,8 +61,8 @@ text_editor_load_cmd_callback (GtkAction *action,
|
||||||
GTK_WINDOW (editor),
|
GTK_WINDOW (editor),
|
||||||
GTK_FILE_CHOOSER_ACTION_OPEN,
|
GTK_FILE_CHOOSER_ACTION_OPEN,
|
||||||
|
|
||||||
GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,
|
_("_Cancel"), GTK_RESPONSE_CANCEL,
|
||||||
GTK_STOCK_OPEN, GTK_RESPONSE_OK,
|
_("_Open"), GTK_RESPONSE_OK,
|
||||||
|
|
||||||
NULL);
|
NULL);
|
||||||
|
|
||||||
|
|
|
@ -115,8 +115,8 @@ text_tool_load_cmd_callback (GtkAction *action,
|
||||||
parent ? GTK_WINDOW (parent) : NULL,
|
parent ? GTK_WINDOW (parent) : NULL,
|
||||||
GTK_FILE_CHOOSER_ACTION_OPEN,
|
GTK_FILE_CHOOSER_ACTION_OPEN,
|
||||||
|
|
||||||
GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,
|
_("_Cancel"), GTK_RESPONSE_CANCEL,
|
||||||
GTK_STOCK_OPEN, GTK_RESPONSE_OK,
|
_("_Open"), GTK_RESPONSE_OK,
|
||||||
|
|
||||||
NULL);
|
NULL);
|
||||||
|
|
||||||
|
|
|
@ -192,11 +192,12 @@ tool_options_reset_all_cmd_callback (GtkAction *action,
|
||||||
GTK_DIALOG_DESTROY_WITH_PARENT,
|
GTK_DIALOG_DESTROY_WITH_PARENT,
|
||||||
gimp_standard_help_func, NULL,
|
gimp_standard_help_func, NULL,
|
||||||
|
|
||||||
GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,
|
_("_Cancel"), GTK_RESPONSE_CANCEL,
|
||||||
GIMP_STOCK_RESET, GTK_RESPONSE_OK,
|
_("_Reset"), GTK_RESPONSE_OK,
|
||||||
|
|
||||||
NULL);
|
NULL);
|
||||||
|
|
||||||
|
gtk_dialog_set_default_response (GTK_DIALOG (dialog), GTK_RESPONSE_CANCEL);
|
||||||
gtk_dialog_set_alternative_button_order (GTK_DIALOG (dialog),
|
gtk_dialog_set_alternative_button_order (GTK_DIALOG (dialog),
|
||||||
GTK_RESPONSE_OK,
|
GTK_RESPONSE_OK,
|
||||||
GTK_RESPONSE_CANCEL,
|
GTK_RESPONSE_CANCEL,
|
||||||
|
|
|
@ -32,6 +32,8 @@
|
||||||
#include "actions.h"
|
#include "actions.h"
|
||||||
#include "window-commands.h"
|
#include "window-commands.h"
|
||||||
|
|
||||||
|
#include "gimp-intl.h"
|
||||||
|
|
||||||
|
|
||||||
/* public functions */
|
/* public functions */
|
||||||
|
|
||||||
|
@ -70,8 +72,8 @@ window_open_display_cmd_callback (GtkAction *action,
|
||||||
widget, GTK_DIALOG_MODAL,
|
widget, GTK_DIALOG_MODAL,
|
||||||
NULL, NULL,
|
NULL, NULL,
|
||||||
|
|
||||||
GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,
|
_("_Cancel"), GTK_RESPONSE_CANCEL,
|
||||||
GTK_STOCK_OK, GTK_RESPONSE_OK,
|
_("_OK"), GTK_RESPONSE_OK,
|
||||||
|
|
||||||
NULL);
|
NULL);
|
||||||
|
|
||||||
|
|
|
@ -133,7 +133,7 @@ color_profile_dialog_new (ColorProfileDialogType dialog_type,
|
||||||
gimp_standard_help_func,
|
gimp_standard_help_func,
|
||||||
GIMP_HELP_IMAGE_COLOR_PROFILE_ASSIGN,
|
GIMP_HELP_IMAGE_COLOR_PROFILE_ASSIGN,
|
||||||
|
|
||||||
GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,
|
_("_Cancel"), GTK_RESPONSE_CANCEL,
|
||||||
_("_Assign"), GTK_RESPONSE_OK,
|
_("_Assign"), GTK_RESPONSE_OK,
|
||||||
|
|
||||||
NULL);
|
NULL);
|
||||||
|
@ -151,8 +151,8 @@ color_profile_dialog_new (ColorProfileDialogType dialog_type,
|
||||||
gimp_standard_help_func,
|
gimp_standard_help_func,
|
||||||
GIMP_HELP_IMAGE_COLOR_PROFILE_CONVERT,
|
GIMP_HELP_IMAGE_COLOR_PROFILE_CONVERT,
|
||||||
|
|
||||||
GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,
|
_("_Cancel"), GTK_RESPONSE_CANCEL,
|
||||||
GTK_STOCK_CONVERT, GTK_RESPONSE_OK,
|
_("C_onvert"), GTK_RESPONSE_OK,
|
||||||
|
|
||||||
NULL);
|
NULL);
|
||||||
dest_label = _("Convert to");
|
dest_label = _("Convert to");
|
||||||
|
@ -169,8 +169,8 @@ color_profile_dialog_new (ColorProfileDialogType dialog_type,
|
||||||
gimp_standard_help_func,
|
gimp_standard_help_func,
|
||||||
GIMP_HELP_IMAGE_CONVERT_RGB,
|
GIMP_HELP_IMAGE_CONVERT_RGB,
|
||||||
|
|
||||||
GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,
|
_("_Cancel"), GTK_RESPONSE_CANCEL,
|
||||||
GTK_STOCK_CONVERT, GTK_RESPONSE_OK,
|
_("C_onvert"), GTK_RESPONSE_OK,
|
||||||
|
|
||||||
NULL);
|
NULL);
|
||||||
dest_label = _("Convert to");
|
dest_label = _("Convert to");
|
||||||
|
@ -187,8 +187,8 @@ color_profile_dialog_new (ColorProfileDialogType dialog_type,
|
||||||
gimp_standard_help_func,
|
gimp_standard_help_func,
|
||||||
GIMP_HELP_IMAGE_CONVERT_GRAYSCALE,
|
GIMP_HELP_IMAGE_CONVERT_GRAYSCALE,
|
||||||
|
|
||||||
GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,
|
_("_Cancel"), GTK_RESPONSE_CANCEL,
|
||||||
GTK_STOCK_CONVERT, GTK_RESPONSE_OK,
|
_("C_onvert"), GTK_RESPONSE_OK,
|
||||||
|
|
||||||
NULL);
|
NULL);
|
||||||
dest_label = _("Convert to");
|
dest_label = _("Convert to");
|
||||||
|
@ -205,7 +205,7 @@ color_profile_dialog_new (ColorProfileDialogType dialog_type,
|
||||||
gimp_standard_help_func,
|
gimp_standard_help_func,
|
||||||
GIMP_HELP_VIEW_COLOR_MANAGEMENT,
|
GIMP_HELP_VIEW_COLOR_MANAGEMENT,
|
||||||
|
|
||||||
GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,
|
_("_Cancel"), GTK_RESPONSE_CANCEL,
|
||||||
_("_Select"), GTK_RESPONSE_OK,
|
_("_Select"), GTK_RESPONSE_OK,
|
||||||
|
|
||||||
NULL);
|
NULL);
|
||||||
|
|
|
@ -135,16 +135,11 @@ convert_indexed_dialog_new (GimpImage *image,
|
||||||
gimp_standard_help_func,
|
gimp_standard_help_func,
|
||||||
GIMP_HELP_IMAGE_CONVERT_INDEXED,
|
GIMP_HELP_IMAGE_CONVERT_INDEXED,
|
||||||
|
|
||||||
GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,
|
_("_Cancel"), GTK_RESPONSE_CANCEL,
|
||||||
|
_("C_onvert"), GTK_RESPONSE_OK,
|
||||||
|
|
||||||
NULL);
|
NULL);
|
||||||
|
|
||||||
button = gtk_dialog_add_button (GTK_DIALOG (dialog),
|
|
||||||
_("C_onvert"), GTK_RESPONSE_OK);
|
|
||||||
gtk_button_set_image (GTK_BUTTON (button),
|
|
||||||
gtk_image_new_from_icon_name (GIMP_STOCK_CONVERT_INDEXED,
|
|
||||||
GTK_ICON_SIZE_BUTTON));
|
|
||||||
|
|
||||||
gtk_dialog_set_alternative_button_order (GTK_DIALOG (dialog),
|
gtk_dialog_set_alternative_button_order (GTK_DIALOG (dialog),
|
||||||
GTK_RESPONSE_OK,
|
GTK_RESPONSE_OK,
|
||||||
GTK_RESPONSE_CANCEL,
|
GTK_RESPONSE_CANCEL,
|
||||||
|
|
|
@ -78,7 +78,6 @@ convert_precision_dialog_new (GimpImage *image,
|
||||||
{
|
{
|
||||||
ConvertDialog *private;
|
ConvertDialog *private;
|
||||||
GtkWidget *dialog;
|
GtkWidget *dialog;
|
||||||
GtkWidget *button;
|
|
||||||
GtkWidget *main_vbox;
|
GtkWidget *main_vbox;
|
||||||
GtkWidget *vbox;
|
GtkWidget *vbox;
|
||||||
GtkWidget *frame;
|
GtkWidget *frame;
|
||||||
|
@ -163,18 +162,13 @@ convert_precision_dialog_new (GimpImage *image,
|
||||||
gimp_standard_help_func,
|
gimp_standard_help_func,
|
||||||
GIMP_HELP_IMAGE_CONVERT_PRECISION,
|
GIMP_HELP_IMAGE_CONVERT_PRECISION,
|
||||||
|
|
||||||
GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,
|
_("_Cancel"), GTK_RESPONSE_CANCEL,
|
||||||
|
_("C_onvert"), GTK_RESPONSE_OK,
|
||||||
|
|
||||||
NULL);
|
NULL);
|
||||||
|
|
||||||
g_free (blurb);
|
g_free (blurb);
|
||||||
|
|
||||||
button = gtk_dialog_add_button (GTK_DIALOG (dialog),
|
|
||||||
_("C_onvert"), GTK_RESPONSE_OK);
|
|
||||||
gtk_button_set_image (GTK_BUTTON (button),
|
|
||||||
gtk_image_new_from_icon_name (GIMP_STOCK_CONVERT_PRECISION,
|
|
||||||
GTK_ICON_SIZE_BUTTON));
|
|
||||||
|
|
||||||
gtk_dialog_set_alternative_button_order (GTK_DIALOG (dialog),
|
gtk_dialog_set_alternative_button_order (GTK_DIALOG (dialog),
|
||||||
GTK_RESPONSE_OK,
|
GTK_RESPONSE_OK,
|
||||||
GTK_RESPONSE_CANCEL,
|
GTK_RESPONSE_CANCEL,
|
||||||
|
|
|
@ -83,8 +83,8 @@ data_delete_dialog_new (GimpDataFactory *factory,
|
||||||
gtk_widget_get_toplevel (parent), 0,
|
gtk_widget_get_toplevel (parent), 0,
|
||||||
gimp_standard_help_func, NULL,
|
gimp_standard_help_func, NULL,
|
||||||
|
|
||||||
GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,
|
_("_Cancel"), GTK_RESPONSE_CANCEL,
|
||||||
GTK_STOCK_DELETE, GTK_RESPONSE_OK,
|
_("_Delete"), GTK_RESPONSE_OK,
|
||||||
|
|
||||||
NULL);
|
NULL);
|
||||||
|
|
||||||
|
|
|
@ -117,7 +117,7 @@ fade_dialog_new (GimpImage *image,
|
||||||
gimp_standard_help_func,
|
gimp_standard_help_func,
|
||||||
GIMP_HELP_EDIT_FADE,
|
GIMP_HELP_EDIT_FADE,
|
||||||
|
|
||||||
GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,
|
_("_Cancel"), GTK_RESPONSE_CANCEL,
|
||||||
_("_Fade"), GTK_RESPONSE_OK,
|
_("_Fade"), GTK_RESPONSE_OK,
|
||||||
|
|
||||||
NULL);
|
NULL);
|
||||||
|
|
|
@ -77,20 +77,20 @@ file_open_location_dialog_new (Gimp *gimp)
|
||||||
gimp_standard_help_func,
|
gimp_standard_help_func,
|
||||||
GIMP_HELP_FILE_OPEN_LOCATION,
|
GIMP_HELP_FILE_OPEN_LOCATION,
|
||||||
|
|
||||||
GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,
|
_("_Cancel"), GTK_RESPONSE_CANCEL,
|
||||||
GTK_STOCK_OPEN, GTK_RESPONSE_OK,
|
_("_Open"), GTK_RESPONSE_OK,
|
||||||
|
|
||||||
NULL);
|
NULL);
|
||||||
|
|
||||||
g_signal_connect (dialog, "response",
|
|
||||||
G_CALLBACK (file_open_location_response),
|
|
||||||
gimp);
|
|
||||||
|
|
||||||
gtk_dialog_set_alternative_button_order (GTK_DIALOG(dialog),
|
gtk_dialog_set_alternative_button_order (GTK_DIALOG(dialog),
|
||||||
GTK_RESPONSE_OK,
|
GTK_RESPONSE_OK,
|
||||||
GTK_RESPONSE_CANCEL,
|
GTK_RESPONSE_CANCEL,
|
||||||
-1);
|
-1);
|
||||||
|
|
||||||
|
g_signal_connect (dialog, "response",
|
||||||
|
G_CALLBACK (file_open_location_response),
|
||||||
|
gimp);
|
||||||
|
|
||||||
hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 12);
|
hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 12);
|
||||||
gtk_container_set_border_width (GTK_CONTAINER (hbox), 12);
|
gtk_container_set_border_width (GTK_CONTAINER (hbox), 12);
|
||||||
gtk_box_pack_start (GTK_BOX (gtk_dialog_get_content_area (GTK_DIALOG (dialog))),
|
gtk_box_pack_start (GTK_BOX (gtk_dialog_get_content_area (GTK_DIALOG (dialog))),
|
||||||
|
|
|
@ -629,7 +629,7 @@ file_save_dialog_switch_dialogs (GimpFileDialog *file_dialog,
|
||||||
GTK_DIALOG_DESTROY_WITH_PARENT,
|
GTK_DIALOG_DESTROY_WITH_PARENT,
|
||||||
gimp_standard_help_func, NULL,
|
gimp_standard_help_func, NULL,
|
||||||
|
|
||||||
GTK_STOCK_OK, GTK_RESPONSE_OK,
|
_("_OK"), GTK_RESPONSE_OK,
|
||||||
|
|
||||||
NULL);
|
NULL);
|
||||||
|
|
||||||
|
@ -705,8 +705,8 @@ file_save_dialog_use_extension (GtkWidget *save_dialog,
|
||||||
save_dialog, GTK_DIALOG_DESTROY_WITH_PARENT,
|
save_dialog, GTK_DIALOG_DESTROY_WITH_PARENT,
|
||||||
gimp_standard_help_func, NULL,
|
gimp_standard_help_func, NULL,
|
||||||
|
|
||||||
GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,
|
_("_Cancel"), GTK_RESPONSE_CANCEL,
|
||||||
GTK_STOCK_SAVE, GTK_RESPONSE_OK,
|
_("_Save"), GTK_RESPONSE_OK,
|
||||||
|
|
||||||
NULL);
|
NULL);
|
||||||
|
|
||||||
|
|
|
@ -111,8 +111,8 @@ fill_dialog_new (GimpItem *item,
|
||||||
gimp_standard_help_func,
|
gimp_standard_help_func,
|
||||||
help_id,
|
help_id,
|
||||||
|
|
||||||
GIMP_STOCK_RESET, RESPONSE_RESET,
|
_("_Reset"), RESPONSE_RESET,
|
||||||
GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,
|
_("_Cancel"), GTK_RESPONSE_CANCEL,
|
||||||
_("_Fill"), GTK_RESPONSE_OK,
|
_("_Fill"), GTK_RESPONSE_OK,
|
||||||
|
|
||||||
NULL);
|
NULL);
|
||||||
|
|
|
@ -98,9 +98,9 @@ grid_dialog_new (GimpImage *image,
|
||||||
gimp_standard_help_func,
|
gimp_standard_help_func,
|
||||||
GIMP_HELP_IMAGE_GRID,
|
GIMP_HELP_IMAGE_GRID,
|
||||||
|
|
||||||
GIMP_STOCK_RESET, GRID_RESPONSE_RESET,
|
_("_Reset"), GRID_RESPONSE_RESET,
|
||||||
GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,
|
_("_Cancel"), GTK_RESPONSE_CANCEL,
|
||||||
GTK_STOCK_OK, GTK_RESPONSE_OK,
|
_("_OK"), GTK_RESPONSE_OK,
|
||||||
|
|
||||||
NULL);
|
NULL);
|
||||||
|
|
||||||
|
|
|
@ -97,7 +97,7 @@ image_merge_layers_dialog_new (GimpImage *image,
|
||||||
gimp_standard_help_func,
|
gimp_standard_help_func,
|
||||||
GIMP_HELP_IMAGE_MERGE_LAYERS,
|
GIMP_HELP_IMAGE_MERGE_LAYERS,
|
||||||
|
|
||||||
GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,
|
_("_Cancel"), GTK_RESPONSE_CANCEL,
|
||||||
_("_Merge"), GTK_RESPONSE_OK,
|
_("_Merge"), GTK_RESPONSE_OK,
|
||||||
|
|
||||||
NULL);
|
NULL);
|
||||||
|
|
|
@ -102,9 +102,9 @@ image_new_dialog_new (GimpContext *context)
|
||||||
NULL, 0,
|
NULL, 0,
|
||||||
gimp_standard_help_func, GIMP_HELP_FILE_NEW,
|
gimp_standard_help_func, GIMP_HELP_FILE_NEW,
|
||||||
|
|
||||||
GIMP_STOCK_RESET, RESPONSE_RESET,
|
_("_Reset"), RESPONSE_RESET,
|
||||||
GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,
|
_("_Cancel"), GTK_RESPONSE_CANCEL,
|
||||||
GTK_STOCK_OK, GTK_RESPONSE_OK,
|
_("_OK"), GTK_RESPONSE_OK,
|
||||||
|
|
||||||
NULL);
|
NULL);
|
||||||
|
|
||||||
|
@ -322,8 +322,8 @@ image_new_confirm_dialog (ImageNewDialog *private)
|
||||||
GTK_DIALOG_DESTROY_WITH_PARENT,
|
GTK_DIALOG_DESTROY_WITH_PARENT,
|
||||||
gimp_standard_help_func, NULL,
|
gimp_standard_help_func, NULL,
|
||||||
|
|
||||||
GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,
|
_("_Cancel"), GTK_RESPONSE_CANCEL,
|
||||||
GTK_STOCK_OK, GTK_RESPONSE_OK,
|
_("_OK"), GTK_RESPONSE_OK,
|
||||||
|
|
||||||
NULL);
|
NULL);
|
||||||
|
|
||||||
|
|
|
@ -65,7 +65,7 @@ image_properties_dialog_new (GimpImage *image,
|
||||||
gimp_standard_help_func,
|
gimp_standard_help_func,
|
||||||
GIMP_HELP_IMAGE_PROPERTIES,
|
GIMP_HELP_IMAGE_PROPERTIES,
|
||||||
|
|
||||||
GTK_STOCK_CLOSE, GTK_RESPONSE_OK,
|
_("_Close"), GTK_RESPONSE_OK,
|
||||||
|
|
||||||
NULL);
|
NULL);
|
||||||
|
|
||||||
|
|
|
@ -207,8 +207,8 @@ image_scale_confirm_dialog (ImageScaleDialog *private)
|
||||||
gimp_standard_help_func,
|
gimp_standard_help_func,
|
||||||
GIMP_HELP_IMAGE_SCALE_WARNING,
|
GIMP_HELP_IMAGE_SCALE_WARNING,
|
||||||
|
|
||||||
GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,
|
_("_Cancel"), GTK_RESPONSE_CANCEL,
|
||||||
GIMP_STOCK_SCALE, GTK_RESPONSE_OK,
|
_("_Scale"), GTK_RESPONSE_OK,
|
||||||
|
|
||||||
NULL);
|
NULL);
|
||||||
|
|
||||||
|
|
|
@ -59,8 +59,8 @@ input_devices_dialog_new (Gimp *gimp)
|
||||||
gimp_standard_help_func,
|
gimp_standard_help_func,
|
||||||
GIMP_HELP_INPUT_DEVICES,
|
GIMP_HELP_INPUT_DEVICES,
|
||||||
|
|
||||||
GTK_STOCK_CLOSE, GTK_RESPONSE_CLOSE,
|
_("_Close"), GTK_RESPONSE_CLOSE,
|
||||||
GTK_STOCK_SAVE, GTK_RESPONSE_OK,
|
_("_Save"), GTK_RESPONSE_OK,
|
||||||
|
|
||||||
NULL);
|
NULL);
|
||||||
|
|
||||||
|
|
|
@ -142,8 +142,8 @@ item_options_dialog_new (GimpImage *image,
|
||||||
parent,
|
parent,
|
||||||
gimp_standard_help_func, help_id,
|
gimp_standard_help_func, help_id,
|
||||||
|
|
||||||
GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,
|
_("_Cancel"), GTK_RESPONSE_CANCEL,
|
||||||
GTK_STOCK_OK, GTK_RESPONSE_OK,
|
_("_OK"), GTK_RESPONSE_OK,
|
||||||
|
|
||||||
NULL);
|
NULL);
|
||||||
|
|
||||||
|
|
|
@ -52,7 +52,7 @@ keyboard_shortcuts_dialog_new (Gimp *gimp)
|
||||||
gimp_standard_help_func,
|
gimp_standard_help_func,
|
||||||
GIMP_HELP_KEYBOARD_SHORTCUTS,
|
GIMP_HELP_KEYBOARD_SHORTCUTS,
|
||||||
|
|
||||||
GTK_STOCK_CLOSE, GTK_RESPONSE_OK,
|
_("_Close"), GTK_RESPONSE_OK,
|
||||||
|
|
||||||
NULL);
|
NULL);
|
||||||
|
|
||||||
|
|
|
@ -107,8 +107,8 @@ layer_add_mask_dialog_new (GimpLayer *layer,
|
||||||
gimp_standard_help_func,
|
gimp_standard_help_func,
|
||||||
GIMP_HELP_LAYER_MASK_ADD,
|
GIMP_HELP_LAYER_MASK_ADD,
|
||||||
|
|
||||||
GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,
|
_("_Cancel"), GTK_RESPONSE_CANCEL,
|
||||||
GTK_STOCK_ADD, GTK_RESPONSE_OK,
|
_("_Add"), GTK_RESPONSE_OK,
|
||||||
|
|
||||||
NULL);
|
NULL);
|
||||||
|
|
||||||
|
|
|
@ -130,8 +130,8 @@ module_dialog_new (Gimp *gimp)
|
||||||
"gimp-modules", NULL, 0,
|
"gimp-modules", NULL, 0,
|
||||||
gimp_standard_help_func, GIMP_HELP_MODULE_DIALOG,
|
gimp_standard_help_func, GIMP_HELP_MODULE_DIALOG,
|
||||||
|
|
||||||
GTK_STOCK_REFRESH, RESPONSE_REFRESH,
|
_("_Refresh"), RESPONSE_REFRESH,
|
||||||
GTK_STOCK_CLOSE, GTK_RESPONSE_CLOSE,
|
_("_Close"), GTK_RESPONSE_CLOSE,
|
||||||
|
|
||||||
NULL);
|
NULL);
|
||||||
|
|
||||||
|
|
|
@ -133,7 +133,7 @@ offset_dialog_new (GimpDrawable *drawable,
|
||||||
gimp_standard_help_func,
|
gimp_standard_help_func,
|
||||||
GIMP_HELP_LAYER_OFFSET,
|
GIMP_HELP_LAYER_OFFSET,
|
||||||
|
|
||||||
GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,
|
_("_Cancel"), GTK_RESPONSE_CANCEL,
|
||||||
/* offset, used as a verb */
|
/* offset, used as a verb */
|
||||||
_("_Offset"), GTK_RESPONSE_OK,
|
_("_Offset"), GTK_RESPONSE_OK,
|
||||||
|
|
||||||
|
|
|
@ -135,7 +135,6 @@ palette_import_dialog_new (GimpContext *context)
|
||||||
ImportDialog *private;
|
ImportDialog *private;
|
||||||
GimpGradient *gradient;
|
GimpGradient *gradient;
|
||||||
GtkWidget *dialog;
|
GtkWidget *dialog;
|
||||||
GtkWidget *button;
|
|
||||||
GtkWidget *main_hbox;
|
GtkWidget *main_hbox;
|
||||||
GtkWidget *frame;
|
GtkWidget *frame;
|
||||||
GtkWidget *vbox;
|
GtkWidget *vbox;
|
||||||
|
@ -160,16 +159,11 @@ palette_import_dialog_new (GimpContext *context)
|
||||||
gimp_standard_help_func,
|
gimp_standard_help_func,
|
||||||
GIMP_HELP_PALETTE_IMPORT,
|
GIMP_HELP_PALETTE_IMPORT,
|
||||||
|
|
||||||
GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,
|
_("_Cancel"), GTK_RESPONSE_CANCEL,
|
||||||
|
_("_Import"), GTK_RESPONSE_OK,
|
||||||
|
|
||||||
NULL);
|
NULL);
|
||||||
|
|
||||||
button = gtk_dialog_add_button (GTK_DIALOG (dialog),
|
|
||||||
_("_Import"), GTK_RESPONSE_OK);
|
|
||||||
gtk_button_set_image (GTK_BUTTON (button),
|
|
||||||
gtk_image_new_from_icon_name ("gtk-convert",
|
|
||||||
GTK_ICON_SIZE_BUTTON));
|
|
||||||
|
|
||||||
gtk_dialog_set_alternative_button_order (GTK_DIALOG (dialog),
|
gtk_dialog_set_alternative_button_order (GTK_DIALOG (dialog),
|
||||||
GTK_RESPONSE_OK,
|
GTK_RESPONSE_OK,
|
||||||
GTK_RESPONSE_CANCEL,
|
GTK_RESPONSE_CANCEL,
|
||||||
|
|
|
@ -273,8 +273,8 @@ prefs_response (GtkWidget *widget,
|
||||||
GTK_DIALOG_DESTROY_WITH_PARENT,
|
GTK_DIALOG_DESTROY_WITH_PARENT,
|
||||||
gimp_standard_help_func, NULL,
|
gimp_standard_help_func, NULL,
|
||||||
|
|
||||||
GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,
|
_("_Cancel"), GTK_RESPONSE_CANCEL,
|
||||||
GIMP_STOCK_RESET, GTK_RESPONSE_OK,
|
_("_Reset"), GTK_RESPONSE_OK,
|
||||||
|
|
||||||
NULL);
|
NULL);
|
||||||
|
|
||||||
|
@ -603,8 +603,8 @@ prefs_menus_remove_callback (GtkWidget *widget,
|
||||||
GTK_DIALOG_DESTROY_WITH_PARENT,
|
GTK_DIALOG_DESTROY_WITH_PARENT,
|
||||||
gimp_standard_help_func, NULL,
|
gimp_standard_help_func, NULL,
|
||||||
|
|
||||||
GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,
|
_("_Cancel"), GTK_RESPONSE_CANCEL,
|
||||||
GTK_STOCK_CLEAR, GTK_RESPONSE_OK,
|
_("Cl_ear"), GTK_RESPONSE_OK,
|
||||||
|
|
||||||
NULL);
|
NULL);
|
||||||
|
|
||||||
|
@ -995,9 +995,9 @@ prefs_dialog_new (Gimp *gimp,
|
||||||
prefs_help_func,
|
prefs_help_func,
|
||||||
GIMP_HELP_PREFS_DIALOG,
|
GIMP_HELP_PREFS_DIALOG,
|
||||||
|
|
||||||
GIMP_STOCK_RESET, RESPONSE_RESET,
|
_("_Reset"), RESPONSE_RESET,
|
||||||
GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,
|
_("_Cancel"), GTK_RESPONSE_CANCEL,
|
||||||
GTK_STOCK_OK, GTK_RESPONSE_OK,
|
_("_OK"), GTK_RESPONSE_OK,
|
||||||
|
|
||||||
NULL);
|
NULL);
|
||||||
|
|
||||||
|
|
|
@ -120,9 +120,9 @@ print_size_dialog_new (GimpImage *image,
|
||||||
parent,
|
parent,
|
||||||
help_func, help_id,
|
help_func, help_id,
|
||||||
|
|
||||||
GIMP_STOCK_RESET, RESPONSE_RESET,
|
_("_Reset"), RESPONSE_RESET,
|
||||||
GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,
|
_("_Cancel"), GTK_RESPONSE_CANCEL,
|
||||||
GTK_STOCK_OK, GTK_RESPONSE_OK,
|
_("_OK"), GTK_RESPONSE_OK,
|
||||||
|
|
||||||
NULL);
|
NULL);
|
||||||
|
|
||||||
|
|
|
@ -167,7 +167,7 @@ quit_close_all_dialog_new (Gimp *gimp,
|
||||||
do_quit ?
|
do_quit ?
|
||||||
GIMP_HELP_FILE_QUIT : GIMP_HELP_FILE_CLOSE_ALL,
|
GIMP_HELP_FILE_QUIT : GIMP_HELP_FILE_CLOSE_ALL,
|
||||||
|
|
||||||
GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,
|
_("_Cancel"), GTK_RESPONSE_CANCEL,
|
||||||
|
|
||||||
NULL);
|
NULL);
|
||||||
|
|
||||||
|
@ -359,7 +359,7 @@ quit_close_all_dialog_container_changed (GimpContainer *images,
|
||||||
accel_string);
|
accel_string);
|
||||||
|
|
||||||
g_object_set (private->ok_button,
|
g_object_set (private->ok_button,
|
||||||
"label", private->do_quit ? GTK_STOCK_QUIT : GTK_STOCK_CLOSE,
|
"label", private->do_quit ? _("_Quit") : _("Cl_ose"),
|
||||||
"use-stock", TRUE,
|
"use-stock", TRUE,
|
||||||
"image", NULL,
|
"image", NULL,
|
||||||
NULL);
|
NULL);
|
||||||
|
|
|
@ -182,9 +182,9 @@ resize_dialog_new (GimpViewable *viewable,
|
||||||
parent,
|
parent,
|
||||||
help_func, help_id,
|
help_func, help_id,
|
||||||
|
|
||||||
GIMP_STOCK_RESET, RESPONSE_RESET,
|
_("Re_set"), RESPONSE_RESET,
|
||||||
GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,
|
_("_Cancel"), GTK_RESPONSE_CANCEL,
|
||||||
GIMP_STOCK_RESIZE, GTK_RESPONSE_OK,
|
_("_Resize"), GTK_RESPONSE_OK,
|
||||||
|
|
||||||
NULL);
|
NULL);
|
||||||
|
|
||||||
|
|
|
@ -73,8 +73,8 @@ resolution_calibrate_dialog (GtkWidget *resolution_entry,
|
||||||
GTK_DIALOG_DESTROY_WITH_PARENT,
|
GTK_DIALOG_DESTROY_WITH_PARENT,
|
||||||
NULL, NULL,
|
NULL, NULL,
|
||||||
|
|
||||||
GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,
|
_("_Cancel"), GTK_RESPONSE_CANCEL,
|
||||||
GTK_STOCK_OK, GTK_RESPONSE_OK,
|
_("_OK"), GTK_RESPONSE_OK,
|
||||||
|
|
||||||
NULL);
|
NULL);
|
||||||
|
|
||||||
|
|
|
@ -133,9 +133,9 @@ scale_dialog_new (GimpViewable *viewable,
|
||||||
parent,
|
parent,
|
||||||
help_func, help_id,
|
help_func, help_id,
|
||||||
|
|
||||||
GIMP_STOCK_RESET, RESPONSE_RESET,
|
_("_Reset"), RESPONSE_RESET,
|
||||||
GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,
|
_("_Cancel"), GTK_RESPONSE_CANCEL,
|
||||||
GIMP_STOCK_SCALE, GTK_RESPONSE_OK,
|
_("_Scale"), GTK_RESPONSE_OK,
|
||||||
|
|
||||||
NULL);
|
NULL);
|
||||||
|
|
||||||
|
|
|
@ -124,9 +124,9 @@ stroke_dialog_new (GimpItem *item,
|
||||||
gimp_standard_help_func,
|
gimp_standard_help_func,
|
||||||
help_id,
|
help_id,
|
||||||
|
|
||||||
GIMP_STOCK_RESET, RESPONSE_RESET,
|
_("_Reset"), RESPONSE_RESET,
|
||||||
GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,
|
_("_Cancel"), GTK_RESPONSE_CANCEL,
|
||||||
icon_name, GTK_RESPONSE_OK,
|
_("_Stroke"), GTK_RESPONSE_OK,
|
||||||
|
|
||||||
NULL);
|
NULL);
|
||||||
|
|
||||||
|
|
|
@ -115,8 +115,8 @@ template_options_dialog_new (GimpTemplate *template,
|
||||||
parent,
|
parent,
|
||||||
gimp_standard_help_func, help_id,
|
gimp_standard_help_func, help_id,
|
||||||
|
|
||||||
GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,
|
_("_Cancel"), GTK_RESPONSE_CANCEL,
|
||||||
GTK_STOCK_OK, GTK_RESPONSE_OK,
|
_("_OK"), GTK_RESPONSE_OK,
|
||||||
|
|
||||||
NULL);
|
NULL);
|
||||||
|
|
||||||
|
|
|
@ -86,7 +86,7 @@ user_install_dialog_new (GimpUserInstall *install)
|
||||||
GIMP_STOCK_WILBER_EEK,
|
GIMP_STOCK_WILBER_EEK,
|
||||||
NULL, 0, NULL, NULL,
|
NULL, 0, NULL, NULL,
|
||||||
|
|
||||||
GTK_STOCK_QUIT, GTK_RESPONSE_OK,
|
_("_Quit"), GTK_RESPONSE_OK,
|
||||||
|
|
||||||
NULL);
|
NULL);
|
||||||
|
|
||||||
|
|
|
@ -80,23 +80,21 @@ vectors_export_dialog_new (GimpImage *image,
|
||||||
dialog = gtk_file_chooser_dialog_new (_("Export Path to SVG"), NULL,
|
dialog = gtk_file_chooser_dialog_new (_("Export Path to SVG"), NULL,
|
||||||
GTK_FILE_CHOOSER_ACTION_SAVE,
|
GTK_FILE_CHOOSER_ACTION_SAVE,
|
||||||
|
|
||||||
GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,
|
_("_Cancel"), GTK_RESPONSE_CANCEL,
|
||||||
GTK_STOCK_SAVE, GTK_RESPONSE_OK,
|
_("_Save"), GTK_RESPONSE_OK,
|
||||||
|
|
||||||
NULL);
|
NULL);
|
||||||
|
|
||||||
|
gtk_dialog_set_default_response (GTK_DIALOG (dialog), GTK_RESPONSE_OK);
|
||||||
gtk_dialog_set_alternative_button_order (GTK_DIALOG (dialog),
|
gtk_dialog_set_alternative_button_order (GTK_DIALOG (dialog),
|
||||||
GTK_RESPONSE_OK,
|
GTK_RESPONSE_OK,
|
||||||
GTK_RESPONSE_CANCEL,
|
GTK_RESPONSE_CANCEL,
|
||||||
-1);
|
-1);
|
||||||
|
|
||||||
gtk_dialog_set_default_response (GTK_DIALOG (dialog), GTK_RESPONSE_OK);
|
|
||||||
|
|
||||||
gtk_window_set_screen (GTK_WINDOW (dialog),
|
|
||||||
gtk_widget_get_screen (parent));
|
|
||||||
|
|
||||||
gtk_window_set_role (GTK_WINDOW (dialog), "gimp-vectors-export");
|
gtk_window_set_role (GTK_WINDOW (dialog), "gimp-vectors-export");
|
||||||
gtk_window_set_position (GTK_WINDOW (dialog), GTK_WIN_POS_MOUSE);
|
gtk_window_set_position (GTK_WINDOW (dialog), GTK_WIN_POS_MOUSE);
|
||||||
|
gtk_window_set_screen (GTK_WINDOW (dialog),
|
||||||
|
gtk_widget_get_screen (parent));
|
||||||
|
|
||||||
gtk_file_chooser_set_do_overwrite_confirmation (GTK_FILE_CHOOSER (dialog),
|
gtk_file_chooser_set_do_overwrite_confirmation (GTK_FILE_CHOOSER (dialog),
|
||||||
TRUE);
|
TRUE);
|
||||||
|
|
|
@ -85,24 +85,21 @@ vectors_import_dialog_new (GimpImage *image,
|
||||||
dialog = gtk_file_chooser_dialog_new (_("Import Paths from SVG"), NULL,
|
dialog = gtk_file_chooser_dialog_new (_("Import Paths from SVG"), NULL,
|
||||||
GTK_FILE_CHOOSER_ACTION_OPEN,
|
GTK_FILE_CHOOSER_ACTION_OPEN,
|
||||||
|
|
||||||
GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,
|
_("_Cancel"), GTK_RESPONSE_CANCEL,
|
||||||
GTK_STOCK_OPEN, GTK_RESPONSE_OK,
|
_("_Open"), GTK_RESPONSE_OK,
|
||||||
|
|
||||||
NULL);
|
NULL);
|
||||||
|
|
||||||
|
gtk_dialog_set_default_response (GTK_DIALOG (dialog), GTK_RESPONSE_OK);
|
||||||
gtk_dialog_set_alternative_button_order (GTK_DIALOG (dialog),
|
gtk_dialog_set_alternative_button_order (GTK_DIALOG (dialog),
|
||||||
GTK_RESPONSE_OK,
|
GTK_RESPONSE_OK,
|
||||||
GTK_RESPONSE_CANCEL,
|
GTK_RESPONSE_CANCEL,
|
||||||
-1);
|
-1);
|
||||||
|
|
||||||
gtk_dialog_set_default_response (GTK_DIALOG (dialog),
|
|
||||||
GTK_RESPONSE_OK);
|
|
||||||
|
|
||||||
gtk_window_set_screen (GTK_WINDOW (dialog),
|
|
||||||
gtk_widget_get_screen (parent));
|
|
||||||
|
|
||||||
gtk_window_set_role (GTK_WINDOW (dialog), "gimp-vectors-import");
|
gtk_window_set_role (GTK_WINDOW (dialog), "gimp-vectors-import");
|
||||||
gtk_window_set_position (GTK_WINDOW (dialog), GTK_WIN_POS_MOUSE);
|
gtk_window_set_position (GTK_WINDOW (dialog), GTK_WIN_POS_MOUSE);
|
||||||
|
gtk_window_set_screen (GTK_WINDOW (dialog),
|
||||||
|
gtk_widget_get_screen (parent));
|
||||||
|
|
||||||
if (import_folder)
|
if (import_folder)
|
||||||
gtk_file_chooser_set_current_folder_file (GTK_FILE_CHOOSER (dialog),
|
gtk_file_chooser_set_current_folder_file (GTK_FILE_CHOOSER (dialog),
|
||||||
|
|
|
@ -172,19 +172,17 @@ gimp_display_shell_close_dialog (GimpDisplayShell *shell,
|
||||||
GTK_WIDGET (shell),
|
GTK_WIDGET (shell),
|
||||||
GTK_DIALOG_DESTROY_WITH_PARENT,
|
GTK_DIALOG_DESTROY_WITH_PARENT,
|
||||||
gimp_standard_help_func, NULL,
|
gimp_standard_help_func, NULL,
|
||||||
NULL);
|
|
||||||
g_free (title);
|
|
||||||
|
|
||||||
gtk_dialog_add_buttons (GTK_DIALOG (dialog),
|
file ?
|
||||||
(file ?
|
_("_Save") :
|
||||||
GTK_STOCK_SAVE :
|
_("Save _As"), RESPONSE_SAVE,
|
||||||
GTK_STOCK_SAVE_AS), RESPONSE_SAVE,
|
_("_Cancel"), GTK_RESPONSE_CANCEL,
|
||||||
GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,
|
|
||||||
_("_Discard Changes"), GTK_RESPONSE_CLOSE,
|
_("_Discard Changes"), GTK_RESPONSE_CLOSE,
|
||||||
NULL);
|
NULL);
|
||||||
|
|
||||||
gtk_dialog_set_default_response (GTK_DIALOG (dialog), GTK_RESPONSE_CANCEL);
|
g_free (title);
|
||||||
|
|
||||||
|
gtk_dialog_set_default_response (GTK_DIALOG (dialog), GTK_RESPONSE_CANCEL);
|
||||||
gtk_dialog_set_alternative_button_order (GTK_DIALOG (dialog),
|
gtk_dialog_set_alternative_button_order (GTK_DIALOG (dialog),
|
||||||
RESPONSE_SAVE,
|
RESPONSE_SAVE,
|
||||||
GTK_RESPONSE_CLOSE,
|
GTK_RESPONSE_CLOSE,
|
||||||
|
|
|
@ -84,8 +84,8 @@ gimp_display_shell_filter_dialog_new (GimpDisplayShell *shell)
|
||||||
gimp_standard_help_func,
|
gimp_standard_help_func,
|
||||||
GIMP_HELP_DISPLAY_FILTER_DIALOG,
|
GIMP_HELP_DISPLAY_FILTER_DIALOG,
|
||||||
|
|
||||||
GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,
|
_("_Cancel"), GTK_RESPONSE_CANCEL,
|
||||||
GTK_STOCK_OK, GTK_RESPONSE_OK,
|
_("_OK"), GTK_RESPONSE_OK,
|
||||||
|
|
||||||
NULL);
|
NULL);
|
||||||
|
|
||||||
|
|
|
@ -118,9 +118,9 @@ gimp_display_shell_rotate_dialog (GimpDisplayShell *shell)
|
||||||
gimp_standard_help_func,
|
gimp_standard_help_func,
|
||||||
GIMP_HELP_VIEW_ROTATE_OTHER,
|
GIMP_HELP_VIEW_ROTATE_OTHER,
|
||||||
|
|
||||||
GIMP_STOCK_RESET, RESPONSE_RESET,
|
_("_Reset"), RESPONSE_RESET,
|
||||||
GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,
|
_("_Cancel"), GTK_RESPONSE_CANCEL,
|
||||||
GTK_STOCK_OK, GTK_RESPONSE_OK,
|
_("_OK"), GTK_RESPONSE_OK,
|
||||||
|
|
||||||
NULL);
|
NULL);
|
||||||
|
|
||||||
|
|
|
@ -119,8 +119,8 @@ gimp_display_shell_scale_dialog (GimpDisplayShell *shell)
|
||||||
gimp_standard_help_func,
|
gimp_standard_help_func,
|
||||||
GIMP_HELP_VIEW_ZOOM_OTHER,
|
GIMP_HELP_VIEW_ZOOM_OTHER,
|
||||||
|
|
||||||
GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,
|
_("_Cancel"), GTK_RESPONSE_CANCEL,
|
||||||
GTK_STOCK_OK, GTK_RESPONSE_OK,
|
_("_OK"), GTK_RESPONSE_OK,
|
||||||
|
|
||||||
NULL);
|
NULL);
|
||||||
|
|
||||||
|
|
|
@ -188,7 +188,9 @@ gui_abort (const gchar *abort_message)
|
||||||
|
|
||||||
dialog = gimp_dialog_new (_("GIMP Message"), "gimp-abort",
|
dialog = gimp_dialog_new (_("GIMP Message"), "gimp-abort",
|
||||||
NULL, GTK_DIALOG_MODAL, NULL, NULL,
|
NULL, GTK_DIALOG_MODAL, NULL, NULL,
|
||||||
GTK_STOCK_OK, GTK_RESPONSE_OK,
|
|
||||||
|
_("_OK"), GTK_RESPONSE_OK,
|
||||||
|
|
||||||
NULL);
|
NULL);
|
||||||
|
|
||||||
gtk_window_set_resizable (GTK_WINDOW (dialog), FALSE);
|
gtk_window_set_resizable (GTK_WINDOW (dialog), FALSE);
|
||||||
|
|
|
@ -345,7 +345,7 @@ gimp_color_picker_tool_info_create (GimpColorPickerTool *picker_tool)
|
||||||
gimp_widget_get_monitor (GTK_WIDGET (shell)),
|
gimp_widget_get_monitor (GTK_WIDGET (shell)),
|
||||||
TRUE,
|
TRUE,
|
||||||
|
|
||||||
GTK_STOCK_CLOSE, GTK_RESPONSE_CLOSE,
|
_("_Close"), GTK_RESPONSE_CLOSE,
|
||||||
|
|
||||||
NULL);
|
NULL);
|
||||||
|
|
||||||
|
|
|
@ -352,9 +352,9 @@ gimp_filter_tool_initialize (GimpTool *tool,
|
||||||
gimp_widget_get_monitor (GTK_WIDGET (shell)),
|
gimp_widget_get_monitor (GTK_WIDGET (shell)),
|
||||||
filter_tool->overlay,
|
filter_tool->overlay,
|
||||||
|
|
||||||
GIMP_STOCK_RESET, RESPONSE_RESET,
|
_("_Reset"), RESPONSE_RESET,
|
||||||
GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,
|
_("_Cancel"), GTK_RESPONSE_CANCEL,
|
||||||
GTK_STOCK_OK, GTK_RESPONSE_OK,
|
_("_OK"), GTK_RESPONSE_OK,
|
||||||
|
|
||||||
NULL);
|
NULL);
|
||||||
|
|
||||||
|
|
|
@ -102,6 +102,8 @@ gimp_flip_tool_class_init (GimpFlipToolClass *klass)
|
||||||
|
|
||||||
trans_class->get_undo_desc = gimp_flip_tool_get_undo_desc;
|
trans_class->get_undo_desc = gimp_flip_tool_get_undo_desc;
|
||||||
trans_class->transform = gimp_flip_tool_transform;
|
trans_class->transform = gimp_flip_tool_transform;
|
||||||
|
|
||||||
|
trans_class->ok_button_label = _("_Flip");
|
||||||
}
|
}
|
||||||
|
|
||||||
static void
|
static void
|
||||||
|
|
|
@ -305,8 +305,10 @@ gimp_foreground_select_tool_initialize (GimpTool *tool,
|
||||||
gtk_widget_get_screen (GTK_WIDGET (shell)),
|
gtk_widget_get_screen (GTK_WIDGET (shell)),
|
||||||
gimp_widget_get_monitor (GTK_WIDGET (shell)),
|
gimp_widget_get_monitor (GTK_WIDGET (shell)),
|
||||||
TRUE,
|
TRUE,
|
||||||
GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,
|
|
||||||
GIMP_STOCK_TOOL_FOREGROUND_SELECT, GTK_RESPONSE_APPLY,
|
_("_Cancel"), GTK_RESPONSE_CANCEL,
|
||||||
|
_("_Select"), GTK_RESPONSE_APPLY,
|
||||||
|
|
||||||
NULL);
|
NULL);
|
||||||
|
|
||||||
gimp_tool_gui_set_auto_overlay (fg_select->gui, TRUE);
|
gimp_tool_gui_set_auto_overlay (fg_select->gui, TRUE);
|
||||||
|
|
|
@ -1076,7 +1076,7 @@ gimp_measure_tool_dialog_new (GimpMeasureTool *measure)
|
||||||
gimp_widget_get_monitor (GTK_WIDGET (shell)),
|
gimp_widget_get_monitor (GTK_WIDGET (shell)),
|
||||||
TRUE,
|
TRUE,
|
||||||
|
|
||||||
GTK_STOCK_CLOSE, GTK_RESPONSE_CLOSE,
|
_("_Close"), GTK_RESPONSE_CLOSE,
|
||||||
|
|
||||||
NULL);
|
NULL);
|
||||||
|
|
||||||
|
|
|
@ -113,6 +113,8 @@ gimp_rotate_tool_class_init (GimpRotateToolClass *klass)
|
||||||
trans_class->motion = gimp_rotate_tool_motion;
|
trans_class->motion = gimp_rotate_tool_motion;
|
||||||
trans_class->recalc_matrix = gimp_rotate_tool_recalc_matrix;
|
trans_class->recalc_matrix = gimp_rotate_tool_recalc_matrix;
|
||||||
trans_class->get_undo_desc = gimp_rotate_tool_get_undo_desc;
|
trans_class->get_undo_desc = gimp_rotate_tool_get_undo_desc;
|
||||||
|
|
||||||
|
trans_class->ok_button_label = _("R_otate");
|
||||||
}
|
}
|
||||||
|
|
||||||
static void
|
static void
|
||||||
|
|
|
@ -106,6 +106,8 @@ gimp_scale_tool_class_init (GimpScaleToolClass *klass)
|
||||||
trans_class->motion = gimp_scale_tool_motion;
|
trans_class->motion = gimp_scale_tool_motion;
|
||||||
trans_class->recalc_matrix = gimp_scale_tool_recalc_matrix;
|
trans_class->recalc_matrix = gimp_scale_tool_recalc_matrix;
|
||||||
trans_class->get_undo_desc = gimp_scale_tool_get_undo_desc;
|
trans_class->get_undo_desc = gimp_scale_tool_get_undo_desc;
|
||||||
|
|
||||||
|
trans_class->ok_button_label = _("_Scale");
|
||||||
}
|
}
|
||||||
|
|
||||||
static void
|
static void
|
||||||
|
|
|
@ -103,6 +103,8 @@ gimp_shear_tool_class_init (GimpShearToolClass *klass)
|
||||||
trans_class->motion = gimp_shear_tool_motion;
|
trans_class->motion = gimp_shear_tool_motion;
|
||||||
trans_class->recalc_matrix = gimp_shear_tool_recalc_matrix;
|
trans_class->recalc_matrix = gimp_shear_tool_recalc_matrix;
|
||||||
trans_class->get_undo_desc = gimp_shear_tool_get_undo_desc;
|
trans_class->get_undo_desc = gimp_shear_tool_get_undo_desc;
|
||||||
|
|
||||||
|
trans_class->ok_button_label = _("_Shear");
|
||||||
}
|
}
|
||||||
|
|
||||||
static void
|
static void
|
||||||
|
|
|
@ -1525,8 +1525,8 @@ gimp_text_tool_confirm_dialog (GimpTextTool *text_tool)
|
||||||
gimp_standard_help_func, NULL,
|
gimp_standard_help_func, NULL,
|
||||||
|
|
||||||
_("Create _New Layer"), RESPONSE_NEW,
|
_("Create _New Layer"), RESPONSE_NEW,
|
||||||
GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,
|
_("_Cancel"), GTK_RESPONSE_CANCEL,
|
||||||
GTK_STOCK_EDIT, GTK_RESPONSE_ACCEPT,
|
_("_Edit"), GTK_RESPONSE_ACCEPT,
|
||||||
|
|
||||||
NULL);
|
NULL);
|
||||||
|
|
||||||
|
|
|
@ -217,6 +217,8 @@ gimp_transform_tool_class_init (GimpTransformToolClass *klass)
|
||||||
klass->transform = gimp_transform_tool_real_transform;
|
klass->transform = gimp_transform_tool_real_transform;
|
||||||
klass->pick_function = gimp_transform_tool_real_pick_function;
|
klass->pick_function = gimp_transform_tool_real_pick_function;
|
||||||
klass->draw_gui = gimp_transform_tool_real_draw_gui;
|
klass->draw_gui = gimp_transform_tool_real_draw_gui;
|
||||||
|
|
||||||
|
klass->ok_button_label = _("_Transform");
|
||||||
}
|
}
|
||||||
|
|
||||||
static void
|
static void
|
||||||
|
@ -1643,7 +1645,7 @@ gimp_transform_tool_dialog (GimpTransformTool *tr_tool)
|
||||||
GimpTool *tool = GIMP_TOOL (tr_tool);
|
GimpTool *tool = GIMP_TOOL (tr_tool);
|
||||||
GimpToolInfo *tool_info = tool->tool_info;
|
GimpToolInfo *tool_info = tool->tool_info;
|
||||||
GimpDisplayShell *shell;
|
GimpDisplayShell *shell;
|
||||||
const gchar *icon_name;
|
const gchar *ok_button_label;
|
||||||
|
|
||||||
if (! GIMP_TRANSFORM_TOOL_GET_CLASS (tr_tool)->dialog)
|
if (! GIMP_TRANSFORM_TOOL_GET_CLASS (tr_tool)->dialog)
|
||||||
return;
|
return;
|
||||||
|
@ -1652,7 +1654,7 @@ gimp_transform_tool_dialog (GimpTransformTool *tr_tool)
|
||||||
|
|
||||||
shell = gimp_display_get_shell (tool->display);
|
shell = gimp_display_get_shell (tool->display);
|
||||||
|
|
||||||
icon_name = gimp_viewable_get_icon_name (GIMP_VIEWABLE (tool_info));
|
ok_button_label = GIMP_TRANSFORM_TOOL_GET_CLASS (tr_tool)->ok_button_label;
|
||||||
|
|
||||||
tr_tool->gui = gimp_tool_gui_new (tool_info,
|
tr_tool->gui = gimp_tool_gui_new (tool_info,
|
||||||
NULL, NULL, NULL, NULL,
|
NULL, NULL, NULL, NULL,
|
||||||
|
@ -1660,9 +1662,9 @@ gimp_transform_tool_dialog (GimpTransformTool *tr_tool)
|
||||||
gimp_widget_get_monitor (GTK_WIDGET (shell)),
|
gimp_widget_get_monitor (GTK_WIDGET (shell)),
|
||||||
TRUE,
|
TRUE,
|
||||||
|
|
||||||
GIMP_STOCK_RESET, RESPONSE_RESET,
|
_("_Reset"), RESPONSE_RESET,
|
||||||
GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,
|
_("_Cancel"), GTK_RESPONSE_CANCEL,
|
||||||
icon_name, GTK_RESPONSE_OK,
|
ok_button_label, GTK_RESPONSE_OK,
|
||||||
|
|
||||||
NULL);
|
NULL);
|
||||||
|
|
||||||
|
|
|
@ -157,6 +157,8 @@ struct _GimpTransformToolClass
|
||||||
GimpColorProfile **buffer_profile,
|
GimpColorProfile **buffer_profile,
|
||||||
gint *new_offset_x,
|
gint *new_offset_x,
|
||||||
gint *new_offset_y);
|
gint *new_offset_y);
|
||||||
|
|
||||||
|
const gchar *ok_button_label;
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
||||||
|
|
|
@ -671,8 +671,8 @@ gimp_action_view_conflict_confirm (GimpActionView *view,
|
||||||
gtk_widget_get_toplevel (GTK_WIDGET (view)), 0,
|
gtk_widget_get_toplevel (GTK_WIDGET (view)), 0,
|
||||||
gimp_standard_help_func, NULL,
|
gimp_standard_help_func, NULL,
|
||||||
|
|
||||||
GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,
|
_("_Cancel"), GTK_RESPONSE_CANCEL,
|
||||||
_("_Reassign shortcut"), GTK_RESPONSE_OK,
|
_("_Reassign Shortcut"), GTK_RESPONSE_OK,
|
||||||
|
|
||||||
NULL);
|
NULL);
|
||||||
|
|
||||||
|
@ -680,6 +680,7 @@ gimp_action_view_conflict_confirm (GimpActionView *view,
|
||||||
GTK_RESPONSE_OK,
|
GTK_RESPONSE_OK,
|
||||||
GTK_RESPONSE_CANCEL,
|
GTK_RESPONSE_CANCEL,
|
||||||
-1);
|
-1);
|
||||||
|
|
||||||
g_signal_connect (dialog, "response",
|
g_signal_connect (dialog, "response",
|
||||||
G_CALLBACK (gimp_action_view_conflict_response),
|
G_CALLBACK (gimp_action_view_conflict_response),
|
||||||
confirm_data);
|
confirm_data);
|
||||||
|
|
|
@ -105,10 +105,13 @@ static void
|
||||||
gimp_color_dialog_init (GimpColorDialog *dialog)
|
gimp_color_dialog_init (GimpColorDialog *dialog)
|
||||||
{
|
{
|
||||||
gtk_dialog_add_buttons (GTK_DIALOG (dialog),
|
gtk_dialog_add_buttons (GTK_DIALOG (dialog),
|
||||||
GIMP_STOCK_RESET, RESPONSE_RESET,
|
|
||||||
GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,
|
_("_Reset"), RESPONSE_RESET,
|
||||||
GTK_STOCK_OK, GTK_RESPONSE_OK,
|
_("_Cancel"), GTK_RESPONSE_CANCEL,
|
||||||
|
_("_OK"), GTK_RESPONSE_OK,
|
||||||
|
|
||||||
NULL);
|
NULL);
|
||||||
|
|
||||||
gtk_dialog_set_default_response (GTK_DIALOG (dialog), GTK_RESPONSE_OK);
|
gtk_dialog_set_default_response (GTK_DIALOG (dialog), GTK_RESPONSE_OK);
|
||||||
|
|
||||||
gtk_dialog_set_alternative_button_order (GTK_DIALOG (dialog),
|
gtk_dialog_set_alternative_button_order (GTK_DIALOG (dialog),
|
||||||
|
|
|
@ -662,8 +662,8 @@ gimp_controller_editor_edit_clicked (GtkWidget *button,
|
||||||
gimp_standard_help_func,
|
gimp_standard_help_func,
|
||||||
GIMP_HELP_PREFS_INPUT_CONTROLLERS,
|
GIMP_HELP_PREFS_INPUT_CONTROLLERS,
|
||||||
|
|
||||||
GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,
|
_("_Cancel"), GTK_RESPONSE_CANCEL,
|
||||||
GTK_STOCK_OK, GTK_RESPONSE_OK,
|
_("_OK"), GTK_RESPONSE_OK,
|
||||||
|
|
||||||
NULL);
|
NULL);
|
||||||
|
|
||||||
|
|
|
@ -564,9 +564,9 @@ gimp_controller_list_remove_clicked (GtkWidget *button,
|
||||||
GTK_WIDGET (list), GTK_DIALOG_MODAL,
|
GTK_WIDGET (list), GTK_DIALOG_MODAL,
|
||||||
NULL, NULL,
|
NULL, NULL,
|
||||||
|
|
||||||
_("Disable Controller"), RESPONSE_DISABLE,
|
_("_Disable Controller"), RESPONSE_DISABLE,
|
||||||
GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,
|
_("_Cancel"), GTK_RESPONSE_CANCEL,
|
||||||
_("Remove Controller"), GTK_RESPONSE_OK,
|
_("_Remove Controller"), GTK_RESPONSE_OK,
|
||||||
|
|
||||||
NULL);
|
NULL);
|
||||||
|
|
||||||
|
@ -641,7 +641,7 @@ gimp_controller_list_edit_clicked (GtkWidget *button,
|
||||||
gimp_standard_help_func,
|
gimp_standard_help_func,
|
||||||
GIMP_HELP_PREFS_INPUT_CONTROLLERS,
|
GIMP_HELP_PREFS_INPUT_CONTROLLERS,
|
||||||
|
|
||||||
GTK_STOCK_CLOSE, GTK_RESPONSE_CLOSE,
|
_("_Close"), GTK_RESPONSE_CLOSE,
|
||||||
|
|
||||||
NULL);
|
NULL);
|
||||||
|
|
||||||
|
|
|
@ -505,8 +505,8 @@ gimp_device_editor_delete_clicked (GtkWidget *button,
|
||||||
GTK_DIALOG_DESTROY_WITH_PARENT,
|
GTK_DIALOG_DESTROY_WITH_PARENT,
|
||||||
gimp_standard_help_func, NULL,
|
gimp_standard_help_func, NULL,
|
||||||
|
|
||||||
GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,
|
_("_Cancel"), GTK_RESPONSE_CANCEL,
|
||||||
GTK_STOCK_DELETE, GTK_RESPONSE_OK,
|
_("_Delete"), GTK_RESPONSE_OK,
|
||||||
|
|
||||||
NULL);
|
NULL);
|
||||||
|
|
||||||
|
|
|
@ -224,7 +224,7 @@ gimp_file_overwrite_dialog (GtkWidget *parent,
|
||||||
parent, GTK_DIALOG_DESTROY_WITH_PARENT,
|
parent, GTK_DIALOG_DESTROY_WITH_PARENT,
|
||||||
gimp_standard_help_func, NULL,
|
gimp_standard_help_func, NULL,
|
||||||
|
|
||||||
GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,
|
_("_Cancel"), GTK_RESPONSE_CANCEL,
|
||||||
_("_Replace"), GTK_RESPONSE_OK,
|
_("_Replace"), GTK_RESPONSE_OK,
|
||||||
|
|
||||||
NULL);
|
NULL);
|
||||||
|
|
|
@ -64,7 +64,9 @@ gimp_error_dialog_init (GimpErrorDialog *dialog)
|
||||||
gtk_window_set_role (GTK_WINDOW (dialog), "gimp-message");
|
gtk_window_set_role (GTK_WINDOW (dialog), "gimp-message");
|
||||||
|
|
||||||
gtk_dialog_add_buttons (GTK_DIALOG (dialog),
|
gtk_dialog_add_buttons (GTK_DIALOG (dialog),
|
||||||
GTK_STOCK_OK, GTK_RESPONSE_CLOSE,
|
|
||||||
|
_("_OK"), GTK_RESPONSE_CLOSE,
|
||||||
|
|
||||||
NULL);
|
NULL);
|
||||||
|
|
||||||
gtk_dialog_set_default_response (GTK_DIALOG (dialog), GTK_RESPONSE_CLOSE);
|
gtk_dialog_set_default_response (GTK_DIALOG (dialog), GTK_RESPONSE_CLOSE);
|
||||||
|
|
|
@ -69,7 +69,7 @@ gimp_export_dialog_new (Gimp *gimp)
|
||||||
"title", _("Export Image"),
|
"title", _("Export Image"),
|
||||||
"role", "gimp-file-export",
|
"role", "gimp-file-export",
|
||||||
"help-id", GIMP_HELP_FILE_EXPORT_AS,
|
"help-id", GIMP_HELP_FILE_EXPORT_AS,
|
||||||
"stock-id", _("_Export"),
|
"ok-button-label", _("_Export"),
|
||||||
|
|
||||||
"automatic-label", _("By Extension"),
|
"automatic-label", _("By Extension"),
|
||||||
"automatic-help-id", GIMP_HELP_FILE_SAVE_BY_EXTENSION,
|
"automatic-help-id", GIMP_HELP_FILE_SAVE_BY_EXTENSION,
|
||||||
|
|
|
@ -55,7 +55,7 @@ enum
|
||||||
PROP_0,
|
PROP_0,
|
||||||
PROP_GIMP,
|
PROP_GIMP,
|
||||||
PROP_HELP_ID,
|
PROP_HELP_ID,
|
||||||
PROP_STOCK_ID,
|
PROP_OK_BUTTON_LABEL,
|
||||||
PROP_AUTOMATIC_HELP_ID,
|
PROP_AUTOMATIC_HELP_ID,
|
||||||
PROP_AUTOMATIC_LABEL,
|
PROP_AUTOMATIC_LABEL,
|
||||||
PROP_FILE_FILTER_LABEL,
|
PROP_FILE_FILTER_LABEL,
|
||||||
|
@ -182,9 +182,10 @@ gimp_file_dialog_class_init (GimpFileDialogClass *klass)
|
||||||
GIMP_PARAM_READWRITE |
|
GIMP_PARAM_READWRITE |
|
||||||
G_PARAM_CONSTRUCT_ONLY));
|
G_PARAM_CONSTRUCT_ONLY));
|
||||||
|
|
||||||
g_object_class_install_property (object_class, PROP_STOCK_ID,
|
g_object_class_install_property (object_class, PROP_OK_BUTTON_LABEL,
|
||||||
g_param_spec_string ("stock-id", NULL, NULL,
|
g_param_spec_string ("ok-button-label",
|
||||||
NULL,
|
NULL, NULL,
|
||||||
|
_("_OK"),
|
||||||
GIMP_PARAM_WRITABLE |
|
GIMP_PARAM_WRITABLE |
|
||||||
G_PARAM_CONSTRUCT_ONLY));
|
G_PARAM_CONSTRUCT_ONLY));
|
||||||
|
|
||||||
|
@ -229,7 +230,6 @@ gimp_file_dialog_class_init (GimpFileDialogClass *klass)
|
||||||
static void
|
static void
|
||||||
gimp_file_dialog_init (GimpFileDialog *dialog)
|
gimp_file_dialog_init (GimpFileDialog *dialog)
|
||||||
{
|
{
|
||||||
dialog->stock_id = GTK_STOCK_OK;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
static void
|
static void
|
||||||
|
@ -261,8 +261,8 @@ gimp_file_dialog_set_property (GObject *object,
|
||||||
case PROP_HELP_ID:
|
case PROP_HELP_ID:
|
||||||
dialog->help_id = g_value_dup_string (value);
|
dialog->help_id = g_value_dup_string (value);
|
||||||
break;
|
break;
|
||||||
case PROP_STOCK_ID:
|
case PROP_OK_BUTTON_LABEL:
|
||||||
dialog->stock_id = g_value_dup_string (value);
|
dialog->ok_button_label = g_value_dup_string (value);
|
||||||
break;
|
break;
|
||||||
case PROP_AUTOMATIC_HELP_ID:
|
case PROP_AUTOMATIC_HELP_ID:
|
||||||
dialog->automatic_help_id = g_value_dup_string (value);
|
dialog->automatic_help_id = g_value_dup_string (value);
|
||||||
|
@ -321,9 +321,10 @@ gimp_file_dialog_constructed (GObject *object)
|
||||||
G_OBJECT_CLASS (parent_class)->constructed (object);
|
G_OBJECT_CLASS (parent_class)->constructed (object);
|
||||||
|
|
||||||
gtk_dialog_add_buttons (GTK_DIALOG (dialog),
|
gtk_dialog_add_buttons (GTK_DIALOG (dialog),
|
||||||
GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,
|
_("_Cancel"), GTK_RESPONSE_CANCEL,
|
||||||
dialog->stock_id, GTK_RESPONSE_OK,
|
dialog->ok_button_label, GTK_RESPONSE_OK,
|
||||||
NULL);
|
NULL);
|
||||||
|
|
||||||
gtk_dialog_set_default_response (GTK_DIALOG (dialog), GTK_RESPONSE_OK);
|
gtk_dialog_set_default_response (GTK_DIALOG (dialog), GTK_RESPONSE_OK);
|
||||||
gtk_dialog_set_alternative_button_order (GTK_DIALOG (dialog),
|
gtk_dialog_set_alternative_button_order (GTK_DIALOG (dialog),
|
||||||
GTK_RESPONSE_OK,
|
GTK_RESPONSE_OK,
|
||||||
|
@ -341,9 +342,12 @@ gimp_file_dialog_constructed (GObject *object)
|
||||||
|
|
||||||
if (GIMP_GUI_CONFIG (dialog->gimp->config)->show_help_button)
|
if (GIMP_GUI_CONFIG (dialog->gimp->config)->show_help_button)
|
||||||
{
|
{
|
||||||
GtkWidget *action_area = gtk_dialog_get_action_area (GTK_DIALOG (dialog));
|
GtkWidget *action_area;
|
||||||
GtkWidget *button = gtk_button_new_from_stock (GTK_STOCK_HELP);
|
GtkWidget *button;
|
||||||
|
|
||||||
|
action_area = gtk_dialog_get_action_area (GTK_DIALOG (dialog));
|
||||||
|
|
||||||
|
button = gtk_button_new_with_mnemonic (_("_Help"));
|
||||||
gtk_box_pack_end (GTK_BOX (action_area), button, FALSE, TRUE, 0);
|
gtk_box_pack_end (GTK_BOX (action_area), button, FALSE, TRUE, 0);
|
||||||
gtk_button_box_set_child_secondary (GTK_BUTTON_BOX (action_area),
|
gtk_button_box_set_child_secondary (GTK_BUTTON_BOX (action_area),
|
||||||
button, TRUE);
|
button, TRUE);
|
||||||
|
@ -393,9 +397,9 @@ gimp_file_dialog_dispose (GObject *object)
|
||||||
g_free (dialog->help_id);
|
g_free (dialog->help_id);
|
||||||
dialog->help_id = NULL;
|
dialog->help_id = NULL;
|
||||||
|
|
||||||
if (dialog->stock_id)
|
if (dialog->ok_button_label)
|
||||||
g_free (dialog->stock_id);
|
g_free (dialog->ok_button_label);
|
||||||
dialog->stock_id = NULL;
|
dialog->ok_button_label = NULL;
|
||||||
|
|
||||||
if (dialog->automatic_help_id)
|
if (dialog->automatic_help_id)
|
||||||
g_free (dialog->automatic_help_id);
|
g_free (dialog->automatic_help_id);
|
||||||
|
|
|
@ -53,7 +53,7 @@ struct _GimpFileDialog
|
||||||
gboolean canceled;
|
gboolean canceled;
|
||||||
|
|
||||||
gchar *help_id;
|
gchar *help_id;
|
||||||
gchar *stock_id;
|
gchar *ok_button_label;
|
||||||
gchar *automatic_help_id;
|
gchar *automatic_help_id;
|
||||||
gchar *automatic_label;
|
gchar *automatic_label;
|
||||||
gchar *file_filter_label;
|
gchar *file_filter_label;
|
||||||
|
|
|
@ -383,7 +383,7 @@ gimp_help_browser_error (Gimp *gimp,
|
||||||
NULL, 0,
|
NULL, 0,
|
||||||
NULL, NULL,
|
NULL, NULL,
|
||||||
|
|
||||||
GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,
|
_("_Cancel"), GTK_RESPONSE_CANCEL,
|
||||||
_("Use _Web Browser"), GTK_RESPONSE_OK,
|
_("Use _Web Browser"), GTK_RESPONSE_OK,
|
||||||
|
|
||||||
NULL);
|
NULL);
|
||||||
|
@ -713,25 +713,21 @@ static void
|
||||||
gimp_help_query_user_manual_online (GimpIdleHelp *idle_help)
|
gimp_help_query_user_manual_online (GimpIdleHelp *idle_help)
|
||||||
{
|
{
|
||||||
GtkWidget *dialog;
|
GtkWidget *dialog;
|
||||||
GtkWidget *button;
|
|
||||||
|
|
||||||
dialog = gimp_message_dialog_new (_("GIMP user manual is missing"),
|
dialog = gimp_message_dialog_new (_("GIMP user manual is missing"),
|
||||||
GIMP_STOCK_USER_MANUAL,
|
GIMP_STOCK_USER_MANUAL,
|
||||||
NULL, 0, NULL, NULL,
|
NULL, 0, NULL, NULL,
|
||||||
GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,
|
|
||||||
|
_("_Cancel"), GTK_RESPONSE_CANCEL,
|
||||||
|
_("Read _Online"), GTK_RESPONSE_ACCEPT,
|
||||||
|
|
||||||
NULL);
|
NULL);
|
||||||
|
|
||||||
button = gtk_dialog_add_button (GTK_DIALOG (dialog),
|
gtk_dialog_set_default_response (GTK_DIALOG (dialog), GTK_RESPONSE_ACCEPT);
|
||||||
_("_Read Online"), GTK_RESPONSE_ACCEPT);
|
|
||||||
gtk_button_set_image (GTK_BUTTON (button),
|
|
||||||
gtk_image_new_from_icon_name (GIMP_STOCK_WEB,
|
|
||||||
GTK_ICON_SIZE_BUTTON));
|
|
||||||
|
|
||||||
gtk_dialog_set_alternative_button_order (GTK_DIALOG (dialog),
|
gtk_dialog_set_alternative_button_order (GTK_DIALOG (dialog),
|
||||||
GTK_RESPONSE_ACCEPT,
|
GTK_RESPONSE_ACCEPT,
|
||||||
GTK_RESPONSE_CANCEL,
|
GTK_RESPONSE_CANCEL,
|
||||||
-1);
|
-1);
|
||||||
gtk_dialog_set_default_response (GTK_DIALOG (dialog), GTK_RESPONSE_ACCEPT);
|
|
||||||
|
|
||||||
if (idle_help->progress)
|
if (idle_help->progress)
|
||||||
{
|
{
|
||||||
|
|
|
@ -512,8 +512,10 @@ gimp_icon_picker_menu_from_file (GtkWidget *widget,
|
||||||
dialog = gtk_file_chooser_dialog_new (_("Load Icon Image"),
|
dialog = gtk_file_chooser_dialog_new (_("Load Icon Image"),
|
||||||
NULL,
|
NULL,
|
||||||
GTK_FILE_CHOOSER_ACTION_OPEN,
|
GTK_FILE_CHOOSER_ACTION_OPEN,
|
||||||
GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,
|
|
||||||
GTK_STOCK_OPEN, GTK_RESPONSE_ACCEPT,
|
_("_Cancel"), GTK_RESPONSE_CANCEL,
|
||||||
|
_("_Open"), GTK_RESPONSE_ACCEPT,
|
||||||
|
|
||||||
NULL);
|
NULL);
|
||||||
|
|
||||||
filter = gtk_file_filter_new ();
|
filter = gtk_file_filter_new ();
|
||||||
|
@ -534,8 +536,10 @@ gimp_icon_picker_menu_from_file (GtkWidget *widget,
|
||||||
gimp_icon_picker_set_icon_pixbuf (picker, icon_pixbuf);
|
gimp_icon_picker_set_icon_pixbuf (picker, icon_pixbuf);
|
||||||
g_object_unref (icon_pixbuf);
|
g_object_unref (icon_pixbuf);
|
||||||
}
|
}
|
||||||
|
|
||||||
g_free (filename);
|
g_free (filename);
|
||||||
}
|
}
|
||||||
|
|
||||||
gtk_widget_destroy (dialog);
|
gtk_widget_destroy (dialog);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -66,7 +66,7 @@ gimp_open_dialog_new (Gimp *gimp)
|
||||||
"title", _("Open Image"),
|
"title", _("Open Image"),
|
||||||
"role", "gimp-file-open",
|
"role", "gimp-file-open",
|
||||||
"help-id", GIMP_HELP_FILE_OPEN,
|
"help-id", GIMP_HELP_FILE_OPEN,
|
||||||
"stock-id", GTK_STOCK_OPEN,
|
"ok-button-label", _("_Open"),
|
||||||
|
|
||||||
"automatic-label", _("Automatically Detected"),
|
"automatic-label", _("Automatically Detected"),
|
||||||
"automatic-help-id", GIMP_HELP_FILE_OPEN_BY_EXTENSION,
|
"automatic-help-id", GIMP_HELP_FILE_OPEN_BY_EXTENSION,
|
||||||
|
|
|
@ -172,7 +172,7 @@ gimp_pdb_dialog_init (GimpPdbDialog *dialog,
|
||||||
klass->dialogs = g_list_prepend (klass->dialogs, dialog);
|
klass->dialogs = g_list_prepend (klass->dialogs, dialog);
|
||||||
|
|
||||||
gtk_dialog_add_button (GTK_DIALOG (dialog),
|
gtk_dialog_add_button (GTK_DIALOG (dialog),
|
||||||
GTK_STOCK_CLOSE, GTK_RESPONSE_CLOSE);
|
_("_Close"), GTK_RESPONSE_CLOSE);
|
||||||
}
|
}
|
||||||
|
|
||||||
static void
|
static void
|
||||||
|
|
|
@ -88,7 +88,7 @@ gimp_progress_dialog_init (GimpProgressDialog *dialog)
|
||||||
&dialog->box);
|
&dialog->box);
|
||||||
|
|
||||||
gtk_dialog_add_button (GTK_DIALOG (dialog),
|
gtk_dialog_add_button (GTK_DIALOG (dialog),
|
||||||
GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL);
|
_("_Cancel"), GTK_RESPONSE_CANCEL);
|
||||||
gtk_dialog_set_default_response (GTK_DIALOG (dialog), GTK_RESPONSE_CANCEL);
|
gtk_dialog_set_default_response (GTK_DIALOG (dialog), GTK_RESPONSE_CANCEL);
|
||||||
|
|
||||||
gtk_widget_set_size_request (GTK_WIDGET (dialog), PROGRESS_DIALOG_WIDTH, -1);
|
gtk_widget_set_size_request (GTK_WIDGET (dialog), PROGRESS_DIALOG_WIDTH, -1);
|
||||||
|
|
|
@ -138,7 +138,7 @@ gimp_save_dialog_new (Gimp *gimp)
|
||||||
"title", _("Save Image"),
|
"title", _("Save Image"),
|
||||||
"role", "gimp-file-save",
|
"role", "gimp-file-save",
|
||||||
"help-id", GIMP_HELP_FILE_SAVE,
|
"help-id", GIMP_HELP_FILE_SAVE,
|
||||||
"stock-id", GTK_STOCK_SAVE,
|
"ok-button-label", _("_Save"),
|
||||||
|
|
||||||
"automatic-label", _("By Extension"),
|
"automatic-label", _("By Extension"),
|
||||||
"automatic-help-id", GIMP_HELP_FILE_SAVE_BY_EXTENSION,
|
"automatic-help-id", GIMP_HELP_FILE_SAVE_BY_EXTENSION,
|
||||||
|
|
|
@ -693,7 +693,7 @@ gimp_settings_box_manage_activate (GtkWidget *widget,
|
||||||
toplevel, 0,
|
toplevel, 0,
|
||||||
NULL, NULL,
|
NULL, NULL,
|
||||||
|
|
||||||
GTK_STOCK_CLOSE, GTK_RESPONSE_CLOSE,
|
_("_Close"), GTK_RESPONSE_CLOSE,
|
||||||
|
|
||||||
NULL);
|
NULL);
|
||||||
|
|
||||||
|
@ -764,12 +764,13 @@ gimp_settings_box_file_dialog (GimpSettingsBox *box,
|
||||||
GTK_FILE_CHOOSER_ACTION_SAVE :
|
GTK_FILE_CHOOSER_ACTION_SAVE :
|
||||||
GTK_FILE_CHOOSER_ACTION_OPEN,
|
GTK_FILE_CHOOSER_ACTION_OPEN,
|
||||||
|
|
||||||
GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,
|
_("_Cancel"), GTK_RESPONSE_CANCEL,
|
||||||
save ? GTK_STOCK_SAVE : GTK_STOCK_OPEN,
|
save ?
|
||||||
GTK_RESPONSE_OK,
|
_("_Save") : _("_Open"), GTK_RESPONSE_OK,
|
||||||
|
|
||||||
NULL);
|
NULL);
|
||||||
|
|
||||||
|
gtk_dialog_set_default_response (GTK_DIALOG (dialog), GTK_RESPONSE_OK);
|
||||||
gtk_dialog_set_alternative_button_order (GTK_DIALOG (dialog),
|
gtk_dialog_set_alternative_button_order (GTK_DIALOG (dialog),
|
||||||
GTK_RESPONSE_OK,
|
GTK_RESPONSE_OK,
|
||||||
GTK_RESPONSE_CANCEL,
|
GTK_RESPONSE_CANCEL,
|
||||||
|
@ -779,15 +780,13 @@ gimp_settings_box_file_dialog (GimpSettingsBox *box,
|
||||||
|
|
||||||
gtk_window_set_role (GTK_WINDOW (dialog), "gimp-import-export-settings");
|
gtk_window_set_role (GTK_WINDOW (dialog), "gimp-import-export-settings");
|
||||||
gtk_window_set_position (GTK_WINDOW (dialog), GTK_WIN_POS_MOUSE);
|
gtk_window_set_position (GTK_WINDOW (dialog), GTK_WIN_POS_MOUSE);
|
||||||
|
gtk_window_set_destroy_with_parent (GTK_WINDOW (dialog), TRUE);
|
||||||
|
|
||||||
g_object_add_weak_pointer (G_OBJECT (dialog), (gpointer) &private->file_dialog);
|
g_object_add_weak_pointer (G_OBJECT (dialog), (gpointer) &private->file_dialog);
|
||||||
g_signal_connect (toplevel, "unmap",
|
g_signal_connect (toplevel, "unmap",
|
||||||
G_CALLBACK (gimp_settings_box_toplevel_unmap),
|
G_CALLBACK (gimp_settings_box_toplevel_unmap),
|
||||||
dialog);
|
dialog);
|
||||||
|
|
||||||
gtk_window_set_destroy_with_parent (GTK_WINDOW (dialog), TRUE);
|
|
||||||
gtk_dialog_set_default_response (GTK_DIALOG (dialog), GTK_RESPONSE_OK);
|
|
||||||
|
|
||||||
if (save)
|
if (save)
|
||||||
gtk_file_chooser_set_do_overwrite_confirmation (GTK_FILE_CHOOSER (dialog),
|
gtk_file_chooser_set_do_overwrite_confirmation (GTK_FILE_CHOOSER (dialog),
|
||||||
TRUE);
|
TRUE);
|
||||||
|
|
|
@ -162,7 +162,7 @@ gimp_text_editor_new (const gchar *title,
|
||||||
NULL);
|
NULL);
|
||||||
|
|
||||||
gtk_dialog_add_button (GTK_DIALOG (editor),
|
gtk_dialog_add_button (GTK_DIALOG (editor),
|
||||||
GTK_STOCK_CLOSE, GTK_RESPONSE_CLOSE);
|
_("_Close"), GTK_RESPONSE_CLOSE);
|
||||||
|
|
||||||
g_signal_connect (editor, "response",
|
g_signal_connect (editor, "response",
|
||||||
G_CALLBACK (gtk_widget_destroy),
|
G_CALLBACK (gtk_widget_destroy),
|
||||||
|
|
|
@ -85,6 +85,7 @@ app/actions/vectors-commands.c
|
||||||
app/actions/view-actions.c
|
app/actions/view-actions.c
|
||||||
app/actions/view-commands.c
|
app/actions/view-commands.c
|
||||||
app/actions/window-actions.c
|
app/actions/window-actions.c
|
||||||
|
app/actions/window-commands.c
|
||||||
app/actions/windows-actions.c
|
app/actions/windows-actions.c
|
||||||
app/actions/windows-commands.c
|
app/actions/windows-commands.c
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue