diff options
| author | Jabiertxof <jtx@jtx> | 2017-01-07 18:08:50 +0000 |
|---|---|---|
| committer | Jabiertxof <jtx@jtx> | 2017-01-07 18:08:50 +0000 |
| commit | c3526a9842e9e8e85667d50e2b1862ad487928fb (patch) | |
| tree | 9656c090eb13d7ae46b672d427d78605d7a5d5bd /src | |
| parent | Some naming fix and headers (diff) | |
| parent | install non-executable scripts without executable bit (diff) | |
| download | inkscape-c3526a9842e9e8e85667d50e2b1862ad487928fb.tar.gz inkscape-c3526a9842e9e8e85667d50e2b1862ad487928fb.zip | |
Update to trunk
(bzr r15295.1.58)
Diffstat (limited to 'src')
| -rw-r--r-- | src/sp-object.cpp | 4 | ||||
| -rw-r--r-- | src/widgets/eraser-toolbar.cpp | 2 | ||||
| -rw-r--r-- | src/widgets/measure-toolbar.cpp | 2 | ||||
| -rw-r--r-- | src/widgets/toolbox.cpp | 5 |
4 files changed, 8 insertions, 5 deletions
diff --git a/src/sp-object.cpp b/src/sp-object.cpp index 222626162..0dc301c49 100644 --- a/src/sp-object.cpp +++ b/src/sp-object.cpp @@ -660,7 +660,9 @@ void SPObject::build(SPDocument *document, Inkscape::XML::Node *repr) { object->readAttr("xml:space"); object->readAttr("inkscape:label"); object->readAttr("inkscape:collect"); - if(object->cloned) + if(object->cloned && (repr->attribute("id")) ) // The cases where this happens are when the "original" has no id. This happens + // if it is a SPString (a TextNode, e.g. in a <title>), or when importing + // stuff externally modified to have no id. object->clone_original = document->getObjectById(repr->attribute("id")); for (Inkscape::XML::Node *rchild = repr->firstChild() ; rchild != NULL; rchild = rchild->next()) { diff --git a/src/widgets/eraser-toolbar.cpp b/src/widgets/eraser-toolbar.cpp index 64aace4e7..7377cdc00 100644 --- a/src/widgets/eraser-toolbar.cpp +++ b/src/widgets/eraser-toolbar.cpp @@ -33,6 +33,8 @@ #include "eraser-toolbar.h" #include "calligraphy-toolbar.h" // TODO: needed for update_presets_list +#include <array> + #include "desktop.h" #include "document-undo.h" #include "widgets/ege-adjustment-action.h" diff --git a/src/widgets/measure-toolbar.cpp b/src/widgets/measure-toolbar.cpp index a8c974bbc..066c3fbfa 100644 --- a/src/widgets/measure-toolbar.cpp +++ b/src/widgets/measure-toolbar.cpp @@ -326,7 +326,7 @@ void sp_measure_toolbox_prep(SPDesktop * desktop, GtkActionGroup* mainActions, G { eact = create_adjustment_action( "MeasureOffsetAction", _("Offset"), _("Offset:"), - _("The offset size"), + _("Mark dimension offset"), "/tools/measure/offset", 5.0, GTK_WIDGET(desktop->canvas), holder, FALSE, NULL, 0.0, 90000.0, 1.0, 4.0, diff --git a/src/widgets/toolbox.cpp b/src/widgets/toolbox.cpp index 758a3125b..126eac9cd 100644 --- a/src/widgets/toolbox.cpp +++ b/src/widgets/toolbox.cpp @@ -362,8 +362,6 @@ static gchar const * ui_descr = " <separator />" " <toolitem action='MeasureScaleAction' />" " <separator />" - " <toolitem action='MeasureOffsetAction' />" - " <separator />" " <toolitem action='measure_units_label' />" " <toolitem action='MeasureUnitsAction' />" " <toolitem action='MeasureIgnore1stAndLast' />" @@ -373,8 +371,9 @@ static gchar const * ui_descr = " <toolitem action='MeasureReverse' />" " <toolitem action='MeasureToPhantom' />" " <toolitem action='MeasureToGuides' />" - " <toolitem action='MeasureMarkDimension' />" " <toolitem action='MeasureToItem' />" + " <toolitem action='MeasureMarkDimension' />" + " <toolitem action='MeasureOffsetAction' />" " </toolbar>" " <toolbar name='StarToolbar'>" |