Diffusion Krita 2f056fb17ba1

Merge branch 'master' into rempt/resourcemodel_rewrite
2f056fb17ba1
Actions

Authored by rempt on Jun 9 2020, 9:23 AM.

Description

Merge branch 'master' into rempt/resourcemodel_rewrite

Details

Committed

rempt

Jun 9 2020, 9:23 AM

Parents

R37:ddc4f481eb6e: Add a model to filter resources for active status and status of their storage
R37:9f98ec4ab2ea: Disable the fast float plugin for now.

Branches

Unknown

Tags

Unknown

rempt committed R37:2f056fb17ba1: Merge branch 'master' into rempt/resourcemodel_rewrite (authored by rempt).Jun 9 2020, 9:23 AM

Merged Changes

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

Commit	Author	Details	Committed
9f98ec4ab2ea	rempt	Disable the fast float plugin for now.	Jun 9 2020
b5e18c501723	rempt	Re-add karchive so kimageformats can open kra files	Jun 9 2020
e3c0816bc11f	dkazakov	Fix border artifacts in edge-detection filters	Jun 8 2020
9e9bfce29b68	emmetoneill	Fixed OpenGL canvas rendering for High-DPI displays.	Jun 8 2020
9dbe11bbdb4c	rempt	Fix error in 3rdparty instructions	Jun 8 2020
6b83942ff92e	woltherav	Change shear to be in percentages as it is a ratio, not pixels.	Jun 7 2020
1eecb736ee8d	woltherav	Hide 3d transformation box, remove unused color box.	Jun 7 2020
2d505b0c2380	l10n daemon script	SVN_SILENT made messages (.desktop file) - always resolve ours	Jun 7 2020
2d560c4a9d8b	rempt	Add i18nc to the scripting api	Jun 6 2020
b55104a6eaf4	woltherav	Merge branch 'master' into wolthera/T1624-pattern-rotation	Jun 6 2020
99760f90512c	l10n daemon script	SVN_SILENT made messages (.desktop file) - always resolve ours	Jun 6 2020
9efd1d1379ec	dkazakov	Show selection outline when moving with move-selection-stroke	Jun 5 2020
0ffed8a5c678	dkazakov	Fix arrow markers to look better	Jun 5 2020
9d7f912e6904	rempt	Fix unique constraint on creating resources	Jun 5 2020
ef0398cc9b56	rempt	disambiguate two strings	Jun 5 2020
8130dce97a47	alvinhochun	Win installer: Make uninstaller prompt show in correct language	Jun 5 2020
ae5d76636c42	dkazakov	Fix freeze when changing shape's marker	Jun 5 2020
042ad182551e	dkazakov	Don't update too much area around path shapes	Jun 5 2020
e361f9fe0f4c	dkazakov	Notify KoShapeManager's r-tree about changing the shape's bounds	Jun 5 2020
e2ce6347d630	dkazakov	Fix double updates when changing shape's marker	Jun 5 2020
e4db3ce4e05f	alvinhochun	Win installer: Skip language selection dialog in silent mode	Jun 5 2020
17f47918e9c7	alvinhochun	Win installer: Reuse language on uninstall	Jun 5 2020
0e3b1a422f9b	l10n daemon script	SVN_SILENT made messages (.desktop file) - always resolve ours	Jun 5 2020
e801f946f024	dkazakov	Recover active node when the user toggles "Edit Global Selection"	Jun 4 2020
c6d00e8fb666	dkazakov	Fix conversion of masks into a paint layer	Jun 4 2020
96157f51e8ed	dkazakov	Fix move-selection action after using locked-alpha painting	Jun 4 2020
2a18026d9254	woltherav	Add pattern transform options to fill tool.	Jun 4 2020
dbf24cc8e3f6	alvinhochun	Win installer: Fix using the translation files	Jun 4 2020
9853d845a7a2	woltherav	Merge branch 'master' into wolthera/T1624-pattern-rotation	Jun 4 2020
8c66e58706b3	woltherav	Add options to allow rotation and scale of geometric pattern fill.	Jun 4 2020
cc3adcfd25be	rempt	Do not crash on loading broken gradients in layer styles	Jun 4 2020
c6581b15864c	alvinhochun	Win installer: Fix makensis invocation	Jun 4 2020
89c9b8c85b03	dkazakov	Add notification that move-selection stroke ended unexpectedly	Jun 4 2020
c30616ba926f	dkazakov	Don't start move-selection stroke if selection is empty	Jun 4 2020
999b37ef4316	woltherav	Replace old pattern painting places with the new fill algorithm.	Jun 4 2020
923a9a7122ab	alvinhochun	Merge branch 'nsis-localization'	Jun 4 2020
859609a79157	alvinhochun	Win installer: Include Simp. Chinese translation	Jun 4 2020
109309b481ca	tysontan/alvinhochun	Add S-Chinese translation to NSIS installer.	Jun 4 2020
ed49fff88f9f	alvinhochun	Win installer: Stop adding the "Uninstall Krita" item to the Start Menu	Jun 4 2020
a4cfe5861757	alvinhochun	Win installer: Make some changes to the strings	Jun 4 2020
000ad10e9444	alvinhochun	Win installer: Add tentative Trad. Chinese translations	Jun 4 2020
9713ef5f6330	alvinhochun	Win installer: Split strings into its own file	Jun 4 2020
7ea17bf85736	alvinhochun	Win installer: Remove prompt regarding separate shell extension	Jun 4 2020
b31446819d9c	alvinhochun	Win installer: Combine desktop icon page and confirm page	Jun 4 2020
a06bc489cb1a	alvinhochun	Win installer: Fix deletion of localized shortcut	Jun 4 2020
97e7841a786a	alvinhochun	Win installer: Reduce the amount of strings to translate	Jun 4 2020
c2c850f50708	alvinhochun	Win installer: Simplify ancient version handling to reduce strings	Jun 4 2020
ae22d453bf45	alvinhochun	Win installer: Extract strings to prepare for translation	Jun 4 2020
aec3418f259b	alvinhochun	Bump Windows installer NSIS version to 3.05	Jun 4 2020
6c22682177b6	dkazakov	Fix converting multile shapes into a vector selection	Jun 3 2020

