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

use GTK_STOCK_FILE for File actions. 

2005-09-19  Sven Neumann  <sven@gimp.org>

	* app/actions/actions.c: use GTK_STOCK_FILE for File actions.

	* app/actions/dialogs-actions.c
	* plug-ins/gimpressionist/gimpressionist.c
	* plug-ins/print/gimp_main_window.c: use GTK_STOCK_ABOUT for About
	dialogs.

	* app/actions/actions.c
	* app/actions/brushes-actions.c
	* app/actions/channels-actions.c
	* app/actions/channels-commands.c
	* app/actions/colormap-editor-actions.c
	* app/actions/gradients-actions.c
	* app/actions/layers-actions.c
	* app/actions/layers-commands.c
	* app/actions/palette-editor-actions.c
	* app/actions/palettes-actions.c
	* app/actions/patterns-actions.c
	* app/actions/templates-actions.c
	* app/actions/templates-commands.c
	* app/actions/text-editor-actions.c
	* app/actions/tool-options-actions.c
	* app/actions/vectors-actions.c
	* app/actions/vectors-commands.c
	* app/tools/gimptexttool.c
	* app/widgets/gimpcontrollereditor.c
	* app/widgets/gimpcontrollerlist.c
	* plug-ins/flame/flame.c
	* plug-ins/gflare/gflare.c
	* plug-ins/gimpressionist/orientation.c
	* plug-ins/gimpressionist/size.c
	* plug-ins/metadata/interface.c: s/GIMP_STOCK_EDIT/GTK_STOCK_EDIT/
This commit is contained in:
Sven Neumann 2005-09-19 13:07:24 +00:00 committed by Sven Neumann
parent e4e52e54f3
commit 3b28167dd2
30 changed files with 74 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
ChangeLog
View File

@ -1,3 +1,38 @@
2005-09-19 Sven Neumann <sven@gimp.org>
* app/actions/actions.c: use GTK_STOCK_FILE for File actions.
* app/actions/dialogs-actions.c
* plug-ins/gimpressionist/gimpressionist.c
* plug-ins/print/gimp_main_window.c: use GTK_STOCK_ABOUT for About
dialogs.
* app/actions/actions.c
* app/actions/brushes-actions.c
* app/actions/channels-actions.c
* app/actions/channels-commands.c
* app/actions/colormap-editor-actions.c
* app/actions/gradients-actions.c
* app/actions/layers-actions.c
* app/actions/layers-commands.c
* app/actions/palette-editor-actions.c
* app/actions/palettes-actions.c
* app/actions/patterns-actions.c
* app/actions/templates-actions.c
* app/actions/templates-commands.c
* app/actions/text-editor-actions.c
* app/actions/tool-options-actions.c
* app/actions/vectors-actions.c
* app/actions/vectors-commands.c
* app/tools/gimptexttool.c
* app/widgets/gimpcontrollereditor.c
* app/widgets/gimpcontrollerlist.c
* plug-ins/flame/flame.c
* plug-ins/gflare/gflare.c
* plug-ins/gimpressionist/orientation.c
* plug-ins/gimpressionist/size.c
* plug-ins/metadata/interface.c: s/GIMP_STOCK_EDIT/GTK_STOCK_EDIT/
2005-09-19 Michael Natterer <mitch@gimp.org>
Did a global s/qmask/quick-mask/:

6
app/actions/actions.c
View File

