From bd370127fa9f74dcf97c0baa8ca194173f98b772 Mon Sep 17 00:00:00 2001 From: Tim Rawlinson Date: Thu, 7 Feb 2019 22:36:38 +0000 Subject: Fix capitalisation of menu items. --- src/ui/contextmenu.cpp | 8 ++++---- src/verbs.cpp | 14 +++++++------- 2 files changed, 11 insertions(+), 11 deletions(-) (limited to 'src') diff --git a/src/ui/contextmenu.cpp b/src/ui/contextmenu.cpp index 486af0dda..96a9dc649 100644 --- a/src/ui/contextmenu.cpp +++ b/src/ui/contextmenu.cpp @@ -103,7 +103,7 @@ ContextMenu::ContextMenu(SPDesktop *desktop, SPItem *item) : } Gtk::MenuItem* mi; - mi = Gtk::manage(new Gtk::MenuItem(_("Hide selected objects"),true)); + mi = Gtk::manage(new Gtk::MenuItem(_("Hide Selected Objects"),true)); mi->signal_activate().connect(sigc::mem_fun(*this, &ContextMenu::HideSelected)); if (_desktop->selection->isEmpty()) { mi->set_sensitive(false); @@ -119,7 +119,7 @@ ContextMenu::ContextMenu(SPDesktop *desktop, SPItem *item) : mi->show(); append(*mi);//insert(*mi,positionOfLastDialog++); - mi = Gtk::manage(new Gtk::MenuItem(_("Lock selected objects"),true)); + mi = Gtk::manage(new Gtk::MenuItem(_("Lock Selected Objects"),true)); mi->signal_activate().connect(sigc::mem_fun(*this, &ContextMenu::LockSelected)); if (_desktop->selection->isEmpty()) { mi->set_sensitive(false); @@ -413,14 +413,14 @@ void ContextMenu::MakeItemMenu () select_same_submenu->append(*mi); /* Select same stroke style */ - mi = Gtk::manage(new Gtk::MenuItem(_("Object type"), true)); + mi = Gtk::manage(new Gtk::MenuItem(_("Object Type"), true)); mi->signal_activate().connect(sigc::mem_fun(*this, &ContextMenu::SelectSameObjectType)); mi->set_sensitive(!SP_IS_ANCHOR(_item)); mi->show(); select_same_submenu->append(*mi); /* Move to layer */ - mi = Gtk::manage(new Gtk::MenuItem(_("_Move to layer ..."), true)); + mi = Gtk::manage(new Gtk::MenuItem(_("_Move to Layer..."), true)); if (_desktop->selection->isEmpty()) { mi->set_sensitive(FALSE); } else { diff --git a/src/verbs.cpp b/src/verbs.cpp index e18ea71c7..17e31ddbe 100644 --- a/src/verbs.cpp +++ b/src/verbs.cpp @@ -2602,13 +2602,13 @@ Verb *Verb::_base_verbs[] = { INKSCAPE_ICON("document-save-as")), new FileVerb(SP_VERB_FILE_SAVE_A_COPY, "FileSaveACopy", N_("Save a Cop_y..."), N_("Save a copy of the document under a new name"), nullptr), - new FileVerb(SP_VERB_FILE_SAVE_TEMPLATE, "FileSaveTemplate", N_("Save template ..."), + new FileVerb(SP_VERB_FILE_SAVE_TEMPLATE, "FileSaveTemplate", N_("Save Template..."), N_("Save a copy of the document as template"), nullptr), new FileVerb(SP_VERB_FILE_PRINT, "FilePrint", N_("_Print..."), N_("Print document"), INKSCAPE_ICON("document-print")), // TRANSLATORS: "Vacuum Defs" means "Clean up defs" (so as to remove unused definitions) new FileVerb( - SP_VERB_FILE_VACUUM, "FileVacuum", N_("Clean _up document"), + SP_VERB_FILE_VACUUM, "FileVacuum", N_("Clean _Up Document"), N_("Remove unused definitions (such as gradients or clipping paths) from the <defs> of the document"), INKSCAPE_ICON("document-cleanup")), new FileVerb(SP_VERB_FILE_IMPORT, "FileImport", N_("_Import..."), @@ -2756,7 +2756,7 @@ Verb *Verb::_base_verbs[] = { new SelectionVerb(SP_VERB_SELECTION_UNGROUP, "SelectionUnGroup", N_("_Ungroup"), N_("Ungroup selected groups"), INKSCAPE_ICON("object-ungroup")), new SelectionVerb(SP_VERB_SELECTION_UNGROUP_POP_SELECTION, "SelectionUnGroupPopSelection", - N_("_Pop selected objects out of group"), N_("Pop selected objects out of group"), + N_("_Pop Selected Objects out of Group"), N_("Pop selected objects out of group"), INKSCAPE_ICON("object-ungroup-pop-selection")), new SelectionVerb(SP_VERB_SELECTION_TEXTTOPATH, "SelectionTextToPath", N_("_Put on Path"), N_("Put text on path"), @@ -2887,7 +2887,7 @@ Verb *Verb::_base_verbs[] = { nullptr), new LayerVerb(SP_VERB_LAYER_TOGGLE_LOCK, "LayerToggleLock", N_("_Lock/Unlock Current Layer"), N_("Toggle lock on current layer"), nullptr), - new LayerVerb(SP_VERB_LAYER_TOGGLE_HIDE, "LayerToggleHide", N_("_Show/hide Current Layer"), + new LayerVerb(SP_VERB_LAYER_TOGGLE_HIDE, "LayerToggleHide", N_("_Show/Hide Current Layer"), N_("Toggle visibility of current layer"), nullptr), // Object @@ -3126,7 +3126,7 @@ Verb *Verb::_base_verbs[] = { new ZoomVerb(SP_VERB_VIEW_TOGGLE_XRAY, "ViewXRayToggle", N_("Toggle _XRay Mode"), N_("XRay around cursor"), nullptr), - new ZoomVerb(SP_VERB_VIEW_CMS_TOGGLE, "ViewCmsToggle", N_("Color-managed view"), + new ZoomVerb(SP_VERB_VIEW_CMS_TOGGLE, "ViewCmsToggle", N_("Color-Managed View"), N_("Toggle color-managed display for this document window"), INKSCAPE_ICON("color-management")), new ZoomVerb(SP_VERB_VIEW_ICON_PREVIEW, "ViewIconPreview", N_("Ico_n Preview..."), @@ -3197,11 +3197,11 @@ Verb *Verb::_base_verbs[] = { INKSCAPE_ICON("dialog-layers")), new DialogVerb(SP_VERB_DIALOG_OBJECTS, "DialogObjects", N_("Object_s..."), N_("View Objects"), INKSCAPE_ICON("dialog-layers")), - new DialogVerb(SP_VERB_DIALOG_TAGS, "DialogTags", N_("Selection se_ts..."), N_("View Tags"), + new DialogVerb(SP_VERB_DIALOG_TAGS, "DialogTags", N_("Selection Se_ts..."), N_("View Tags"), INKSCAPE_ICON("edit-select-all-layers")), new DialogVerb(SP_VERB_DIALOG_STYLE, "DialogStyle", N_("Style Dialog..."), N_("View Style Dialog"), nullptr), new DialogVerb(SP_VERB_DIALOG_CSS, "DialogCss", N_("Css Dialog..."), N_("View Css Dialog"), nullptr), - new DialogVerb(SP_VERB_DIALOG_LIVE_PATH_EFFECT, "DialogLivePathEffect", N_("Path E_ffects ..."), + new DialogVerb(SP_VERB_DIALOG_LIVE_PATH_EFFECT, "DialogLivePathEffect", N_("Path E_ffects..."), N_("Manage, edit, and apply path effects"), INKSCAPE_ICON("dialog-path-effects")), new DialogVerb(SP_VERB_DIALOG_FILTER_EFFECTS, "DialogFilterEffects", N_("Filter _Editor..."), N_("Manage, edit, and apply SVG filters"), INKSCAPE_ICON("dialog-filters")), -- cgit v1.2.3 From 3ab7b9a2dfb72e046fbf775c25fb1545350ff7f1 Mon Sep 17 00:00:00 2001 From: tim_rawlinson Date: Fri, 8 Feb 2019 13:21:35 +0000 Subject: Fix more capitalisation inconsistencies. --- src/ui/contextmenu.cpp | 4 ++-- src/verbs.cpp | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) (limited to 'src') diff --git a/src/ui/contextmenu.cpp b/src/ui/contextmenu.cpp index 96a9dc649..efbe8b0ff 100644 --- a/src/ui/contextmenu.cpp +++ b/src/ui/contextmenu.cpp @@ -111,7 +111,7 @@ ContextMenu::ContextMenu(SPDesktop *desktop, SPItem *item) : mi->show(); append(*mi);//insert(*mi,positionOfLastDialog++); - mi = Gtk::manage(new Gtk::MenuItem(_("Unhide objects below"),true)); + mi = Gtk::manage(new Gtk::MenuItem(_("Unhide Objects Below"),true)); mi->signal_activate().connect(sigc::bind >(sigc::mem_fun(*this, &ContextMenu::UnHideBelow), down_items)); if (!has_down_hidden) { mi->set_sensitive(false); @@ -127,7 +127,7 @@ ContextMenu::ContextMenu(SPDesktop *desktop, SPItem *item) : mi->show(); append(*mi);//insert(*mi,positionOfLastDialog++); - mi = Gtk::manage(new Gtk::MenuItem(_("Unlock objects below"),true)); + mi = Gtk::manage(new Gtk::MenuItem(_("Unlock Objects Below"),true)); mi->signal_activate().connect(sigc::bind >(sigc::mem_fun(*this, &ContextMenu::UnLockBelow), down_items)); if (!has_down_locked) { mi->set_sensitive(false); diff --git a/src/verbs.cpp b/src/verbs.cpp index 17e31ddbe..deedecf75 100644 --- a/src/verbs.cpp +++ b/src/verbs.cpp @@ -2662,7 +2662,7 @@ Verb *Verb::_base_verbs[] = { N_("Remove any filters from selected objects"), nullptr), new EditVerb(SP_VERB_EDIT_DELETE, "EditDelete", N_("_Delete"), N_("Delete selection"), INKSCAPE_ICON("edit-delete")), - new EditVerb(SP_VERB_EDIT_DUPLICATE, "EditDuplicate", N_("Duplic_ate"), N_("Duplicate selected objects"), + new EditVerb(SP_VERB_EDIT_DUPLICATE, "EditDuplicate", N_("Duplic_ate"), N_("Duplicate Selected Objects"), INKSCAPE_ICON("edit-duplicate")), new EditVerb(SP_VERB_EDIT_CLONE, "EditClone", N_("Create Clo_ne"), N_("Create a clone (a copy linked to the original) of selected object"), INKSCAPE_ICON("edit-clone")), -- cgit v1.2.3 From f07f5ebff9efb6f2255ecb5cc1602b7fdb7c8e05 Mon Sep 17 00:00:00 2001 From: Bryce Harrington Date: Sat, 9 Feb 2019 14:45:05 -0800 Subject: ui: Parse mnemonic for Open _Recent In Gtkmm, looks like when creating a MenuItem, there is a second boolean parameter to indicate if the string should be parsed for mnemonics. When the gtk code was converted to gtkmm (2c971690) the flag was left unspecified and defaulted to false. Fixes: https://gitlab.com/inkscape/inkscape/issues/57 --- src/ui/desktop/menubar.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src') diff --git a/src/ui/desktop/menubar.cpp b/src/ui/desktop/menubar.cpp index 38d2a5ad3..e9ef9e897 100644 --- a/src/ui/desktop/menubar.cpp +++ b/src/ui/desktop/menubar.cpp @@ -464,7 +464,7 @@ build_menu(Gtk::MenuShell* menu, Inkscape::XML::Node* xml, Inkscape::UI::View::V recentchoosermenu->signal_item_activated().connect( sigc::bind(sigc::ptr_fun(&sp_recent_open), recentchoosermenu)); - Gtk::MenuItem* menuitem = Gtk::manage(new Gtk::MenuItem(_("Open _Recent"))); + Gtk::MenuItem* menuitem = Gtk::manage(new Gtk::MenuItem(_("Open _Recent"), true)); menuitem->set_submenu(*recentchoosermenu); menu->append(*menuitem); continue; -- cgit v1.2.3