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

Authored by rempt on Jan 14 2019, 12:04 PM.

Description

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

Details

Committed

Jan 14 2019, 12:04 PM

Parents

R37:097d7e617aa2: Refactor KisNodeDelegate and support RTL
R37:fcc92fe9b500: Merge branch 'master' into rempt/T379-resource-management

Branches

Unknown

Tags

Unknown

rempt committed R37:dff00c5462ca: Merge branch 'master' into rempt/T379-resource-management (authored by rempt).Jan 14 2019, 12:04 PM

Merged Changes

Commit		Author	Details	Committed
097d7e617aa2	D15590	safaalfulaij	Refactor KisNodeDelegate and support RTL	Jan 13 2019
95773b5057b1		scottpetrovic	D18098 Add hasKeyframeAtTime function to Node Python API	Jan 10 2019
0b4c6ba35423		yurchor	Fix minor Doxygen issues (the last part)	Jan 10 2019
8edafb150aa6		yurchor	Fix minor Doxygen issues	Jan 9 2019
aed191675e82		jounip	Always update UI time when changing displayed frame	Jan 9 2019
69392e7bd7cd		dkazakov	Revert "Add a CMake option for ASAN address sanitizer"	Jan 9 2019
540000e98c19		yurchor	Minor fixes of Doxygen documentation	Jan 9 2019
570ee13bcc12		yurchor	Fix minor Doxygen issues	Jan 8 2019
05762b6eb3b2	D17853	dkazakov	Add a CMake option for ASAN address sanitizer	Jan 7 2019
46cf08f0484f		yurchor	Fix minor Doxygen issues	Jan 7 2019
0c1da950700a	D18036	sitter	encode the old appstream id as provided by the new appstream id	Jan 7 2019
7225997b8e8e		pavelb/rempt	BUG:402535 Make sure the assistant does not return NaN points	Jan 7 2019
80613a5bdc10		l10n daemon script	SVN_SILENT made messages (.desktop file) - always resolve ours	Jan 7 2019
3bbe0fc97896		l10n daemon script	GIT_SILENT made messages (after extraction)	Jan 7 2019
d6a1aae89e16		rempt	Add information about memory, cores and swap location to the buginfo	Jan 6 2019
b1e502e5ccf3		rempt	Add a safe assert to prevent Krita from crashing when a toolbar gets…	Jan 6 2019
6970bfcad9bf		rempt	Restore the ui after crashing in canvasonly mode	Jan 6 2019
5fe95d19fc18		yurchor	Fix minor Doxygen issues	Jan 6 2019
91430816af88		l10n daemon script	SVN_SILENT made messages (.desktop file) - always resolve ours	Jan 6 2019
e8064685ba7a		yurchor	Fix minor Doxygen issues	Jan 5 2019
52528f6a3fd6		yurchor	Fix minor Doxygen issues	Jan 5 2019

Changes (231)
Show All Changes

Very Large Commit

