Merge branch 'frameworks' into words-newsectionmodel-deniskup
e8e4119ef584
Actions

Authored by deniskuplyakov.

Description

Merge branch 'frameworks' into words-newsectionmodel-deniskup

Details

Committed

Jul 6 2015, 4:17 PM

Parents

R8:acb3c2226dbb: Improve the documentation for the CEIL, CEILING, and FLOOR functions as…
R8:37592907dc10: Moved wrongly placed testdata file.

Branches

Unknown

Tags

Unknown

deniskuplyakov committed R8:e8e4119ef584: Merge branch 'frameworks' into words-newsectionmodel-deniskup (authored by deniskuplyakov).Jul 6 2015, 4:17 PM

Merged Changes

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

Commit		Author	Details	Committed
acb3c2226dbb		Tomas Mecir	Improve the documentation for the CEIL, CEILING, and FLOOR functions as…	Jul 4 2015
899028b7d073		kossebau	Merge remote-tracking branch 'origin/master' into frameworks	Jul 4 2015
bd90988dc7a9		rempt	Merge branch 'calligra/2.9'	Jul 4 2015
4d7bbea13835		staniek	Fix KexiWelcomeStatusBarGuiUpdater's file rename	Jul 3 2015
e4f2a626ce39		staniek	Kexi: Fix compacting databases	Jul 3 2015
1815fdb849db		stefanobonicatti	Added an optional optimization to slider spin box	Jul 3 2015
594bf674fd81		stefanobonicatti	BUG:348599 Fix node activating on the wrong image	Jul 3 2015
15975a078d94		stefanobonicatti	Fix assert when restoring selection during a document switch	Jul 3 2015
e6056cf15588		Jonathan Ringstad/dkazakov	Fix a misprint in psd_pattern.cpp	Jul 3 2015
4d9dfe7055c2		stefanobonicatti	Do not crash when a node is not present in the dummies graph	Jul 3 2015
f9244de29adb	D134	stefanobonicatti	BUG:349792 Fix deleting a color in the palette docker	Jul 3 2015
94f657bbfbda		staniek	Kexi recent files: use file's base name a good replacement for captions	Jul 2 2015
88971bf2c530		stefanobonicatti	BUG:349823 Fix scale to image size while adding a file layer	Jul 2 2015
5da07a2895e9	D130	kossebau	Rename libkispsd to kritapsd	Jul 1 2015
3cb0709b703e		kossebau	Rename libglobal to kritaglobal	Jul 1 2015
f8fbd8786763		staniek	Fix left margin for Kexi's global search box (dependent on style)	Jul 1 2015
d94f4809f399		staniek	Calligradb: +docs for driver's behaviour	Jul 1 2015
1f5e838b7e20	D126	staniek	Modernize version macros for the 3.0 series: use 2.99.89 for the 3.0.0 Alpha	Jun 30 2015
d4cadbe5a2e9		kossebau	Search for KDb, KProperty, KReport and add these as Kexi dependencies	Jun 30 2015
530bf6ca8e8d		C. Boemann	Fix crash with some cases of pagebreak, and make page break work correctly on…	Jun 30 2015
71dbfd32990f		l10n daemon script	SVN_SILENT made messages (.desktop file)	Jun 30 2015
732719d7344f		l10n daemon script	SVN_SILENT made messages (after extraction)	Jun 30 2015
607ffc84af86		l10n daemon script	SVN_SILENT made messages (.desktop file) - always resolve ours	Jun 30 2015
f6d4f4bf40de		dkazakov	Fix compilation	Jun 30 2015
e98e4141e0a3		dkazakov	Implemented continuation of the transform with clicking on canvas	Jun 30 2015
3d05ff01e5dd		l10n daemon script	SVN_SILENT made messages (after extraction)	Jun 30 2015
1836aab229af		Stuart Dickson	Fix for windows	Jun 30 2015
1e281474bfe8		C. Boemann	Handle Column breaks	Jun 29 2015
52981997b584		kossebau	KPluginFactory no longer takes data about component or a parent object	Jun 29 2015
65794df936bf		kossebau	Port KXMLGUIClient::setComponentData -> KXMLGUIClient::setComponentName	Jun 29 2015
0481cbeac745		kossebau	KLocale no longer takes catalog name as first argument	Jun 29 2015
382d91a1a150		kossebau	Port to KF5's variant of KLocalizedString::toString() for a given locale	Jun 29 2015
0c05efff785a		kossebau	Move i18n calls out of public header	Jun 28 2015
1ec372cc0954		kossebau	Move i18n calls out of public header	Jun 28 2015
9b607594b9e2		C. Boemann	Fix regressions that made floating textshapes geometry protected	Jun 28 2015
cd780f1943f5		C. Boemann	Fix "keep lines together" checkbox in paragraph checkbox to actually work	Jun 28 2015
71f3ec128e62	D128	kossebau	Restore loading of defaultstyles.xml	Jun 28 2015
5f0f1826d1ba		woltherav	Revert "Remove separate Brightness/Contrast filter"	Jun 28 2015
ec99e42eff58		C. Boemann	Fix disappearing blocks during relayouts Layouting of a block that we abandon…	Jun 28 2015
dae5872975b0		C. Boemann	remove one more usage/call of obsolete method	Jun 28 2015
2f0e02033022		stefanobonicatti	Fixing build, failed function renaming	Jun 27 2015
0efd3929d1ba		stefanobonicatti	Fix layer selection clearing when the model resets	Jun 27 2015
a44d1c79b2c5		kossebau	Clean up includes of sheets/Cell.h a little	Jun 27 2015
1a880b4ed5ed		victorw	BUG:348494 Reworked Resource Manager UI layout to work better when window is…	Jun 27 2015
ec432739148e		kossebau	Clean up includes of KoDocument.h	Jun 27 2015
6d1a988d3e80		victorw	Fixed wrapping issue for all dial widgets in Layer Styles dialog	Jun 27 2015
8d7deaf2efe7		victorw	BUG:347310 Fixed issue where drop shadow dial widget didn't wrap properly	Jun 27 2015
f8e793c453c6		dkazakov	Disable translation of an untranslatable string	Jun 27 2015
b23d328f12de		l10n daemon script	SVN_SILENT made messages (after extraction)	Jun 27 2015
89b903266262		kossebau	Install desktop files for Okular plugins in normal location, not /calligra	Jun 26 2015

