[gimp/metadata-browser] app: rename all tool-preset dialog related things to "tool presets"
- From: Roman Joost <romanofski src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gimp/metadata-browser] app: rename all tool-preset dialog related things to "tool presets"
- Date: Fri, 2 Dec 2011 02:15:58 +0000 (UTC)
commit 294e176b568508cf0be7c49a6421cb2886f1231d
Author: Michael Natterer <mitch gimp org>
Date: Sun Oct 9 21:55:58 2011 +0200
app: rename all tool-preset dialog related things to "tool presets"
not just "tool preset". It's also "brushes", "patterns" etc. and not
just "brush" or "pattern".
app/actions/Makefile.am | 4 +-
app/actions/actions.c | 8 +-
...ool-preset-actions.c => tool-presets-actions.c} | 72 ++++++++++----------
...ool-preset-actions.h => tool-presets-actions.h} | 10 ++--
app/menus/menus.c | 8 +-
app/menus/plug-in-menus.c | 4 +-
app/widgets/gimptoolpresetfactoryview.c | 6 +-
menus/Makefile.am | 2 +-
menus/tool-preset-menu.xml | 16 -----
menus/tool-presets-menu.xml | 16 +++++
10 files changed, 73 insertions(+), 73 deletions(-)
---
diff --git a/app/actions/Makefile.am b/app/actions/Makefile.am
index c03921a..5a7d876 100644
--- a/app/actions/Makefile.am
+++ b/app/actions/Makefile.am
@@ -161,8 +161,8 @@ libappactions_a_SOURCES = \
tool-options-actions.h \
tool-options-commands.c \
tool-options-commands.h \
- tool-preset-actions.c \
- tool-preset-actions.h \
+ tool-presets-actions.c \
+ tool-presets-actions.h \
tool-preset-editor-actions.c \
tool-preset-editor-actions.h \
tools-actions.c \
diff --git a/app/actions/actions.c b/app/actions/actions.c
index 084e8e6..c4ca0ab 100644
--- a/app/actions/actions.c
+++ b/app/actions/actions.c
@@ -87,7 +87,7 @@
#include "text-editor-actions.h"
#include "text-tool-actions.h"
#include "tool-options-actions.h"
-#include "tool-preset-actions.h"
+#include "tool-presets-actions.h"
#include "tool-preset-editor-actions.h"
#include "tools-actions.h"
#include "vectors-actions.h"
@@ -172,9 +172,9 @@ static const GimpActionFactoryEntry action_groups[] =
{ "gradients", N_("Gradients"), GIMP_STOCK_GRADIENT,
gradients_actions_setup,
gradients_actions_update },
- { "tool-preset", N_("Tool Presets"), GIMP_STOCK_TOOL_PRESET,
- tool_preset_actions_setup,
- tool_preset_actions_update },
+ { "tool-presets", N_("Tool Presets"), GIMP_STOCK_TOOL_PRESET,
+ tool_presets_actions_setup,
+ tool_presets_actions_update },
{ "tool-preset-editor", N_("Tool Preset Editor"), GIMP_STOCK_TOOL_PRESET,
tool_preset_editor_actions_setup,
tool_preset_editor_actions_update },
diff --git a/app/actions/tool-preset-actions.c b/app/actions/tool-presets-actions.c
similarity index 52%
rename from app/actions/tool-preset-actions.c
rename to app/actions/tool-presets-actions.c
index 62c765a..5ec943d 100644
--- a/app/actions/tool-preset-actions.c
+++ b/app/actions/tool-presets-actions.c
@@ -33,74 +33,74 @@
#include "actions.h"
#include "data-commands.h"
-#include "tool-preset-actions.h"
+#include "tool-presets-actions.h"
#include "gimp-intl.h"
-static const GimpActionEntry tool_preset_actions[] =
+static const GimpActionEntry tool_presets_actions[] =
{
- { "tool-preset-popup", GIMP_STOCK_TOOL_PRESET,
- NC_("tool-preset-action", "Tool Preset Menu"), NULL, NULL, NULL,
+ { "tool-presets-popup", GIMP_STOCK_TOOL_PRESET,
+ NC_("tool-presets-action", "Tool Presets Menu"), NULL, NULL, NULL,
GIMP_HELP_TOOL_PRESET_DIALOG },
- { "tool-preset-new", GTK_STOCK_NEW,
- NC_("tool-preset-action", "_New Tool Preset"), "",
- NC_("tool-preset-action", "Create a new tool preset"),
+ { "tool-presets-new", GTK_STOCK_NEW,
+ NC_("tool-presets-action", "_New Tool Preset"), "",
+ NC_("tool-presets-action", "Create a new tool preset"),
G_CALLBACK (data_new_cmd_callback),
GIMP_HELP_TOOL_PRESET_NEW },
- { "tool-preset-duplicate", GIMP_STOCK_DUPLICATE,
- NC_("tool-preset-action", "D_uplicate Tool Preset"), NULL,
- NC_("tool-preset-action", "Duplicate this tool preset"),
+ { "tool-presets-duplicate", GIMP_STOCK_DUPLICATE,
+ NC_("tool-presets-action", "D_uplicate Tool Preset"), NULL,
+ NC_("tool-presets-action", "Duplicate this tool preset"),
G_CALLBACK (data_duplicate_cmd_callback),
GIMP_HELP_TOOL_PRESET_DUPLICATE },
- { "tool-preset-copy-location", GTK_STOCK_COPY,
- NC_("tool-preset-action", "Copy Tool Preset _Location"), "",
- NC_("tool-preset-action", "Copy tool preset file location to clipboard"),
+ { "tool-presets-copy-location", GTK_STOCK_COPY,
+ NC_("tool-presets-action", "Copy Tool Preset _Location"), "",
+ NC_("tool-presets-action", "Copy tool preset file location to clipboard"),
G_CALLBACK (data_copy_location_cmd_callback),
GIMP_HELP_TOOL_PRESET_COPY_LOCATION },
- { "tool-preset-delete", GTK_STOCK_DELETE,
- NC_("tool-preset-action", "_Delete Tool Preset"), "",
- NC_("tool-preset-action", "Delete this tool preset"),
+ { "tool-presets-delete", GTK_STOCK_DELETE,
+ NC_("tool-presets-action", "_Delete Tool Preset"), "",
+ NC_("tool-presets-action", "Delete this tool preset"),
G_CALLBACK (data_delete_cmd_callback),
GIMP_HELP_TOOL_PRESET_DELETE },
- { "tool-preset-refresh", GTK_STOCK_REFRESH,
- NC_("tool-preset-action", "_Refresh Tool Presets"), "",
- NC_("tool-preset-action", "Refresh tool presets"),
+ { "tool-presets-refresh", GTK_STOCK_REFRESH,
+ NC_("tool-presets-action", "_Refresh Tool Presets"), "",
+ NC_("tool-presets-action", "Refresh tool presets"),
G_CALLBACK (data_refresh_cmd_callback),
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,
- NC_("tool-preset-action", "_Edit Tool Preset..."), NULL,
- NC_("tool-preset-action", "Edit this tool preset"),
+ { "tool-presets-edit", GTK_STOCK_EDIT,
+ NC_("tool-presets-action", "_Edit Tool Preset..."), NULL,
+ NC_("tool-presets-action", "Edit this tool preset"),
"gimp-tool-preset-editor",
GIMP_HELP_TOOL_PRESET_EDIT }
};
void
-tool_preset_actions_setup (GimpActionGroup *group)
+tool_presets_actions_setup (GimpActionGroup *group)
{
- gimp_action_group_add_actions (group, "tool-preset-action",
- tool_preset_actions,
- G_N_ELEMENTS (tool_preset_actions));
+ gimp_action_group_add_actions (group, "tool-presets-action",
+ tool_presets_actions,
+ G_N_ELEMENTS (tool_presets_actions));
- gimp_action_group_add_string_actions (group, "tool-preset-action",
- tool_preset_edit_actions,
- G_N_ELEMENTS (tool_preset_edit_actions),
+ gimp_action_group_add_string_actions (group, "tool-presets-action",
+ tool_presets_edit_actions,
+ G_N_ELEMENTS (tool_presets_edit_actions),
G_CALLBACK (data_edit_cmd_callback));
}
void
-tool_preset_actions_update (GimpActionGroup *group,
- gpointer user_data)
+tool_presets_actions_update (GimpActionGroup *group,
+ gpointer user_data)
{
GimpContext *context = action_data_get_context (user_data);
GimpToolPreset *tool_preset = NULL;
@@ -122,10 +122,10 @@ tool_preset_actions_update (GimpActionGroup *group,
#define SET_SENSITIVE(action,condition) \
gimp_action_group_set_action_sensitive (group, action, (condition) != 0)
- SET_SENSITIVE ("tool-preset-edit", tool_preset);
- SET_SENSITIVE ("tool-preset-duplicate", tool_preset && GIMP_DATA_GET_CLASS (data)->duplicate);
- SET_SENSITIVE ("tool-preset-copy-location", tool_preset && filename);
- SET_SENSITIVE ("tool-preset-delete", tool_preset && gimp_data_is_deletable (data));
+ SET_SENSITIVE ("tool-presets-edit", tool_preset);
+ SET_SENSITIVE ("tool-presets-duplicate", tool_preset && GIMP_DATA_GET_CLASS (data)->duplicate);
+ SET_SENSITIVE ("tool-presets-copy-location", tool_preset && filename);
+ SET_SENSITIVE ("tool-presets-delete", tool_preset && gimp_data_is_deletable (data));
#undef SET_SENSITIVE
}
diff --git a/app/actions/tool-preset-actions.h b/app/actions/tool-presets-actions.h
similarity index 75%
rename from app/actions/tool-preset-actions.h
rename to app/actions/tool-presets-actions.h
index 8625e02..9bbf8d7 100644
--- a/app/actions/tool-preset-actions.h
+++ b/app/actions/tool-presets-actions.h
@@ -15,13 +15,13 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-#ifndef __TOOL_PRESET_ACTIONS_H__
-#define __TOOL_PRESET_ACTIONS_H__
+#ifndef __TOOL_PRESETS_ACTIONS_H__
+#define __TOOL_PRESETS_ACTIONS_H__
-void tool_preset_actions_setup (GimpActionGroup *group);
-void tool_preset_actions_update (GimpActionGroup *group,
- gpointer user_data);
+void tool_presets_actions_setup (GimpActionGroup *group);
+void tool_presets_actions_update (GimpActionGroup *group,
+ gpointer user_data);
#endif /* __TOOL_PRESET_ACTIONS_H__ */
diff --git a/app/menus/menus.c b/app/menus/menus.c
index 455d388..58cdac3 100644
--- a/app/menus/menus.c
+++ b/app/menus/menus.c
@@ -240,12 +240,12 @@ menus_init (Gimp *gimp,
NULL);
- gimp_menu_factory_manager_register (global_menu_factory, "<ToolPreset>",
- "tool-preset",
+ gimp_menu_factory_manager_register (global_menu_factory, "<ToolPresets>",
+ "tool-presets",
"plug-in",
NULL,
- "/tool-preset-popup",
- "tool-preset-menu.xml", plug_in_menus_setup,
+ "/tool-presets-popup",
+ "tool-presets-menu.xml", plug_in_menus_setup,
NULL);
gimp_menu_factory_manager_register (global_menu_factory, "<Fonts>",
diff --git a/app/menus/plug-in-menus.c b/app/menus/plug-in-menus.c
index 0c9081c..4d1d2da 100644
--- a/app/menus/plug-in-menus.c
+++ b/app/menus/plug-in-menus.c
@@ -342,9 +342,9 @@ plug_in_menus_menu_path_added (GimpPlugInProcedure *plug_in_proc,
plug_in_menus_add_proc (manager, "/patterns-popup",
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);
}
else if (! strcmp (manager->name, "<Fonts>"))
diff --git a/app/widgets/gimptoolpresetfactoryview.c b/app/widgets/gimptoolpresetfactoryview.c
index 4d0b8cd..0ec873d 100644
--- a/app/widgets/gimptoolpresetfactoryview.c
+++ b/app/widgets/gimptoolpresetfactoryview.c
@@ -77,12 +77,12 @@ gimp_tool_preset_factory_view_new (GimpViewType view_type,
"view-size", view_size,
"view-border-width", view_border_width,
"menu-factory", menu_factory,
- "menu-identifier", "<ToolPreset>",
- "ui-path", "/tool-preset-popup",
+ "menu-identifier", "<ToolPresets>",
+ "ui-path", "/tool-presets-popup",
NULL);
if (! gimp_data_factory_view_construct (GIMP_DATA_FACTORY_VIEW (factory_view),
- "tool-preset"))
+ "tool-presets"))
{
g_object_unref (factory_view);
return NULL;
diff --git a/menus/Makefile.am b/menus/Makefile.am
index b5a8b46..62da794 100644
--- a/menus/Makefile.am
+++ b/menus/Makefile.am
@@ -29,7 +29,7 @@ menudata_DATA = \
palettes-menu.xml \
patterns-menu.xml \
tool-preset-editor-menu.xml \
- tool-preset-menu.xml \
+ tool-presets-menu.xml \
quick-mask-menu.xml \
sample-points-menu.xml \
selection-menu.xml \
diff --git a/menus/tool-presets-menu.xml b/menus/tool-presets-menu.xml
new file mode 100644
index 0000000..acc7d26
--- /dev/null
+++ b/menus/tool-presets-menu.xml
@@ -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>
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