This commit is very large. Load each file individually.

				Path	Packages
	M			krita/data/templates/animation/.directory
	M			krita/data/templates/animation/Anim-Jp-EN.desktop
	M			krita/data/templates/animation/Anim-Jp-JP.desktop
	M			krita/data/templates/comics/a4_waffle_grid.desktop
	M			krita/data/templates/design/Designcinema16_10_2484x1200_96dpiRGB_8bit_.desktop
	M			krita/data/templates/design/Designcinema2.39_1_2484x1040_96dpiRGB_8bit_.desktop
	M			krita/data/templates/design/DesignpresentationA3Landscape_4960x3508_300dpiRGB_8bit_.desktop
	M			krita/data/templates/design/DesignpresentationA4portrait_2480x3508,300dpiRGB_8bit_.desktop
	M			krita/data/templates/design/DesignpresentationA4portrait_2480x3508_300dpiRGB_8bit_.desktop
	M			krita/data/templates/design/Designscreen4_3_2250x1680_96dpiRGB_8bit_.desktop
	M			krita/data/templates/design/web_design.desktop
	M			krita/data/templates/texture/Texture1024x10248bitsrgb.desktop
	M			krita/data/templates/texture/Texture1k32bitscalar.desktop
	M			krita/data/templates/texture/Texture1k8bitsrgb.desktop
	M			krita/data/templates/texture/Texture2048x20488bitsrgb.desktop
	M			krita/data/templates/texture/Texture256x2568bitsrgb.desktop
	M			krita/data/templates/texture/Texture2k32bitscalar.desktop
	M			krita/data/templates/texture/Texture2k8bitsrgb.desktop
	M			krita/data/templates/texture/Texture4096x40968bitsrgb.desktop
	M			krita/data/templates/texture/Texture4k32bitscalar.desktop
	M			krita/data/templates/texture/Texture4k8bitsrgb.desktop
	M			krita/data/templates/texture/Texture512x5128bitsrgb.desktop
	M			krita/data/templates/texture/Texture8k32bitscalar.desktop
	M			krita/data/templates/texture/Texture8k8bitsrgb.desktop
	M			krita/org.kde.krita.appdata.xml
	M			libs/brush/kis_brush.h
	M			libs/flake/KoCanvasControllerWidget.h
	M			libs/flake/KoFilterEffectRegistry.h
	M			libs/flake/KoParameterShape.h
	M			libs/flake/KoPathShape.h
	M			libs/flake/KoResourceManager_p.h
	M			libs/flake/KoSelection.h
	M			libs/flake/KoShape.h
	M			libs/flake/KoShapeContainer.h
	M			libs/flake/KoShapeController.h
	M			libs/flake/KoShapeControllerBase.h
	M			libs/flake/KoShapeManager.h
	M			libs/flake/KoToolManager.h
	M			libs/flake/commands/KoPathBaseCommand.h
	M			libs/flake/commands/KoPathControlPointMoveCommand.h
	M			libs/flake/commands/KoShapeGroupCommand.h
	M			libs/flake/commands/KoShapeReorderCommand.h
	M			libs/flake/commands/KoShapeUngroupCommand.h
	M			libs/flake/svg/SvgUtil.h
	M			libs/flake/text/KoSvgTextChunkShape.h
	M			libs/flake/text/KoSvgTextProperties.h
	M			libs/flake/text/KoSvgTextShape.h
	M			libs/flake/text/KoSvgTextShapeMarkupConverter.h
	M			libs/image/brushengine/kis_paintop_factory.h
	M			libs/image/commands/kis_image_command.h
	M			libs/image/commands/kis_image_layer_add_command.h
	M			libs/image/commands/kis_image_layer_move_command.h
	M			libs/image/filter/kis_color_transformation_filter.h
	M			libs/image/filter/kis_filter.h
	M			libs/image/generator/kis_generator.h
	M			libs/image/kis_adjustment_layer.h
	M			libs/image/kis_annotation.h
	M			libs/image/kis_base_mask_generator.h
	M			libs/image/kis_datamanager.h
	M			libs/image/kis_edge_detection_kernel.h
	M			libs/image/kis_fill_painter.h
	M			libs/image/kis_filter_weights_applicator.h
	M			libs/image/kis_fixed_paint_device.h
	M			libs/image/kis_image.h
	M			libs/image/kis_math_toolbox.h
	M			libs/image/kis_merge_walker.h
	M			libs/image/kis_paint_device.h
	M			libs/image/kis_paint_device_debug_utils.h
	M			libs/image/kis_paint_device_frames_interface.h
	M			libs/image/kis_painter.h
	M			libs/image/kis_raster_keyframe_channel.h
	M			libs/image/kis_repeat_iterators_pixel.h
	M			libs/image/kis_selection_based_layer.h
	M			libs/image/kis_transform_worker.h
	M			libs/image/lazybrush/KisWatershedWorker.h
	M			libs/image/lazybrush/kis_lazy_fill_tools.h
	M			libs/image/lazybrush/patched_boykov_kolmogorov_max_flow.hpp
	M			libs/image/tiles3/kis_tiled_data_manager.h
	M			libs/image/tiles3/swap/kis_abstract_compression.h
	M			libs/image/tiles3/swap/kis_abstract_tile_compressor.h
	M			libs/image/tiles3/swap/kis_memory_window.h
	M			libs/libkis/Canvas.h
	M			libs/libkis/CloneLayer.h
	M			libs/libkis/Document.h
	M			libs/libkis/Extension.h
	M			libs/libkis/FileLayer.h
	M			libs/libkis/Filter.h
	M			libs/libkis/InfoObject.h
	M			libs/libkis/ManagedColor.h
	M			libs/libkis/Node.cpp
	M			libs/libkis/Node.h
	M			libs/libkis/Palette.h
	M			libs/libkis/PaletteView.h
	M			libs/libkis/Window.h
	M			libs/odf/KoElementReference.h
	M			libs/pigment/KoChannelInfo.h
	M			libs/pigment/KoColor.h
	M			libs/pigment/KoColorConversionCache.h
	M			libs/pigment/KoColorConversionTransformationAbstractFactory.h
	M			libs/pigment/KoColorSpace.h
	M			libs/pigment/KoColorSpaceRegistry.h
	M			libs/pigment/KoConvolutionOpImpl.h
	M			libs/pigment/compositeops/KoStreamedMath.h
	M			libs/pigment/resources/KisSwatchGroup.h
	M			libs/pigment/resources/KoColorSet.h
	M			libs/store/KoStore_p.h
	M			libs/store/KoXmlReader.h
	M			libs/store/KoXmlVector.h
	M			libs/ui/KisMainWindow.cpp
	M			libs/ui/KisNodeDelegate.cpp
	M			libs/ui/KisNodeDelegate.h
	M			libs/ui/KisNodeView.cpp
	M			libs/ui/KisOpenPane.h
	M			libs/ui/KisPaletteEditor.h
	M			libs/ui/KisPrintJob.h
	M			libs/ui/KisResourceBundle.h
	M			libs/ui/KisResourceBundleManifest.h
	M			libs/ui/KisSaveGroupVisitor.h
	M			libs/ui/KisViewManager.cpp
	M			libs/ui/KisViewManager.h
	M			libs/ui/canvas/kis_animation_player.cpp
	M			libs/ui/canvas/kis_canvas_decoration.h
	M			libs/ui/canvas/kis_image_patch.h
	M			libs/ui/canvas/kis_image_pyramid.cpp
	M			libs/ui/canvas/kis_projection_backend.h
	M			libs/ui/canvas/kis_update_info.h
	M			libs/ui/dialogs/kis_dlg_adj_layer_props.h
	M			libs/ui/dialogs/kis_dlg_adjustment_layer.h
	M			libs/ui/dialogs/kis_dlg_file_layer.h
	M			libs/ui/dialogs/kis_dlg_generator_layer.h
	M			libs/ui/input/config/kis_input_button.h
	M			libs/ui/input/wintab/kis_tablet_support_win.cpp
	M			libs/ui/kis_categorized_item_delegate.h
	M			libs/ui/kis_deferred_signal.h
	M			libs/ui/kis_image_manager.h
	M			libs/ui/kis_model_index_converter_base.h
	M			libs/ui/kis_node_view_color_scheme.cpp
	M			libs/ui/kis_node_view_color_scheme.h
	M			libs/ui/kis_painting_assistants_decoration.cpp
	M			libs/ui/kis_paintop_box.cc
	M			libs/ui/kis_paintop_option.h
	M			libs/ui/kis_png_converter.h
	M			libs/ui/opengl/kis_opengl_image_textures.h
	M			libs/ui/qtlockedfile/qtlockedfile.cpp
	M			libs/ui/tool/kis_tool_freehand_helper.h
	M			libs/ui/utils/kis_document_aware_spin_box_unit_manager.h
	M			libs/ui/widgets/kis_curve_widget.h
	M			libs/ui/widgets/kis_curve_widget_p.h
	M			libs/ui/widgets/kis_custom_image_widget.h
	M			libs/ui/widgets/kis_image_from_clipboard_widget.h
	M			libs/ui/widgets/kis_preset_live_preview_view.h
	M			libs/ui/widgets/kis_workspace_chooser.cpp
	M			libs/vectorimage/libemf/EmfOutput.h
	M			libs/vectorimage/libemf/EmfRecords.h
	M			libs/vectorimage/libsvm/SvmAbstractBackend.h
	M			libs/vectorimage/libsvm/SvmPainterBackend.h
	M			libs/widgets/KisDlgInternalColorSelector.h
	M			libs/widgets/KisPaletteModel.h
	M			libs/widgets/KisVisualColorSelectorShape.h
	M			libs/widgets/KoDialog.h
	M			libs/widgets/KoResourcePopupAction.h
	M			libs/widgets/KoResourceServer.h
	M			libs/widgets/KoToolBox_p.h
	M			libs/widgets/KoZoomController.h
	M			libs/widgets/KoZoomWidget.h
	M			libs/widgets/kis_palette_view.h
	M			libs/widgets/squeezedcombobox.h
	M			libs/widgetutils/config/kcolorscheme.h
	M			libs/widgetutils/config/kcolorschememanager.h
	M			libs/widgetutils/config/kstandardaction.h
	M			libs/widgetutils/xmlgui/KisShortcutsDialog.h
	M			libs/widgetutils/xmlgui/KisShortcutsEditor.h
	M			libs/widgetutils/xmlgui/kactioncollection.h
	M			libs/widgetutils/xmlgui/kedittoolbar.h
	M			libs/widgetutils/xmlgui/kedittoolbar_p.h
	M			libs/widgetutils/xmlgui/kgesture_p.h
	M			libs/widgetutils/xmlgui/kswitchlanguagedialog_p.h
	M			libs/widgetutils/xmlgui/ktoggletoolbaraction.h
	M			libs/widgetutils/xmlgui/ktoolbar.h
	M			libs/widgetutils/xmlgui/ktoolbarhandler_p.h
	M			libs/widgetutils/xmlgui/kxmlguibuilder.h
	M			packaging/linux/snap/setup/gui/krita.desktop
	M			plugins/extensions/buginfo/dlg_buginfo.cpp
	M			plugins/extensions/pykrita/plugin/utilities.h
	M			plugins/extensions/pykrita/sip/krita/Node.sip
	M			plugins/filters/colors/kis_color_to_alpha.cpp
	M			plugins/filters/colorsfilters/kis_multichannel_filter_base.cpp
	M			plugins/flake/textshape/kotext/KoAnchorInlineObject.h
	M			plugins/flake/textshape/kotext/KoAnchorTextRange.h
	M			plugins/flake/textshape/kotext/KoAnnotationManager.h
	M			plugins/flake/textshape/kotext/KoBookmarkManager.h
	M			plugins/flake/textshape/kotext/KoDocumentRdfBase.h
	M			plugins/flake/textshape/kotext/KoInlineObjectFactoryBase.h
	M			plugins/flake/textshape/kotext/KoInlineTextObjectManager.h
	M			plugins/flake/textshape/kotext/KoSectionModel.h
	M			plugins/flake/textshape/kotext/KoText.h
	M			plugins/flake/textshape/kotext/KoTextDebug.h
	M			plugins/flake/textshape/kotext/KoTextEditor.h
	M			plugins/flake/textshape/kotext/KoTextEditor_p.h
	M			plugins/flake/textshape/kotext/KoTextEditor_undo.cpp
	M			plugins/flake/textshape/kotext/KoTextRdfCore.h
	M			plugins/flake/textshape/kotext/commands/ChangeListCommand.h
	M			plugins/flake/textshape/kotext/opendocument/KoTextWriter.h
	M			plugins/flake/textshape/kotext/styles/KoTableCellStyle.h
	M			plugins/flake/textshape/textlayout/AnchorStrategy.h
	M			plugins/flake/textshape/textlayout/KoTextLayoutArea_paint.cpp
	M			plugins/flake/textshape/textlayout/KoTextLayoutCellHelper.h
	M			plugins/flake/textshape/textlayout/KoTextShapeData.h
	M			plugins/impex/exr/krita_exr.desktop
	M			plugins/impex/heif/krita_heif.desktop
	M			plugins/paintops/libpaintop/kis_color_source.h
	M			plugins/paintops/libpaintop/kis_dab_cache_base.h
	M			plugins/paintops/libpaintop/kis_dynamic_sensor.h
	M			plugins/paintops/libpaintop/kis_paintop_plugin_utils.h
	M			plugins/paintops/libpaintop/kis_texture_option.h
	M			plugins/python/assignprofiledialog/kritapykrita_assignprofiledialog.desktop
	M			plugins/python/colorspace/kritapykrita_colorspace.desktop
	M			plugins/python/comics_project_management_tools/kritapykrita_comics_project_management_tools.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/hello/kritapykrita_hello.desktop
	M			plugins/python/krita_script_starter/kritapykrita_krita_script_starter.desktop
	M			plugins/python/lastdocumentsdocker/kritapykrita_lastdocumentsdocker.desktop
	M			plugins/python/palette_docker/kritapykrita_palette_docker.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/selectionsbagdocker/kritapykrita_selectionsbagdocker.desktop
	M			plugins/python/tenbrushes/kritapykrita_tenbrushes.desktop
	M			plugins/python/tenscripts/kritapykrita_tenscripts.desktop