Changes (554)
Show All Changes

Very Large Commit

This commit is very large. Load each file individually.

				Path	Packages
	M			CMakeLists.txt
	D			cmake/modules/FindGLEW.cmake
	D			cmake/modules/FindGLU.cmake
	D			cmake/modules/FindGLUT.cmake
	M			doc/sheets/functions.docbook
	M			extras/okularodpgenerator/CMakeLists.txt
	M			extras/okularodpgenerator/OkularOdpGenerator.h
	M			extras/okularodtgenerator/CMakeLists.txt
	M			extras/okularodtgenerator/OkularOdtGenerator.h
	M			filters/karbon/image/calligra_filter_karbon2image.desktop
	M			filters/karbon/karbon1.x/karbon_karbon1x_thumbnail.desktop
	M			filters/plan/mpxj/import/mpxjimport.cpp
	M			filters/sheets/excel/import/ExcelImport.cpp
	M			filters/stage/powerpoint/CMakeLists.txt
	M			filters/stage/pptx/CMakeLists.txt
	M			filters/words/docx/import/CMakeLists.txt
	M			filters/words/mobi/MobiFile.cpp
	M			filters/words/msword-odf/CMakeLists.txt
	M			filters/words/wordperfect/import/CMakeLists.txt
	M			flow/part/FlowFactory.cpp
	M			flow/part/FlowFactory.h
	M			flow/part/flow.appdata.xml
	M			gemini/RecentImageImageProvider.cpp
	M			gemini/ThumbnailHelperImpl.cpp
	M			gemini/calligragemini.desktop
	M			karbon/KarbonFactoryInit.h
	M			karbon/data/karbon.appdata.xml
	M			karbon/stencils/Cisco/home_office.desktop
	M			karbon/ui/KarbonDocument.cpp
	M			karbon/ui/KarbonFactory.cpp
	M			karbon/ui/KarbonFactory.h
	M			karbon/ui/KarbonView.cpp
	M			karbon/ui/widgets/KarbonCanvas.cpp
	M			kexi/kexi.appdata.xml
	M			kexi/main/KexiMainWindow.cpp
	M			kexi/main/KexiMainWindow.h
	M			kexi/main/KexiSearchLineEdit.cpp
	M			kexi/main/KexiSearchLineEdit.h
	M			kexi/main/startup/KexiRecentProjectsModel.cpp
	M			kexi/main/startup/KexiWelcomeStatusBar.cpp
	M			kexi/migration/importwizard.cpp
	M			kexi/plugins/queries/kexiquerydesignerguieditor.cpp
	M			kexi/plugins/tables/kexitabledesignerview.cpp
	M			kexi/widget/tableview/kexicomboboxpopup.cpp
	M			krita/CMakeLists.txt
	D			krita/config-glew.h.cmake
	M			krita/data/brushes/LJF_smoke_c.gih
	M			krita/data/krita_filefilter.desktop
	M			krita/data/kritarc
	M			krita/data/paintoppresets/Bristle_Details.kpp
	M			krita/data/paintoppresets/Bristle_Large.kpp
	M			krita/data/paintoppresets/Bristle_Special_Blender.kpp
	M			krita/data/paintoppresets/Bristle_Squared.kpp
	M			krita/data/paintoppresets/Bristle_Tapered.kpp
	M			krita/data/paintoppresets/Bristle_Texture.kpp
	M			krita/data/templates/comics/BD-EuroTemplate.desktop
	M			krita/data/templates/comics/Comics-USTemplate.desktop
	M			krita/data/templates/comics/Manga-JpTemplate.desktop
	M			krita/data/templates/comics/a4_waffle_grid.desktop
	M			krita/data/workspaces/CMakeLists.txt
	V			krita/data/workspaces/{Default.kws ← Small_Paint.kws}
	V			krita/data/workspaces/{Small_Paint.kws → Default.kws}
	M			krita/gemini/CMakeLists.txt
	M			krita/image/CMakeLists.txt
	M			krita/image/brushengine/kis_paint_information.cc
	M			krita/image/brushengine/kis_paint_information.h
	M			krita/image/brushengine/kis_paintop_utils.h
	P			krita/image/commands_new/kis_image_resize_command.h Copied to krita/plugins/extensions/gmic/kis_gmic_synchronize_image_size_command.h
	M			krita/image/commands_new/kis_saved_commands.cpp
	M			krita/image/kis_adjustment_layer.cc
	M			krita/image/kis_async_merger.cpp
	M			krita/image/kis_base_rects_walker.h
	A			krita/image/kis_busy_progress_indicator.cpp
	P			krita/image/kis_busy_progress_indicator.h Copied from krita/plugins/formats/psd/tests/kis_psd_test.h
	M			krita/image/kis_cubic_curve.cpp
	M			krita/image/kis_cubic_curve.h
	M			krita/image/kis_filter_mask.cpp
	M			krita/image/kis_image.cc
	M			krita/image/kis_image_config.cpp
	M			krita/image/kis_image_config.h
	A			krita/image/kis_memory_statistics_server.cpp
	A			krita/image/kis_memory_statistics_server.h
	M			krita/image/kis_node.cpp
	M			krita/image/kis_node.h
	M			krita/image/kis_node_progress_proxy.cpp
	M			krita/image/kis_properties_configuration.cc
	M			krita/image/kis_selection.h
	M			krita/image/kis_selection_based_layer.cpp
	M			krita/image/kis_selection_based_layer.h
	M			krita/image/kis_stroke_strategy.cpp
	M			krita/image/kis_stroke_strategy.h
	M			krita/image/kis_stroke_strategy_undo_command_based.cpp
	M			krita/image/kis_stroke_strategy_undo_command_based.h
	M			krita/image/kis_transform_mask.cpp
	M			krita/image/kis_undo_store.h
	M			krita/image/kis_undo_stores.cpp
	M			krita/image/kis_undo_stores.h
	M			krita/image/kis_update_time_monitor.cpp
	M			krita/image/layerstyles/kis_layer_style_filter_environment.cpp
	M			krita/image/layerstyles/kis_layer_style_filter_projection_plane.cpp
	M			krita/image/layerstyles/kis_layer_style_projection_plane.cpp
	M			krita/image/layerstyles/kis_ls_bevel_emboss_filter.cpp
	M			krita/image/metadata/kis_meta_data_merge_strategy_p.cc
	M			krita/image/tests/CMakeLists.txt
	M			krita/image/tests/kis_cubic_curve_test.cpp
	P			krita/image/tests/kis_cubic_curve_test.h Copied to krita/ui/tool/kis_speed_smoother.h
	M			krita/image/tests/kis_layer_styles_test.cpp
	M			krita/image/tests/kis_paint_information_test.cpp
	M			krita/image/tiles3/kis_tile_data.h
	M			krita/image/tiles3/kis_tile_data_interface.h
	M			krita/image/tiles3/kis_tile_data_pooler.cc
	M			krita/image/tiles3/kis_tile_data_pooler.h
	M			krita/image/tiles3/kis_tile_data_store.cc
	M			krita/image/tiles3/kis_tile_data_store.h
	M			krita/image/tiles3/swap/kis_memory_window.cpp
	M			krita/image/tiles3/swap/kis_memory_window.h
	M			krita/image/tiles3/swap/kis_swapped_data_store.cpp
	M			krita/image/tiles3/swap/kis_swapped_data_store.h
	M			krita/image/tiles3/swap/kis_tile_data_swapper.cpp
	M			krita/krita.action
	M			krita/krita.rc
	M			krita/libbrush/kis_auto_brush.cpp
	M			krita/libbrush/kis_gbr_brush.cpp
	M			krita/libbrush/tests/kis_auto_brush_test.cpp
	M			krita/libbrush/tests/kis_brush_test.cpp
	M			krita/libbrush/tests/kis_imagepipe_brush_test.cpp
	M			krita/libcolor/colord/KisColord.h
	M			krita/libglobal/CMakeLists.txt
	M			krita/libpsd/CMakeLists.txt
	M			krita/libpsd/psd_pattern.cpp
	M			krita/libpsd/tests/CMakeLists.txt
	M			krita/main.cc
	M			krita/plugins/assistants/RulerAssistant/CMakeLists.txt
	A			krita/plugins/assistants/RulerAssistant/ConcentricEllipseAssistant.cc
	A			krita/plugins/assistants/RulerAssistant/ConcentricEllipseAssistant.h
	A			krita/plugins/assistants/RulerAssistant/FisheyePointAssistant.cc
	A			krita/plugins/assistants/RulerAssistant/FisheyePointAssistant.h
	M			krita/plugins/assistants/RulerAssistant/PerspectiveAssistant.cc
	M			krita/plugins/assistants/RulerAssistant/kis_ruler_assistant_tool.cc
	M			krita/plugins/assistants/RulerAssistant/ruler_assistant_tool.cc
	M			krita/plugins/extensions/colorspaceconversion/colorspaceconversion.cc
	M			krita/plugins/extensions/colorspaceconversion/dlg_colorspaceconversion.cc
	M			krita/plugins/extensions/colorspaceconversion/dlg_colorspaceconversion.h
	M			krita/plugins/extensions/dockers/advancedcolorselector/kis_color_patches.cpp
	M			krita/plugins/extensions/dockers/advancedcolorselector/kis_color_selector_base.cpp
	M			krita/plugins/extensions/dockers/advancedcolorselector/kis_color_selector_base.h
	M			krita/plugins/extensions/dockers/advancedcolorselector/kis_color_selector_container.cpp
	M			krita/plugins/extensions/dockers/advancedcolorselector/kis_color_selector_container.h
	M			krita/plugins/extensions/dockers/advancedcolorselector/kis_color_selector_settings.cpp
	M			krita/plugins/extensions/dockers/advancedcolorselector/kis_color_selector_settings.h
	M			krita/plugins/extensions/dockers/advancedcolorselector/wdg_color_selector_settings.ui
	M			krita/plugins/extensions/dockers/defaultdockers/kis_layer_box.cpp
	M			krita/plugins/extensions/dockers/defaultdockers/kis_layer_box.h
	M			krita/plugins/extensions/dockers/historydocker/KisUndoModel.cpp
	M			krita/plugins/extensions/dockers/lut/CMakeLists.txt
	M			krita/plugins/extensions/dockers/lut/lutdocker_dock.cpp
	M			krita/plugins/extensions/dockers/lut/ocio_display_filter.cpp
	M			krita/plugins/extensions/dockers/overview/overviewwidget.cc
	M			krita/plugins/extensions/dockers/palettedocker/palettedocker_dock.cpp
	M			krita/plugins/extensions/dockers/presetdocker/krita_presetdocker.desktop
	M			krita/plugins/extensions/dockers/presethistory/krita_presethistory.desktop
	M			krita/plugins/extensions/gmic/3rdparty/gmic/CImg.h
	M			krita/plugins/extensions/gmic/3rdparty/gmic/gmic.cpp
	M			krita/plugins/extensions/gmic/3rdparty/gmic/gmic.h
	M			krita/plugins/extensions/gmic/3rdparty/gmic/gmic_def.gmic
	M			krita/plugins/extensions/gmic/3rdparty/gmic/gmic_def.h
	A			krita/plugins/extensions/gmic/3rdparty/gmic/update1610.gmic
	M			krita/plugins/extensions/gmic/CMakeLists.txt
	M			krita/plugins/extensions/gmic/Category.cpp
	M			krita/plugins/extensions/gmic/Category.h
	M			krita/plugins/extensions/gmic/Command.cpp
	M			krita/plugins/extensions/gmic/Command.h
	M			krita/plugins/extensions/gmic/Component.h
	M			krita/plugins/extensions/gmic/Parameter.cpp
	M			krita/plugins/extensions/gmic/kis_gmic_applicator.cpp
	M			krita/plugins/extensions/gmic/kis_gmic_blacklister.cpp
	M			krita/plugins/extensions/gmic/kis_gmic_blacklister.h
	M			krita/plugins/extensions/gmic/kis_gmic_parser.cpp
	M			krita/plugins/extensions/gmic/kis_gmic_parser.h
	M			krita/plugins/extensions/gmic/kis_gmic_plugin.cpp
	M			krita/plugins/extensions/gmic/kis_gmic_plugin.h
	M			krita/plugins/extensions/gmic/kis_gmic_settings_widget.cpp
	M			krita/plugins/extensions/gmic/kis_gmic_settings_widget.h
	A			krita/plugins/extensions/gmic/kis_gmic_synchronize_image_size_command.cpp
	P			krita/plugins/extensions/gmic/kis_gmic_synchronize_image_size_command.h Copied from krita/image/commands_new/kis_image_resize_command.h
	M			krita/plugins/extensions/gmic/tests/CMakeLists.txt
	D			krita/plugins/extensions/gmic/tests/data/filterCommands.txt
	A			krita/plugins/extensions/gmic/tests/data/gmic_def_1610_gimp.xml
	M			krita/plugins/extensions/gmic/tests/data/gmic_def_1610_krita.xml
	M			krita/plugins/extensions/gmic/tests/kis_gmic_tests.cpp
	M			krita/plugins/extensions/gmic/tests/kis_gmic_tests.h
	M			krita/plugins/extensions/layersplit/kritalayersplit.desktop
	M			krita/plugins/extensions/resourcemanager/dlg_create_bundle.cpp
	M			krita/plugins/extensions/resourcemanager/wdgdlgbundlemanager.ui
	M			krita/plugins/filters/colorsfilters/CMakeLists.txt
	M			krita/plugins/filters/colorsfilters/kis_brightness_contrast_filter.cpp
	M			krita/plugins/filters/colorsfilters/kis_perchannel_filter.cpp
	M			krita/plugins/filters/colorsfilters/kis_perchannel_filter.h
	A			krita/plugins/filters/colorsfilters/virtual_channel_info.cpp
	A			krita/plugins/filters/colorsfilters/virtual_channel_info.h
	M			krita/plugins/filters/indexcolors/palettegeneratorconfig.cpp
	M			krita/plugins/formats/jpeg/kis_jpeg_converter.cc
	M			krita/plugins/formats/ora/ora_converter.cc
	M			krita/plugins/formats/ora/ora_converter.h
	M			krita/plugins/formats/pdf/kis_pdf_import.cpp
	M			krita/plugins/formats/pdf/kis_pdf_import_widget.cpp
	M			krita/plugins/formats/pdf/kis_pdf_import_widget.h
	M			krita/plugins/formats/pdf/pdfimportwidgetbase.ui
	M			krita/plugins/formats/ppm/kis_ppm_import.h
	M			krita/plugins/formats/psd/CMakeLists.txt
	M			krita/plugins/formats/psd/psd_loader.cpp
	A			krita/plugins/formats/psd/tests/data/test_krita_psd_from_opencanvas.psd
	M			krita/plugins/formats/psd/tests/kis_psd_test.cpp
	P			krita/plugins/formats/psd/tests/kis_psd_test.h Copied to krita/image/kis_busy_progress_indicator.h
	M			krita/plugins/formats/xcf/kis_xcf_import.h
	M			krita/plugins/paintops/gridbrush/kritagridpaintop.desktop
	M			krita/plugins/paintops/hairy/hairy_brush.cpp
	M			krita/plugins/paintops/hairy/hairy_brush.h
	M			krita/plugins/paintops/libpaintop/kis_dynamic_sensor.cc
	P			krita/plugins/paintops/libpaintop/kis_dynamic_sensors.cc Copied from krita/plugins/paintops/libpaintop/sensors/kis_dynamic_sensors.cc
	P			krita/plugins/paintops/libpaintop/kis_dynamic_sensors.h Copied from krita/plugins/paintops/libpaintop/sensors/kis_dynamic_sensors.h
	M			krita/plugins/paintops/libpaintop/tests/kis_sensors_test.cpp
	M			krita/plugins/tools/defaulttools/kis_tool_brush.cc
	M			krita/plugins/tools/defaulttools/kis_tool_ellipse.cc
	M			krita/plugins/tools/defaulttools/kis_tool_ellipse.h
	M			krita/plugins/tools/defaulttools/kis_tool_fill.cc
	M			krita/plugins/tools/defaulttools/kis_tool_fill.h
	M			krita/plugins/tools/defaulttools/kis_tool_gradient.cc
	M			krita/plugins/tools/defaulttools/kis_tool_gradient.h
	M			krita/plugins/tools/defaulttools/kis_tool_line.cc
	M			krita/plugins/tools/defaulttools/kis_tool_line.h
	M			krita/plugins/tools/defaulttools/kis_tool_move.cc
	M			krita/plugins/tools/defaulttools/kis_tool_move.h
	M			krita/plugins/tools/defaulttools/kis_tool_path.cc
	M			krita/plugins/tools/defaulttools/kis_tool_path.h
	M			krita/plugins/tools/defaulttools/kis_tool_pencil.cc
	M			krita/plugins/tools/defaulttools/kis_tool_pencil.h
	M			krita/plugins/tools/defaulttools/kis_tool_rectangle.cc
	M			krita/plugins/tools/defaulttools/kis_tool_rectangle.h
	M			krita/plugins/tools/selectiontools/kis_tool_select_contiguous.cc
	M			krita/plugins/tools/selectiontools/kis_tool_select_contiguous.h
	M			krita/plugins/tools/selectiontools/kis_tool_select_elliptical.cc
	M			krita/plugins/tools/selectiontools/kis_tool_select_elliptical.h
	M			krita/plugins/tools/selectiontools/kis_tool_select_outline.cc
	M			krita/plugins/tools/selectiontools/kis_tool_select_outline.h
	M			krita/plugins/tools/selectiontools/kis_tool_select_path.cc
	M			krita/plugins/tools/selectiontools/kis_tool_select_path.h
	M			krita/plugins/tools/selectiontools/kis_tool_select_polygonal.cc
	M			krita/plugins/tools/selectiontools/kis_tool_select_polygonal.h
	M			krita/plugins/tools/selectiontools/kis_tool_select_rectangular.cc
	M			krita/plugins/tools/selectiontools/kis_tool_select_rectangular.h
	M			krita/plugins/tools/selectiontools/kis_tool_select_similar.cc
	M			krita/plugins/tools/selectiontools/kis_tool_select_similar.h
	M			krita/plugins/tools/tool_dyna/kis_tool_dyna.cpp
	M			krita/plugins/tools/tool_dyna/kis_tool_dyna.h
	M			krita/plugins/tools/tool_polygon/kis_tool_polygon.cc
	M			krita/plugins/tools/tool_polygon/kis_tool_polygon.h
	M			krita/plugins/tools/tool_polyline/kis_tool_polyline.cc
	M			krita/plugins/tools/tool_polyline/kis_tool_polyline.h
	M			krita/plugins/tools/tool_transform2/kis_free_transform_strategy.cpp
	M			krita/plugins/tools/tool_transform2/kis_tool_transform.cc
	M			krita/plugins/tools/tool_transform2/kis_tool_transform.h
	M			krita/plugins/tools/tool_transform2/strokes/transform_stroke_strategy.cpp
	M			krita/plugins/tools/tool_transform2/strokes/transform_stroke_strategy.h
	M			krita/sketch/CMakeLists.txt
	M			krita/sketch/KisSketchView.cpp
	M			krita/ui/CMakeLists.txt
	M			krita/ui/KisApplication.cpp
	M			krita/ui/KisApplication.h
	M			krita/ui/KisDocument.cpp
	M			krita/ui/KisMainWindow.cpp
	M			krita/ui/KisMainWindow.h
	M			krita/ui/KisPart.cpp
	M			krita/ui/KisPart.h
	M			krita/ui/KisView.cpp
	M			krita/ui/KisView.h
	M			krita/ui/KisViewManager.cpp
	M			krita/ui/KisViewManager.h
	M			krita/ui/Mainpage.dox
	M			krita/ui/canvas/kis_canvas2.cpp
	M			krita/ui/canvas/kis_canvas2.h
	M			krita/ui/canvas/kis_canvas_controller.cpp
	M			krita/ui/canvas/kis_canvas_controller.h
	M			krita/ui/canvas/kis_canvas_widget_base.cpp
	M			krita/ui/canvas/kis_display_filter.h
	M			krita/ui/canvas/kis_image_pyramid.cpp
	M			krita/ui/canvas/kis_infinity_manager.cpp
	M			krita/ui/canvas/kis_mirror_axis.cpp
	M			krita/ui/canvas/kis_tool_proxy.h
	M			krita/ui/dialogs/kis_about_application.cpp
	M			krita/ui/dialogs/kis_dlg_filter.cpp
	M			krita/ui/dialogs/kis_dlg_filter.h
	M			krita/ui/dialogs/kis_dlg_image_properties.cc
	M			krita/ui/dialogs/kis_dlg_preferences.cc
	M			krita/ui/dialogs/kis_dlg_preferences.h
	A			krita/ui/dialogs/slider_and_spin_box_sync.cpp
	A			krita/ui/dialogs/slider_and_spin_box_sync.h
	M			krita/ui/flake/kis_node_dummies_graph.cpp
	M			krita/ui/forms/wdgfilterdialog.ui
	M			krita/ui/forms/wdggeneralsettings.ui
	M			krita/ui/forms/wdglayerproperties.ui
	M			krita/ui/forms/wdgperformancesettings.ui
	M			krita/ui/input/kis_alternate_invocation_action.cpp
	M			krita/ui/input/kis_input_manager.cpp
	M			krita/ui/kis_aboutdata.cpp
	M			krita/ui/kis_autogradient.cc
	M			krita/ui/kis_autogradient.h
	M			krita/ui/kis_config.cc
	M			krita/ui/kis_config.h
	M			krita/ui/kis_document_undo_store.cpp
	M			krita/ui/kis_document_undo_store.h
	M			krita/ui/kis_favorite_resource_manager.cpp
	M			krita/ui/kis_file_layer.cpp
	M			krita/ui/kis_image_manager.cc
	M			krita/ui/kis_layer_manager.cc
	M			krita/ui/kis_mask_manager.cc
	M			krita/ui/kis_node_manager.cpp
	M			krita/ui/kis_node_model.cpp
	M			krita/ui/kis_node_model.h
	M			krita/ui/kis_painting_assistant.cc
	M			krita/ui/kis_paintop_box.cc
	M			krita/ui/kis_paintop_box.h
	M			krita/ui/kis_png_converter.cpp
	M			krita/ui/kis_png_converter.h
	M			krita/ui/kis_selection_manager.cc
	M			krita/ui/kis_splash_screen.cpp
	M			krita/ui/kis_splash_screen.h
	M			krita/ui/kis_statusbar.cc
	M			krita/ui/kis_statusbar.h
	M			krita/ui/kis_zoom_manager.cc
	M			krita/ui/kis_zoom_manager.h
	M			krita/ui/kra/kis_kra_loader.cpp
	M			krita/ui/kra/kis_kra_saver.cpp
	M			krita/ui/kra/kis_kra_savexml_visitor.cpp
	M			krita/ui/layerstyles/WdgGradientOverlay.ui
	M			krita/ui/layerstyles/WdgSatin.ui
	M			krita/ui/layerstyles/WdgStroke.ui
	M			krita/ui/layerstyles/wdgBevelAndEmboss.ui
	M			krita/ui/layerstyles/wdgdropshadow.ui
	M			krita/ui/opengl/kis_opengl.cpp
	M			krita/ui/opengl/kis_opengl.h
	M			krita/ui/opengl/kis_opengl_canvas2.cpp
	M			krita/ui/opengl/kis_opengl_canvas2.h
	M			krita/ui/opengl/kis_opengl_canvas2_p.h
	M			krita/ui/opengl/kis_opengl_image_textures.cpp
	M			krita/ui/ora/ora_save_context.cc
	M			krita/ui/tests/kis_action_manager_test.cpp
	M			krita/ui/tool/kis_delegated_tool.h
	M			krita/ui/tool/kis_painting_information_builder.cpp
	M			krita/ui/tool/kis_painting_information_builder.h
	A			krita/ui/tool/kis_speed_smoother.cpp
	P			krita/ui/tool/kis_speed_smoother.h Copied from krita/image/tests/kis_cubic_curve_test.h
	M			krita/ui/tool/kis_tool.cc
	M			krita/ui/tool/kis_tool.h
	M			krita/ui/tool/kis_tool_freehand.cc
	M			krita/ui/tool/kis_tool_paint.cc
	M			krita/ui/tool/kis_tool_paint.h
	M			krita/ui/tool/kis_tool_polyline_base.cpp
	M			krita/ui/tool/kis_tool_polyline_base.h
	M			krita/ui/tool/kis_tool_rectangle_base.cpp
	M			krita/ui/tool/kis_tool_rectangle_base.h
	D			krita/ui/tool/kis_tool_select_base.cpp
	M			krita/ui/tool/kis_tool_select_base.h
	M			krita/ui/wdgsplash.ui
	M			krita/ui/widgets/kis_custom_image_widget.cc
	M			krita/ui/widgets/kis_floating_message.cpp
	M			krita/ui/widgets/kis_floating_message.h
	M			krita/ui/widgets/kis_image_from_clipboard_widget.cpp
	M			krita/ui/widgets/kis_preset_chooser.cpp
	M			krita/ui/widgets/kis_slider_spin_box.cpp
	M			krita/ui/widgets/kis_slider_spin_box.h
	A			krita/ui/widgets/kis_tool_options_popup.cpp
	P			krita/ui/widgets/kis_tool_options_popup.h Copied from plugins/textshape/dialogs/ParagraphLayout.h
	M			libs/basicflakes/tools/KoCreatePathTool.cpp
	M			libs/basicflakes/tools/KoCreatePathTool.h
	M			libs/basicflakes/tools/KoCreatePathTool_p.h
	M			libs/kokross/KoScriptingDocker.cpp
	M			libs/kopageapp/KoPACanvas.cpp
	M			libs/kopageapp/KoPACanvasBase.cpp
	M			libs/kopageapp/KoPACanvasItem.cpp
	M			libs/kopageapp/KoPADocument.cpp
	M			libs/kopageapp/KoPADocument.h
	M			libs/kopageapp/KoPADocumentModel.cpp
	M			libs/kopageapp/KoPAPastePage.cpp
	M			libs/kopageapp/KoPAView.cpp
	M			libs/kopageapp/KoPAViewModeNormal.cpp
	M			libs/kopageapp/dialogs/KoPAConfigureDialog.cpp
	M			libs/koplugin/CMakeLists.txt
	M			libs/koplugin/KoJsonTrader.cpp
	M			libs/koplugin/KoPluginLoader.cpp
	M			libs/kotext/KoInlineNote.cpp
	M			libs/kotext/KoTextEditor.cpp
	M			libs/kotext/opendocument/KoTextLoader.cpp
	M			libs/kotext/opendocument/KoTextSharedLoadingData.cpp
	M			libs/kotext/opendocument/KoTextSharedLoadingData.h
	M			libs/kotext/styles/KoCharacterStyle.cpp
	M			libs/kotext/styles/KoStyleManager.cpp
	M			libs/kundo2/kundo2stack.cpp
	M			libs/kundo2/kundo2stack.h
	M			libs/kundo2/kundo2stack_p.h
	M			libs/main/KoApplication.cpp
	M			libs/main/KoDocument.cpp
	M			libs/main/KoDocument.h
	M			libs/main/KoDocumentEntry.cpp
	M			libs/main/KoFilterGraph.cpp
	M			libs/main/KoMainWindow.cpp
	M			libs/main/KoPart.cpp
	M			libs/main/KoTemplateCreateDia.cpp
	M			libs/odf/KoOdfLoadingContext.cpp
	M			libs/odf/KoOdfLoadingContext.h
	M			libs/odf/KoOdfNotesConfiguration.cpp
	M			libs/odf/KoOdfNotesConfiguration.h
	M			libs/pigment/CMakeLists.txt
	M			libs/pigment/KoBasicHistogramProducers.cpp
	M			libs/pigment/KoBasicHistogramProducers.h
	M			libs/pigment/KoColorSpace.h
	A			libs/pigment/KoCompositeColorTransformation.cpp
	A			libs/pigment/KoCompositeColorTransformation.h
	M			libs/pigment/resources/KoColorSet.cpp
	M			libs/pigment/resources/KoColorSet.h
	M			libs/rdf/KoDocumentRdfEditWidget.cpp
	M			libs/textlayout/KoTextDocumentLayout.cpp
	M			libs/textlayout/KoTextLayoutArea.cpp
	M			libs/textlayout/KoTextLayoutArea.h
	M			libs/textlayout/KoTextLayoutArea_p.h
	M			libs/textlayout/KoTextLayoutArea_paint.cpp
	M			libs/textlayout/KoTextLayoutNoteArea.cpp
	M			libs/textlayout/KoTextLayoutRootAreaProvider.h
	M			libs/version/calligraversion.h.cmake
	M			libs/widgets/KoGlobal.cpp
	M			libs/widgets/KoResourceItemChooser.cpp
	M			libs/widgets/KoResourceItemChooser.h
	M			libs/widgets/KoResourceItemView.cpp
	M			libs/widgets/KoResourceItemView.h
	M			libs/widgets/KoResourceModel.cpp
	M			libs/widgets/KoResourceServer.h
	M			libs/widgets/KoResourceTaggingManager.cpp
	M			libs/widgets/KoTagChooserWidget.cpp
	M			libs/widgets/KoToolDocker.cpp
	M			libs/widgets/KoZoomController.cpp
	M			libs/widgets/KoZoomController.h
	M			libs/widgets/KoZoomController_p.h
	M			plan/about/plan.css
	P			plan/about/top-left-plan.png Copied from plan/pics/128-apps-calligraplan.png
	M			plan/kptfactory.cpp
	M			plan/kptfactory.h
	M			plan/kptfactoryinit.h
	M			plan/kptmaindocument.cpp
	M			plan/kptschedulerpluginloader.cpp
	M			plan/kptview.cpp
	M			plan/libs/kernel/kptcalendar.cpp
	M			plan/libs/kernel/kptcalendar.h
	M			plan/libs/kernel/tests/CalendarTester.cpp
	M			plan/libs/ui/kptganttview.cpp
	M			plan/libs/ui/kptsplitterview.cpp
	M			plan/libs/ui/kpttaskdialog.cpp
	M			plan/libs/ui/kpttaskdialog.h
	M			plan/libs/ui/reports/reportdata.h
	M			plan/libs/ui/reports/reportdesignview.h
	M			plan/libs/ui/reports/reportview.cpp
	M			plan/libs/ui/reports/reportview.h
	M			plan/libs/ui/reports/reportview_p.h
	M			plan/plan.appdata.xml
	M			plan/plugins/schedulers/rcps/KPlatoRCPSPlugin.cpp
	M			plan/plugins/schedulers/tj/PlanTJPlugin.cpp
	M			plan/workpackage/factory.cpp
	M			plan/workpackage/factory.h
	M			plan/workpackage/factoryinit.h
	M			plan/workpackage/part.cpp
	M			plan/workpackage/taskworkpackageview.cpp
	M			plugins/chartshape/Axis.cpp
	M			plugins/chartshape/ChartConfigWidget.cpp
	M			plugins/chartshape/DataSet.cpp
	M			plugins/chartshape/PlotArea.cpp
	M			plugins/colorengines/lcms2/CMakeLists.txt
	M			plugins/colorengines/lcms2/LcmsColorSpace.h
	M			plugins/colorengines/lcms2/tests/CMakeLists.txt
	M			plugins/defaultTools/defaulttool/DefaultTool.cpp
	M			plugins/dockers/shapeproperties/ShapePropertiesDocker.cpp
	M			plugins/kexi/spreadsheet/spreadsheetmigrate.cpp
	M			plugins/textshape/dialogs/ParagraphLayout.cpp
	P			plugins/textshape/dialogs/ParagraphLayout.h Copied to krita/ui/widgets/kis_tool_options_popup.h
	M			qtquick/CQPresentationCanvas.cpp
	M			sheets/Cell.h
	M			sheets/FunctionModuleRegistry.cpp
	M			sheets/Global.h
	M			sheets/Localization.cpp
	M			sheets/RowColumnFormat.cpp
	M			sheets/Sheet.h
	M			sheets/Value.cpp
	M			sheets/ValueConverter.cpp
	M			sheets/ValueParser.cpp
	M			sheets/commands/AutoFillCommand.cpp
	M			sheets/dialogs/AutoFormatDialog.cpp
	M			sheets/dialogs/DatabaseDialog.cpp
	M			sheets/dialogs/DocumentSettingsDialog.cpp
	M			sheets/dialogs/LayoutDialog.cpp
	M			sheets/dialogs/LayoutDialog.h
	M			sheets/dialogs/LinkDialog.cpp
	M			sheets/dialogs/SortDialog.cpp
	M			sheets/dialogs/ValidityDialog.cpp
	M			sheets/functions/datetime.cpp
	M			sheets/functions/math.xml
	M			sheets/part/Doc.cpp
	M			sheets/part/Factory.cpp
	M			sheets/part/Factory.h
	M			sheets/part/Factory_init.h
	M			sheets/part/Find.cpp
	M			sheets/part/View.cpp
	M			sheets/part/dialogs/PreferenceDialog.cpp
	M			sheets/shape/TableShape.cpp
	M			sheets/shape/TableTool.cpp
	M			sheets/sheets.appdata.xml
	M			sheets/tests/TestCell.cpp
	M			sheets/tests/TestCellStorage.cpp
	M			sheets/tests/TestPasteCommand.cpp
	M			sheets/tests/inspector.cpp
	M			stage/app/stage.appdata.xml
	M			stage/part/KPrCustomSlideShows.cpp
	M			stage/part/KPrDocument.cpp
	M			stage/part/KPrFactory.cpp
	M			stage/part/KPrFactory.h
	P			stage/part/KPrFactoryInit.h Copied to words/part/author/CAuFactoryInit.h
	M			stage/part/KPrView.cpp
	M			stage/part/KPrViewModeSlidesSorter.cpp
	M			stage/part/tools/animationtool/KPrAnimationSelectorWidget.cpp
	M			stage/part/tools/animationtool/KPrPredefinedAnimationsLoader.cpp
	M			stage/templates/odf/cohere-blue.desktop
	M			stage/templates/odf/cohere-gold.desktop
	M			stage/templates/odf/cohere-magenta.desktop
	M			stage/templates/odf/cohere-red.desktop
	M			stage/templates/odf/skyline_monotone.desktop
	M			stage/templates/odf/skyline_monotone_wide.desktop
	M			stage/templates/odf/skyline_morning.desktop
	M			stage/templates/odf/skyline_morning_wide.desktop
	M			stage/templates/odf/skyline_night.desktop
	M			stage/templates/odf/skyline_night_wide.desktop
	M			words/app/words.appdata.xml
	M			words/part/KWCanvasBase.cpp
	M			words/part/KWDocument.cpp
	M			words/part/KWFactory.cpp
	M			words/part/KWFactory.h
	M			words/part/KWFactoryInit.h
	M			words/part/KWGui.cpp
	M			words/part/KWOdfLoader.cpp
	M			words/part/KWOdfWriter.cpp
	M			words/part/KWRootAreaProvider.cpp
	M			words/part/KWView.cpp
	M			words/part/author/CAuFactory.cpp
	M			words/part/author/CAuFactory.h
	M			words/part/author/CAuFactoryInit.cpp
	P			words/part/author/CAuFactoryInit.h Copied from stage/part/KPrFactoryInit.h
	M			words/part/author/CAuView.cpp
	M			words/part/frames/KWTextFrameSet.cpp