Diffusion Krita 8cecdb7e8d17

Merge remote-tracking branch 'origin' into rempt/T1625-python-scripting
8cecdb7e8d17
Actions

Authored by rempt on Oct 24 2016, 8:06 AM.

Description

Merge remote-tracking branch 'origin' into rempt/T1625-python-scripting

Details

Committed

rempt

Oct 24 2016, 8:06 AM

Parents

R37:70f7d3e7a8a0: Implement Data copy ctor for KisStrokeJob::createLodClone for QPAINTER_PATH
R37:623dbeb4b6d2: Merge remote-tracking branch 'origin' into rempt/T1625-python-scripting

Branches

Unknown

Tags

Unknown

rempt committed R37:8cecdb7e8d17: Merge remote-tracking branch 'origin' into rempt/T1625-python-scripting (authored by rempt).Oct 24 2016, 8:06 AM

Merged Changes

This commit merges a very large number of changes. Only the first 50 are shown.

Commit		Author	Details	Committed
70f7d3e7a8a0	D3147	gladhorn	Implement Data copy ctor for KisStrokeJob::createLodClone for QPAINTER_PATH	Oct 24 2016
98bfa5157e4f		rempt	Add Scribus palette parsing.	Oct 24 2016
c0f676b1e03c		gladhorn	Improve readability	Oct 23 2016
e5a20307d38c		gladhorn	Add Q_UNUSED to reduce warnings	Oct 23 2016
f2b82af11cb6		gladhorn	Fix typo	Oct 23 2016
4d25662d5590		gladhorn	Minor cleanup	Oct 23 2016
ba6fbc8bf3a0		gladhorn	Be consistent in switch statement: break also for the last case	Oct 23 2016
047cf084a4d6		gladhorn	Add Q_UNUSED to reduce warnings	Oct 23 2016
b9af0b19119c		gladhorn	Fix Vc deprecation warnings - use tie	Oct 23 2016
34b63f14beab		scottpetrovic	BUG:369308 hide the links and recent files until we are done loading the main…	Oct 23 2016
9c7f6188d8f0		gladhorn	Add default to switch that doesn't handle all enum values	Oct 23 2016
81fbb2f3c560		gladhorn	Remove register keyword	Oct 23 2016
7cc997781c20		gladhorn	Avoid detaching: use QByteArray::constData instead of data	Oct 23 2016
a6150a34cbdc		gladhorn	Fix unused function warning: KoWmfFunc	Oct 23 2016
cd50bb3bd6ad		gladhorn	Fix constructor interpreted as function warning	Oct 23 2016
28e1c0c87186		gladhorn	Fix unused parameter warning	Oct 23 2016
3f4fc50f56f1		gladhorn	Add override keyboard to virtuals	Oct 23 2016
6c7e2702d2c1		gladhorn	Remove deprecated unused function KoTriangleColorSelector::setQColor	Oct 23 2016
adf8f6ee5982		rempt	BUG:371523 Do not crash on opening Gimp 2.9 files	Oct 23 2016
5a12643b8f1c		rempt	Fix typo in comment	Oct 23 2016
4ad4246dfde3		rempt	Update snap definition	Oct 23 2016
c7b362c74c8f		rempt	Update the xmlgui version number	Oct 23 2016
e032da163eb1		rempt	BUG:371463 Don't crash when creating an image from a template	Oct 23 2016
edd4e605f916		rempt	Fix valgrind warning	Oct 23 2016
6b603681e7be	D3135	gladhorn	Fix dubious nullptr check	Oct 22 2016
2edb5d4a5a50		gladhorn	Remove unused variables	Oct 22 2016
97130634ca54		gladhorn	Remove unused member variable	Oct 22 2016
672a0ad3209b		gladhorn	Remove redundant parenthesis	Oct 22 2016
2f85edc83788		gladhorn	QString: prefer single .arg call and QStringLiteral	Oct 22 2016
a5a83abd9a1f		gladhorn	QString::number instead of QString(%1).arg(i)	Oct 22 2016
c71dc63157ef		gladhorn	Remove unused function	Oct 22 2016
63dbaaefb92f		gladhorn	Add missing override keyword	Oct 22 2016
f2c813563be5		gladhorn	struct/class mismatch	Oct 22 2016
ad15727c9967		gladhorn	Cleanup usage of empty strings	Oct 22 2016
01841330a9ff		gladhorn	Remove nonsensical QObject name	Oct 22 2016
9037dac329da		rempt	Clean up tool id's	Oct 22 2016
45a5e1d0fa73		rempt	BUG:364034 Fix toolbox layout so all buttons can always be pressed	Oct 22 2016
a275a9028076		rempt	Fix warning	Oct 22 2016
0f66e2d4bc1e		gladhorn	Remove unused variables	Oct 22 2016
bd9ff90979b9		gladhorn	Remove repeated variable assignment	Oct 22 2016
d87a3cd5cab9		gladhorn	Fix include guard (typo in ifdef/define)	Oct 22 2016
0a144845a390		gladhorn	Use int as counter in for loops	Oct 22 2016
7185123bae32		gladhorn	Protect from out of bounds access	Oct 22 2016
09043163d5a9		gladhorn	Fix warningn: #if __i386__ should use defined()	Oct 22 2016
18bbe87c0b66		gladhorn	Remove question about deleting scoped pointer	Oct 22 2016
2c171b786d63		gladhorn	Remove unused variable	Oct 22 2016
9c85aee7a1e8		gladhorn	Mark virtual with override	Oct 22 2016
f8f4def68f0b		rempt	Check pointer before dereferencing	Oct 21 2016
33e188c6c54b		rempt	Hide the brush tip options that are not relevant for the hairy brush	Oct 20 2016
09821811fbf7		rempt	Revert "Switch cmake CMP0002 NEW: no duplicate targets"	Oct 20 2016

