From 28aa0afd28a6c7113492c3494b8e8dce5286e1ca Mon Sep 17 00:00:00 2001 From: Martin Owens Date: Thu, 20 Apr 2023 10:46:33 -0400 Subject: [PATCH 1/2] Rename 'Effects' group to 'Extensions' Users don't expect extensions to be called Effects in the menu, this term is mostly an internal caligorisation of the type of extensions. Putting no-prefs extensions in their own category. Fixes https://gitlab.com/inkscape/inkscape/-/issues/3346 --- src/actions/actions-effect.cpp | 4 ++-- src/actions/actions-layer.cpp | 34 +++++++++++++++++----------------- src/extension/effect.cpp | 8 ++++---- 3 files changed, 23 insertions(+), 23 deletions(-) diff --git a/src/actions/actions-effect.cpp b/src/actions/actions-effect.cpp index 75d814eb21..e9d539a784 100644 --- a/src/actions/actions-effect.cpp +++ b/src/actions/actions-effect.cpp @@ -59,8 +59,8 @@ std::vector> raw_data_effect = { // clang-format off {"app.edit-remove-filter", N_("Remove Filters"), "Filter", N_("Remove any filters from selected objects")}, - {"app.last-effect", N_("Previous Extension"), "Extension", N_("Repeat the last extension with the same settings")}, - {"app.last-effect-pref", N_("Previous Extension Settings"), "Extension", N_("Repeat the last extension with new settings")} + {"app.last-effect", N_("Previous Extension"), "Extensions", N_("Repeat the last extension with the same settings")}, + {"app.last-effect-pref", N_("Previous Extension Settings"), "Extensions", N_("Repeat the last extension with new settings")} // clang-format on }; diff --git a/src/actions/actions-layer.cpp b/src/actions/actions-layer.cpp index e97e8dfdaa..a1063d0919 100644 --- a/src/actions/actions-layer.cpp +++ b/src/actions/actions-layer.cpp @@ -457,28 +457,28 @@ group_exit (InkscapeWindow* win) std::vector> raw_data_layer = { // clang-format off - {"win.layer-new", N_("Add Layer"), "Layers", N_("Create a new layer")}, - {"win.layer-duplicate", N_("Duplicate Current Layer"), "Layers", N_("Duplicate the current layer")}, - {"win.layer-delete", N_("Delete Current Layer"), "Layers", N_("Delete the current layer")}, - {"win.layer-rename", N_("Rename Layer"), "Layers", N_("Rename the current layer")}, + {"win.layer-new", N_("Add Layer"), "Layer", N_("Create a new layer")}, + {"win.layer-duplicate", N_("Duplicate Current Layer"), "Layer", N_("Duplicate the current layer")}, + {"win.layer-delete", N_("Delete Current Layer"), "Layer", N_("Delete the current layer")}, + {"win.layer-rename", N_("Rename Layer"), "Layer", N_("Rename the current layer")}, - {"win.layer-hide-toggle", N_("Show/Hide Current Layer"), "Layers", N_("Toggle visibility of current layer")}, - {"win.layer-lock-toggle", N_("Lock/Unlock Current Layer"), "Layers", N_("Toggle lock on current layer")}, + {"win.layer-hide-toggle", N_("Show/Hide Current Layer"), "Layer", N_("Toggle visibility of current layer")}, + {"win.layer-lock-toggle", N_("Lock/Unlock Current Layer"), "Layer", N_("Toggle lock on current layer")}, - {"win.layer-previous", N_("Switch to Layer Above"), "Layers", N_("Switch to the layer above the current")}, - {"win.layer-next", N_("Switch to Layer Below"), "Layers", N_("Switch to the layer below the current")}, + {"win.layer-previous", N_("Switch to Layer Above"), "Layer", N_("Switch to the layer above the current")}, + {"win.layer-next", N_("Switch to Layer Below"), "Layer", N_("Switch to the layer below the current")}, - {"win.selection-move-to-layer-above", N_("Move Selection to Layer Above"), "Layers", N_("Move selection to the layer above the current")}, - {"win.selection-move-to-layer-below", N_("Move Selection to Layer Below"), "Layers", N_("Move selection to the layer below the current")}, - {"win.selection-move-to-layer", N_("Move Selection to Layer..."), "Layers", N_("Move selection to layer")}, + {"win.selection-move-to-layer-above", N_("Move Selection to Layer Above"), "Layer", N_("Move selection to the layer above the current")}, + {"win.selection-move-to-layer-below", N_("Move Selection to Layer Below"), "Layer", N_("Move selection to the layer below the current")}, + {"win.selection-move-to-layer", N_("Move Selection to Layer..."), "Layer", N_("Move selection to layer")}, - {"win.layer-top", N_("Layer to Top"), "Layers", N_("Raise the current layer to the top")}, - {"win.layer-raise", N_("Raise Layer"), "Layers", N_("Raise the current layer")}, - {"win.layer-lower", N_("Lower Layer"), "Layers", N_("Lower the current layer")}, - {"win.layer-bottom", N_("Layer to Bottom"), "Layers", N_("Lower the current layer to the bottom")}, + {"win.layer-top", N_("Layer to Top"), "Layer", N_("Raise the current layer to the top")}, + {"win.layer-raise", N_("Raise Layer"), "Layer", N_("Raise the current layer")}, + {"win.layer-lower", N_("Lower Layer"), "Layer", N_("Lower the current layer")}, + {"win.layer-bottom", N_("Layer to Bottom"), "Layer", N_("Lower the current layer to the bottom")}, - {"win.layer-to-group", N_("Layer to Group"), "Layers", N_("Convert the current layer to a group")}, - {"win.layer-from-group", N_("Layer from Group"), "Layers", N_("Convert the group to a layer")}, + {"win.layer-to-group", N_("Layer to Group"), "Layer", N_("Convert the current layer to a group")}, + {"win.layer-from-group", N_("Layer from Group"), "Layer", N_("Convert the group to a layer")}, // These use Layer technology even if they don't act on layers. {"win.selection-group-enter", N_("Enter Group"), "Select", N_("Enter group")}, diff --git a/src/extension/effect.cpp b/src/extension/effect.cpp index cfd47f1689..0877d91e89 100644 --- a/src/extension/effect.cpp +++ b/src/extension/effect.cpp @@ -144,15 +144,15 @@ Effect::Effect (Inkscape::XML::Node *in_repr, Implementation::Implementation *in if (local_effects_menu && local_effects_menu->attribute("name") && !strcmp(local_effects_menu->attribute("name"), ("Filters"))) { std::vector>raw_data_filter = - {{ action_id, get_name(), "Filter", description }, - { action_id + ".noprefs", Glib::ustring(get_name()) + " " + _("(No preferences)"), "Filter", description }}; + {{ action_id, get_name(), "Filters", description }, + { action_id + ".noprefs", Glib::ustring(get_name()) + " " + _("(No preferences)"), "Filters (no prefs)", description }}; app->get_action_extra_data().add_data(raw_data_filter); } else { std::vector>raw_data_effect = - {{ action_id, get_name(), "Effect", description }, - { action_id + ".noprefs", Glib::ustring(get_name()) + " " + _("(No preferences)"), "Effect", description }}; + {{ action_id, get_name(), "Extensions", description }, + { action_id + ".noprefs", Glib::ustring(get_name()) + " " + _("(No preferences)"), "Extensions (no prefs)", description }}; app->get_action_extra_data().add_data(raw_data_effect); sub_menu_list.push_front("Effects"); -- GitLab From 45496ac8ae3f19f0d865659206dd56706780518f Mon Sep 17 00:00:00 2001 From: Martin Owens Date: Thu, 20 Apr 2023 17:14:06 +0000 Subject: [PATCH 2/2] Plural --- src/actions/actions-effect.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/actions/actions-effect.cpp b/src/actions/actions-effect.cpp index e9d539a784..640a219ab3 100644 --- a/src/actions/actions-effect.cpp +++ b/src/actions/actions-effect.cpp @@ -58,7 +58,7 @@ last_effect_pref(InkscapeApplication *app) std::vector> raw_data_effect = { // clang-format off - {"app.edit-remove-filter", N_("Remove Filters"), "Filter", N_("Remove any filters from selected objects")}, + {"app.edit-remove-filter", N_("Remove Filters"), "Filters", N_("Remove any filters from selected objects")}, {"app.last-effect", N_("Previous Extension"), "Extensions", N_("Repeat the last extension with the same settings")}, {"app.last-effect-pref", N_("Previous Extension Settings"), "Extensions", N_("Repeat the last extension with new settings")} // clang-format on -- GitLab