Diffusion Krita 27e49757bac8

Merge branch 'master' into rempt/resourcemodel_rewrite
27e49757bac8
Actions

Authored by rempt on Jun 24 2020, 8:53 AM.

Description

Merge branch 'master' into rempt/resourcemodel_rewrite

Details

Committed

rempt

Jun 24 2020, 8:53 AM

Parents

R37:8f68fc901d55: Remove resetModel method
R37:a57d554de05a: Fixed bug where if user deleted the resource location, Krita would no longer…

Branches

Unknown

Tags

Unknown

References

refs/keep-around/27e49757bac81936fef60887829f886396f4d154

rempt committed R37:27e49757bac8: Merge branch 'master' into rempt/resourcemodel_rewrite (authored by rempt).Jun 24 2020, 8:53 AM

Merged Changes

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

Commit	Author	Details	Committed
a57d554de05a	Peter Schatz/rempt	Fixed bug where if user deleted the resource location, Krita would no longer…	Jun 24 2020
a1f984947305	rempt	Try to fix build with Qt 5.9	Jun 24 2020
670fedbf6e02	rempt	Update the waterc brushes so they work with mice, too	Jun 24 2020
fab132090997	yurchor	Fix minor typo	Jun 24 2020
1281d6f85441	emmetoneill	Temporarily remove timeline scrollbar realignment.	Jun 24 2020
96e3af27f78e	tymond	Fix contiguous selection tool working on projection	Jun 23 2020
0aa64395380c	rempt	Add support for loading dds files	Jun 23 2020
5a6fbdd61e62	rempt	Fill layers: Keep the config around when switching generators	Jun 23 2020
40e93b1f4ada	dkazakov	Fix Resource ID for KisPatternSizeResourceConverter	Jun 23 2020
1c0687435e24	dkazakov	Fix compilation for master	Jun 23 2020
19ba92090304	dkazakov	Remove commented-out code	Jun 23 2020
9a5aa4d8a94c	Peter Schatz/dkazakov	Pattern Scale slider is now disabled when tools or brushes don't support it.	Jun 23 2020
0cc0d5b70b3b	Peter Schatz/dkazakov	Fixed problem with fourth brush slider not showing up as an option in the list…	Jun 23 2020
2be9d6961281	Peter Schatz/dkazakov	Changed Pattern Scale option to use the same widget it uses in the brush option.	Jun 23 2020
665fb0c3dbfd	Peter Schatz/dkazakov	Adds the option of a slider control for Texture Scale on the main toolbar.	Jun 23 2020
40fdc0d509a4	rempt	Fix the script starter corrupting kritarc	Jun 23 2020
372cb875490b	rempt	Fix generating docker plugin	Jun 23 2020
0543b840d576	rempt	Disambiguate the filter categories	Jun 23 2020
0017039e4cd7	NMaghfurUsman/rempt	Show floating message of activated preset in Ten Brushes	Jun 23 2020
69be49bedf9f	NMaghfurUsman/rempt	python: Add showFloatingMessage to View API	Jun 23 2020
461f5aa0524e	eoinoneill	LayerFilterWidget: Removed parent-inclusion to text filter to keep behavior…	Jun 23 2020
c39731457e6b	eoinoneill	LayerFilterWidget: Reworked color label button visualization to work on more…	Jun 23 2020
e13694dcbccb	eoinoneill	LayerFilterWidget: Fix icon alignment issues on KDE system Made icon for text…	Jun 23 2020
e9fa7916446b	eoinoneill	LayerFilterWidget: Added mouse click filter on menus holding…	Jun 23 2020
80a25bc82a35	eoinoneill	LayerFilterWidget: Reimplement color-pie visualization for when filters are…	Jun 23 2020
83b97c8b77c4	eoinoneill	LayerFilterWidget: Added KisColorLabelButtons to Onion Skins Docker.	Jun 23 2020
884a35cca36d	eoinoneill	LayerFilterWidget -- Updated label selector to match new layer filter widget.	Jun 23 2020
8afb4fccf90f	eoinoneill	LayerFilterWidget: Visual Alterations To KisColorLabelButton	Jun 23 2020
e81381c03e47	eoinoneill	Text Filter Now Accounts for Direct Parent Name	Jun 23 2020
48c39f3424d1	eoinoneill	Added ability to isolate color labels.	Jun 23 2020
8cfe3c70fddf	emmetoneill/eoinoneill	Added new KisLayerFilterWidget.	Jun 23 2020
a4a758b5f396	emmetoneill/eoinoneill	Layer color label recursion no overwrite.	Jun 23 2020
654b158f5b7d	eoinoneill	Finalize last few issues with scrollbar.	Jun 23 2020
bb6fcc6b0753	eoinoneill	Timeline Zoom - Resize now updates infinite scroll field.	Jun 23 2020
228300405398	eoinoneill	ZoomScrollbar: Account for High DPI Displayes.	Jun 23 2020
2160ace1fa76	eoinoneill	Added basic horizontal / vertical deadzone for zoomable scrollbar.	Jun 23 2020
e6f71354c4f0	eoinoneill	KisTimelineRedux: Zoomable Scrollbar Mouse Event Support	Jun 23 2020
c56ead319dee	eoinoneill	Timeline Docker Redux: Scrollbar Realignemnt and Zoom Feat.	Jun 23 2020
b405a261b3db	tymond	Add 'selection as a border' option to Fill Tool	Jun 22 2020
4764f1f9096a	mcoudert/dkazakov	Add a warning label in file layer dialog	Jun 22 2020
9ae4f3bde6f7	NMaghfurUsman/dkazakov	Save and load assistant side handles in .kra and .paintingassistant files	Jun 22 2020
58f15a09f869	rempt	Add a small executable to print the version	Jun 22 2020
87f72b5c02c6	InkLab App/rempt	Fix exporting ORA files	Jun 22 2020
fb772e6e5ac8	rempt	Remove the jpef/jfif mime subtype	Jun 22 2020
3c6f8af56da7	Merlijn Sebrechts/dkazakov	Snap: update to 4.3.0	Jun 22 2020
76adfc5c4477	vanyossi	pkg macos: Fix tarball setup and compile process.	Jun 22 2020
4c7fe5aacb4f	l10n daemon script	SVN_SILENT made messages (.desktop file) - always resolve ours	Jun 22 2020
b499703865a6	rempt	No need to abort when this assert fails	Jun 21 2020
3738d47f327c	rempt	No need to abort when this assert fails	Jun 21 2020
3a4ceb999a3b	scottpetrovic	Python Scratchpad API fixes	Jun 20 2020

