From bf5917550889e6a3af05b4b997327dbcc583381a Mon Sep 17 00:00:00 2001 From: John Smith Date: Tue, 3 Apr 2012 12:32:00 +0900 Subject: Fix for 170378 : Select same objects by fill or stroke (bzr r11141) --- src/verbs.cpp | 15 +++++++++++++++ 1 file changed, 15 insertions(+) (limited to 'src/verbs.cpp') diff --git a/src/verbs.cpp b/src/verbs.cpp index d7e5f6841..ab16c6c93 100644 --- a/src/verbs.cpp +++ b/src/verbs.cpp @@ -961,6 +961,15 @@ void EditVerb::perform(SPAction *action, void *data) case SP_VERB_EDIT_SELECT_ALL: SelectionHelper::selectAll(dt); break; + case SP_VERB_EDIT_SELECT_SAME_FILL_STROKE: + SelectionHelper::selectSameFillStroke(dt); + break; + case SP_VERB_EDIT_SELECT_SAME_FILL: + SelectionHelper::selectSameFill(dt); + break; + case SP_VERB_EDIT_SELECT_SAME_STROKE: + SelectionHelper::selectSameStroke(dt); + break; case SP_VERB_EDIT_INVERT: SelectionHelper::invert(dt); break; @@ -2288,6 +2297,12 @@ Verb *Verb::_base_verbs[] = { N_("Select all objects or all nodes"), GTK_STOCK_SELECT_ALL), new EditVerb(SP_VERB_EDIT_SELECT_ALL_IN_ALL_LAYERS, "EditSelectAllInAllLayers", N_("Select All in All La_yers"), N_("Select all objects in all visible and unlocked layers"), INKSCAPE_ICON("edit-select-all-layers")), + new EditVerb(SP_VERB_EDIT_SELECT_SAME_FILL_STROKE, "EditSelectSameFillStroke", N_("S_ame Fill and Stroke"), + N_("Select all objects with the same fill and stroke as the selected objects"), GTK_STOCK_SELECT_ALL), + new EditVerb(SP_VERB_EDIT_SELECT_SAME_FILL, "EditSelectSameFill", N_("Same _Fill"), + N_("Select all objects with the same fill as the selected objects"), GTK_STOCK_SELECT_ALL), + new EditVerb(SP_VERB_EDIT_SELECT_SAME_STROKE, "EditSelectSameStroke", N_("Same _Stroke"), + N_("Select all objects with the same stroke as the selected objects"), GTK_STOCK_SELECT_ALL), new EditVerb(SP_VERB_EDIT_INVERT, "EditInvert", N_("In_vert Selection"), N_("Invert selection (unselect what is selected and select everything else)"), INKSCAPE_ICON("edit-select-invert")), new EditVerb(SP_VERB_EDIT_INVERT_IN_ALL_LAYERS, "EditInvertInAllLayers", N_("Invert in All Layers"), -- cgit v1.2.3 From 4d44c257559a9cea38f69eb340fad84688aca3e8 Mon Sep 17 00:00:00 2001 From: John Smith Date: Wed, 4 Apr 2012 18:54:17 +0900 Subject: Fix for 170378 : Select same objects by fill or stroke : Added stroke style (bzr r11146) --- src/verbs.cpp | 19 ++++++++++++------- 1 file changed, 12 insertions(+), 7 deletions(-) (limited to 'src/verbs.cpp') diff --git a/src/verbs.cpp b/src/verbs.cpp index ab16c6c93..913cec837 100644 --- a/src/verbs.cpp +++ b/src/verbs.cpp @@ -964,11 +964,14 @@ void EditVerb::perform(SPAction *action, void *data) case SP_VERB_EDIT_SELECT_SAME_FILL_STROKE: SelectionHelper::selectSameFillStroke(dt); break; - case SP_VERB_EDIT_SELECT_SAME_FILL: - SelectionHelper::selectSameFill(dt); + case SP_VERB_EDIT_SELECT_SAME_FILL_COLOR: + SelectionHelper::selectSameFillColor(dt); break; - case SP_VERB_EDIT_SELECT_SAME_STROKE: - SelectionHelper::selectSameStroke(dt); + case SP_VERB_EDIT_SELECT_SAME_STROKE_COLOR: + SelectionHelper::selectSameStrokeColor(dt); + break; + case SP_VERB_EDIT_SELECT_SAME_STROKE_STYLE: + SelectionHelper::selectSameStrokeStyle(dt); break; case SP_VERB_EDIT_INVERT: SelectionHelper::invert(dt); @@ -2297,12 +2300,14 @@ Verb *Verb::_base_verbs[] = { N_("Select all objects or all nodes"), GTK_STOCK_SELECT_ALL), new EditVerb(SP_VERB_EDIT_SELECT_ALL_IN_ALL_LAYERS, "EditSelectAllInAllLayers", N_("Select All in All La_yers"), N_("Select all objects in all visible and unlocked layers"), INKSCAPE_ICON("edit-select-all-layers")), - new EditVerb(SP_VERB_EDIT_SELECT_SAME_FILL_STROKE, "EditSelectSameFillStroke", N_("S_ame Fill and Stroke"), + new EditVerb(SP_VERB_EDIT_SELECT_SAME_FILL_STROKE, "EditSelectSameFillStroke", N_("Fill _and Stroke"), N_("Select all objects with the same fill and stroke as the selected objects"), GTK_STOCK_SELECT_ALL), - new EditVerb(SP_VERB_EDIT_SELECT_SAME_FILL, "EditSelectSameFill", N_("Same _Fill"), + new EditVerb(SP_VERB_EDIT_SELECT_SAME_FILL_COLOR, "EditSelectSameFillColor", N_("_Fill Color"), N_("Select all objects with the same fill as the selected objects"), GTK_STOCK_SELECT_ALL), - new EditVerb(SP_VERB_EDIT_SELECT_SAME_STROKE, "EditSelectSameStroke", N_("Same _Stroke"), + new EditVerb(SP_VERB_EDIT_SELECT_SAME_STROKE_COLOR, "EditSelectSameStrokeColor", N_("_Stroke Color"), N_("Select all objects with the same stroke as the selected objects"), GTK_STOCK_SELECT_ALL), + new EditVerb(SP_VERB_EDIT_SELECT_SAME_STROKE_STYLE, "EditSelectSameStrokeStyle", N_("Stroke St_yle"), + N_("Select all objects with the same stroke style (width, dsh, markers) as the selected objects"), GTK_STOCK_SELECT_ALL), new EditVerb(SP_VERB_EDIT_INVERT, "EditInvert", N_("In_vert Selection"), N_("Invert selection (unselect what is selected and select everything else)"), INKSCAPE_ICON("edit-select-invert")), new EditVerb(SP_VERB_EDIT_INVERT_IN_ALL_LAYERS, "EditInvertInAllLayers", N_("Invert in All Layers"), -- cgit v1.2.3 From ba5269e29bf844fe52429f8549b65d716d942ac4 Mon Sep 17 00:00:00 2001 From: Nicolas Dufour Date: Fri, 13 Apr 2012 19:54:11 +0200 Subject: Translation. More disambiguations (see Bug #832560). Fixed bugs: - https://launchpad.net/bugs/832560 (bzr r11234) --- src/verbs.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/verbs.cpp') diff --git a/src/verbs.cpp b/src/verbs.cpp index 913cec837..d4ac35b33 100644 --- a/src/verbs.cpp +++ b/src/verbs.cpp @@ -2510,7 +2510,7 @@ Verb *Verb::_base_verbs[] = { N_("Create and edit gradients"), INKSCAPE_ICON("color-gradient")), new ContextVerb(SP_VERB_CONTEXT_ZOOM, "ToolZoom", N_("Zoom"), N_("Zoom in or out"), INKSCAPE_ICON("zoom")), - new ContextVerb(SP_VERB_CONTEXT_MEASURE, "ToolMeasure", N_("Measure"), + new ContextVerb(SP_VERB_CONTEXT_MEASURE, "ToolMeasure", NC_("Measurement tool", "Measure"), N_("Measurement tool"), INKSCAPE_ICON("tool-measure")), new ContextVerb(SP_VERB_CONTEXT_DROPPER, "ToolDropper", N_("Dropper"), N_("Pick colors from image"), INKSCAPE_ICON("color-picker")), -- cgit v1.2.3 From 0024197c76bca50d557edc2824646a636d695c4d Mon Sep 17 00:00:00 2001 From: Alex Valavanis Date: Sun, 15 Apr 2012 01:17:25 +0100 Subject: Get rid of remaining deprecated GDK Key symbols (bzr r11250) --- src/verbs.cpp | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) (limited to 'src/verbs.cpp') diff --git a/src/verbs.cpp b/src/verbs.cpp index d4ac35b33..1b57ad4ff 100644 --- a/src/verbs.cpp +++ b/src/verbs.cpp @@ -84,6 +84,11 @@ #include +#if !GTK_CHECK_VERSION(2,22,0) +#define GDK_KEY_KP_Add 0xffab +#define GDK_KEY_KP_Subtract 0xffad +#endif + using Inkscape::DocumentUndo; //#ifdef WITH_INKBOARD @@ -1656,7 +1661,7 @@ void ZoomVerb::perform(SPAction *action, void *data) case SP_VERB_ZOOM_IN: { gint mul = 1 + gobble_key_events( - GDK_KP_Add, 0); // with any mask + GDK_KEY_KP_Add, 0); // with any mask // While drawing with the pen/pencil tool, zoom towards the end of the unfinished path if (tools_isactive(dt, TOOLS_FREEHAND_PENCIL) || tools_isactive(dt, TOOLS_FREEHAND_PEN)) { SPCurve *rc = SP_DRAW_CONTEXT(ec)->red_curve; @@ -1674,7 +1679,7 @@ void ZoomVerb::perform(SPAction *action, void *data) case SP_VERB_ZOOM_OUT: { gint mul = 1 + gobble_key_events( - GDK_KP_Subtract, 0); // with any mask + GDK_KEY_KP_Subtract, 0); // with any mask // While drawing with the pen/pencil tool, zoom away from the end of the unfinished path if (tools_isactive(dt, TOOLS_FREEHAND_PENCIL) || tools_isactive(dt, TOOLS_FREEHAND_PEN)) { SPCurve *rc = SP_DRAW_CONTEXT(ec)->red_curve; -- cgit v1.2.3