lp:~penginsbacon/inkscape/fill-n-stroke-cppify

Branch merges

Propose for merging

No branches dependent on this one.

Merged into lp:~inkscape.dev/inkscape/trunk at revision 14160

Tavmjong Bah: Approve on 2015-05-18

Diff: 10178 lines (+3899/-4073)

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 (+163/-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 (+586/-620)
src/ui/widget/color-icc-selector.h (+41/-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 (+594/-677)
src/ui/widget/color-scales.h (+66/-56)
src/ui/widget/color-slider.cpp (+611/-727)
src/ui/widget/color-slider.h (+99/-49)
src/ui/widget/color-wheel-selector.cpp (+239/-285)
src/ui/widget/color-wheel-selector.h (+75/-56)
src/widgets/CMakeLists.txt (+0/-10)
src/widgets/Makefile_insert (+0/-10)
src/widgets/fill-style.cpp (+4/-6)
src/widgets/gradient-selector.cpp (+4/-0)
src/widgets/gradient-vector.cpp (+58/-24)
src/widgets/paint-selector.cpp (+75/-67)
src/widgets/paint-selector.h (+14/-5)
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)

api

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Related blueprints

14089. By Tomasz Boczkowski on 2015-05-17

fixed: color icc selector - extra rows on startup

14088. By Tomasz Boczkowski on 2015-05-17

fixed: color scales - updating color when switched from undefined

14087. By Tomasz Boczkowski on 2015-05-17

fixed: color scales - extra row in RGB mode

14086. By Tomasz Boczkowski on 2015-05-17

merged trunk

14085. By Tomasz Boczkowski on 2015-05-11

merged trunk

14084. By Tomasz Boczkowski on 2015-05-11

fixed color selector not remembering it's last open tab

14083. By Tomasz Boczkowski on 2015-05-11

merged trunk

14082. By Tomasz Boczkowski on 2015-05-09

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

14081. By Tomasz Boczkowski on 2015-05-09

Using MODE_SOLID_COLOR in paint selector instead of duplicated MODE_COLOR_RGB and MODE_COLOR_CMYK

14080. By Tomasz Boczkowski on 2015-05-09

merged trunk