Changes (125)
Show All Changes

Very Large Commit

This commit is very large. Load each file individually.

				Path	Packages
	M			benchmarks/kis_floodfill_benchmark.cpp
	M			benchmarks/kis_floodfill_benchmark.h
	M			krita/CMakeLists.txt
	M			krita/data/paintoppresets/j)_WaterC_Basic_Lines-Dry.kpp
	M			krita/data/paintoppresets/j)_WaterC_Basic_Lines-Wet-Pattern.kpp
	M			krita/data/paintoppresets/j)_WaterC_Basic_Lines-Wet.kpp
	M			krita/data/paintoppresets/j)_WaterC_Basic_Round-Fringe_02.kpp
	M			krita/data/paintoppresets/j)_WaterC_Basic_Round-Grain.kpp
	M			krita/data/paintoppresets/j)_WaterC_Basic_Round-Grunge.kpp
	M			krita/data/paintoppresets/j)_WaterC_Flat_Big-Grain_Tilt.kpp
	M			krita/data/paintoppresets/j)_WaterC_Flat_Decay_Tilt.kpp
	M			krita/data/paintoppresets/j)_WaterC_Special_Blobs.kpp
	M			krita/data/paintoppresets/j)_WaterC_Special_Splats.kpp
	M			krita/data/paintoppresets/j)_WaterC_Spread-Pattern.kpp
	M			krita/data/paintoppresets/j)_WaterC_Spread.kpp
	M			krita/data/paintoppresets/j)_WaterC_Spread_WideArea.kpp
	M			krita/data/paintoppresets/j)_WaterC_Water-Pattern.kpp
	M			krita/kritamenu.action
	A			krita/kritaversion.cpp
	M			libs/flake/KoCanvasController.h
	M			libs/flake/KoCanvasControllerWidget.cpp
	M			libs/flake/KoViewConverter.cpp
	M			libs/flake/KoViewConverter.h
	M			libs/flake/tools/KoZoomStrategy.cpp
	M			libs/flake/tools/KoZoomTool.cpp
	M			libs/image/brushengine/kis_paintop_settings.cpp
	M			libs/image/brushengine/kis_paintop_settings.h
	M			libs/image/filter/kis_filter_category_ids.cpp
	M			libs/image/floodfill/kis_scanline_fill.cpp
	M			libs/image/floodfill/kis_scanline_fill.h
	M			libs/image/kis_fill_painter.cc
	M			libs/image/kis_fill_painter.h
	M			libs/libkis/Document.cpp
	M			libs/libkis/Scratchpad.cpp
	M			libs/libkis/Scratchpad.h
	M			libs/libkis/View.cpp
	M			libs/libkis/View.h
	M			libs/resources/KisResourceLocator.cpp
	M			libs/ui/CMakeLists.txt
	M			libs/ui/KisDocument.cpp
	M			libs/ui/KisDocument.h
	M			libs/ui/KisView.cpp
	M			libs/ui/KisView.h
	M			libs/ui/KisViewManager.cpp
	M			libs/ui/actions/kis_selection_action_factories.cpp
	M			libs/ui/canvas/kis_coordinates_converter.cpp
	M			libs/ui/canvas/kis_coordinates_converter.h
	M			libs/ui/dialogs/kis_dlg_generator_layer.cpp
	M			libs/ui/forms/wdgdlgfilelayer.ui
	M			libs/ui/forms/wdgmultipliersdoublesliderspinbox.ui
	M			libs/ui/kis_canvas_resource_provider.cpp
	M			libs/ui/kis_canvas_resource_provider.h
	M			libs/ui/kis_derived_resources.cpp
	M			libs/ui/kis_derived_resources.h
	M			libs/ui/kis_node_filter_proxy_model.cpp
	M			libs/ui/kis_node_filter_proxy_model.h
	M			libs/ui/kis_painting_assistant.cc
	M			libs/ui/kis_paintop_box.cc
	M			libs/ui/kis_paintop_box.h
	M			libs/ui/opengl/kis_opengl_canvas2.cpp
	M			libs/ui/processing/fill_processing_visitor.cpp
	M			libs/ui/processing/fill_processing_visitor.h
	M			libs/ui/tests/fill_processing_visitor_test.cpp
	M			libs/ui/widgets/kis_color_filter_combo.cpp
	M			libs/ui/widgets/kis_color_filter_combo.h
	A			libs/ui/widgets/kis_color_label_button.cpp
	A			libs/ui/widgets/kis_color_label_button.h
	M			libs/ui/widgets/kis_color_label_selector_widget.cpp
	M			libs/ui/widgets/kis_color_label_selector_widget.h
	A			libs/ui/widgets/kis_layer_filter_widget.cpp
	A			libs/ui/widgets/kis_layer_filter_widget.h
	M			libs/ui/widgets/kis_multipliers_double_slider_spinbox.cpp
	M			libs/ui/widgets/kis_multipliers_double_slider_spinbox.h
	M			libs/ui/widgets/kis_scratch_pad.cpp
	M			libs/ui/widgets/kis_scratch_pad.h
	M			libs/ui/widgets/kis_wdg_generator.cpp
	M			libs/widgets/KoToolBox.cpp
	M			libs/widgetutils/CMakeLists.txt
	A			libs/widgetutils/kis_zoom_scrollbar.cpp
	A			libs/widgetutils/kis_zoom_scrollbar.h
	M			packaging/linux/snap/snapcraft.yaml
	M			packaging/macos/osxbuild.sh
	M			plugins/assistants/Assistants/VanishingPointAssistant.cc
	M			plugins/assistants/Assistants/kis_assistant_tool.cc
	M			plugins/dockers/animation/kis_time_based_item_model.cpp
	M			plugins/dockers/animation/kis_time_based_item_model.h
	M			plugins/dockers/animation/onion_skins_docker.cpp
	M			plugins/dockers/animation/onion_skins_docker.h
	M			plugins/dockers/animation/onion_skins_docker.ui
	M			plugins/dockers/animation/timeline_docker.cpp
	M			plugins/dockers/animation/timeline_frames_model.h
	M			plugins/dockers/animation/timeline_frames_view.cpp
	M			plugins/dockers/animation/timeline_frames_view.h
	M			plugins/dockers/animation/timeline_ruler_header.cpp
	M			plugins/dockers/animation/timeline_ruler_header.h
	M			plugins/dockers/layerdocker/LayerBox.cpp
	M			plugins/dockers/layerdocker/LayerBox.h
	M			plugins/dockers/layerdocker/WdgLayerBox.ui
	M			plugins/extensions/pykrita/sip/krita/Document.sip
	M			plugins/extensions/pykrita/sip/krita/Scratchpad.sip
	M			plugins/extensions/pykrita/sip/krita/View.sip
	M			plugins/impex/jpeg/krita_jpeg_export.json
	M			plugins/impex/jpeg/krita_jpeg_import.json
	M			plugins/impex/ora/kis_open_raster_stack_save_visitor.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/paintops/filterop/kis_filterop_settings.cpp
	M			plugins/paintops/filterop/kis_filterop_settings.h
	M			plugins/paintops/hairy/kis_hairy_paintop_settings.cpp
	M			plugins/paintops/hairy/kis_hairy_paintop_settings.h
	M			plugins/paintops/libpaintop/kis_brush_based_paintop_settings.cpp
	M			plugins/paintops/libpaintop/kis_brush_based_paintop_settings.h
	M			plugins/paintops/sketch/kis_sketch_paintop_settings.cpp
	M			plugins/paintops/sketch/kis_sketch_paintop_settings.h
	M			plugins/python/assignprofiledialog/kritapykrita_assignprofiledialog.desktop
	M			plugins/python/batch_exporter/kritapykrita_batch_exporter.desktop
	M			plugins/python/channels2layers/kritapykrita_channels2layers.desktop
	M			plugins/python/krita_script_starter/krita_script_starter.py
	M			plugins/python/tenbrushes/tenbrushes.py
	M			plugins/tools/basictools/kis_tool_fill.cc
	M			plugins/tools/basictools/kis_tool_fill.h
	M			plugins/tools/selectiontools/kis_tool_select_contiguous.cc
	M			plugins/tools/selectiontools/kis_tool_select_contiguous.h
	M			plugins/tools/tool_crop/KisToolCrop.action