Merge lp://staging/~penginsbacon/inkscape/fill-n-stroke-cppify into lp://staging/~inkscape.dev/inkscape/trunk

Proposed by Tomasz Boczkowski
Status: Superseded
Proposed branch: lp://staging/~penginsbacon/inkscape/fill-n-stroke-cppify
Merge into: lp://staging/~inkscape.dev/inkscape/trunk
Diff against target: 9988 lines (+3793/-4028)
45 files modified
src/desktop-style.cpp (+2/-2)
src/extension/internal/cairo-render-context.cpp (+8/-9)
src/extension/internal/emf-print.cpp (+4/-4)
src/extension/internal/wmf-print.cpp (+2/-2)
src/extension/param/color.cpp (+32/-41)
src/extension/param/color.h (+7/-2)
src/extension/param/parameter.cpp (+5/-2)
src/knot-holder-entity.cpp (+9/-9)
src/selection-chemistry.cpp (+5/-5)
src/sp-item.cpp (+4/-4)
src/sp-pattern.cpp (+387/-402)
src/sp-pattern.h (+98/-65)
src/ui/CMakeLists.txt (+14/-0)
src/ui/Makefile_insert (+2/-0)
src/ui/dialog/objects.cpp (+17/-20)
src/ui/dialog/objects.h (+6/-3)
src/ui/dialog/tags.cpp (+1/-1)
src/ui/selected-color.cpp (+161/-0)
src/ui/selected-color.h (+96/-0)
src/ui/widget/Makefile_insert (+12/-0)
src/ui/widget/color-entry.cpp (+104/-0)
src/ui/widget/color-entry.h (+53/-0)
src/ui/widget/color-icc-selector.cpp (+570/-620)
src/ui/widget/color-icc-selector.h (+39/-35)
src/ui/widget/color-notebook.cpp (+226/-673)
src/ui/widget/color-notebook.h (+61/-82)
src/ui/widget/color-picker.cpp (+31/-41)
src/ui/widget/color-picker.h (+5/-3)
src/ui/widget/color-scales.cpp (+559/-657)
src/ui/widget/color-scales.h (+64/-56)
src/ui/widget/color-slider.cpp (+611/-727)
src/ui/widget/color-slider.h (+99/-49)
src/ui/widget/color-wheel-selector.cpp (+218/-279)
src/ui/widget/color-wheel-selector.h (+73/-56)
src/widgets/CMakeLists.txt (+0/-10)
src/widgets/Makefile_insert (+0/-10)
src/widgets/fill-style.cpp (+2/-2)
src/widgets/gradient-selector.cpp (+4/-0)
src/widgets/gradient-vector.cpp (+58/-24)
src/widgets/paint-selector.cpp (+52/-54)
src/widgets/paint-selector.h (+13/-3)
src/widgets/sp-color-selector.cpp (+6/-1)
src/widgets/sp-color-selector.h (+8/-0)
src/widgets/swatch-selector.cpp (+58/-70)
src/widgets/swatch-selector.h (+7/-5)
To merge this branch: bzr merge lp://staging/~penginsbacon/inkscape/fill-n-stroke-cppify
Reviewer Review Type Date Requested Status
Tavmjong Bah code Needs Fixing
Review via email: mp+257482@code.staging.launchpad.net

This proposal has been superseded by a proposal from 2015-05-03.

Description of the change

This branch merges the c++-sification effort from GSOC 2014 project.

Refactored classes are related to fill'n'stroke dialog. The list includes:
SPColorSelector
SPColorWheelSelector
SPColorICCSelector
SPColorScales
SPNotebook
SPColorSlider

SPPattern

To post a comment you must log in.
Revision history for this message
Tavmjong Bah (tavmjong-free) wrote :

Mostly looks good. We reviewed the first 5000 lines (the view was truncated there). Saw a bunch of minor white space issues. Reviewed at hackfest.

We are really looking forward to getting this in for 0.92!

review: Needs Fixing (code)
14071. By Tomasz Boczkowski

merge with trunk

14072. By Tomasz Boczkowski

gtk3 compile fix

14073. By Tomasz Boczkowski

Removed unnecessary inclusion of glibmm/threads.h

14074. By Tomasz Boczkowski

merged trunk

14075. By Tomasz Boczkowski

Introduced fixes after merge proposal review

14076. By Tomasz Boczkowski

Removed commented out code from ColorNotebook

14077. By Tomasz Boczkowski

Reformatted refactored files

14078. By Tomasz Boczkowski

Reformatted SPPattern

14079. By Tomasz Boczkowski

renamed SPPattern methods to match coding style

14080. By Tomasz Boczkowski

merged trunk

14081. By Tomasz Boczkowski

Using MODE_SOLID_COLOR in paint selector instead of duplicated MODE_COLOR_RGB and MODE_COLOR_CMYK

14082. By Tomasz Boczkowski

fixed crash in paint selector when changing from gradient to solid color

14083. By Tomasz Boczkowski

merged trunk

14084. By Tomasz Boczkowski

fixed color selector not remembering it's last open tab

14085. By Tomasz Boczkowski

merged trunk

14086. By Tomasz Boczkowski

merged trunk

14087. By Tomasz Boczkowski

fixed: color scales - extra row in RGB mode

14088. By Tomasz Boczkowski

fixed: color scales - updating color when switched from undefined

14089. By Tomasz Boczkowski

fixed: color icc selector - extra rows on startup

Unmerged revisions

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
The diff is not available at this time. You can reload the page or download it.