callisto-debian/gimp
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

app: rename all tool-preset dialog related things to "tool presets"

Browse Source 
not just "tool preset". It's also "brushes", "patterns" etc. and not
just "brush" or "pattern".
This commit is contained in:
Michael Natterer
2011-10-09 21:55:58 +02:00
parent 04e8ae8435
commit b3db7e6c4e
10 changed files with 73 additions and 73 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
app/actions/Makefile.am
View File

@ -161,8 +161,8 @@ libappactions_a_SOURCES = \
tool-options-actions.h \ tool-options-actions.h \
tool-options-commands.c \ tool-options-commands.c \
tool-options-commands.h \ tool-options-commands.h \
tool-preset-actions.c \ tool-presets-actions.c \
tool-preset-actions.h \ tool-presets-actions.h \
tool-preset-editor-actions.c \ tool-preset-editor-actions.c \
tool-preset-editor-actions.h \ tool-preset-editor-actions.h \
tools-actions.c \ tools-actions.c \

8
app/actions/actions.c
View File

@ -87,7 +87,7 @@
#include "text-editor-actions.h" #include "text-editor-actions.h"
#include "text-tool-actions.h" #include "text-tool-actions.h"
#include "tool-options-actions.h" #include "tool-options-actions.h"
#include "tool-preset-actions.h" #include "tool-presets-actions.h"
#include "tool-preset-editor-actions.h" #include "tool-preset-editor-actions.h"
#include "tools-actions.h" #include "tools-actions.h"
#include "vectors-actions.h" #include "vectors-actions.h"
@ -172,9 +172,9 @@ static const GimpActionFactoryEntry action_groups[] =
{ "gradients", N_("Gradients"), GIMP_STOCK_GRADIENT, { "gradients", N_("Gradients"), GIMP_STOCK_GRADIENT,
gradients_actions_setup, gradients_actions_setup,
gradients_actions_update }, gradients_actions_update },
{ "tool-preset", N_("Tool Presets"), GIMP_STOCK_TOOL_PRESET, { "tool-presets", N_("Tool Presets"), GIMP_STOCK_TOOL_PRESET,
tool_preset_actions_setup, tool_presets_actions_setup,
tool_preset_actions_update }, tool_presets_actions_update },
{ "tool-preset-editor", N_("Tool Preset Editor"), GIMP_STOCK_TOOL_PRESET, { "tool-preset-editor", N_("Tool Preset Editor"), GIMP_STOCK_TOOL_PRESET,
tool_preset_editor_actions_setup, tool_preset_editor_actions_setup,
tool_preset_editor_actions_update }, tool_preset_editor_actions_update },

70
app/actions/tool-preset-actions.c → app/actions/tool-presets-actions.c
View File