Changes (205)
Show All Changes

Very Large Commit

This commit is very large. Load each file individually.

				Path	Packages
	M			krita/krita.xmlgui
	M			libs/basicflakes/plugin/KoCreatePathToolFactory.cpp
	M			libs/basicflakes/plugin/KoPencilToolFactory.cpp
	M			libs/brush/kis_auto_brush.h
	M			libs/brush/kis_brush.cpp
	M			libs/brush/kis_gbr_brush.h
	M			libs/brush/kis_imagepipe_brush.cpp
	M			libs/brush/kis_imagepipe_brush.h
	M			libs/brush/kis_text_brush.h
	M			libs/flake/KoFilterEffectLoadingContext.h
	M			libs/flake/KoFilterEffectStack.cpp
	M			libs/flake/KoShapeRegistry.cpp
	M			libs/flake/KoToolFactoryBase.cpp
	M			libs/flake/KoToolFactoryBase.h
	M			libs/flake/KoToolManager.cpp
	M			libs/flake/KoToolManager_p.cpp
	M			libs/flake/KoToolManager_p.h
	M			libs/flake/tools/KoCreateShapesToolFactory.cpp
	M			libs/flake/tools/KoPanToolFactory.cpp
	M			libs/flake/tools/KoPathTool.cpp
	M			libs/flake/tools/KoPathToolFactory.cpp
	M			libs/flake/tools/KoZoomToolFactory.cpp
	M			libs/global/kis_assert.cpp
	M			libs/global/kis_assert.h
	M			libs/image/filter/kis_filter_registry.cc
	M			libs/image/generator/kis_generator_registry.cpp
	M			libs/image/kis_filter_strategy.h
	M			libs/image/kis_image_config.cpp
	M			libs/image/kis_layer.h
	M			libs/image/kis_scalar_keyframe_channel.cpp
	M			libs/image/kis_stroke_strategy.h
	M			libs/image/kis_strokes_queue.cpp
	M			libs/image/kis_suspend_projection_updates_stroke_strategy.cpp
	M			libs/image/lazybrush/patched_boykov_kolmogorov_max_flow.hpp
	M			libs/image/tests/CMakeLists.txt
	M			libs/image/tests/kis_asl_parser_test.cpp
	M			libs/image/tests/kis_macro_test.cpp
	M			libs/image/tests/kis_warp_transform_worker_test.cpp
	M			libs/koplugin/KisMimeDatabase.cpp
	M			libs/odf/KoOdfLoadingContext.cpp
	M			libs/odf/tests/TestXmlReader.cpp
	M			libs/odf/tests/TestXmlReaderWithoutSpaces.cpp
	M			libs/pigment/KoColorSpace.cpp
	M			libs/pigment/compositeops/KoOptimizedCompositeOpAlphaDarken128.h
	M			libs/pigment/compositeops/KoOptimizedCompositeOpOver128.h
	M			libs/pigment/resources/KoColorSet.cpp
	M			libs/pigment/resources/KoColorSet.h
	M			libs/pigment/resources/KoPattern.cpp
	M			libs/pigment/resources/KoSegmentGradient.h
	M			libs/pigment/resources/KoStopGradient.cpp
	M			libs/pigment/resources/KoStopGradient.h
	M			libs/pigment/tests/CCSGraph.cpp
	M			libs/ui/KisApplication.cpp
	M			libs/ui/KisImportExportFilter.cpp
	M			libs/ui/KisImportExportFilter.h
	M			libs/ui/KisMainWindow.cpp
	M			libs/ui/KisPart.cpp
	M			libs/ui/KisResourceBundleManifest.cpp
	M			libs/ui/KisSaveGroupVisitor.h
	M			libs/ui/actions/kis_selection_action_factories.cpp
	M			libs/ui/brushhud/kis_brush_hud.cpp
	M			libs/ui/canvas/kis_guides_config.h
	M			libs/ui/dialogs/kis_about_application.cpp
	M			libs/ui/dialogs/kis_dlg_internal_color_selector.cpp
	M			libs/ui/input/kis_input_manager.cpp
	M			libs/ui/input/kis_input_manager_p.cpp
	M			libs/ui/kis_splash_screen.cpp
	M			libs/ui/kis_splash_screen.h
	M			libs/ui/tool/kis_figure_painting_tool_helper.cpp
	M			libs/ui/tool/kis_tool.h
	M			libs/ui/tool/strokes/freehand_stroke.cpp
	M			libs/ui/tool/strokes/freehand_stroke.h
	M			libs/ui/wdgsplash.ui
	M			libs/ui/widgets/kis_workspace_chooser.cpp
	M			libs/vectorimage/libwmf/WmfParser.cpp
	M			libs/version/KritaVersionWrapper.cpp
	M			libs/widgets/KoEditColorSetDialog.cpp
	M			libs/widgets/KoResourceServerProvider.cpp
	M			libs/widgets/KoToolBox.cpp
	M			libs/widgets/KoToolBoxButton_p.h
	M			libs/widgets/KoToolBoxLayout_p.h
	M			libs/widgets/KoTriangleColorSelector.cpp
	M			libs/widgets/KoTriangleColorSelector.h
	M			libs/widgets/kis_double_parse_spin_box.cpp
	M			libs/widgets/kis_int_parse_spin_box.cpp
	M			libs/widgets/tests/zoomhandler_test.cpp
	M			libs/widgetutils/kis_action_registry.cpp
	M			packaging/linux/snap/snapcraft.yaml
	M			plugins/assistants/RulerAssistant/kis_ruler_assistant_tool.h
	M			plugins/color/lcms2engine/colorprofiles/IccColorProfile.cpp
	M			plugins/color/lcms2engine/tests/CMakeLists.txt
	M			plugins/dockers/animation/kis_animation_curves_keyframe_delegate.cpp
	M			plugins/dockers/animation/kis_animation_curves_view.cpp
	M			plugins/dockers/animation/onion_skins_docker.cpp
	M			plugins/dockers/colorslider/kis_color_slider_dock.h
	M			plugins/dockers/colorslider/kis_color_slider_widget.cpp
	M			plugins/dockers/lut/ocio_display_filter.cpp
	M			plugins/dockers/specificcolorselector/kis_specific_color_selector_widget.cc
	M			plugins/dockers/tasksetdocker/tasksetdocker_dock.cpp
	M			plugins/extensions/gmic/Parameter.cpp
	M			plugins/extensions/resourcemanager/dlg_bundle_manager.cpp
	M			plugins/extensions/waveletdecompose/waveletdecompose.h
	M			plugins/filters/colorsfilters/colorsfilters.cpp
	M			plugins/flake/artistictextshape/ArtisticTextTool.cpp
	M			plugins/flake/artistictextshape/ArtisticTextToolFactory.cpp
	M			plugins/flake/textshape/FontSizeAction.cpp
	M			plugins/flake/textshape/ReferencesTool.cpp
	M			plugins/flake/textshape/ReferencesToolFactory.cpp
	M			plugins/flake/textshape/ReviewToolFactory.cpp
	M			plugins/flake/textshape/TextShape.cpp
	M			plugins/flake/textshape/TextShape.h
	M			plugins/flake/textshape/TextToolFactory.cpp
	M			plugins/flake/textshape/dialogs/LinkInsertionDialog.cpp
	M			plugins/flake/textshape/kotext/KoTableOfContentsGeneratorInfo.cpp
	M			plugins/flake/textshape/kotext/KoTextEditor.cpp
	M			plugins/flake/textshape/kotext/commands/TextPasteCommand.cpp
	M			plugins/flake/textshape/kotext/opendocument/KoTextWriter_p.cpp
	M			plugins/flake/vectorshape/VectorToolFactory.cpp
	M			plugins/impex/bmp/kis_bmp_export.cpp
	M			plugins/impex/bmp/kis_bmp_import.cpp
	M			plugins/impex/csv/csv_layer_record.cpp
	M			plugins/impex/csv/csv_loader.cpp
	M			plugins/impex/csv/kis_csv_export.cpp
	M			plugins/impex/csv/kis_csv_import.cpp
	M			plugins/impex/exr/exr_converter.cc
	M			plugins/impex/exr/exr_import.cc
	M			plugins/impex/heightmap/kis_heightmap_import.cpp
	M			plugins/impex/odg/kis_odg_import.cc
	M			plugins/impex/ora/ora_export.cc
	M			plugins/impex/ora/ora_import.cc
	M			plugins/impex/pdf/kis_pdf_import.cpp
	M			plugins/impex/png/kis_png_import.cc
	M			plugins/impex/ppm/kis_ppm_import.cpp
	M			plugins/impex/psd/psd_export.cc
	M			plugins/impex/psd/psd_import.cc
	M			plugins/impex/psd/psd_layer_record.cpp
	M			plugins/impex/qml/qml_export.cc
	M			plugins/impex/raw/kis_raw_import.cpp
	M			plugins/impex/spriter/kis_spriter_export.cpp
	M			plugins/impex/tga/kis_tga_export.cpp
	M			plugins/impex/tga/kis_tga_import.cpp
	M			plugins/impex/tiff/kis_buffer_stream.cc
	M			plugins/impex/tiff/kis_tiff_import.cc
	M			plugins/impex/tiff/kis_tiff_reader.h
	M			plugins/impex/xcf/3rdparty/xcftools/pixels.h
	M			plugins/impex/xcf/3rdparty/xcftools/xcf-general.c
	M			plugins/impex/xcf/3rdparty/xcftools/xcftools.h
	M			plugins/impex/xcf/kis_xcf_import.cpp
	M			plugins/paintops/chalk/kis_chalk_paintop_settings.h
	M			plugins/paintops/dynadraw/kis_dyna_paintop_settings.h
	M			plugins/paintops/hairy/CMakeLists.txt
	M			plugins/paintops/hairy/kis_hairy_paintop.cpp
	M			plugins/paintops/hairy/kis_hairy_paintop_settings.cpp
	M			plugins/paintops/hairy/kis_hairy_paintop_settings_widget.cpp
	D			plugins/paintops/hairy/kis_hairy_shape_option.cpp
	D			plugins/paintops/hairy/kis_hairy_shape_option.h
	M			plugins/paintops/hatching/kis_hatching_paintop_settings_widget.cpp
	M			plugins/paintops/libpaintop/forms/wdgautobrush.ui
	M			plugins/paintops/libpaintop/kis_brush_based_paintop_options_widget.cpp
	M			plugins/paintops/libpaintop/kis_brush_based_paintop_options_widget.h
	M			plugins/paintops/libpaintop/kis_brush_chooser.cpp
	M			plugins/paintops/libpaintop/kis_brush_option_widget.cpp
	M			plugins/paintops/libpaintop/kis_brush_option_widget.h
	M			plugins/paintops/libpaintop/kis_brush_selection_widget.cpp
	M			plugins/paintops/libpaintop/kis_brush_selection_widget.h
	M			plugins/paintops/libpaintop/kis_pressure_scatter_option_widget.cpp
	M			plugins/paintops/sketch/kis_sketch_paintop_settings_widget.cpp
	M			plugins/paintops/spray/kis_spray_paintop_settings.h
	M			plugins/tools/basictools/kis_tool_brush.h
	M			plugins/tools/basictools/kis_tool_colorpicker.h
	M			plugins/tools/basictools/kis_tool_ellipse.h
	M			plugins/tools/basictools/kis_tool_fill.h
	M			plugins/tools/basictools/kis_tool_gradient.h
	M			plugins/tools/basictools/kis_tool_line.h
	M			plugins/tools/basictools/kis_tool_measure.h
	M			plugins/tools/basictools/kis_tool_move.h
	M			plugins/tools/basictools/kis_tool_multihand.h
	M			plugins/tools/basictools/kis_tool_path.h
	M			plugins/tools/basictools/kis_tool_pencil.h
	M			plugins/tools/basictools/kis_tool_rectangle.h
	M			plugins/tools/defaulttool/connectionTool/ConnectionTool.cpp
	M			plugins/tools/defaulttool/connectionTool/ConnectionToolFactory.cpp
	M			plugins/tools/defaulttool/defaulttool/DefaultToolFactory.cpp
	M			plugins/tools/karbonplugins/tools/CalligraphyTool/KarbonCalligraphyToolFactory.cpp
	M			plugins/tools/karbonplugins/tools/KarbonGradientToolFactory.cpp
	M			plugins/tools/karbonplugins/tools/KarbonPatternToolFactory.cpp
	M			plugins/tools/karbonplugins/tools/filterEffectTool/FilterEffectResource.cpp
	M			plugins/tools/karbonplugins/tools/filterEffectTool/KarbonFilterEffectsToolFactory.cpp
	M			plugins/tools/selectiontools/kis_tool_select_contiguous.h
	M			plugins/tools/selectiontools/kis_tool_select_elliptical.h
	M			plugins/tools/selectiontools/kis_tool_select_outline.h
	M			plugins/tools/selectiontools/kis_tool_select_path.h
	M			plugins/tools/selectiontools/kis_tool_select_polygonal.h
	M			plugins/tools/selectiontools/kis_tool_select_rectangular.h
	M			plugins/tools/selectiontools/kis_tool_select_similar.h
	M			plugins/tools/tool_crop/kis_tool_crop.h
	M			plugins/tools/tool_dyna/kis_tool_dyna.h
	M			plugins/tools/tool_lazybrush/kis_tool_lazy_brush.h
	M			plugins/tools/tool_polygon/kis_tool_polygon.h
	M			plugins/tools/tool_polyline/kis_tool_polyline.h
	M			plugins/tools/tool_text/kis_tool_text.h
	M			plugins/tools/tool_transform2/kis_animated_transform_parameters.cpp
	M			plugins/tools/tool_transform2/kis_tool_transform.h
	M			plugins/tools/tool_transform2/kis_transform_args_keyframe_channel.cpp
	M			plugins/tools/tool_transform2/kis_transform_mask_adapter.cpp