Diffusion Krita 271812f503ca

Merge branch 'master' into rempt/T379-resource-management
271812f503ca
Actions

Authored by rempt on Jul 31 2019, 9:10 AM.

Description

Merge branch 'master' into rempt/T379-resource-management

Details

Committed

rempt

Jul 31 2019, 9:10 AM

Parents

R37:73511cb7725c: GIT_SILENT made messages (after extraction)
R37:cfe0a93a7cce: Merge branch 'master' into rempt/T379-resource-management

Branches

Unknown

Tags

Unknown

References

refs/keep-around/271812f503cad6068ac732b1c80e288fbfbae8cd

rempt committed R37:271812f503ca: Merge branch 'master' into rempt/T379-resource-management (authored by rempt).Jul 31 2019, 9:10 AM

Merged Changes

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

Commit	Author	Details	Committed
73511cb7725c	l10n daemon script	GIT_SILENT made messages (after extraction)	Jul 31 2019
5f2bbef2eb13	sh-zam	Updated `kritadefault.profile` version number	Jul 30 2019
2c07467638cc	dkazakov	Make sure that the tool action is deactivated/finished exactly for the canvas…	Jul 30 2019
d23d38ec9280	dkazakov	Remove KisTool::notifyMdified	Jul 30 2019
54e66ea42076	dkazakov	Remove artifacts of blind find-replace of qDebug	Jul 30 2019
008503fb5c55	dkazakov	Make shape painting tools unblocking (use strokes)	Jul 30 2019
b8870d02392a	dkazakov	Make KisShortcutMatcher be more tolerant to recursive entering	Jul 30 2019
30f971a6b1f4	dkazakov	Fix a crash in transform tool caused by wrong copying of ToolTransformArgs	Jul 30 2019
eb17ce74a26a	dkazakov	Make KisToolTransform fully asynchronous	Jul 30 2019
21889437905f	dkazakov	Make Move Tool asynchronous	Jul 30 2019
26e236d50d51	huftis/tymond	Improve label for input field for number of raindrops	Jul 30 2019
af50061b659d	huftis/tymond	Make ‘Random Noise’ filter name consistent	Jul 30 2019
8686c16f1390	huftis	Make filter subcategory order consistent	Jul 30 2019
3aca33facd8b	huftis	Make ‘...’ suffix of filter names consistent with filter behaviour	Jul 30 2019
6af6c41564aa	amedonosova	Log asserts to usage log	Jul 29 2019
339e748c2d11	amedonosova	Use regular asserts in KisDocument::slotChildCompletedSavingInBackground	Jul 29 2019
d8be8f20215d	amedonosova	Unlock KisDocument in case of an assert after saving	Jul 29 2019
d3c5a3f613dd	amedonosova	Do not process user input during saving operations	Jul 29 2019
b9671ace4fe4	amedonosova	Disallow closing Krita while it initiates saving	Jul 29 2019
0db31fb322d3	sh-zam/rempt	Add option for disabling touch-rotation	Jul 29 2019
9bf9cd4a8338	sh-zam/rempt	Add dedicated action for KisZoomAndRotateAction	Jul 29 2019
07167cd2d884	dkazakov	Add a workaround for KisShortcutsMatcher assert	Jul 29 2019
d1ced644fabf	huftis	Disambiguate ‘Spot’ strings for translation	Jul 29 2019
b4e1710021ce	huftis	Add message context for scene types ‘Portrait’ and ‘Landscape’	Jul 29 2019
2e2f4826a0cd	rempt	Merge branch 'huftis/krita-add-additional-categories'	Jul 29 2019
e43e988af6cd	huftis/rempt	Remove trailing comma and space in list of backers	Jul 29 2019
ab5621f0c52e	yurchor	Add missing spaces	Jul 29 2019
fa3c22deab25	eoinoneill	Gradient Stop Sorting by Value	Jul 29 2019
4271c95684ed	vanyossi	Silence Warnings: unused variable	Jul 29 2019
407e4432434f	vanyossi	Silence warnig: compare signed and unsigned	Jul 29 2019
bb688f63ac73	vanyossi	Silence Warning: Proper concateation of integer and string	Jul 29 2019
8a766115bcdd	vanyossi	Silence Warning: unused variable	Jul 29 2019
50f131267317	vanyossi	Silence warning on undefined macro variables __STDC_VERSION__	Jul 29 2019
c71c1dff9c40	vanyossi	Silence Warning	Jul 29 2019
f9e5d048efca	vanyossi	Silence warnings: Struct declared as class	Jul 29 2019
36abda77fd96	vanyossi	Silence warnigs: Struct declared as class	Jul 29 2019
59943ced085d	vanyossi	Add missing overrides	Jul 29 2019
cfef5ea0163e	vanyossi	Silence warning	Jul 29 2019
3328f797f175	vanyossi	Silence Warnings	Jul 29 2019
ed9d1b67d776	vanyossi	Silence warning	Jul 29 2019
f5750c2ad17a	vanyossi	Silence warning	Jul 29 2019
37ff2088948a	vanyossi	Minor code fix: Private declared as struct	Jul 29 2019
ecedab2bc726	l10n daemon script	SVN_SILENT made messages (.desktop file) - always resolve ours	Jul 29 2019
9150c4cbfc50	huftis	Add subcategories to ‘appdata’ and .desktop files	Jul 28 2019
a358ba53feb7	huftis	Fix filename reference for Rec.709 profiles	Jul 28 2019
98af93aab573	woltherav	BUG:410023 update color profile notes for largeRGB.	Jul 28 2019
73057eeac1f7	woltherav	BUG:410308 Fix logic on seperate image dialog options.	Jul 28 2019
32e10c8f5f6b	huftis/woltherav	Make ‘Saving frames...’ string translatable	Jul 28 2019
1b966ed0e5f0	rempt	Fix URL	Jul 26 2019
c3ed40b50c64	rempt	Try with the zip file, let's see whether that works	Jul 26 2019