@ -33,73 +33,73 @@
#include "actions.h" #include "actions.h"
#include "data-commands.h" #include "data-commands.h"
#include "tool-preset-actions.h" #include "tool-presets-actions.h"
#include "gimp-intl.h" #include "gimp-intl.h"
static const GimpActionEntry tool_preset_actions[] = static const GimpActionEntry tool_presets_actions[] =
{ {
{ "tool-preset-popup", GIMP_STOCK_TOOL_PRESET, { "tool-presets-popup", GIMP_STOCK_TOOL_PRESET,
NC_("tool-preset-action", "Tool Preset Menu"), NULL, NULL, NULL, NC_("tool-presets-action", "Tool Presets Menu"), NULL, NULL, NULL,
GIMP_HELP_TOOL_PRESET_DIALOG }, GIMP_HELP_TOOL_PRESET_DIALOG },
{ "tool-preset-new", GTK_STOCK_NEW, { "tool-presets-new", GTK_STOCK_NEW,
NC_("tool-preset-action", "_New Tool Preset"), "", NC_("tool-presets-action", "_New Tool Preset"), "",
NC_("tool-preset-action", "Create a new tool preset"), NC_("tool-presets-action", "Create a new tool preset"),
G_CALLBACK (data_new_cmd_callback), G_CALLBACK (data_new_cmd_callback),
GIMP_HELP_TOOL_PRESET_NEW }, GIMP_HELP_TOOL_PRESET_NEW },
{ "tool-preset-duplicate", GIMP_STOCK_DUPLICATE, { "tool-presets-duplicate", GIMP_STOCK_DUPLICATE,
NC_("tool-preset-action", "D_uplicate Tool Preset"), NULL, NC_("tool-presets-action", "D_uplicate Tool Preset"), NULL,
NC_("tool-preset-action", "Duplicate this tool preset"), NC_("tool-presets-action", "Duplicate this tool preset"),
G_CALLBACK (data_duplicate_cmd_callback), G_CALLBACK (data_duplicate_cmd_callback),
GIMP_HELP_TOOL_PRESET_DUPLICATE }, GIMP_HELP_TOOL_PRESET_DUPLICATE },
{ "tool-preset-copy-location", GTK_STOCK_COPY, { "tool-presets-copy-location", GTK_STOCK_COPY,
NC_("tool-preset-action", "Copy Tool Preset _Location"), "", NC_("tool-presets-action", "Copy Tool Preset _Location"), "",
NC_("tool-preset-action", "Copy tool preset file location to clipboard"), NC_("tool-presets-action", "Copy tool preset file location to clipboard"),
G_CALLBACK (data_copy_location_cmd_callback), G_CALLBACK (data_copy_location_cmd_callback),
GIMP_HELP_TOOL_PRESET_COPY_LOCATION }, GIMP_HELP_TOOL_PRESET_COPY_LOCATION },
{ "tool-preset-delete", GTK_STOCK_DELETE, { "tool-presets-delete", GTK_STOCK_DELETE,
NC_("tool-preset-action", "_Delete Tool Preset"), "", NC_("tool-presets-action", "_Delete Tool Preset"), "",
NC_("tool-preset-action", "Delete this tool preset"), NC_("tool-presets-action", "Delete this tool preset"),
G_CALLBACK (data_delete_cmd_callback), G_CALLBACK (data_delete_cmd_callback),
GIMP_HELP_TOOL_PRESET_DELETE }, GIMP_HELP_TOOL_PRESET_DELETE },
{ "tool-preset-refresh", GTK_STOCK_REFRESH, { "tool-presets-refresh", GTK_STOCK_REFRESH,
NC_("tool-preset-action", "_Refresh Tool Presets"), "", NC_("tool-presets-action", "_Refresh Tool Presets"), "",
NC_("tool-preset-action", "Refresh tool presets"), NC_("tool-presets-action", "Refresh tool presets"),
G_CALLBACK (data_refresh_cmd_callback), G_CALLBACK (data_refresh_cmd_callback),
GIMP_HELP_TOOL_PRESET_REFRESH } GIMP_HELP_TOOL_PRESET_REFRESH }
}; };
static const GimpStringActionEntry tool_preset_edit_actions[] = static const GimpStringActionEntry tool_presets_edit_actions[] =
{ {
{ "tool-preset-edit", GTK_STOCK_EDIT, { "tool-presets-edit", GTK_STOCK_EDIT,
NC_("tool-preset-action", "_Edit Tool Preset..."), NULL, NC_("tool-presets-action", "_Edit Tool Preset..."), NULL,
NC_("tool-preset-action", "Edit this tool preset"), NC_("tool-presets-action", "Edit this tool preset"),
"gimp-tool-preset-editor", "gimp-tool-preset-editor",
GIMP_HELP_TOOL_PRESET_EDIT } GIMP_HELP_TOOL_PRESET_EDIT }
}; };
void void
tool_preset_actions_setup (GimpActionGroup *group) tool_presets_actions_setup (GimpActionGroup *group)
{ {
gimp_action_group_add_actions (group, "tool-preset-action", gimp_action_group_add_actions (group, "tool-presets-action",
tool_preset_actions, tool_presets_actions,
G_N_ELEMENTS (tool_preset_actions)); G_N_ELEMENTS (tool_presets_actions));
gimp_action_group_add_string_actions (group, "tool-preset-action", gimp_action_group_add_string_actions (group, "tool-presets-action",
tool_preset_edit_actions, tool_presets_edit_actions,
G_N_ELEMENTS (tool_preset_edit_actions), G_N_ELEMENTS (tool_presets_edit_actions),
G_CALLBACK (data_edit_cmd_callback)); G_CALLBACK (data_edit_cmd_callback));
} }
void void
tool_preset_actions_update (GimpActionGroup *group, tool_presets_actions_update (GimpActionGroup *group,
gpointer user_data) gpointer user_data)
{ {
GimpContext *context = action_data_get_context (user_data); GimpContext *context = action_data_get_context (user_data);
@ -122,10 +122,10 @@ tool_preset_actions_update (GimpActionGroup *group,
#define SET_SENSITIVE(action,condition) \ #define SET_SENSITIVE(action,condition) \
gimp_action_group_set_action_sensitive (group, action, (condition) != 0) gimp_action_group_set_action_sensitive (group, action, (condition) != 0)
SET_SENSITIVE ("tool-preset-edit", tool_preset); SET_SENSITIVE ("tool-presets-edit", tool_preset);
SET_SENSITIVE ("tool-preset-duplicate", tool_preset && GIMP_DATA_GET_CLASS (data)->duplicate); SET_SENSITIVE ("tool-presets-duplicate", tool_preset && GIMP_DATA_GET_CLASS (data)->duplicate);
SET_SENSITIVE ("tool-preset-copy-location", tool_preset && filename); SET_SENSITIVE ("tool-presets-copy-location", tool_preset && filename);
SET_SENSITIVE ("tool-preset-delete", tool_preset && gimp_data_is_deletable (data)); SET_SENSITIVE ("tool-presets-delete", tool_preset && gimp_data_is_deletable (data));
#undef SET_SENSITIVE #undef SET_SENSITIVE
} }

8
app/actions/tool-preset-actions.h → app/actions/tool-presets-actions.h
View File

@ -15,12 +15,12 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>. * along with this program. If not, see <http://www.gnu.org/licenses/>.
*/ */
#ifndef __TOOL_PRESET_ACTIONS_H__ #ifndef __TOOL_PRESETS_ACTIONS_H__
#define __TOOL_PRESET_ACTIONS_H__ #define __TOOL_PRESETS_ACTIONS_H__
void tool_preset_actions_setup (GimpActionGroup *group); void tool_presets_actions_setup (GimpActionGroup *group);
void tool_preset_actions_update (GimpActionGroup *group, void tool_presets_actions_update (GimpActionGroup *group,
gpointer user_data); gpointer user_data);

8
app/menus/menus.c
View File

@ -240,12 +240,12 @@ menus_init (Gimp *gimp,
NULL); NULL);
gimp_menu_factory_manager_register (global_menu_factory, "<ToolPreset>", gimp_menu_factory_manager_register (global_menu_factory, "<ToolPresets>",
"tool-preset", "tool-presets",
"plug-in", "plug-in",
NULL, NULL,
"/tool-preset-popup", "/tool-presets-popup",
"tool-preset-menu.xml", plug_in_menus_setup, "tool-presets-menu.xml", plug_in_menus_setup,
NULL); NULL);
gimp_menu_factory_manager_register (global_menu_factory, "<Fonts>", gimp_menu_factory_manager_register (global_menu_factory, "<Fonts>",

4
app/menus/plug-in-menus.c
View File

@ -342,9 +342,9 @@ plug_in_menus_menu_path_added (GimpPlugInProcedure *plug_in_proc,
plug_in_menus_add_proc (manager, "/patterns-popup", plug_in_menus_add_proc (manager, "/patterns-popup",
plug_in_proc, menu_path); plug_in_proc, menu_path);
} }
else if (! strcmp (manager->name, "<ToolPreset>")) else if (! strcmp (manager->name, "<ToolPresets>"))
{ {
plug_in_menus_add_proc (manager, "/tool-preset-popup", plug_in_menus_add_proc (manager, "/tool-presets-popup",
plug_in_proc, menu_path); plug_in_proc, menu_path);
} }
else if (! strcmp (manager->name, "<Fonts>")) else if (! strcmp (manager->name, "<Fonts>"))

6
app/widgets/gimptoolpresetfactoryview.c
View File

@ -77,12 +77,12 @@ gimp_tool_preset_factory_view_new (GimpViewType view_type,
"view-size", view_size, "view-size", view_size,
"view-border-width", view_border_width, "view-border-width", view_border_width,
"menu-factory", menu_factory, "menu-factory", menu_factory,
"menu-identifier", "<ToolPreset>", "menu-identifier", "<ToolPresets>",
"ui-path", "/tool-preset-popup", "ui-path", "/tool-presets-popup",
NULL); NULL);
if (! gimp_data_factory_view_construct (GIMP_DATA_FACTORY_VIEW (factory_view), if (! gimp_data_factory_view_construct (GIMP_DATA_FACTORY_VIEW (factory_view),
"tool-preset")) "tool-presets"))
{ {
g_object_unref (factory_view); g_object_unref (factory_view);
return NULL; return NULL;

2
menus/Makefile.am
View File

@ -29,7 +29,7 @@ menudata_DATA = \
palettes-menu.xml \ palettes-menu.xml \
patterns-menu.xml \ patterns-menu.xml \
tool-preset-editor-menu.xml \ tool-preset-editor-menu.xml \
tool-preset-menu.xml \ tool-presets-menu.xml \
quick-mask-menu.xml \ quick-mask-menu.xml \
sample-points-menu.xml \ sample-points-menu.xml \
selection-menu.xml \ selection-menu.xml \

16
menus/tool-preset-menu.xml
View File

@ -1,16 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<!DOCTYPE ui SYSTEM "gtkuimanager.dtd">
<ui>
<popup action="tool-preset-popup">
<menuitem action="tool-preset-edit" />
<separator />
<menuitem action="tool-preset-new" />
<menuitem action="tool-preset-duplicate" />
<menuitem action="tool-preset-copy-location" />
<menuitem action="tool-preset-delete" />
<separator />
<menuitem action="tool-preset-refresh" />
<separator />
</popup>
</ui>

16
menus/tool-presets-menu.xml Normal file
View File

@ -0,0 +1,16 @@
<?xml version="1.0" encoding="utf-8"?>
<!DOCTYPE ui SYSTEM "gtkuimanager.dtd">
<ui>
<popup action="tool-presets-popup">
<menuitem action="tool-presets-edit" />
<separator />
<menuitem action="tool-presets-new" />
<menuitem action="tool-presets-duplicate" />
<menuitem action="tool-presets-copy-location" />
<menuitem action="tool-presets-delete" />
<separator />
<menuitem action="tool-presets-refresh" />
<separator />
</popup>
</ui>