summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorMarc Jeanmougin <marc@jeanmougin.fr>2019-07-27 09:49:54 +0000
committerMarc Jeanmougin <marc@jeanmougin.fr>2019-07-27 09:49:54 +0000
commit727140f98fd7b85a25b6b00d6016b18feff2aa34 (patch)
treef647442455e3022294871bbd7098b859b7faa340 /src
parentDistribute/Move considers selection order (diff)
parentRemove some trailing whitespace. (diff)
downloadinkscape-727140f98fd7b85a25b6b00d6016b18feff2aa34.tar.gz
inkscape-727140f98fd7b85a25b6b00d6016b18feff2aa34.zip
Merge branch 'lpe-strings' of https://gitlab.com/Moini/inkscape
Diffstat (limited to 'src')
-rw-r--r--src/live_effects/effect.cpp94
-rw-r--r--src/live_effects/lpe-bool.cpp6
-rw-r--r--src/live_effects/lpe-copy_rotate.cpp2
-rw-r--r--src/live_effects/lpe-mirror_symmetry.cpp22
-rw-r--r--src/live_effects/parameter/originalpath.cpp2
-rw-r--r--src/live_effects/parameter/originalpatharray.cpp2
-rw-r--r--src/live_effects/parameter/path.cpp10
7 files changed, 69 insertions, 69 deletions
diff --git a/src/live_effects/effect.cpp b/src/live_effects/effect.cpp
index acc9dfaa9..1dcdfb566 100644
--- a/src/live_effects/effect.cpp
+++ b/src/live_effects/effect.cpp
@@ -103,7 +103,7 @@ const EnumEffectData<EffectType> LPETypeData[] = {
, "bend_path" //key
, "bend-path" //icon
, "Bend" //untranslated name
- , N_("Bend an object along the curvature of another path.") //description
+ , N_("Bend an object along the curvature of another path") //description
, true //on_path
, true //on_shape
, true //on_group
@@ -117,7 +117,7 @@ const EnumEffectData<EffectType> LPETypeData[] = {
, "gears" //key
, "gears" //icon
, "Gears" //untranslated name
- , N_("Create interlocking, configurable gears based on the nodes of a path.") //description
+ , N_("Create interlocking, configurable gears based on the nodes of a path") //description
, true //on_path
, true //on_shape
, true //on_group
@@ -131,7 +131,7 @@ const EnumEffectData<EffectType> LPETypeData[] = {
, "skeletal" //key
, "skeletal" //icon
, "Pattern Along Path" //untranslated name
- , N_("Place one or more copies of another path along the path.") //description
+ , N_("Place one or more copies of another path along the path") //description
, true //on_path
, true //on_shape
, true //on_group
@@ -145,10 +145,10 @@ const EnumEffectData<EffectType> LPETypeData[] = {
, "curvestitching" //key
, "curvestitching" //icon
, "Stitch Sub-Paths" //untranslated name
- , N_("Draw perpendicular lines between subpaths of a path, like rungs of a ladder.") //description
+ , N_("Draw perpendicular lines between subpaths of a path, like rungs of a ladder") //description
, true //on_path
, false //on_shape
- , false //on_group
+ , true //on_group
, false //on_image
, false //on_text
, false //experimental
@@ -188,7 +188,7 @@ const EnumEffectData<EffectType> LPETypeData[] = {
, "construct_grid" //key
, "construct-grid" //icon
, "Construct grid" //untranslated name
- , N_("Create a (perspective) grid from a 3-node path.") //description
+ , N_("Create a (perspective) grid from a 3-node path") //description
, true //on_path
, true //on_shape
, true //on_group
@@ -216,7 +216,7 @@ const EnumEffectData<EffectType> LPETypeData[] = {
, "envelope" //key
, "envelope" //icon
, "Envelope Deformation" //untranslated name
- , N_("Adjust the shape of an object by transforming paths on its four sides.") //description
+ , N_("Adjust the shape of an object by transforming paths on its four sides") //description
, true //on_path
, true //on_shape
, true //on_group
@@ -230,7 +230,7 @@ const EnumEffectData<EffectType> LPETypeData[] = {
, "interpolate" //key
, "interpolate" //icon
, "Interpolate Sub-Paths" //untranslated name
- , N_("Create a stepwise transition between the 2 subpaths of a path.") //description
+ , N_("Create a stepwise transition between the 2 subpaths of a path") //description
, true //on_path
, false //on_shape
, false //on_group
@@ -244,7 +244,7 @@ const EnumEffectData<EffectType> LPETypeData[] = {
, "rough_hatches" //key
, "rough-hatches" //icon
, "Hatches (rough)" //untranslated name
- , N_("Fill the object with adjustable hatching.") //description
+ , N_("Fill the object with adjustable hatching") //description
, true //on_path
, true //on_shape
, true //on_group
@@ -258,7 +258,7 @@ const EnumEffectData<EffectType> LPETypeData[] = {
, "sketch" //key
, "sketch" //icon
, "Sketch" //untranslated name
- , N_("Draw multiple short strokes along the path, as in a pencil sketch.") //description
+ , N_("Draw multiple short strokes along the path, as in a pencil sketch") //description
, true //on_path
, true //on_shape
, true //on_group
@@ -301,7 +301,7 @@ const EnumEffectData<EffectType> LPETypeData[] = {
, "clone_original" //key
, "clone-original" //icon
, "Clone original" //untranslated name
- , N_("Let a object take on the shape, fill, stroke and/or other attributes of another object.") //description
+ , N_("Let an object take on the shape, fill, stroke and/or other attributes of another object.") //description
, true //on_path
, true //on_shape
, true //on_group
@@ -344,7 +344,7 @@ const EnumEffectData<EffectType> LPETypeData[] = {
, "perspective-envelope" //key wrong key with "-" retain because historic
, "perspective-envelope" //icon
, "Perspective/Envelope" //untranslated name
- , N_("Transform the object to fit into a shape with four corners, either by stretching it or creating the illusion of a 3D-perspective.") //description
+ , N_("Transform the object to fit into a shape with four corners, either by stretching it or creating the illusion of a 3D-perspective") //description
, true //on_path
, true //on_shape
, true //on_group
@@ -372,7 +372,7 @@ const EnumEffectData<EffectType> LPETypeData[] = {
, "transform_2pts" //key
, "transform-2pts" //icon
, "Transform by 2 points" //untranslated name
- , N_("Scale, stretch and rotate an object by two handles.") //description
+ , N_("Scale, stretch and rotate an object by two handles") //description
, true //on_path
, true //on_shape
, true //on_group
@@ -386,7 +386,7 @@ const EnumEffectData<EffectType> LPETypeData[] = {
, "show_handles" //key
, "show-handles" //icon
, "Show handles" //untranslated name
- , N_("Draw the handles and nodes of objects (replaces the original styling with a black stroke).") //description
+ , N_("Draw the handles and nodes of objects (replaces the original styling with a black stroke)") //description
, true //on_path
, true //on_shape
, true //on_group
@@ -400,7 +400,7 @@ const EnumEffectData<EffectType> LPETypeData[] = {
, "roughen" //key
, "roughen" //icon
, "Roughen" //untranslated name
- , N_("Roughen an object by adding and randomly shifting new nodes.") //description
+ , N_("Roughen an object by adding and randomly shifting new nodes") //description
, true //on_path
, true //on_shape
, true //on_group
@@ -442,7 +442,7 @@ const EnumEffectData<EffectType> LPETypeData[] = {
, "taper_stroke" //key
, "taper-stroke" //icon
, "Taper stroke" //untranslated name
- , N_("Let the path's ends narrow down to a tip.") //description
+ , N_("Let the path's ends narrow down to a tip") //description
, true //on_path
, true //on_shape
, false //on_group
@@ -485,7 +485,7 @@ const EnumEffectData<EffectType> LPETypeData[] = {
, "attach_path" //key
, "attach-path" //icon
, "Attach path" //untranslated name
- , N_("Glue the current path's ends to a specific position on one or two other paths.") //description
+ , N_("Glue the current path's ends to a specific position on one or two other paths") //description
, true //on_path
, true //on_shape
, true //on_group
@@ -527,7 +527,7 @@ const EnumEffectData<EffectType> LPETypeData[] = {
, "ellipse_5pts" //key
, "ellipse-5pts" //icon
, "Ellipse by 5 points" //untranslated name
- , N_("Create an ellipse from 5 nodes on its circumference.") //description
+ , N_("Create an ellipse from 5 nodes on its circumference") //description
, true //on_path
, true //on_shape
, false //on_group
@@ -541,7 +541,7 @@ const EnumEffectData<EffectType> LPETypeData[] = {
, "bounding_box" //key
, "bounding-box" //icon
, "Bounding Box" //untranslated name
- , N_("Turn the path into a bounding box that entirely encompasses another path.") //description
+ , N_("Turn the path into a bounding box that entirely encompasses another path") //description
, true //on_path
, true //on_shape
, true //on_group
@@ -556,7 +556,7 @@ const EnumEffectData<EffectType> LPETypeData[] = {
, "measure_segments" //key
, "measure-segments" //icon
, "Measure Segments" //untranslated name
- , N_("Add dimensioning for distances between nodes, optionally with projection and many other configuration options.") //description
+ , N_("Add dimensioning for distances between nodes, optionally with projection and many other configuration options") //description
, true //on_path
, true //on_shape
, false //on_group
@@ -570,7 +570,7 @@ const EnumEffectData<EffectType> LPETypeData[] = {
, "fillet_chamfer" //key
, "fillet-chamfer" //icon
, "Fillet/Chamfer" //untranslated name
- , N_("Adjust the shape of a path's corners, rounding them to a specified radius, or cutting them off.") //description
+ , N_("Adjust the shape of a path's corners, rounding them to a specified radius, or cutting them off") //description
, true //on_path
, true //on_shape
, false //on_group
@@ -584,7 +584,7 @@ const EnumEffectData<EffectType> LPETypeData[] = {
, "bool_op" //key
, "bool-op" //icon
, "Boolean operation" //untranslated name
- , N_("Cut, union, subtract, intersect and divide a path non-destructively with another path.") //description
+ , N_("Cut, union, subtract, intersect and divide a path non-destructively with another path") //description
, true //on_path
, true //on_shape
, true //on_group
@@ -612,7 +612,7 @@ const EnumEffectData<EffectType> LPETypeData[] = {
, "powerclip" //key
, "powerclip" //icon
, "Power clip" //untranslated name
- , N_("Power clip allows to reverse a clip, flatten it...") //description
+ , N_("Invert, hide or flatten a clip (apply like a Boolean operation)") //description
, true //on_path
, true //on_shape
, true //on_group
@@ -626,7 +626,7 @@ const EnumEffectData<EffectType> LPETypeData[] = {
, "powermask" //key
, "powermask" //icon
, "Power mask" //untranslated name
- , N_("Power mask allows inversing the mask, make negative...") //description
+ , N_("Invert or hide a mask, or use its negative") //description
, true //on_path
, true //on_shape
, true //on_group
@@ -640,7 +640,7 @@ const EnumEffectData<EffectType> LPETypeData[] = {
, "pts2ellipse" //key
, "pts2ellipse" //icon
, "Ellipse from points" //untranslated name
- , N_("Draw a circle, ellipse, arc or slice based on the nodes of a path.") //description
+ , N_("Draw a circle, ellipse, arc or slice based on the nodes of a path") //description
, true //on_path
, true //on_shape
, true //on_group
@@ -654,7 +654,7 @@ const EnumEffectData<EffectType> LPETypeData[] = {
, "offset" //key
, "offset" //icon
, "Offset" //untranslated name
- , N_("Offset the path, optionally keeping cusp corners cusp.") //description
+ , N_("Offset the path, optionally keeping cusp corners cusp") //description
, true //on_path
, true //on_shape
, true //on_group
@@ -668,7 +668,7 @@ const EnumEffectData<EffectType> LPETypeData[] = {
, "dashed_stroke" //key
, "dashed-stroke" //icon
, "Dashed Stroke" //untranslated name
- , N_("Add a dashed stroke whose dashes end exactly on a node, optionally with the same number of dashes per path segment.") //description
+ , N_("Add a dashed stroke whose dashes end exactly on a node, optionally with the same number of dashes per path segment") //description
, true //on_path
, true //on_shape
, true //on_group
@@ -683,7 +683,7 @@ const EnumEffectData<EffectType> LPETypeData[] = {
, "doeffectstacktest" //key
, "experimental" //icon
, "doEffect stack test" //untranslated name
- , N_("doEffect stack test") //description
+ , N_("Test LPE") //description
, true //on_path
, true //on_shape
, true //on_group
@@ -697,7 +697,7 @@ const EnumEffectData<EffectType> LPETypeData[] = {
, "angle_bisector" //key
, "experimental" //icon
, "Angle bisector" //untranslated name
- , N_("Angle bisector") //description
+ , N_("Draw a line that halves the angle between the first three nodes of the path") //description
, true //on_path
, true //on_shape
, true //on_group
@@ -711,7 +711,7 @@ const EnumEffectData<EffectType> LPETypeData[] = {
, "circle_with_radius" //key
, "experimental" //icon
, "Circle (by center and radius)" //untranslated name
- , N_("Circle (by center and radius)") //description
+ , N_("Draw a circle, where the first node of the path is the center, and the last determines its radius") //description
, true //on_path
, true //on_shape
, true //on_group
@@ -725,7 +725,7 @@ const EnumEffectData<EffectType> LPETypeData[] = {
, "circle_3pts" //key
, "experimental" //icon
, "Circle by 3 points" //untranslated name
- , N_("Circle by 3 points") //description
+ , N_("Draw a circle whose circumference passes through the first three nodes of the path") //description
, true //on_path
, true //on_shape
, true //on_group
@@ -739,7 +739,7 @@ const EnumEffectData<EffectType> LPETypeData[] = {
, "dynastroke" //key
, "experimental" //icon
, "Dynamic stroke" //untranslated name
- , N_("Dynamic stroke") //description
+ , N_("Create calligraphic strokes with variably shaped ends, making use of a parameter for the brush angle") //description
, true //on_path
, true //on_shape
, true //on_group
@@ -753,7 +753,7 @@ const EnumEffectData<EffectType> LPETypeData[] = {
, "extrude" //key
, "experimental" //icon
, "Extrude" //untranslated name
- , N_("Extrude") //description
+ , N_("Extrude the path, creating a face for each path segment") //description
, true //on_path
, true //on_shape
, true //on_group
@@ -767,7 +767,7 @@ const EnumEffectData<EffectType> LPETypeData[] = {
, "lattice" //key
, "experimental" //icon
, "Lattice Deformation" //untranslated name
- , N_("Lattice Deformation") //description
+ , N_("Deform an object using a 4x4 grid") //description
, true //on_path
, true //on_shape
, true //on_group
@@ -781,7 +781,7 @@ const EnumEffectData<EffectType> LPETypeData[] = {
, "line_segment" //key
, "experimental" //icon
, "Line Segment" //untranslated name
- , N_("Line Segment") //description
+ , N_("Draw a straight line that connects the first and last node of a path") //description
, true //on_path
, true //on_shape
, true //on_group
@@ -795,7 +795,7 @@ const EnumEffectData<EffectType> LPETypeData[] = {
, "parallel" //key
, "experimental" //icon
, "Parallel" //untranslated name
- , N_("Parallel") //description
+ , N_("Create a draggable line that will always be parallel to a two-node path") //description
, true //on_path
, true //on_shape
, true //on_group
@@ -809,7 +809,7 @@ const EnumEffectData<EffectType> LPETypeData[] = {
, "path_length" //key
, "experimental" //icon
, "Path length" //untranslated name
- , N_("Path length") //description
+ , N_("Display the total length of a (curved) path") //description
, true //on_path
, true //on_shape
, true //on_group
@@ -823,7 +823,7 @@ const EnumEffectData<EffectType> LPETypeData[] = {
, "perp_bisector" //key
, "experimental" //icon
, "Perpendicular bisector" //untranslated name
- , N_("Perpendicular bisector") //description
+ , N_("Draw a perpendicular line in the middle of the (imaginary) line that connects the start and end nodes") //description
, true //on_path
, true //on_shape
, true //on_group
@@ -837,7 +837,7 @@ const EnumEffectData<EffectType> LPETypeData[] = {
, "recursive_skeleton" //key
, "experimental" //icon
, "Recursive skeleton" //untranslated name
- , N_("Recursive skeleton") //description
+ , N_("Draw a path recursively") //description
, true //on_path
, true //on_shape
, true //on_group
@@ -851,7 +851,7 @@ const EnumEffectData<EffectType> LPETypeData[] = {
, "tangent_to_curve" //key
, "experimental" //icon
, "Tangent to curve" //untranslated name
- , N_("Tangent to curve") //description
+ , N_("Draw a tangent with variable length and additional angle that can be moved along the path") //description
, true //on_path
, true //on_shape
, true //on_group
@@ -865,7 +865,7 @@ const EnumEffectData<EffectType> LPETypeData[] = {
, "text_label" //key
, "experimental" //icon
, "Text label" //untranslated name
- , N_("Text label") //description
+ , N_("Add a label for the object") //description
, true //on_path
, true //on_shape
, true //on_group
@@ -1113,7 +1113,7 @@ Effect::Effect(LivePathEffectObject *lpeobject)
current_shape(nullptr),
provides_own_flash_paths(true), // is automatically set to false if providesOwnFlashPaths() is not overridden
defaultsopen(false),
- is_ready(false)
+ is_ready(false)
{
registerParameter( dynamic_cast<Parameter *>(&is_visible) );
is_visible.widget_is_visible = false;
@@ -1161,7 +1161,7 @@ Effect::isNodePointSelected(Geom::Point const &nodePoint) const
{
if (selectedNodesPoints.size() > 0) {
using Geom::X;
- using Geom::Y;
+ using Geom::Y;
for (auto p : selectedNodesPoints) {
Geom::Affine transformCoordinate = sp_lpe_item->i2dt_affine();
Geom::Point p2(nodePoint[X],nodePoint[Y]);
@@ -1174,7 +1174,7 @@ Effect::isNodePointSelected(Geom::Point const &nodePoint) const
return false;
}
-void
+void
Effect::processObjects(LPEAction lpe_action)
{
SPDocument * document = SP_ACTIVE_DOCUMENT;
@@ -1389,7 +1389,7 @@ Effect::readallParameters(Inkscape::XML::Node const* repr)
} else {
Glib::ustring pref_path = (Glib::ustring)"/live_effects/" +
(Glib::ustring)LPETypeConverter.get_key(effectType()).c_str() +
- (Glib::ustring)"/" +
+ (Glib::ustring)"/" +
(Glib::ustring)key;
bool valid = prefs->getEntry(pref_path).isValid();
if(valid){
@@ -1571,7 +1571,7 @@ Effect::defaultParamSet()
Gtk::Button *set = Gtk::manage(new Gtk::Button((Glib::ustring)set_or_upd));
Gtk::Button *unset = Gtk::manage(new Gtk::Button(Glib::ustring(_("Unset"))));
unset->signal_clicked().connect(sigc::bind<Glib::ustring, Glib::ustring, Parameter *, Gtk::Label *, Gtk::Button *, Gtk::Button *>(sigc::mem_fun(*this, &Effect::unsetDefaultParam), pref_path, tooltip, param, parameter_label, set, unset));
-
+
set->signal_clicked().connect(sigc::bind<Glib::ustring, Glib::ustring, Parameter *, Gtk::Label *, Gtk::Button *, Gtk::Button *>(sigc::mem_fun(*this, &Effect::setDefaultParam), pref_path, tooltip, param, parameter_label, set, unset));
if (!valid) {
unset->set_sensitive(false);
@@ -1755,4 +1755,4 @@ Effect::providesKnotholder() const
fill-column:99
End:
*/
-// vim: filetype=cpp:expandtab:shiftwidth=4:tabstop=8:softtabstop=4 : \ No newline at end of file
+// vim: filetype=cpp:expandtab:shiftwidth=4:tabstop=8:softtabstop=4 :
diff --git a/src/live_effects/lpe-bool.cpp b/src/live_effects/lpe-bool.cpp
index cecc575fe..0f79c3b73 100644
--- a/src/live_effects/lpe-bool.cpp
+++ b/src/live_effects/lpe-bool.cpp
@@ -52,16 +52,16 @@ static const Util::EnumData<LPEBool::bool_op_ex> BoolOpData[LPEBool::bool_op_ex_
static const Util::EnumDataConverter<LPEBool::bool_op_ex> BoolOpConverter(BoolOpData, sizeof(BoolOpData) / sizeof(*BoolOpData));
static const Util::EnumData<fill_typ> FillTypeData[] = {
- { fill_oddEven, N_("odd-even"), "oddeven" },
+ { fill_oddEven, N_("even-odd"), "oddeven" },
{ fill_nonZero, N_("non-zero"), "nonzero" },
{ fill_positive, N_("positive"), "positive" },
- { fill_justDont, N_("from curve"), "from-curve" }
+ { fill_justDont, N_("take from object"), "from-curve" }
};
static const Util::EnumDataConverter<fill_typ> FillTypeConverter(FillTypeData, sizeof(FillTypeData) / sizeof(*FillTypeData));
static const Util::EnumData<fill_typ> FillTypeDataThis[] = {
- { fill_oddEven, N_("odd-even"), "oddeven" },
+ { fill_oddEven, N_("even-odd"), "oddeven" },
{ fill_nonZero, N_("non-zero"), "nonzero" },
{ fill_positive, N_("positive"), "positive" }
};
diff --git a/src/live_effects/lpe-copy_rotate.cpp b/src/live_effects/lpe-copy_rotate.cpp
index 3a75f9371..8c52d13b0 100644
--- a/src/live_effects/lpe-copy_rotate.cpp
+++ b/src/live_effects/lpe-copy_rotate.cpp
@@ -70,7 +70,7 @@ LPECopyRotate::LPECopyRotate(LivePathEffectObject *lpeobject) :
gap(_("Gap"), _("Gap"), _("Gap space between copies, use small negative gaps to fix some joins"), &wr, this, 0.05),
copies_to_360(_("360° Copies"), _("No rotation angle, fixed to 360°"), "copies_to_360", &wr, this, true),
mirror_copies(_("Mirror copies"), _("Mirror between copies"), "mirror_copies", &wr, this, false),
- split_items(_("Split elements"), _("Split elements, this allow gradients and other paints."), "split_items", &wr, this, false),
+ split_items(_("Split elements"), _("Split elements, so each can have its own style"), "split_items", &wr, this, false),
dist_angle_handle(100.0)
{
show_orig_path = true;
diff --git a/src/live_effects/lpe-mirror_symmetry.cpp b/src/live_effects/lpe-mirror_symmetry.cpp
index dda84d2f1..249aca9e6 100644
--- a/src/live_effects/lpe-mirror_symmetry.cpp
+++ b/src/live_effects/lpe-mirror_symmetry.cpp
@@ -56,7 +56,7 @@ LPEMirrorSymmetry::LPEMirrorSymmetry(LivePathEffectObject *lpeobject) :
discard_orig_path(_("Discard original path"), _("Only keep mirrored part of the path, remove the original."), "discard_orig_path", &wr, this, false),
fuse_paths(_("Fuse paths"), _("Fuse original path and mirror image into a single path"), "fuse_paths", &wr, this, false),
oposite_fuse(_("Fuse opposite sides"), _("Picks the part on the other side of the mirror line as the original."), "oposite_fuse", &wr, this, false),
- split_items(_("Split elements"), _("Split original and mirror image into separate paths. (This allows gradients and other paints.)"), "split_items", &wr, this, false),
+ split_items(_("Split elements"), _("Split original and mirror image into separate paths, so each can have its own style.)"), "split_items", &wr, this, false),
start_point(_("Mirror line start"), _("Start point of mirror line"), "start_point", &wr, this, _("Adjust start point of of mirror line")),
end_point(_("Mirror line end"), _("End point of mirror line"), "end_point", &wr, this, _("Adjust end point of mirror line")),
center_point(_("Mirror line mid"), _("Center point of mirror line"), "center_point", &wr, this, _("Adjust center point of mirror line"))
@@ -95,7 +95,7 @@ LPEMirrorSymmetry::doAfterEffect (SPLPEItem const* lpeitem)
if (root_origin != root) {
return;
}
-
+
if (split_items && !discard_orig_path) {
Geom::Line ls((Geom::Point)start_point, (Geom::Point)end_point);
Geom::Affine m = Geom::reflection (ls.vector(), (Geom::Point)start_point);
@@ -108,7 +108,7 @@ LPEMirrorSymmetry::doAfterEffect (SPLPEItem const* lpeitem)
}
}
-Gtk::Widget *
+Gtk::Widget *
LPEMirrorSymmetry::newWidget()
{
// use manage here, because after deletion of Effect object, others might
@@ -192,7 +192,7 @@ LPEMirrorSymmetry::doBeforeEffect (SPLPEItem const* lpeitem)
//force update
center_horiz = false;
} else {
-
+
if (mode == MT_Y) {
point_a = Geom::Point(boundingbox_X.min(),center_point[Y]);
point_b = Geom::Point(boundingbox_X.max(),center_point[Y]);
@@ -238,7 +238,7 @@ LPEMirrorSymmetry::doBeforeEffect (SPLPEItem const* lpeitem)
Geom::Point trans = center_point - Geom::middle_point((Geom::Point)start_point, (Geom::Point)end_point);
start_point.param_setValue(start_point * trans);
end_point.param_setValue(end_point * trans);
-
+
}
} else if ( mode == MT_V){
SPDocument * document = SP_ACTIVE_DOCUMENT;
@@ -281,7 +281,7 @@ void LPEMirrorSymmetry::cloneStyle(SPObject *orig, SPObject *dest)
}
void
-LPEMirrorSymmetry::cloneD(SPObject *orig, SPObject *dest, bool reset)
+LPEMirrorSymmetry::cloneD(SPObject *orig, SPObject *dest, bool reset)
{
SPDocument * document = SP_ACTIVE_DOCUMENT;
if (!document) {
@@ -295,8 +295,8 @@ LPEMirrorSymmetry::cloneD(SPObject *orig, SPObject *dest, bool reset)
std::vector< SPObject * > childs = orig->childList(true);
size_t index = 0;
for (auto & child : childs) {
- SPObject *dest_child = dest->nthChild(index);
- cloneD(child, dest_child, reset);
+ SPObject *dest_child = dest->nthChild(index);
+ cloneD(child, dest_child, reset);
index++;
}
return;
@@ -409,7 +409,7 @@ LPEMirrorSymmetry::doOnVisibilityToggled(SPLPEItem const* /*lpeitem*/)
processObjects(LPE_VISIBILITY);
}
-void
+void
LPEMirrorSymmetry::doOnRemove (SPLPEItem const* /*lpeitem*/)
{
//set "keep paths" hook on sp-lpe-item.cpp
@@ -449,7 +449,7 @@ LPEMirrorSymmetry::doEffect_path (Geom::PathVector const & path_in)
}
Geom::PathVector const original_pathv = pathv_to_linear_and_cubic_beziers(path_in);
Geom::PathVector path_out;
-
+
if (!discard_orig_path && !fuse_paths) {
path_out = pathv_to_linear_and_cubic_beziers(path_in);
}
@@ -457,7 +457,7 @@ LPEMirrorSymmetry::doEffect_path (Geom::PathVector const & path_in)
Geom::Line line_separation((Geom::Point)start_point, (Geom::Point)end_point);
Geom::Affine m = Geom::reflection (line_separation.vector(), (Geom::Point)start_point);
if (fuse_paths && !discard_orig_path) {
- for (const auto & path_it : original_pathv)
+ for (const auto & path_it : original_pathv)
{
if (path_it.empty()) {
continue;
diff --git a/src/live_effects/parameter/originalpath.cpp b/src/live_effects/parameter/originalpath.cpp
index dd292fee3..6fd63f99e 100644
--- a/src/live_effects/parameter/originalpath.cpp
+++ b/src/live_effects/parameter/originalpath.cpp
@@ -61,7 +61,7 @@ OriginalPathParam::param_newWidget()
pButton->show();
pButton->signal_clicked().connect(sigc::mem_fun(*this, &OriginalPathParam::on_link_button_click));
static_cast<Gtk::HBox*>(_widget)->pack_start(*pButton, true, true);
- pButton->set_tooltip_text(_("Link to path"));
+ pButton->set_tooltip_text(_("Insert from clipboard"));
}
{ // Select original button
diff --git a/src/live_effects/parameter/originalpatharray.cpp b/src/live_effects/parameter/originalpatharray.cpp
index 8728a1f47..d3ecac134 100644
--- a/src/live_effects/parameter/originalpatharray.cpp
+++ b/src/live_effects/parameter/originalpatharray.cpp
@@ -184,7 +184,7 @@ Gtk::Widget* OriginalPathArrayParam::param_newWidget()
pButton->show();
pButton->signal_clicked().connect(sigc::mem_fun(*this, &OriginalPathArrayParam::on_link_button_click));
hbox->pack_start(*pButton, Gtk::PACK_SHRINK);
- pButton->set_tooltip_text(_("Link to path"));
+ pButton->set_tooltip_text(_("Insert from clipboard"));
}
{ // Remove linked path
diff --git a/src/live_effects/parameter/path.cpp b/src/live_effects/parameter/path.cpp
index b8d2f4476..8eb01b502 100644
--- a/src/live_effects/parameter/path.cpp
+++ b/src/live_effects/parameter/path.cpp
@@ -220,7 +220,7 @@ PathParam::param_newWidget()
static_cast<Gtk::HBox*>(_widget)->pack_start(*pButton, true, true);
pButton->set_tooltip_text(_("Edit on-canvas"));
}
-
+
if (_copy_button) {
pIcon = Gtk::manage(sp_get_icon_image(INKSCAPE_ICON("edit-copy"), Gtk::ICON_SIZE_BUTTON));
pButton = Gtk::manage(new Gtk::Button());
@@ -232,7 +232,7 @@ PathParam::param_newWidget()
static_cast<Gtk::HBox*>(_widget)->pack_start(*pButton, true, true);
pButton->set_tooltip_text(_("Copy path"));
}
-
+
if (_paste_button) {
pIcon = Gtk::manage(sp_get_icon_image(INKSCAPE_ICON("edit-paste"), Gtk::ICON_SIZE_BUTTON));
pButton = Gtk::manage(new Gtk::Button());
@@ -253,9 +253,9 @@ PathParam::param_newWidget()
pButton->show();
pButton->signal_clicked().connect(sigc::mem_fun(*this, &PathParam::on_link_button_click));
static_cast<Gtk::HBox*>(_widget)->pack_start(*pButton, true, true);
- pButton->set_tooltip_text(_("Link to path on clipboard"));
+ pButton->set_tooltip_text(_("Insert from clipboard"));
}
-
+
static_cast<Gtk::HBox*>(_widget)->show_all_children();
return dynamic_cast<Gtk::Widget *> (_widget);
@@ -515,7 +515,7 @@ PathParam::paste_param_path(const char *svgd)
path_clipboard *= item->i2doc_affine().inverse();
svgd = sp_svg_write_path( path_clipboard );
}
-
+
param_write_to_repr(svgd);
signal_path_pasted.emit();
}