diff options
| author | Martin Owens <doctormo@gmail.com> | 2014-03-26 17:30:14 +0000 |
|---|---|---|
| committer | Martin Owens <doctormo@gmail.com> | 2014-03-26 17:30:14 +0000 |
| commit | bad6e2e0dd2b5cea8a3f8a56f68d301ded69e768 (patch) | |
| tree | 8084b8e99dcc8ce73efbfbaf41786e23c8710bd6 | |
| parent | fix crash when spelling error is in hidden part of a text on path (diff) | |
| download | inkscape-bad6e2e0dd2b5cea8a3f8a56f68d301ded69e768.tar.gz inkscape-bad6e2e0dd2b5cea8a3f8a56f68d301ded69e768.zip | |
Remove Snap menu item and improve grid menu item text
(bzr r13213)
| -rw-r--r-- | src/desktop-events.cpp | 1 | ||||
| -rw-r--r-- | src/interface.cpp | 3 | ||||
| -rw-r--r-- | src/menus-skeleton.h | 1 | ||||
| -rw-r--r-- | src/verbs.cpp | 2 |
4 files changed, 2 insertions, 5 deletions
diff --git a/src/desktop-events.cpp b/src/desktop-events.cpp index 244d5c8ab..0129a382d 100644 --- a/src/desktop-events.cpp +++ b/src/desktop-events.cpp @@ -230,6 +230,7 @@ static gint sp_dt_ruler_event(GtkWidget *widget, GdkEvent *event, SPDesktopWidge // Ruler click (without drag) toggle the guide visibility on and off Inkscape::XML::Node *repr = desktop->namedview->getRepr(); sp_namedview_toggle_guides(sp_desktop_document(desktop), repr); + } clicked = false; diff --git a/src/interface.cpp b/src/interface.cpp index bdbedd311..6eb1b6a5a 100644 --- a/src/interface.cpp +++ b/src/interface.cpp @@ -580,9 +580,6 @@ static gboolean checkitem_update(GtkWidget *widget, GdkEventExpose * /*event*/, else if (!strcmp(action->id, "ToggleGuides")) { ison = dt->namedview->getGuides(); } - else if (!strcmp(action->id, "ToggleSnapGlobal")) { - ison = dt->namedview->getSnapGlobal(); - } else if (!strcmp(action->id, "ViewCmsToggle")) { ison = dt->colorProfAdjustEnabled(); } diff --git a/src/menus-skeleton.h b/src/menus-skeleton.h index 3fcb77207..de48ea2be 100644 --- a/src/menus-skeleton.h +++ b/src/menus-skeleton.h @@ -131,7 +131,6 @@ static char const menus_skeleton[] = " <separator/>\n" " <verb verb-id=\"ToggleGrid\" check=\"yes\" />\n" " <verb verb-id=\"ToggleGuides\" check=\"yes\" />\n" -" <verb verb-id=\"ToggleSnapGlobal\" check=\"yes\" />\n" " <verb verb-id=\"ViewCmsToggle\" check=\"yes\" />\n" " <separator/>\n" " <submenu name=\"" N_("Sh_ow/Hide") "\">\n" diff --git a/src/verbs.cpp b/src/verbs.cpp index 8b72dd5ab..5914c058a 100644 --- a/src/verbs.cpp +++ b/src/verbs.cpp @@ -2743,7 +2743,7 @@ Verb *Verb::_base_verbs[] = { new ZoomVerb(SP_VERB_ZOOM_OUT, "ZoomOut", N_("Zoom Out"), N_("Zoom out"), INKSCAPE_ICON("zoom-out")), new ZoomVerb(SP_VERB_TOGGLE_RULERS, "ToggleRulers", N_("_Rulers"), N_("Show or hide the canvas rulers"), NULL), new ZoomVerb(SP_VERB_TOGGLE_SCROLLBARS, "ToggleScrollbars", N_("Scroll_bars"), N_("Show or hide the canvas scrollbars"), NULL), - new ZoomVerb(SP_VERB_TOGGLE_GRID, "ToggleGrid", N_("_Grid"), N_("Show or hide the grid"), INKSCAPE_ICON("show-grid")), + new ZoomVerb(SP_VERB_TOGGLE_GRID, "ToggleGrid", N_("Page _Grid"), N_("Show or hide the page grid"), INKSCAPE_ICON("show-grid")), new ZoomVerb(SP_VERB_TOGGLE_GUIDES, "ToggleGuides", N_("G_uides"), N_("Show or hide guides (drag from a ruler to create a guide)"), INKSCAPE_ICON("show-guides")), new ZoomVerb(SP_VERB_TOGGLE_SNAPPING, "ToggleSnapGlobal", N_("Snap"), N_("Enable snapping"), INKSCAPE_ICON("snap")), new ZoomVerb(SP_VERB_TOGGLE_COMMANDS_TOOLBAR, "ToggleCommandsToolbar", N_("_Commands Bar"), N_("Show or hide the Commands bar (under the menu)"), NULL), |