← Back to branch summary

~danieljabailey/inkscape/arc_node_editor

« back to all changes in this revision

Viewing changes to src/ui/tools/measure-tool.cpp

  • Committer: Daniel Bailey
  • Date: 2016-07-09 13:51:59 UTC
  • mfrom: (14888.1.126 inkscape)
  • Revision ID: d@nielbailey.com-20160709135159-0wzbtr0mvmxnjtj0
Merge upstream changes

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/ui/tools/measure-tool.cpp
346
346
    end_p = readMeasurePoint(false);
347
347
    dimension_offset = 35;
348
348
    // create the knots
349
 
    this->knot_start = new SPKnot(desktop, N_("Measure start, <b>Shift+Click</b> for position dialog"));
 
349
    this->knot_start = new SPKnot(desktop, _("Measure start, <b>Shift+Click</b> for position dialog"));
350
350
    this->knot_start->setMode(SP_KNOT_MODE_XOR);
351
351
    this->knot_start->setFill(MT_KNOT_COLOR_NORMAL, MT_KNOT_COLOR_MOUSEOVER, MT_KNOT_COLOR_MOUSEOVER);
352
352
    this->knot_start->setStroke(0x0000007f, 0x0000007f, 0x0000007f);
353
353
    this->knot_start->setShape(SP_KNOT_SHAPE_CIRCLE);
354
354
    this->knot_start->updateCtrl();
355
 
    this->knot_end = new SPKnot(desktop, N_("Measure end, <b>Shift+Click</b> for position dialog"));
 
355
    this->knot_end = new SPKnot(desktop, _("Measure end, <b>Shift+Click</b> for position dialog"));
356
356
    this->knot_end->setMode(SP_KNOT_MODE_XOR);
357
357
    this->knot_end->setFill(MT_KNOT_COLOR_NORMAL, MT_KNOT_COLOR_MOUSEOVER, MT_KNOT_COLOR_MOUSEOVER);
358
358
    this->knot_end->setStroke(0x0000007f, 0x0000007f, 0x0000007f);
565
565
        explicit_base = boost::none;
566
566
        explicit_base_tmp = boost::none;
567
567
        last_end = boost::none;
568
 
        start_p = desktop->w2d(button_w);
569
568
 
570
569
        if (event->button.button == 1 && !this->space_panning) {
571
570
            // save drag origin
778
777
    measure_tmp_items.clear();
779
778
    showCanvasItems(false, false, true);
780
779
    doc->ensureUpToDate();
781
 
    DocumentUndo::done(desktop->getDocument(), SP_VERB_CONTEXT_MEASURE,_("Add Stored to measure tool"));
 
780
    DocumentUndo::done(desktop->getDocument(), SP_VERB_CONTEXT_MEASURE,_("Keep last measure on the canvas, for reference"));
782
781
}
783
782
 
784
783
void MeasureTool::toItem()