[Marble-devel] Review Request 119912: Merging is now performed using CTRL+ clicking the two nodes

[Cruceru Calin-Cristian]

-----------------------------------------------------------
This is an automatically generated e-mail. To reply, visit:
https://git.reviewboard.kde.org/r/119912/
-----------------------------------------------------------

Review request for Marble.


Repository: marble


Description
-------

Changed the way merging is performed. This is no longer an action the user has to select (to enter a particular "state"), but simply keep pressing CTRL and click two nodes while having the focus on that item (polygon/path).


Diffs
-----

  src/plugins/render/annotate/PolylineAnnotation.cpp 347a1a9 
  src/plugins/render/annotate/AnnotatePlugin.h 8d459e8 
  src/plugins/render/annotate/AnnotatePlugin.cpp 3ba2505 
  src/plugins/render/annotate/AreaAnnotation.cpp cacd8ce 
  src/plugins/render/annotate/MergingPolygonNodesAnimation.h 7aaed5d 
  src/plugins/render/annotate/MergingPolygonNodesAnimation.cpp 1213222 
  src/plugins/render/annotate/MergingPolylineNodesAnimation.h 36cada1 
  src/plugins/render/annotate/MergingPolylineNodesAnimation.cpp 7fba02e 

Diff: https://git.reviewboard.kde.org/r/119912/diff/


Testing
-------

Tried different 'special' cases and it works nicely, no crash. But more testing is always good.


Thanks,

Cruceru Calin-Cristian

-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://mail.kde.org/pipermail/marble-devel/attachments/20140823/39050c29/attachment.html>