Merge branch 'master' into krita-testing-wolthera
fbdce997fd70
Actions

Authored by woltherav on Aug 6 2016, 10:47 AM.

Description

Merge branch 'master' into krita-testing-wolthera

Details

Committed

woltherav

Aug 6 2016, 10:47 AM

Parents

R37:38398393973f: Remove signal compressor, use block signals instead.
R37:6530b6dbbee4: Merge branch 'kazakov/testing'

Branches

Unknown

Tags

Unknown

woltherav committed R37:fbdce997fd70: Merge branch 'master' into krita-testing-wolthera (authored by woltherav).Aug 6 2016, 10:47 AM

woltherav mentioned this in R37:93ef7c8ef97e: Merge in new internal color picker dialog!.Sep 6 2016, 2:50 PM

Merged Changes

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

Commit		Author	Details	Committed
6530b6dbbee4	D125	dkazakov	Merge branch 'kazakov/testing'	Aug 6 2016
a3f2361e7315		rempt	use qIsNan everywhere	Aug 6 2016
681b2c71bf27		rempt	Disable the video export plugin	Aug 5 2016
ba458423d537	D1875	jospin	Numerical input boxes for canvas resize	Aug 5 2016
592deeddccfd		jospin	Merge branch 'numericalboxes' of git://anongit.kde.org/krita into numericalboxes	Aug 5 2016
76747ab49efa		jospin	[numericalboxes] fixed a few error that appeared after rebasing prior to land.	Aug 5 2016
3b18d163fae5		jospin	Remove single commented line.	Aug 5 2016
9333546953ee		dkazakov/jospin	Fix whitespace/tabulations problem	Aug 5 2016
6796bcc864fa		jospin	Move the .ui files that where forgotten in last commit (letting them in the…	Aug 5 2016
d347feff6d65		jospin	Correct code and coding conventions prior merging numericalboxes.	Aug 5 2016
97dea18d915f		jospin	Display the warning sign when a parsespinbox is in error state only if there's…	Aug 5 2016
1e4ee51fa8d6		jospin	Let a few last place of the code use the numercic parse spinboxes.	Aug 5 2016
1eb223e761cd		jospin	Fix an annoying bug whith the specific color selector and the parsespinBoxes.	Aug 5 2016
9ea4c44f3f5c		jospin	Transform the spinboxes in parsespinboxes in the paintops plugin.	Aug 5 2016
d6f9150d95ae		jospin	Let the karbon plugin use the math parsing abilities	Aug 5 2016
3f6738c29aa1		jospin	Some little changes in kritaui regarding the use of KisIntParseSpinBox.	Aug 5 2016
214d7dff1af6		jospin	Let all the filters use the math parser spinboxes.	Aug 5 2016
972539518bb5		jospin	Let the widgets previously in kritawidgets use KisDoubleParseUnitSpinBox.	Aug 5 2016
5c29b8237e05		jospin	Move the classes that use KoUnitSpinBox from lib/widget in lib/ui/widget.	Aug 5 2016
6d57fdea805a		jospin	Use the parsespinboxes on all the dockers.	Aug 5 2016
cfe61f40c637		jospin	Create a replacement for KoUnitSpinBox that is able to parse math expression.	Aug 5 2016
1334a0961b64		jospin	Let the slider spinboxes use the math expression parser.	Aug 5 2016
517de9e9dc2b		jospin	[numerical boxes] assert that all the functions from the image and layer menu…	Aug 5 2016
ee796f6dbf36		jospin	[numerical boxes] treat all the forms in the ui/form folder.	Aug 5 2016
eace306ac1da		jospin	[numerical boxes] make use of parsespinboxes in the forms of the tools option…	Aug 5 2016
7b95f1f721f1		rempt	Try to use the desktop-integration funtions	Aug 5 2016
d2386f8de50f		jospin	[numerical boxes] Manage prefix and suffix in error cases.	Aug 5 2016
1756968c1e6f		jospin	[numerical boxes] add parsespinbox to the offsetimage extension.	Aug 5 2016
63f6e2837b9e		jospin	[numerical boxes] add license information to test files.	Aug 5 2016
9b50b5495248		jospin	[numerical boxes] Use the numerical boxes in all the imagesize extension.	Aug 5 2016
0ca651c14490		jospin	[numerical boxes] improve parser structure.	Aug 5 2016
20a46f0b631f		jospin	[numerical boxes] Implement a test for the parserSpinBoxes and correct what…	Aug 5 2016
b717bb12d0be		jospin	[numerical boxes] Add a test for simpleMathExpressionsParser.	Aug 5 2016
2086e9efeeb7		jospin	[numerical boxes] Icons for warning in parseSpinBoxes.	Aug 5 2016
b48a6fb16582		jospin	[numerical boxes] Allow to use floating point in int calculationsbefore…	Aug 5 2016
cd78c034ef7f		jospin	[numerical boxes] Correct style, add comments and do some small corrections to…	Aug 5 2016
f3f6b9da80d9		jospin	[numerical boxes] Improve the behavior of parseSpinBoxes (tested with resize…	Aug 5 2016
798c281a243c		jospin	[numerical boxes] first working version (only for the resize canva dialog for…	Aug 5 2016
e4b5c29eea4a		jospin	Remove single commented line.	Aug 5 2016
066fd16e6ea6		dkazakov	Merge branch 'master' into kazakov/testing	Aug 5 2016
5edaa336d499	D2289	dkazakov	Merge the Heads-up-display for the brushes into master	Aug 5 2016
70eaf2f14e02		dkazakov	Fix whitespace/tabulations problem	Aug 5 2016
8a7c2f89ec6c	D2063	rempt	First attempt to improve K...SP documentation	Aug 5 2016
fdc473912a16	D2063	rempt	First attempt to improve K...SP documentation	Aug 5 2016
dadb06944f9d		jospin	Move the .ui files that where forgotten in last commit (letting them in the…	Aug 4 2016
8be941ace6fd		rempt	Append, not replace the path on Windows	Aug 3 2016
6c78c5fb8269		jospin	Correct code and coding conventions prior merging numericalboxes.	Aug 3 2016
3747300737ff		rempt	Remove OpenJPEG completely	Aug 3 2016
b6a1761dc5ba		dkazakov	Fix jumping sliders in new implementation of Auto Brush Widget	Aug 2 2016
97f88c126c25	D2331	rempt	Fix openexr cmakelists for non-windows	Aug 2 2016

Changes (383)
Show All Changes

Very Large Commit

This commit is very large. Load each file individually.

		Path
M		.gitignore
M		3rdparty/CMakeLists.txt
M		3rdparty/README.md
M		3rdparty/ext_boost/CMakeLists.txt
M		3rdparty/ext_eigen3/CMakeLists.txt
M		3rdparty/ext_eigen3/dart.diff
M		3rdparty/ext_exiv2/CMakeLists.txt
A		3rdparty/ext_exiv2/patch_mingw.patch
M		3rdparty/ext_expat/CMakeLists.txt
M		3rdparty/ext_fftw3/CMakeLists.txt
M		3rdparty/ext_fontconfig/CMakeLists.txt
M		3rdparty/ext_frameworks/CMakeLists.txt
A		3rdparty/ext_frameworks/ecm_install_to_share.diff
M		3rdparty/ext_frameworks/kconfig.diff
M		3rdparty/ext_frameworks/ki18n-appdatalocation.diff
M		3rdparty/ext_freetype/CMakeLists.txt
M		3rdparty/ext_gettext/CMakeLists.txt
M		3rdparty/ext_gsl/CMakeLists.txt
M		3rdparty/ext_iconv/CMakeLists.txt
M		3rdparty/ext_ilmbase/CMakeLists.txt
M		3rdparty/ext_jpeg/CMakeLists.txt
M		3rdparty/ext_lcms2/CMakeLists.txt
V		3rdparty/ext_lcms2/{lcms2-2.4-20130124.diff → lcms2-2.8-20160725.diff}
V		3rdparty/ext_lcms2/{lcms2-2.8-20160725.diff ← lcms2-2.4-20130124.diff}
M		3rdparty/ext_libxml2/CMakeLists.txt
M		3rdparty/ext_libxslt/CMakeLists.txt
M		3rdparty/ext_ocio/CMakeLists.txt
M		3rdparty/ext_ocio/patch.diff
A		3rdparty/ext_ocio/patch_mingw.patch
M		3rdparty/ext_openexr/CMakeLists.txt
A		3rdparty/ext_openexr/patch_mingw.patch
D		3rdparty/ext_openjpeg
D		3rdparty/ext_openjpeg/CMakeLists.txt
M		3rdparty/ext_png/CMakeLists.txt
M		3rdparty/ext_poppler/CMakeLists.txt
M		3rdparty/ext_pthreads/CMakeLists.txt
V		3rdparty/ext_pthreads/{pthreads-w32-2-8-0-release-20110729.diff → pthreads-w32-2-9-1-release-20130901.diff}
V		3rdparty/ext_pthreads/{pthreads-w32-2-9-1-release-20130901.diff ← pthreads-w32-2-8-0-release-20110729.diff}
M		3rdparty/ext_qt/0001-Don-t-request-the-MIME-image-every-time-Windows-asks.patch
M		3rdparty/ext_qt/0002-Hack-always-return-we-support-DIBV5.patch
M		3rdparty/ext_qt/0003-Hack-for-fullscreen-workaround.patch
M		3rdparty/ext_qt/CMakeLists.txt
M		3rdparty/ext_qt/macdeploy-qt.diff
M		3rdparty/ext_tiff/CMakeLists.txt
M		3rdparty/ext_tiff/tiff-4.0.3-20130124.diff
M		3rdparty/ext_vc/CMakeLists.txt
A		3rdparty/ext_vc/vc1.2_malloc_free.patch
M		3rdparty/ext_zlib/CMakeLists.txt
V		3rdparty/ext_zlib/{zlib-1.2.7-20130123.diff → zlib-1.2.8-20130901.diff}
D		3rdparty/ext_zlib/zlib-1.2.7.diff
V		3rdparty/ext_zlib/{zlib-1.2.8-20130901.diff ← zlib-1.2.7-20130123.diff}
M		CMakeLists.txt
M		benchmarks/CMakeLists.txt
A		benchmarks/kis_thumbnail_benchmark.cpp
A		benchmarks/kis_thumbnail_benchmark.h
D		cmake/modules/FindOpenJPEG.cmake
M		krita/data/input/kritadefault.profile
M		krita/data/templates/animation/Anim-Jp-EN.desktop
M		krita/data/templates/animation/Anim-Jp-JP.desktop
M		krita/main.cc
M		libs/basicflakes/tools/KoCreatePathTool.cpp
M		libs/basicflakes/tools/KoPencilTool.cpp
M		libs/flake/CMakeLists.txt
M		libs/flake/KoCanvasResourceManager.cpp
M		libs/flake/KoCanvasResourceManager.h
P		libs/flake/KoDerivedResourceConverter.cpp Copied to multiple locations: libs/image/brushengine/kis_paintop_settings_update_proxy.cpp libs/ui/widgets/kis_elided_label.cpp
M		libs/flake/KoDerivedResourceConverter.h
M		libs/flake/KoResourceManager_p.cpp
M		libs/flake/KoResourceManager_p.h
P		libs/flake/KoResourceUpdateMediator.cpp Copied from plugins/paintops/particle/kis_particle_paintop_settings.h
A		libs/flake/KoResourceUpdateMediator.h
M		libs/flake/tests/TestResourceManager.cpp
M		libs/flake/tests/TestResourceManager.h
M		libs/global/kis_dom_utils.cpp
M		libs/global/kis_dom_utils.h
M		libs/global/kis_global.h
M		libs/image/CMakeLists.txt
A		libs/image/brushengine/kis_callback_based_paintop_property.h
A		libs/image/brushengine/kis_combo_based_paintop_property.cpp
A		libs/image/brushengine/kis_combo_based_paintop_property.h
M		libs/image/brushengine/kis_locked_properties_proxy.h
M		libs/image/brushengine/kis_paintop_config_widget.cpp
M		libs/image/brushengine/kis_paintop_config_widget.h
M		libs/image/brushengine/kis_paintop_preset.cpp
M		libs/image/brushengine/kis_paintop_preset.h
M		libs/image/brushengine/kis_paintop_settings.cpp
M		libs/image/brushengine/kis_paintop_settings.h
P		libs/image/brushengine/kis_paintop_settings_update_proxy.cpp Copied from libs/flake/KoDerivedResourceConverter.cpp
P		libs/image/brushengine/kis_paintop_settings_update_proxy.h Copied from libs/ui/kis_aspect_ratio_locker.h
A		libs/image/brushengine/kis_slider_based_paintop_property.h
A		libs/image/brushengine/kis_standard_uniform_properties_factory.cpp
A		libs/image/brushengine/kis_standard_uniform_properties_factory.h
A		libs/image/brushengine/kis_uniform_paintop_property.cpp
A		libs/image/brushengine/kis_uniform_paintop_property.h
M		libs/image/kis_acyclic_signal_connector.cpp
M		libs/image/kis_acyclic_signal_connector.h
M		libs/image/kis_brush_mask_applicators.h
M		libs/image/kis_config_widget.cpp
M		libs/image/kis_config_widget.h
M		libs/image/kis_convolution_painter.cc
M		libs/image/kis_idle_watcher.cpp
P		libs/image/kis_idle_watcher.h Copied to libs/widgets/tests/kis_parse_spin_boxes_test.h
M		libs/image/kis_layer.cc
M		libs/image/kis_mask.cc
M		libs/image/kis_paint_device.cc
M		libs/image/kis_paint_device.h
M		libs/image/kis_paint_device_cache.h
M		libs/image/kis_progress_update_helper.h
M		libs/image/kis_selection_based_layer.cpp
M		libs/image/kis_signal_auto_connection.h
M		libs/image/kis_types.h
M		libs/image/kis_update_time_monitor.cpp
M		libs/ui/CMakeLists.txt
M		libs/ui/KisApplication.cpp
M		libs/ui/KisColorsetChooser.cpp
M		libs/ui/KisMainWindow.cpp
M		libs/ui/KisViewManager.cpp
A	(dir)	libs/ui/brushhud/
A		libs/ui/brushhud/kis_brush_hud.cpp
P		libs/ui/brushhud/kis_brush_hud.h Copied from libs/ui/kis_aspect_ratio_locker.h
A		libs/ui/brushhud/kis_brush_hud_properties_config.cpp
P		libs/ui/brushhud/kis_brush_hud_properties_config.h Copied from libs/ui/kis_aspect_ratio_locker.h
A		libs/ui/brushhud/kis_brush_hud_properties_list.cpp
P		libs/ui/brushhud/kis_brush_hud_properties_list.h Copied from libs/ui/kis_aspect_ratio_locker.h
A		libs/ui/brushhud/kis_dlg_brush_hud_config.cpp
P		libs/ui/brushhud/kis_dlg_brush_hud_config.h Copied from libs/ui/kis_aspect_ratio_locker.h
A		libs/ui/brushhud/kis_dlg_brush_hud_config.ui
A		libs/ui/brushhud/kis_round_hud_button.cpp
P		libs/ui/brushhud/kis_round_hud_button.h Copied from libs/ui/kis_aspect_ratio_locker.h
A		libs/ui/brushhud/kis_uniform_paintop_property_widget.cpp
A		libs/ui/brushhud/kis_uniform_paintop_property_widget.h
M		libs/ui/canvas/kis_canvas2.cpp
M		libs/ui/dialogs/kis_dlg_preferences.cc
M		libs/ui/forms/kis_matrix_widget.ui
M		libs/ui/forms/wdgautogradient.ui
M		libs/ui/forms/wdgdisplaysettings.ui
M		libs/ui/forms/wdggeneralsettings.ui
M		libs/ui/forms/wdgimportimagesequence.ui
M		libs/ui/forms/wdgnewimage.ui
M		libs/ui/forms/wdgpaintactioneditor.ui
M		libs/ui/forms/wdgperformancesettings.ui
M		libs/ui/forms/wdgrectangleconstraints.ui
M		libs/ui/input/kis_input_manager.cpp
M		libs/ui/input/kis_zoom_action.cpp
M		libs/ui/input/kis_zoom_action.h
M		libs/ui/kis_aspect_ratio_locker.cpp
P		libs/ui/kis_aspect_ratio_locker.h Copied to multiple locations: libs/image/brushengine/kis_paintop_settings_update_proxy.h libs/ui/brushhud/kis_brush_hud.h libs/ui/brushhud/kis_brush_hud_properties_config.h libs/ui/brushhud/kis_brush_hud_properties_list.h libs/ui/brushhud/kis_dlg_brush_hud_config.h libs/ui/brushhud/kis_round_hud_button.h libs/ui/widgets/kis_elided_label.h plugins/paintops/libpaintop/kis_curve_option_uniform_property.h
M		libs/ui/kis_canvas_resource_provider.cpp
M		libs/ui/kis_canvas_resource_provider.h
M		libs/ui/kis_config.cc
M		libs/ui/kis_config.h
M		libs/ui/kis_custom_pattern.cc
M		libs/ui/kis_derived_resources.cpp
M		libs/ui/kis_derived_resources.h
M		libs/ui/kis_layer_manager.cc
M		libs/ui/kis_paintop_box.cc
M		libs/ui/kis_paintop_box.h
M		libs/ui/kis_popup_palette.cpp
M		libs/ui/kis_popup_palette.h
M		libs/ui/layerstyles/WdgGradientOverlay.ui
M		libs/ui/layerstyles/WdgSatin.ui
M		libs/ui/layerstyles/WdgStroke.ui
M		libs/ui/layerstyles/wdgBevelAndEmboss.ui
M		libs/ui/layerstyles/wdgdropshadow.ui
M		libs/ui/recorder/kis_recorded_paint_action_editor.cc
M		libs/ui/tests/CMakeLists.txt
A		libs/ui/tests/kis_brush_hud_properties_config_test.cpp
P		libs/ui/tests/kis_brush_hud_properties_config_test.h Copied from plugins/paintops/curvebrush/kis_curve_paintop_settings.cpp
A		libs/ui/tests/kis_derived_resources_test.cpp
P		libs/ui/tests/kis_derived_resources_test.h Copied from plugins/paintops/curvebrush/kis_curve_paintop_settings.cpp
M		libs/ui/tool/kis_tool_freehand.cc
M		libs/ui/tool/kis_tool_paint.cc
M		libs/ui/widgets/kis_double_widget.cc
M		libs/ui/widgets/kis_double_widget.h
P		libs/ui/widgets/kis_elided_label.cpp Copied from libs/flake/KoDerivedResourceConverter.cpp
P		libs/ui/widgets/kis_elided_label.h Copied from libs/ui/kis_aspect_ratio_locker.h
M		libs/ui/widgets/kis_gradient_slider.cpp
M		libs/ui/widgets/kis_gradient_slider.h
M		libs/ui/widgets/kis_multi_double_filter_widget.cc
M		libs/ui/widgets/kis_multi_double_filter_widget.h
M		libs/ui/widgets/kis_multi_integer_filter_widget.cc
M		libs/ui/widgets/kis_multi_integer_filter_widget.h
M		libs/ui/widgets/kis_paintop_presets_popup.cpp
M		libs/ui/widgets/kis_slider_spin_box.cpp
M		libs/ui/widgets/kis_slider_spin_box.h
M		libs/widgets/CMakeLists.txt
M		libs/widgets/KoPageLayoutWidget.ui
M		libs/widgets/KoShadowConfigWidget.ui
M		libs/widgets/KoStrokeConfigWidget.cpp
M		libs/widgets/KoUnitDoubleSpinBox.h
A		libs/widgets/kis_double_parse_spin_box.cpp
A		libs/widgets/kis_double_parse_spin_box.h
A		libs/widgets/kis_double_parse_unit_spin_box.cpp
A		libs/widgets/kis_double_parse_unit_spin_box.h
A		libs/widgets/kis_int_parse_spin_box.cpp
A		libs/widgets/kis_int_parse_spin_box.h
M		libs/widgets/tests/CMakeLists.txt
A		libs/widgets/tests/kis_parse_spin_boxes_test.cpp
P		libs/widgets/tests/kis_parse_spin_boxes_test.h Copied from libs/image/kis_idle_watcher.h
M		libs/widgetutils/CMakeLists.txt
A		libs/widgetutils/kis_num_parser.cpp
A		libs/widgetutils/kis_num_parser.h
M		libs/widgetutils/tests/CMakeLists.txt
A		libs/widgetutils/tests/kis_simple_math_parser_test.cpp
P		libs/widgetutils/tests/kis_simple_math_parser_test.h Copied from plugins/paintops/particle/kis_particle_paintop_settings.h
M		packaging/linux/appimage/build-deps.sh
M		packaging/linux/appimage/build-image.sh
M		packaging/linux/appimage/build-krita.sh
M		packaging/linux/snap/setup/gui/krita.desktop
M		packaging/linux/snap/snapcraft.yaml
M		packaging/windows/makepkg-64.sh
M		packaging/windows/mxe.txt
A		pics/16_dark_warning.svg
A		pics/16_light_warning.svg
M		pics/icons.qrc
M		plugins/dockers/CMakeLists.txt
M		plugins/dockers/advancedcolorselector/kis_common_colors.cpp
M		plugins/dockers/advancedcolorselector/kis_shade_selector_line_editor.cpp
M		plugins/dockers/advancedcolorselector/kis_shade_selector_line_editor.h
M		plugins/dockers/advancedcolorselector/wdg_color_selector_settings.ui
M		plugins/dockers/animation/tests/timeline_model_test.cpp
M		plugins/dockers/animation/wdg_animation.ui
M		plugins/dockers/channeldocker/channeldocker_dock.cpp
M		plugins/dockers/channeldocker/channeldocker_dock.h
M		plugins/dockers/channeldocker/channelmodel.cpp
M		plugins/dockers/channeldocker/channelmodel.h
M		plugins/dockers/colorslider/kis_color_slider_input.cpp
M		plugins/dockers/colorslider/kis_color_slider_input.h
M		plugins/dockers/griddocker/grid_config_widget.cpp
M		plugins/dockers/griddocker/grid_config_widget.ui
M		plugins/dockers/histogram/CMakeLists.txt
M		plugins/dockers/histogram/histogramdocker_dock.cpp
M		plugins/dockers/histogram/histogramdocker_dock.h
A		plugins/dockers/histogram/histogramdockerwidget.cpp
A		plugins/dockers/histogram/histogramdockerwidget.h
M		plugins/dockers/historydocker/KisUndoModel.cpp
M		plugins/dockers/historydocker/KisUndoView.cpp
M		plugins/dockers/overview/overviewwidget.cc
M		plugins/dockers/overview/overviewwidget.h
M		plugins/dockers/specificcolorselector/kis_color_input.cc
M		plugins/dockers/specificcolorselector/kis_color_input.h
M		plugins/extensions/clonesarray/wdg_clonesarray.ui
M		plugins/extensions/imagesize/wdg_canvassize.ui
M		plugins/extensions/imagesize/wdg_imagesize.ui
M		plugins/extensions/imagesize/wdg_layersize.ui
M		plugins/extensions/imagesplit/wdg_imagesplit.ui
M		plugins/extensions/metadataeditor/editors/exif.ui
M		plugins/extensions/modify_selection/wdg_border_selection.ui
M		plugins/extensions/modify_selection/wdg_feather_selection.ui
M		plugins/extensions/modify_selection/wdg_grow_selection.ui
M		plugins/extensions/modify_selection/wdg_shrink_selection.ui
M		plugins/extensions/offsetimage/wdg_offsetimage.ui
M		plugins/extensions/rotateimage/wdg_rotateimage.ui
M		plugins/extensions/shearimage/wdg_shearimage.ui
M		plugins/filters/CMakeLists.txt
M		plugins/filters/blur/wdg_lens_blur.ui
M		plugins/filters/blur/wdg_motion_blur.ui
M		plugins/filters/blur/wdgblur.ui
M		plugins/filters/colorsfilters/wdg_color_balance.ui
M		plugins/filters/colorsfilters/wdg_hsv_adjustment.ui
M		plugins/filters/colorsfilters/wdg_perchannel.ui
M		plugins/filters/indexcolors/kiswdgindexcolors.cpp
M		plugins/filters/indexcolors/kiswdgindexcolors.ui
M		plugins/filters/levelfilter/wdg_level.ui
M		plugins/filters/noisefilter/wdgnoiseoptions.ui
M		plugins/filters/phongbumpmap/wdgphongbumpmap.ui
M		plugins/filters/randompickfilter/wdgrandompickoptions.ui
A	(dir)	plugins/filters/threshold/
A		plugins/filters/threshold/CMakeLists.txt
A		plugins/filters/threshold/kritathreshold.json
A		plugins/filters/threshold/threshold.cpp
A		plugins/filters/threshold/threshold.h
A		plugins/filters/threshold/wdg_threshold.ui
M		plugins/filters/unsharp/wdgunsharp.ui
M		plugins/filters/wavefilter/wdgwaveoptions.ui
M		plugins/flake/artistictextshape/ArtisticTextShapeConfigWidget.ui
M		plugins/flake/artistictextshape/CMakeLists.txt
M		plugins/flake/pathshapes/CMakeLists.txt
M		plugins/flake/pathshapes/ellipse/EllipseShapeConfigWidget.ui
M		plugins/flake/pathshapes/rectangle/RectangleShapeConfigWidget.ui
M		plugins/flake/pathshapes/spiral/SpiralShapeConfigWidget.ui
M		plugins/flake/pathshapes/star/StarShapeConfigWidget.ui
M		plugins/impex/CMakeLists.txt
M		plugins/impex/heightmap/kis_wdg_options_heightmap.ui
D		plugins/impex/jp2
D		plugins/impex/jp2/CMakeLists.txt
D		plugins/impex/jp2/jp2_converter.cc
D		plugins/impex/jp2/jp2_converter.h
D		plugins/impex/jp2/jp2_export.cc
D		plugins/impex/jp2/jp2_export.h
D		plugins/impex/jp2/jp2_import.cc
D		plugins/impex/jp2/jp2_import.h
D		plugins/impex/jp2/kis_wdg_options_jp2.ui
D		plugins/impex/jp2/krita_jp2.desktop
D		plugins/impex/jp2/krita_jp2_export.json
D		plugins/impex/jp2/krita_jp2_import.json
M		plugins/impex/pdf/pdfimportwidgetbase.ui
M		plugins/impex/video/CMakeLists.txt
M		plugins/impex/xcf/CMakeLists.txt
M		plugins/paintops/colorsmudge/CMakeLists.txt
M		plugins/paintops/colorsmudge/colorsmudge_paintop_plugin.cpp
A		plugins/paintops/colorsmudge/kis_colorsmudgeop_settings.cpp
P		plugins/paintops/colorsmudge/kis_colorsmudgeop_settings.h Copied from plugins/paintops/particle/kis_particle_paintop_settings.h
M		plugins/paintops/colorsmudge/kis_colorsmudgeop_settings_widget.cpp
M		plugins/paintops/curvebrush/kis_curve_line_option.cpp
M		plugins/paintops/curvebrush/kis_curve_line_option.h
M		plugins/paintops/curvebrush/kis_curve_paintop.cpp
M		plugins/paintops/curvebrush/kis_curve_paintop.h
P		plugins/paintops/curvebrush/kis_curve_paintop_settings.cpp Copied to multiple locations: libs/ui/tests/kis_brush_hud_properties_config_test.h libs/ui/tests/kis_derived_resources_test.h
M		plugins/paintops/curvebrush/kis_curve_paintop_settings.h
M		plugins/paintops/defaultpaintops/duplicate/kis_duplicateop_option.cpp
M		plugins/paintops/defaultpaintops/duplicate/kis_duplicateop_option.h
M		plugins/paintops/defaultpaintops/duplicate/kis_duplicateop_settings.cpp
M		plugins/paintops/defaultpaintops/duplicate/kis_duplicateop_settings.h
M		plugins/paintops/deform/deform_brush.cpp
M		plugins/paintops/deform/deform_brush.h
M		plugins/paintops/deform/kis_brush_size_option.cpp
M		plugins/paintops/deform/kis_brush_size_option.h
M		plugins/paintops/deform/kis_deform_option.cpp
M		plugins/paintops/deform/kis_deform_option.h
M		plugins/paintops/deform/kis_deform_paintop.cpp
M		plugins/paintops/deform/kis_deform_paintop.h
M		plugins/paintops/deform/kis_deform_paintop_settings.cpp
M		plugins/paintops/deform/kis_deform_paintop_settings.h
M		plugins/paintops/dynadraw/kis_dyna_paintop_settings.cpp
M		plugins/paintops/dynadraw/kis_dyna_paintop_settings.h
M		plugins/paintops/dynadraw/kis_dynaop_option.cpp
M		plugins/paintops/dynadraw/kis_dynaop_option.h
M		plugins/paintops/dynadraw/wdgdynaoptions.ui
M		plugins/paintops/experiment/kis_experiment_paintop_settings.cpp
M		plugins/paintops/experiment/kis_experiment_paintop_settings.h
M		plugins/paintops/experiment/kis_experimentop_option.cpp
M		plugins/paintops/experiment/kis_experimentop_option.h
M		plugins/paintops/gridbrush/kis_grid_paintop_settings.cpp
M		plugins/paintops/gridbrush/kis_grid_paintop_settings.h
M		plugins/paintops/gridbrush/kis_gridop_option.cpp
M		plugins/paintops/gridbrush/kis_gridop_option.h
M		plugins/paintops/hairy/wdgInkOptions.ui
M		plugins/paintops/hairy/wdghairyshapeoptions.ui
M		plugins/paintops/hatching/kis_hatching_options.cpp
M		plugins/paintops/hatching/kis_hatching_options.h
M		plugins/paintops/hatching/kis_hatching_paintop_settings.cpp
M		plugins/paintops/hatching/kis_hatching_paintop_settings.h
M		plugins/paintops/hatching/wdghatchingoptions.ui
M		plugins/paintops/libpaintop/CMakeLists.txt
M		plugins/paintops/libpaintop/forms/wdgbrushchooser.ui
M		plugins/paintops/libpaintop/kis_auto_brush_widget.cpp
M		plugins/paintops/libpaintop/kis_auto_brush_widget.h
M		plugins/paintops/libpaintop/kis_brush_based_paintop_settings.cpp
M		plugins/paintops/libpaintop/kis_brush_based_paintop_settings.h
A		plugins/paintops/libpaintop/kis_curve_option_uniform_property.cpp
P		plugins/paintops/libpaintop/kis_curve_option_uniform_property.h Copied from libs/ui/kis_aspect_ratio_locker.h
M		plugins/paintops/particle/kis_particle_paintop_settings.cpp
P		plugins/paintops/particle/kis_particle_paintop_settings.h Copied to multiple locations: libs/flake/KoResourceUpdateMediator.cpp libs/widgetutils/tests/kis_simple_math_parser_test.h plugins/paintops/colorsmudge/kis_colorsmudgeop_settings.h
M		plugins/paintops/particle/kis_particleop_option.cpp
M		plugins/paintops/particle/kis_particleop_option.h
M		plugins/paintops/spray/kis_spray_paintop.cpp
M		plugins/paintops/spray/kis_spray_paintop_settings.cpp
M		plugins/paintops/spray/kis_spray_paintop_settings.h
M		plugins/paintops/spray/kis_sprayop_option.cpp
M		plugins/paintops/spray/kis_sprayop_option.h
M		plugins/paintops/spray/spray_brush.cpp
M		plugins/tools/basictools/wdgcolorpicker.ui
M		plugins/tools/basictools/wdgmovetool.ui
M		plugins/tools/defaulttool/CMakeLists.txt
M		plugins/tools/defaulttool/defaulttool/DefaultToolTransformWidget.ui
M		plugins/tools/defaulttool/defaulttool/DefaultToolWidget.ui
M		plugins/tools/karbonplugins/filtereffects/BlurEffectConfigWidget.cpp
M		plugins/tools/karbonplugins/filtereffects/CMakeLists.txt
M		plugins/tools/karbonplugins/filtereffects/ColorMatrixEffectConfigWidget.cpp
M		plugins/tools/karbonplugins/filtereffects/ComponentTransferEffectConfigWidget.cpp
M		plugins/tools/karbonplugins/filtereffects/CompositeEffectConfigWidget.cpp
M		plugins/tools/karbonplugins/filtereffects/ConvolveMatrixEffectConfigWidget.cpp
M		plugins/tools/karbonplugins/filtereffects/MatrixDataModel.cpp
M		plugins/tools/karbonplugins/filtereffects/MorphologyEffectConfigWidget.cpp
M		plugins/tools/karbonplugins/filtereffects/OffsetEffectConfigWidget.cpp
M		plugins/tools/karbonplugins/tools/CMakeLists.txt
M		plugins/tools/karbonplugins/tools/CalligraphyTool/KarbonCalligraphyOptionWidget.cpp
M		plugins/tools/karbonplugins/tools/KarbonPatternOptionsWidget.ui
M		plugins/tools/karbonplugins/tools/filterEffectTool/KarbonFilterEffectsTool.cpp
M		plugins/tools/tool_crop/wdg_tool_crop.ui
M		plugins/tools/tool_transform2/kis_tool_transform.cc
M		plugins/tools/tool_transform2/wdg_tool_transform.ui