@ -130,13 +130,13 @@ static GimpActionFactoryEntry action_groups[] =
{ "drawable", N_("Drawable"), GIMP_STOCK_LAYER,
drawable_actions_setup,
drawable_actions_update },
{ "edit", N_("Edit"), GIMP_STOCK_EDIT,
{ "edit", N_("Edit"), GTK_STOCK_EDIT,
edit_actions_setup,
edit_actions_update },
{ "error-console", N_("Error Console"), GIMP_STOCK_WARNING,
error_console_actions_setup,
error_console_actions_update },
{ "file", N_("File"), GTK_STOCK_OPEN,
{ "file", N_("File"), GTK_STOCK_FILE,
file_actions_setup,
file_actions_update },
{ "fonts", N_("Fonts"), GIMP_STOCK_FONT,
@ -184,7 +184,7 @@ static GimpActionFactoryEntry action_groups[] =
{ "templates", N_("Templates"), GIMP_STOCK_TEMPLATE,
templates_actions_setup,
templates_actions_update },
{ "text-editor", N_("Text Editor"), GIMP_STOCK_EDIT,
{ "text-editor", N_("Text Editor"), GTK_STOCK_EDIT,
text_editor_actions_setup,
text_editor_actions_update },
{ "tool-options", N_("Tool Options"), GIMP_STOCK_TOOL_OPTIONS,

2
app/actions/brushes-actions.c
View File

@ -76,7 +76,7 @@ static GimpActionEntry brushes_actions[] =
static GimpStringActionEntry brushes_edit_actions[] =
{
{ "brushes-edit", GIMP_STOCK_EDIT,
{ "brushes-edit", GTK_STOCK_EDIT,
N_("_Edit Brush..."), NULL,
N_("Edit brush"),
"gimp-brush-editor",

2
app/actions/channels-actions.c
View File

@ -44,7 +44,7 @@ static GimpActionEntry channels_actions[] =
N_("Channels Menu"), NULL, NULL, NULL,
GIMP_HELP_CHANNEL_DIALOG },
{ "channels-edit-attributes", GIMP_STOCK_EDIT,
{ "channels-edit-attributes", GTK_STOCK_EDIT,
N_("_Edit Channel Attributes..."), NULL,
N_("Edit channel attributes"),
G_CALLBACK (channels_edit_attributes_cmd_callback),

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

@ -85,7 +85,7 @@ channels_edit_attributes_cmd_callback (GtkAction *action,
gimp_object_get_name (GIMP_OBJECT (channel)),
_("Channel Attributes"),
"gimp-channel-edit",
GIMP_STOCK_EDIT,
GTK_STOCK_EDIT,
_("Edit Channel Attributes"),
GIMP_HELP_CHANNEL_EDIT,
_("Edit Channel Color"),

2
app/actions/colormap-actions.c
View File

@ -43,7 +43,7 @@ static GimpActionEntry colormap_editor_actions[] =
N_("Colormap Menu"), NULL, NULL, NULL,
GIMP_HELP_INDEXED_PALETTE_DIALOG },
{ "colormap-editor-edit-color", GIMP_STOCK_EDIT,
{ "colormap-editor-edit-color", GTK_STOCK_EDIT,
N_("_Edit Color..."), NULL,
N_("Edit color"),
G_CALLBACK (colormap_editor_edit_color_cmd_callback),

2
app/actions/colormap-editor-actions.c
View File

@ -43,7 +43,7 @@ static GimpActionEntry colormap_editor_actions[] =
N_("Colormap Menu"), NULL, NULL, NULL,
GIMP_HELP_INDEXED_PALETTE_DIALOG },
{ "colormap-editor-edit-color", GIMP_STOCK_EDIT,
{ "colormap-editor-edit-color", GTK_STOCK_EDIT,
N_("_Edit Color..."), NULL,
N_("Edit color"),
G_CALLBACK (colormap_editor_edit_color_cmd_callback),

2
app/actions/dialogs-actions.c
View File

@ -201,7 +201,7 @@ static GimpStringActionEntry dialogs_toplevel_actions[] =
"gimp-tips-dialog",
GIMP_HELP_TIPS_DIALOG },
{ "dialogs-about", GIMP_STOCK_WILBER,
{ "dialogs-about", GTK_STOCK_ABOUT,
N_("_About"), NULL, NULL,
"gimp-about-dialog",
GIMP_HELP_ABOUT_DIALOG }

2
app/actions/gradients-actions.c
View File

@ -77,7 +77,7 @@ static GimpActionEntry gradients_actions[] =
static GimpStringActionEntry gradients_edit_actions[] =
{
{ "gradients-edit", GIMP_STOCK_EDIT,
{ "gradients-edit", GTK_STOCK_EDIT,
N_("_Edit Gradient..."), NULL,
N_("Edit gradient"),
"gimp-gradient-editor",

4
app/actions/layers-actions.c
View File

@ -62,7 +62,7 @@ static GimpActionEntry layers_actions[] =
G_CALLBACK (layers_text_tool_cmd_callback),
GIMP_HELP_TOOL_TEXT },
{ "layers-edit-attributes", GIMP_STOCK_EDIT,
{ "layers-edit-attributes", GTK_STOCK_EDIT,
N_("_Edit Layer Attributes..."), NULL,
N_("Edit layer attributes"),
G_CALLBACK (layers_edit_attributes_cmd_callback),
@ -186,7 +186,7 @@ static GimpToggleActionEntry layers_toggle_actions[] =
FALSE,
GIMP_HELP_LAYER_LOCK_ALPHA },
{ "layers-mask-edit", GIMP_STOCK_EDIT,
{ "layers-mask-edit", GTK_STOCK_EDIT,
N_("_Edit Layer Mask"), NULL, NULL,
G_CALLBACK (layers_mask_edit_cmd_callback),
FALSE,

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

@ -198,7 +198,7 @@ layers_edit_attributes_cmd_callback (GtkAction *action,
layer_fill_type,
_("Layer Attributes"),
"gimp-layer-edit",
GIMP_STOCK_EDIT,
GTK_STOCK_EDIT,
_("Edit Layer Attributes"),
GIMP_HELP_LAYER_EDIT);

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

@ -43,7 +43,7 @@ static GimpActionEntry palette_editor_actions[] =
N_("Palette Editor Menu"), NULL, NULL, NULL,
GIMP_HELP_PALETTE_EDITOR_DIALOG },
{ "palette-editor-edit-color", GIMP_STOCK_EDIT,
{ "palette-editor-edit-color", GTK_STOCK_EDIT,
N_("_Edit Color..."), "",
N_("Edit color"),
G_CALLBACK (palette_editor_edit_color_cmd_callback),

2
app/actions/palettes-actions.c
View File

@ -83,7 +83,7 @@ static GimpActionEntry palettes_actions[] =
static GimpStringActionEntry palettes_edit_actions[] =
{
{ "palettes-edit", GIMP_STOCK_EDIT,
{ "palettes-edit", GTK_STOCK_EDIT,
N_("_Edit Palette..."), NULL,
N_("Edit palette"),
"gimp-palette-editor",

2
app/actions/patterns-actions.c
View File

@ -76,7 +76,7 @@ static GimpActionEntry patterns_actions[] =
static GimpStringActionEntry patterns_edit_actions[] =
{
{ "patterns-edit", GIMP_STOCK_EDIT,
{ "patterns-edit", GTK_STOCK_EDIT,
N_("_Edit Pattern..."), NULL,
N_("Edit pattern"),
"gimp-pattern-editor",

2
app/actions/templates-actions.c
View File

@ -60,7 +60,7 @@ static GimpActionEntry templates_actions[] =
G_CALLBACK (templates_duplicate_cmd_callback),
GIMP_HELP_TEMPLATE_DUPLICATE },
{ "templates-edit", GIMP_STOCK_EDIT,
{ "templates-edit", GTK_STOCK_EDIT,
N_("_Edit Template..."), "",
N_("Edit the selected template"),
G_CALLBACK (templates_edit_cmd_callback),

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

@ -183,7 +183,7 @@ templates_edit_cmd_callback (GtkAction *action,
GTK_WIDGET (editor),
_("Edit Template"),
"gimp-template-edit",
GIMP_STOCK_EDIT,
GTK_STOCK_EDIT,
_("Edit Template"),
GIMP_HELP_TEMPLATE_EDIT);

2
app/actions/text-editor-actions.c
View File

@ -36,7 +36,7 @@
static GimpActionEntry text_editor_actions[] =
{
{ "text-editor-toolbar", GIMP_STOCK_EDIT,
{ "text-editor-toolbar", GTK_STOCK_EDIT,
"Text Editor Toolbar", NULL, NULL, NULL,
GIMP_HELP_TEXT_EDITOR_DIALOG },

4
app/actions/tool-options-actions.c
View File

@ -64,7 +64,7 @@ static GimpActionEntry tool_options_actions[] =
N_("_Restore Options From"), "", NULL, NULL,
GIMP_HELP_TOOL_OPTIONS_RESTORE },
{ "tool-options-rename-menu", GIMP_STOCK_EDIT,
{ "tool-options-rename-menu", GTK_STOCK_EDIT,
N_("Re_name Saved Options"), NULL, NULL, NULL,
GIMP_HELP_TOOL_OPTIONS_RENAME },
@ -136,7 +136,7 @@ tool_options_actions_update (GimpActionGroup *group,
tool_options_actions_update_presets (group, "tool-options-rename-",
G_CALLBACK (tool_options_rename_saved_cmd_callback),
GIMP_STOCK_EDIT,
GTK_STOCK_EDIT,
GIMP_HELP_TOOL_OPTIONS_RENAME,
tool_info->options_presets);

2
app/actions/vectors-actions.c
View File

@ -49,7 +49,7 @@ static GimpActionEntry vectors_actions[] =
G_CALLBACK (vectors_vectors_tool_cmd_callback),
GIMP_HELP_TOOL_VECTORS },
{ "vectors-edit-attributes", GIMP_STOCK_EDIT,
{ "vectors-edit-attributes", GTK_STOCK_EDIT,
N_("_Edit Path Attributes..."), NULL,
N_("Edit path attributes"),
G_CALLBACK (vectors_edit_attributes_cmd_callback),

2
app/actions/vectors-commands.c
View File

@ -139,7 +139,7 @@ vectors_edit_attributes_cmd_callback (GtkAction *action,
gimp_object_get_name (GIMP_OBJECT (vectors)),
_("Path Attributes"),
"gimp-vectors-edit",
GIMP_STOCK_EDIT,
GTK_STOCK_EDIT,
_("Edit Path Attributes"),
GIMP_HELP_PATH_EDIT);

2
app/tools/gimptexttool.c
View File

@ -910,7 +910,7 @@ gimp_text_tool_confirm_dialog (GimpTextTool *text_tool)
tool->tool_info->help_id,
GTK_STOCK_NEW, RESPONSE_NEW,
GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,
GIMP_STOCK_EDIT, GTK_RESPONSE_OK,
GTK_STOCK_EDIT, GTK_RESPONSE_OK,
NULL);
gtk_dialog_set_alternative_button_order (GTK_DIALOG (dialog),

4
app/widgets/gimpcontrollereditor.c
View File

@ -429,7 +429,7 @@ gimp_controller_editor_constructor (GType type,
"the controller"),
NULL);
editor->edit_button = gtk_button_new_from_stock (GIMP_STOCK_EDIT);
editor->edit_button = gtk_button_new_from_stock (GTK_STOCK_EDIT);
gtk_box_pack_start (GTK_BOX (hbox), editor->edit_button, TRUE, TRUE, 0);
gtk_widget_show (editor->edit_button);
@ -690,7 +690,7 @@ gimp_controller_editor_edit_clicked (GtkWidget *button,
gimp_viewable_dialog_new (GIMP_VIEWABLE (editor->info),
_("Select Controller Event Action"),
"gimp-controller-action-dialog",
GIMP_STOCK_EDIT,
GTK_STOCK_EDIT,
title,
gtk_widget_get_toplevel (GTK_WIDGET (editor)),
gimp_standard_help_func,

4
app/widgets/gimpcontrollerlist.c
View File

@ -325,7 +325,7 @@ gimp_controller_list_init (GimpControllerList *list)
list->edit_button =
gimp_editor_add_button (GIMP_EDITOR (list->dest),
GIMP_STOCK_EDIT,
GTK_STOCK_EDIT,
_("Configure the selected controller"),
NULL,
G_CALLBACK (gimp_controller_list_edit_clicked),
@ -633,7 +633,7 @@ gimp_controller_list_edit_clicked (GtkWidget *button,
dialog = gimp_viewable_dialog_new (GIMP_VIEWABLE (list->dest_info),
_("Configure Controller"),
"gimp-controller-editor-dialog",
GIMP_STOCK_EDIT,
GTK_STOCK_EDIT,
_("Configure Input Controller"),
GTK_WIDGET (list),
gimp_standard_help_func,

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

@ -1007,7 +1007,7 @@ flame_dialog (void)
gtk_box_pack_start (GTK_BOX (vbox), vbbox, FALSE, FALSE, 0);
gtk_widget_show (vbbox);
button = gtk_button_new_from_stock (GIMP_STOCK_EDIT);
button = gtk_button_new_from_stock (GTK_STOCK_EDIT);
gtk_box_pack_start (GTK_BOX (vbbox), button, FALSE, FALSE, 0);
gtk_widget_show (button);

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

@ -2853,7 +2853,7 @@ dlg_make_page_selector (GFlareDialog *dlg,
buttons[] =
{
{ GTK_STOCK_NEW, G_CALLBACK (dlg_selector_new_callback) },
{ GIMP_STOCK_EDIT, G_CALLBACK (dlg_selector_edit_callback) },
{ GTK_STOCK_EDIT, G_CALLBACK (dlg_selector_edit_callback) },
{ GTK_STOCK_COPY, G_CALLBACK (dlg_selector_copy_callback) },
{ GTK_STOCK_DELETE, G_CALLBACK (dlg_selector_delete_callback) }
};

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

@ -197,7 +197,7 @@ create_dialog (void)
NULL, 0,
gimp_standard_help_func, HELP_ID,
_("A_bout"), RESPONSE_ABOUT,
GTK_STOCK_ABOUT, RESPONSE_ABOUT,
GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,
GTK_STOCK_OK, GTK_RESPONSE_OK,

2
plug-ins/gimpressionist/orientation.c
View File

@ -177,7 +177,7 @@ create_orientationpage (GtkNotebook *notebook)
orientation_restore ();
tmpw = gtk_button_new_from_stock (GIMP_STOCK_EDIT);
tmpw = gtk_button_new_from_stock (GTK_STOCK_EDIT);
gtk_box_pack_start (GTK_BOX (box4), tmpw, FALSE, FALSE, 0);
gtk_widget_show (tmpw);
g_signal_connect (tmpw, "clicked",

2
plug-ins/gimpressionist/size.c
View File

@ -182,7 +182,7 @@ create_sizepage (GtkNotebook *notebook)
size_type_restore ();
tmpw = gtk_button_new_from_stock (GIMP_STOCK_EDIT);
tmpw = gtk_button_new_from_stock (GTK_STOCK_EDIT);
gtk_box_pack_start (GTK_BOX (box4), tmpw, FALSE, FALSE, 0);
gtk_widget_show (tmpw);
g_signal_connect (tmpw, "clicked",

2
plug-ins/metadata/interface.c
View File

@ -693,7 +693,7 @@ metadata_dialog (gint32 image_ID,
gtk_widget_show (notebook);
mgui.xmp_model = xmp_model;
mgui.edit_icon = gtk_widget_render_icon (mgui.dlg, GIMP_STOCK_EDIT,
mgui.edit_icon = gtk_widget_render_icon (mgui.dlg, GTK_STOCK_EDIT,
GTK_ICON_SIZE_MENU, NULL);
mgui.auto_icon = gtk_widget_render_icon (mgui.dlg, GIMP_STOCK_WILBER,
GTK_ICON_SIZE_MENU, NULL);

9
plug-ins/print/gimp_main_window.c
View File

@ -352,6 +352,7 @@ static void
create_top_level_structure(void)
{
gchar *plug_in_name;
/*
* Create the main dialog
*/
@ -364,7 +365,7 @@ create_top_level_structure(void)
NULL, 0,
gimp_standard_help_func, "file-print-gimp",
_("About"), RESPONSE_ABOUT,
GTK_STOCK_ABOUT, RESPONSE_ABOUT,
_("Save\nSettings"), RESPONSE_SAVE,
_("Print and\nSave Settings"), RESPONSE_PRINTSAVE,
GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,
@ -652,7 +653,7 @@ create_printer_dialog (void)
setup_dialog = gimp_dialog_new (_("Setup Printer"), "print",
NULL, 0,
gimp_standard_help_func, "file-print-gimp",
gimp_standard_help_func, NULL,
GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,
GTK_STOCK_OK, GTK_RESPONSE_OK,
@ -817,7 +818,7 @@ create_new_printer_dialog (void)
new_printer_dialog =
gimp_dialog_new (_("Define New Printer"), "print",
NULL, 0,
gimp_standard_help_func, "file-print-gimp",
gimp_standard_help_func, NULL,
GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,
GTK_STOCK_OK, GTK_RESPONSE_OK,
@ -857,7 +858,7 @@ create_about_dialog (void)
about_dialog =
gimp_dialog_new (_("About Gimp-Print " PLUG_IN_VERSION), "print",
NULL, 0,
gimp_standard_help_func, "file-print-gimp",
gimp_standard_help_func, NULL,
GTK_STOCK_CLOSE, GTK_RESPONSE_CLOSE,