Changes (172)
Show All Changes

Very Large Commit

This commit is very large. Load each file individually.

				Path	Packages
	M			.gitignore
	M			3rdparty/ext_frameworks/CMakeLists.txt
	M			3rdparty/ext_frameworks/karchive.diff
	M			3rdparty/ext_frameworks/kconfig.diff
	M			3rdparty/ext_frameworks/ki18n-appdatalocation.diff
	D			3rdparty/ext_frameworks/ki18n.diff
	M			3rdparty/ext_frameworks/kwindowsystem-x11.diff
	M			3rdparty/ext_qt/CMakeLists.txt
	M			CMakeLists.txt
	M			benchmarks/kis_composition_benchmark.cpp
	M			krita/data/aboutdata/LICENSE
	M			krita/data/input/kritadefault.profile
	M			krita/data/templates/comics/Manga-JpTemplate.desktop
	M			krita/data/templates/texture/Texture1k32bitscalar.desktop
	M			krita/data/templates/texture/Texture2k32bitscalar.desktop
	M			krita/data/templates/texture/Texture4k32bitscalar.desktop
	M			krita/data/templates/texture/Texture8k32bitscalar.desktop
	M			krita/krita4.xmlgui
	M			krita/org.kde.krita.appdata.xml
	M			krita/org.kde.krita.desktop
	M			libs/command/kis_command_ids.h
	M			libs/command/kundo2commandextradata.h
	M			libs/flake/KoColorBackground.h
	M			libs/flake/KoResourceManager_p.cpp
	M			libs/global/kis_assert.cpp
	M			libs/image/CMakeLists.txt
	A			libs/image/commands_new/KisHoldUIUpdatesCommand.cpp
	P			libs/image/commands_new/KisHoldUIUpdatesCommand.h Copied from plugins/impex/ppm/tests/kis_ppm_test.h
	M			libs/image/commands_new/kis_saved_commands.cpp
	M			libs/image/commands_new/kis_saved_commands.h
	M			libs/image/kis_crop_saved_extra_data.h
	M			libs/image/kis_histogram.h
	M			libs/image/kis_image.cc
	M			libs/image/kis_image.h
	M			libs/image/kis_image_interfaces.h
	M			libs/image/kis_stroke_strategy_undo_command_based.cpp
	M			libs/image/kis_stroke_strategy_undo_command_based.h
	M			libs/image/tests/kis_group_layer_test.cpp
	M			libs/image/tests/kis_image_test.cpp
	M			libs/image/tests/kis_paint_device_test.cpp
	M			libs/image/tiles3/tests/kis_tiled_data_manager_test.cpp
	M			libs/pigment/KoColorSpaceRegistry.cpp
	M			libs/pigment/KoColorSpaceRegistry.h
	M			libs/pigment/KoCompositeOpRegistry.cpp
	M			libs/pigment/compositeops/KoCompositeOps.h
	M			libs/pigment/resources/KoStopGradient.h
	M			libs/ui/CMakeLists.txt
	M			libs/ui/KisDocument.cpp
	D			libs/ui/KisFilterEntry.cpp
	D			libs/ui/KisFilterEntry.h
	M			libs/ui/KisImportExportFilter.cpp
	M			libs/ui/KisMainWindow.cpp
	M			libs/ui/KisPaletteEditor.cpp
	M			libs/ui/dialogs/KisAsyncAnimationFramesSaveDialog.cpp
	M			libs/ui/dialogs/KisSessionManagerDialog.cpp
	M			libs/ui/dialogs/kis_about_application.cpp
	M			libs/ui/dialogs/kis_delayed_save_dialog.cpp
	M			libs/ui/dialogs/kis_dlg_preferences.cc
	M			libs/ui/forms/wdggeneralsettings.ui
	M			libs/ui/input/kis_input_manager_p.cpp
	M			libs/ui/input/kis_input_profile_manager.cpp
	M			libs/ui/input/kis_pan_action.h
	M			libs/ui/input/kis_rotate_canvas_action.h
	M			libs/ui/input/kis_shortcut_configuration.h
	M			libs/ui/input/kis_shortcut_matcher.cpp
	M			libs/ui/input/kis_shortcut_matcher.h
	M			libs/ui/input/kis_tool_invocation_action.cpp
	M			libs/ui/input/kis_touch_shortcut.cpp
	M			libs/ui/input/kis_touch_shortcut.h
	M			libs/ui/input/kis_zoom_and_rotate_action.cpp
	M			libs/ui/kis_async_action_feedback.cpp
	M			libs/ui/kis_config.cc
	M			libs/ui/kis_config.h
	M			libs/ui/kis_stopgradient_editor.cpp
	M			libs/ui/kis_stopgradient_editor.h
	M			libs/ui/tool/kis_tool.cc
	M			libs/ui/tool/kis_tool.h
	M			libs/ui/tool/kis_tool_freehand.cc
	M			libs/ui/tool/kis_tool_paint.cc
	M			libs/ui/tool/kis_tool_paint.h
	M			libs/ui/tool/kis_tool_polyline_base.cpp
	M			libs/ui/tool/kis_tool_shape.cc
	M			libs/ui/tool/strokes/move_stroke_strategy.cpp
	M			libs/ui/tool/strokes/move_stroke_strategy.h
	M			libs/ui/widgets/kis_advanced_color_space_selector.cc
	M			libs/ui/widgets/kis_color_space_selector.cc
	M			libs/ui/widgets/kis_stopgradient_slider_widget.cpp
	M			libs/widgets/KoResourceServerProvider.cpp
	M			packaging/linux/flatpak/FLATPAK.md
	A			packaging/linux/flatpak/org.kde.krita-nightly.yaml
	A			packaging/linux/flatpak/org.kde.krita-stable.yaml
	M			packaging/linux/snap/snap/gui/krita.desktop
	M			plugins/extensions/animationrenderer/KisAnimationRenderingOptions.h
	M			plugins/extensions/animationrenderer/VideoHDRMetadataOptionsDialog.h
	M			plugins/extensions/metadataeditor/editors/exif.ui
	M			plugins/extensions/separate_channels/dlg_separate.cc
	M			plugins/extensions/separate_channels/dlg_separate.h
	M			plugins/filters/dodgeburn/DodgeBurnPlugin.cpp
	M			plugins/filters/noisefilter/noisefilter.h
	M			plugins/filters/normalize/kis_normalize.cpp
	M			plugins/filters/palettize/palettize.cpp
	M			plugins/filters/raindropsfilter/kis_raindrops_filter.cpp
	M			plugins/filters/tests/kis_crash_filter_test.cpp
	M			plugins/flake/textshape/kotext/styles/KoTableCellStyle.cpp
	M			plugins/generators/simplexnoise/3rdparty/c-open-simplex/open-simplex-noise.h
	M			plugins/impex/CMakeLists.txt
	M			plugins/impex/heif/HeifImport.cpp
	M			plugins/impex/kra/kra_converter.cpp
	D			plugins/impex/ppm
	D			plugins/impex/ppm/CMakeLists.txt
	D			plugins/impex/ppm/kis_ppm_export.cpp
	D			plugins/impex/ppm/kis_ppm_export.h
	D			plugins/impex/ppm/kis_ppm_import.cpp
	D			plugins/impex/ppm/kis_ppm_import.h
	D			plugins/impex/ppm/kis_wdg_options_ppm.ui
	D			plugins/impex/ppm/krita_ppm.desktop
	D			plugins/impex/ppm/krita_ppm_export.json
	D			plugins/impex/ppm/krita_ppm_import.json
	D			plugins/impex/ppm/tests
	D			plugins/impex/ppm/tests/CMakeLists.txt
	D			plugins/impex/ppm/tests/data
	D			plugins/impex/ppm/tests/data/incorrectFormatFile.txt
	D			plugins/impex/ppm/tests/data/readonlyFile.txt
	D			plugins/impex/ppm/tests/data/results
	D			plugins/impex/ppm/tests/data/results/j.pbm.png
	D			plugins/impex/ppm/tests/data/results/test2.pgm.png
	D			plugins/impex/ppm/tests/data/results/test2.ppm.png
	D			plugins/impex/ppm/tests/data/results/test3.pgm.png
	D			plugins/impex/ppm/tests/data/results/test3.ppm.png
	D			plugins/impex/ppm/tests/data/sources
	D			plugins/impex/ppm/tests/data/sources/j.pbm
	D			plugins/impex/ppm/tests/data/sources/test2.pgm
	D			plugins/impex/ppm/tests/data/sources/test2.ppm
	D			plugins/impex/ppm/tests/data/sources/test3.pgm
	D			plugins/impex/ppm/tests/data/sources/test3.ppm
	D			plugins/impex/ppm/tests/data/writeonlyFile.txt
	D			plugins/impex/ppm/tests/kis_ppm_test.cpp
	P			plugins/impex/ppm/tests/kis_ppm_test.h Deleted after being copied to multiple locations: libs/image/commands_new/KisHoldUIUpdatesCommand.h plugins/tools/basictools/KisMoveBoundsCalculationJob.h
	M			plugins/impex/qimageio/kis_qimageio_import.cpp
	M			plugins/impex/qimageio/krita_qimageio.desktop
	M			plugins/impex/qimageio/krita_qimageio_export.json
	M			plugins/impex/qimageio/krita_qimageio_import.json
	M			plugins/impex/xcf/3rdparty/xcftools/utils.c
	M			plugins/python/assignprofiledialog/kritapykrita_assignprofiledialog.desktop
	M			plugins/python/comics_project_management_tools/kritapykrita_comics_project_management_tools.desktop
	M			plugins/python/krita_script_starter/kritapykrita_krita_script_starter.desktop
	M			plugins/python/palette_docker/kritapykrita_palette_docker.desktop
	M			plugins/python/plugin_importer/kritapykrita_plugin_importer.desktop
	M			plugins/python/quick_settings_docker/kritapykrita_quick_settings_docker.desktop
	M			plugins/python/tenscripts/kritapykrita_tenscripts.desktop
	M			plugins/tools/basictools/CMakeLists.txt
	A			plugins/tools/basictools/KisMoveBoundsCalculationJob.cpp
	V			plugins/{tools/basictools/KisMoveBoundsCalculationJob.h ← impex/ppm/tests/kis_ppm_test.h}
	M			plugins/tools/basictools/kis_tool_ellipse.cc
	M			plugins/tools/basictools/kis_tool_gradient.cc
	M			plugins/tools/basictools/kis_tool_move.cc
	M			plugins/tools/basictools/kis_tool_move.h
	M			plugins/tools/basictools/kis_tool_path.cc
	M			plugins/tools/basictools/kis_tool_rectangle.cc
	M			plugins/tools/basictools/strokes/move_selection_stroke_strategy.cpp
	M			plugins/tools/basictools/strokes/move_selection_stroke_strategy.h
	M			plugins/tools/tool_polygon/kis_tool_polygon.cc
	M			plugins/tools/tool_polyline/kis_tool_polyline.cc
	M			plugins/tools/tool_transform2/kis_tool_transform.cc
	M			plugins/tools/tool_transform2/kis_tool_transform.h
	M			plugins/tools/tool_transform2/kis_tool_transform_config_widget.cpp
	M			plugins/tools/tool_transform2/kis_transform_utils.cpp
	M			plugins/tools/tool_transform2/kis_transform_utils.h
	M			plugins/tools/tool_transform2/strokes/transform_stroke_strategy.cpp
	M			plugins/tools/tool_transform2/strokes/transform_stroke_strategy.h
	M			plugins/tools/tool_transform2/tool_transform_args.cc
	M			plugins/tools/tool_transform2/transform_transaction_properties.h