Changes (264)
Show All Changes

Very Large Commit

This commit is very large. Load each file individually.

		Path
M		3rdparty/README.md
M		3rdparty/ext_frameworks/CMakeLists.txt
M		3rdparty/ext_lcms2/CMakeLists.txt
V		3rdparty/ext_lcms2/{lcms2-10.diff ← lcms2-9.diff}
V		3rdparty/ext_lcms2/{lcms2-9.diff → lcms2-10.diff}
M		krita/data/cursors/cursors.qrc
A		krita/data/cursors/tool_color_picker_cursor.png
A		krita/data/shaders/overlay_inverted.frag
M		krita/data/shaders/shaders.qrc
M		krita/krita.qrc
V		krita/{krita4.xmlgui → krita5.xmlgui}
V		krita/{krita5.xmlgui ← krita4.xmlgui}
M		krita/kritamenu.action
M		krita/main.cc
M		krita/org.kde.krita.appdata.xml
A		krita/pics/svg/dark_python.svg
A		krita/pics/svg/light_python.svg
M		krita/pics/svg/svg-icons.qrc
M		libs/command/kis_command_utils.cpp
M		libs/flake/CMakeLists.txt
M		libs/flake/KoMarker.cpp
M		libs/flake/KoPathShape.cpp
M		libs/flake/KoShape.cpp
M		libs/flake/KoShapeController.cpp
M		libs/flake/KoShapeControllerBase.cpp
M		libs/flake/KoShapeControllerBase.h
M		libs/flake/KoShapeManager.cpp
M		libs/flake/SimpleShapeContainerModel.h
A		libs/flake/commands/KoAddRemoveShapeCommands.cpp
A		libs/flake/commands/KoAddRemoveShapeCommands.h
M		libs/flake/commands/KoPathCombineCommand.cpp
M		libs/flake/commands/KoPathShapeMarkerCommand.cpp
M		libs/flake/commands/KoShapeClipCommand.cpp
M		libs/flake/commands/KoShapeCreateCommand.cpp
M		libs/flake/commands/KoShapeDeleteCommand.cpp
M		libs/flake/commands/KoShapeUnclipCommand.cpp
M		libs/flake/styles/markers.svg
M		libs/flake/tests/MockShapes.h
M		libs/flake/tests/TestPointMergeCommand.cpp
M		libs/flake/tests/TestPointRemoveCommand.cpp
M		libs/flake/tests/TestShapePainting.cpp
M		libs/flake/text/KoSvgTextShape.cpp
M		libs/global/KisUsageLogger.cpp
M		libs/global/kis_algebra_2d.cpp
M		libs/image/KisSelectionUpdateCompressor.cpp
M		libs/image/commands/kis_node_property_list_command.cpp
M		libs/image/kis_asl_layer_style_serializer.cpp
M		libs/image/kis_base_node.cpp
M		libs/image/kis_base_node.h
M		libs/image/kis_convolution_painter.h
M		libs/image/kis_default_bounds.cpp
M		libs/image/kis_default_bounds.h
M		libs/image/kis_edge_detection_kernel.cpp
M		libs/image/kis_fill_painter.cc
M		libs/image/kis_fill_painter.h
M		libs/image/kis_image.cc
M		libs/image/kis_indirect_painting_support.cpp
M		libs/image/kis_layer.cc
M		libs/image/kis_layer.h
M		libs/image/kis_mask.cc
M		libs/image/kis_mask.h
M		libs/image/kis_paint_device.cc
M		libs/image/kis_paint_device.h
M		libs/image/kis_paint_device_data.h
M		libs/image/kis_painter.cc
M		libs/image/kis_painter.h
M		libs/image/kis_painter_p.h
M		libs/image/kis_perspectivetransform_worker.cpp
M		libs/image/kis_processing_applicator.cpp
M		libs/image/kis_processing_applicator.h
M		libs/image/kis_selection.cc
M		libs/image/kis_selection.h
M		libs/image/kis_selection_based_layer.cpp
M		libs/image/kis_selection_based_layer.h
M		libs/image/kis_transaction_data.cpp
M		libs/image/kis_transaction_data.h
M		libs/image/layerstyles/kis_ls_utils.cpp
M		libs/image/lazybrush/kis_colorize_mask.cpp
M		libs/image/tests/CMakeLists.txt
M		libs/image/tests/kis_selection_test.cpp
M		libs/libkis/CMakeLists.txt
M		libs/libkis/Document.cpp
M		libs/libkis/Krita.cpp
M		libs/libkis/Krita.h
A		libs/libkis/Scratchpad.cpp
A		libs/libkis/Scratchpad.h
M		libs/libkis/Selection.cpp
M		libs/libkis/View.cpp
M		libs/libkis/View.h
M		libs/libkis/libkis.h
M		libs/libqml/plugins/kritasketchplugin/models/LayerModel.cpp
M		libs/pigment/resources/KoSegmentGradient.cpp
M		libs/psd/asl/kis_asl_xml_writer.cpp
M		libs/resources/sql/create_resources.sql
M		libs/ui/KisActionPlugin.h
M		libs/ui/KisApplication.cpp
M		libs/ui/KisImportExportErrorCode.cpp
M		libs/ui/KisMainWindow.cpp
M		libs/ui/KisMainWindow.h
M		libs/ui/KisViewManager.cpp
M		libs/ui/actions/kis_selection_action_factories.cpp
M		libs/ui/canvas/kis_canvas2.cpp
M		libs/ui/dialogs/kis_dlg_preferences.cc
M		libs/ui/flake/kis_shape_controller.cpp
M		libs/ui/flake/kis_shape_controller.h
M		libs/ui/flake/kis_shape_layer.cc
M		libs/ui/flake/kis_shape_layer_canvas.cpp
M		libs/ui/flake/kis_shape_selection.cpp
M		libs/ui/flake/kis_shape_selection.h
M		libs/ui/flake/kis_shape_selection_model.cpp
M		libs/ui/forms/wdggeometryoptions.ui
M		libs/ui/input/kis_input_manager_p.cpp
M		libs/ui/kis_config.cc
M		libs/ui/kis_config.h
M		libs/ui/kis_layer_manager.cc
M		libs/ui/kis_node_model.cpp
M		libs/ui/kis_selection_decoration.cc
M		libs/ui/kis_selection_manager.cc
M		libs/ui/opengl/KisOpenGLModeProber.cpp
M		libs/ui/opengl/KisOpenGLModeProber.h
M		libs/ui/opengl/kis_opengl.cpp
M		libs/ui/opengl/kis_opengl.h
M		libs/ui/opengl/kis_opengl_canvas2.cpp
M		libs/ui/opengl/kis_opengl_canvas2.h
M		libs/ui/opengl/kis_opengl_shader_loader.cpp
M		libs/ui/opengl/kis_opengl_shader_loader.h
M		libs/ui/processing/fill_processing_visitor.cpp
M		libs/ui/tests/kis_shape_selection_test.cpp
M		libs/ui/tests/kis_shape_selection_test.h
M		libs/ui/tests/util.h
M		libs/ui/tool/kis_figure_painting_tool_helper.cpp
M		libs/ui/tool/kis_figure_painting_tool_helper.h
M		libs/ui/tool/kis_resources_snapshot.cpp
M		libs/ui/tool/kis_resources_snapshot.h
M		libs/ui/tool/kis_selection_tool_helper.cpp
M		libs/ui/tool/kis_tool_shape.cc
M		libs/ui/tool/kis_tool_shape.h
M		libs/ui/tool/strokes/move_stroke_strategy.cpp
M		libs/ui/widgets/kis_scratch_pad.cpp
M		libs/ui/widgets/kis_scratch_pad.h
M		packaging/windows/installer/ConfigureInstallerNsis.cmake
M		packaging/windows/installer/MakeInstallerNsis.cmake.in
M		packaging/windows/installer/installer_krita.nsi
A	(dir)	packaging/windows/installer/translations/
A		packaging/windows/installer/translations/English.nsh
A		packaging/windows/installer/translations/SimpChinese.nsh
A		packaging/windows/installer/translations/TradChinese.nsh
A	(dir)	packaging/windows/msix/
A		packaging/windows/msix/.gitignore
A		packaging/windows/msix/01_gen_resources_pri.cmd
A		packaging/windows/msix/02_gen_mapping.cmd
A		packaging/windows/msix/03_build_msix.cmd
A		packaging/windows/msix/README.md
A		packaging/windows/msix/manifest.xml
A	(dir)	packaging/windows/msix/pkg/
A	(dir)	packaging/windows/msix/pkg/Assets/
A		packaging/windows/msix/pkg/Assets/Square150x150Logo.scale-100.png
A		packaging/windows/msix/pkg/Assets/Square150x150Logo.scale-125.png
A		packaging/windows/msix/pkg/Assets/Square150x150Logo.scale-150.png
A		packaging/windows/msix/pkg/Assets/Square150x150Logo.scale-200.png
A		packaging/windows/msix/pkg/Assets/Square150x150Logo.scale-400.png
A		packaging/windows/msix/pkg/Assets/Square310x310Logo.scale-100.png
A		packaging/windows/msix/pkg/Assets/Square310x310Logo.scale-125.png
A		packaging/windows/msix/pkg/Assets/Square310x310Logo.scale-150.png
A		packaging/windows/msix/pkg/Assets/Square310x310Logo.scale-200.png
A		packaging/windows/msix/pkg/Assets/Square310x310Logo.scale-400.png
A		packaging/windows/msix/pkg/Assets/Square44x44Logo.scale-100.png
A		packaging/windows/msix/pkg/Assets/Square44x44Logo.scale-125.png
A		packaging/windows/msix/pkg/Assets/Square44x44Logo.scale-150.png
A		packaging/windows/msix/pkg/Assets/Square44x44Logo.scale-200.png
A		packaging/windows/msix/pkg/Assets/Square44x44Logo.scale-400.png
A		packaging/windows/msix/pkg/Assets/Square44x44Logo.targetsize-16.png
A		packaging/windows/msix/pkg/Assets/Square44x44Logo.targetsize-16_altform-unplated.png
A		packaging/windows/msix/pkg/Assets/Square44x44Logo.targetsize-24.png
A		packaging/windows/msix/pkg/Assets/Square44x44Logo.targetsize-24_altform-unplated.png
A		packaging/windows/msix/pkg/Assets/Square44x44Logo.targetsize-256.png
A		packaging/windows/msix/pkg/Assets/Square44x44Logo.targetsize-256_altform-unplated.png
A		packaging/windows/msix/pkg/Assets/Square44x44Logo.targetsize-32.png
A		packaging/windows/msix/pkg/Assets/Square44x44Logo.targetsize-32_altform-unplated.png
A		packaging/windows/msix/pkg/Assets/Square44x44Logo.targetsize-48.png
A		packaging/windows/msix/pkg/Assets/Square44x44Logo.targetsize-48_altform-unplated.png
A		packaging/windows/msix/pkg/Assets/Square71x71Logo.scale-100.png
A		packaging/windows/msix/pkg/Assets/Square71x71Logo.scale-125.png
A		packaging/windows/msix/pkg/Assets/Square71x71Logo.scale-150.png
A		packaging/windows/msix/pkg/Assets/Square71x71Logo.scale-200.png
A		packaging/windows/msix/pkg/Assets/Square71x71Logo.scale-400.png
A		packaging/windows/msix/pkg/Assets/StoreLogo.scale-100.png
A		packaging/windows/msix/pkg/Assets/StoreLogo.scale-125.png
A		packaging/windows/msix/pkg/Assets/StoreLogo.scale-150.png
A		packaging/windows/msix/pkg/Assets/StoreLogo.scale-200.png
A		packaging/windows/msix/pkg/Assets/StoreLogo.scale-400.png
A		packaging/windows/msix/pkg/Assets/Wide310x150Logo.scale-100.png
A		packaging/windows/msix/pkg/Assets/Wide310x150Logo.scale-125.png
A		packaging/windows/msix/pkg/Assets/Wide310x150Logo.scale-150.png
A		packaging/windows/msix/pkg/Assets/Wide310x150Logo.scale-200.png
A		packaging/windows/msix/pkg/Assets/Wide310x150Logo.scale-400.png
A		packaging/windows/msix/pkg/Assets/fileicon.targetsize-16.png
A		packaging/windows/msix/pkg/Assets/fileicon.targetsize-24.png
A		packaging/windows/msix/pkg/Assets/fileicon.targetsize-256.png
A		packaging/windows/msix/pkg/Assets/fileicon.targetsize-32.png
A		packaging/windows/msix/pkg/Assets/fileicon.targetsize-48.png
A		packaging/windows/msix/pkg/Assets/fileicon.targetsize-64.png
A		packaging/windows/msix/priconfig.xml
M		plugins/dockers/animation/timeline_frames_model.cpp
M		plugins/dockers/layerdocker/LayerBox.cpp
M		plugins/dockers/layerdocker/LayerBox.h
M		plugins/extensions/pykrita/plugin/krita/__init__.py
M		plugins/extensions/pykrita/plugin/pyqtpluginsettings.cpp
M		plugins/extensions/pykrita/sip/krita/Krita.sip
A		plugins/extensions/pykrita/sip/krita/Scratchpad.sip
M		plugins/extensions/pykrita/sip/krita/kritamod.sip
M		plugins/generators/pattern/kis_wdg_pattern.cpp
M		plugins/generators/pattern/kis_wdg_pattern.h
M		plugins/generators/pattern/patterngenerator.cpp
M		plugins/generators/pattern/wdgpatternoptions.ui
M		plugins/impex/libkra/kis_kra_load_visitor.cpp
M		plugins/impex/libkra/kis_kra_save_visitor.cpp
M		plugins/impex/libkra/tests/kis_kra_saver_test.cpp
M		plugins/impex/libkra/tests/util.h
M		plugins/paintops/libpaintop/forms/wdgautobrush.ui
M		plugins/paintops/libpaintop/kis_dynamic_sensor.h
M		plugins/python/CMakeLists.txt
M		plugins/python/assignprofiledialog/kritapykrita_assignprofiledialog.desktop
A	(dir)	plugins/python/batch_exporter/
A		plugins/python/batch_exporter/COATools.py
A		plugins/python/batch_exporter/Config.py
A		plugins/python/batch_exporter/Infrastructure.py
A		plugins/python/batch_exporter/Manual.html
A		plugins/python/batch_exporter/Manual.md
A	(dir)	plugins/python/batch_exporter/Utils/
A		plugins/python/batch_exporter/Utils/Export.py
A		plugins/python/batch_exporter/Utils/Tree.py
A		plugins/python/batch_exporter/Utils/__init__.py
A		plugins/python/batch_exporter/__init__.py
A		plugins/python/batch_exporter/batch_exporter.py
A		plugins/python/batch_exporter/kritapykrita_batch_exporter.desktop
A		plugins/python/batch_exporter/pyproject.toml
A	(dir)	plugins/python/channels2layers/
A		plugins/python/channels2layers/Manual.html
A		plugins/python/channels2layers/__init__.py
A		plugins/python/channels2layers/channels2layers.jpg
A		plugins/python/channels2layers/channels2layers.py
A		plugins/python/channels2layers/kritapykrita_channels2layers.desktop
M		plugins/python/documenttools/kritapykrita_documenttools.desktop
M		plugins/python/exportlayers/kritapykrita_exportlayers.desktop
M		plugins/python/filtermanager/kritapykrita_filtermanager.desktop
M		plugins/python/krita_script_starter/kritapykrita_krita_script_starter.desktop
M		plugins/python/mixer_slider_docker/kritapykrita_mixer_slider_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/scriptdocker/kritapykrita_scriptdocker.desktop
M		plugins/python/scripter/kritapykrita_scripter.desktop
M		plugins/python/tenbrushes/kritapykrita_tenbrushes.desktop
M		plugins/python/tenscripts/kritapykrita_tenscripts.desktop
M		plugins/tools/basictools/kis_tool_ellipse.cc
M		plugins/tools/basictools/kis_tool_fill.cc
M		plugins/tools/basictools/kis_tool_fill.h
M		plugins/tools/basictools/kis_tool_move.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_config_widget.cpp