lp:~inkscape.dev/inkscape/guides-improvements

Branch merges

Propose for merging

No branches dependent on this one.

On hold for merging into lp:~inkscape.dev/inkscape/trunk

Inkscape Developers: Pending requested 2012-07-22

Diff: 5623 lines (+2147/-1318)

48 files modified

build.xml (+0/-8)
doc/HACKING.txt (+1/-1)
doc/architecture.txt (+1/-1)
share/icons/icons.svg (+2/-2)
src/Makefile_insert (+1/-1)
src/attributes.cpp (+2/-0)
src/attributes.h (+2/-0)
src/box3d.cpp (+1/-1)
src/desktop-events.cpp (+138/-54)
src/desktop.cpp (+27/-7)
src/desktop.h (+4/-0)
src/display/Makefile_insert (+2/-0)
src/display/canvas-axonomgrid.cpp (+15/-13)
src/display/canvas-axonomgrid.h (+10/-0)
src/display/canvas-grid.cpp (+14/-10)
src/display/canvas-guide.cpp (+549/-0)
src/display/canvas-guide.h (+92/-0)
src/display/guideline.cpp (+38/-6)
src/display/guideline.h (+4/-0)
src/document-undo.cpp (+24/-20)
src/document.cpp (+4/-4)
src/file.cpp (+117/-1)
src/guide-manager.cpp (+154/-0)
src/guide-manager.h (+65/-0)
src/guide-snapper.cpp (+5/-4)
src/helper/geom.cpp (+15/-1)
src/helper/geom.h (+3/-0)
src/line-snapper.cpp (+1/-1)
src/main.cpp (+2/-1)
src/satisfied-guide-cns.cpp (+1/-1)
src/snap.cpp (+11/-10)
src/sp-guide.cpp (+0/-540)
src/sp-guide.h (+0/-88)
src/sp-item-notify-moveto.cpp (+1/-1)
src/sp-item-rm-unsatisfied-cns.cpp (+1/-1)
src/sp-item-update-cns.cpp (+2/-3)
src/sp-item.cpp (+2/-2)
src/sp-line.cpp (+6/-5)
src/sp-namedview.cpp (+30/-6)
src/sp-namedview.h (+7/-2)
src/sp-path.cpp (+3/-3)
src/sp-rect.cpp (+6/-6)
src/ui/dialog/document-properties.cpp (+687/-450)
src/ui/dialog/document-properties.h (+92/-57)
src/ui/dialog/guides.cpp (+2/-3)
src/ui/dialog/layers.cpp (+1/-2)
src/ui/tools/tool-base.cpp (+1/-1)
src/verbs.cpp (+1/-1)

api

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Related blueprints

11592. By Samuel Chase on 2014-09-23

Merge with trunk

11591. By Samuel Chase on 2014-07-30

Merge with trunk

11590. By Samuel Chase on 2014-07-30

Intermediate GTK3 migration attempt commit

11589. By Samuel Chase on 2014-06-24

Remove unnecessary headers

11588. By Samuel Chase on 2014-06-24

Fix Undo for guide-multi-delete

- Some unrelated stylistic change.

11587. By Samuel Chase on 2014-06-14

Implement multiple guide selection and deletion

- Some unrelated stylistic refactoring
- Made some functions private

11586. By Samuel Chase on 2014-06-14

Refactor populate_guides_list()

- Remove unnecessary checks.
- Remove C-style cast.
- Use more descriptive variable names.
- Fix unrelated documentation formatting.

11585. By Samuel Chase on 2014-06-11

Merge with trunk

11584. By Samuel Chase on 2014-05-22

Merge with trunk.

11583. By Samuel Chase on 2014-05-22

Fix formatting of widget_array[]