Diffusion Krita 203f54c45008

intel-3
203f54c45008
Actions

Authored by jounip on Apr 11 2018, 10:32 AM.

Description

Merge remote-tracking branch 'origin/master' into rempt/intel-3

Details

Committed

jounip

Apr 11 2018, 10:32 AM

Parents

R37:8e480a81fc40: Remove placeholder widget used in detached canvas mode
R37:25cea389c460: [4.1 only] Implement frames management action

Branches

Unknown

Tags

Unknown

jounip committed R37:203f54c45008: Merge remote-tracking branch 'origin/master' into rempt/intel-3 (authored by jounip).Apr 11 2018, 10:32 AM

Merged Changes

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

Commit		Author	Details	Committed
25cea389c460		dkazakov	[4.1 only] Implement frames management action	Apr 10 2018
7d1b76d88afd		rempt	use qAppName to find the language override file	Apr 10 2018
83c6f9d48225		rempt	Fix typo	Apr 10 2018
f460b446399c		rempt	Fix loading an override language on macOS	Apr 10 2018
c0431e9b0da7		l10n daemon script	SVN_SILENT made messages (.desktop file) - always resolve ours	Apr 10 2018
f51c2d9967e8		scottpetrovic	D11532 Add actions from timeline header so they can be assigned to shortcuts	Apr 10 2018
5cbd4c8cdfca	D12065	dkazakov	Fix update of the preset editor GUI when a default preset is created	Apr 9 2018
a93e17dcc4b5		jounip	Fix warning about reference images when exporting to non-native format	Apr 9 2018
82a8db752ebc	D11988	rempt	Overview docker: fix shrinking the thumbnail to 1px	Apr 9 2018
b8e85a372778		rempt	Fix crash when creating a new spray preset	Apr 9 2018
95a0a58dba5c		l10n daemon script	SVN_SILENT made messages (.desktop file) - always resolve ours	Apr 9 2018
2d068df9db62		rempt	Move two widgets to libs/widgets	Apr 8 2018
a9110c7292a4		rempt	Add apidox	Apr 8 2018
05f3e4e33d7c		l10n daemon script	SVN_SILENT made messages (.desktop file) - always resolve ours	Apr 8 2018
aa81a25fd338		dkazakov	Fix an assert when creating a vector selection	Apr 6 2018
dddd8c489ce3		dkazakov	Avoid cycling updates in KoFillConfigWidget	Apr 6 2018
30136e54e7cb		dkazakov	Fix canvas lockup when using Guides at the top of the image	Apr 6 2018
f09bc200e9ea	D11895	rempt	FEATURE: add a blending optioon to the color picker	Apr 6 2018
ad0f49885cdf		rempt	whitespace	Apr 6 2018
36d2430da689		dkazakov	Fix an assert in continued mode of Transform Tool	Apr 6 2018
b50f1ead48f0		l10n daemon script	SVN_SILENT made messages (.desktop file) - always resolve ours	Apr 6 2018
eebaf3891d45		dkazakov	Make color pick tools pick from a special device	Apr 5 2018
1e513a176c8a		dkazakov	We should initialize KoColor object before picking data into it	Apr 5 2018
c72acfe68919		dkazakov	Don't let encoding progress dialog hang infinitely if ffmpeg failed to run	Apr 4 2018
e35c0127c023		dkazakov	Fix auto-opening of the editor dialog in the text tool	Apr 4 2018
a42c7e9137e2		rempt	Check whether the colorset is valid before using it	Apr 4 2018
65ed3b4f1a2e		rempt	Re-add the correct state to the kritarc file	Apr 4 2018
3a09d0664ecd		rempt	Use the FontSizeAction from the old text tool in the svg text tool	Apr 4 2018
f094f600e2e1		dkazakov	Disable handling Ctrl+Z as "cancel" action in KisToolMove	Apr 4 2018
d72098bf9463		dkazakov	Fix outline offset when cancelling move tool's stroke	Apr 4 2018
da97ec92672e		rempt	Fix build	Apr 4 2018
f6f4e95d8bf0		rempt	Remove unused code	Apr 4 2018
8888d2e12d02		rempt	Fix warnings: initialization order	Apr 4 2018
e27f3987d66e		rempt	Fix wrong z-order statement	Apr 4 2018
a67e2acf0688		rempt	Fix warning: implicit-fallthrough	Apr 4 2018
6a6a81eb829c		rempt	Fix warning: implicit-fallthrough	Apr 4 2018
43a2b2e04dc1		rempt	Fix warning: unused variable and code	Apr 4 2018
5d145c40510b		rempt	Fix warning: implicit-fallthrough	Apr 4 2018
7c4077f000ac		rempt	Fix warning: implicit-fallthrough	Apr 4 2018
3e69e2875d4a		rempt	Fix warning: implicit-fallthrough	Apr 4 2018
39c07bc23555		rempt	Fix warning: implicit-fallthrough	Apr 4 2018
17c92f5efa61		rempt	Fix warning: implicit-fallthrough	Apr 4 2018
e069ce95de6f		rempt	Fix warning: unused variable	Apr 4 2018
c99598f22d58		rempt	Fix warning: implicit-fallthrough	Apr 4 2018
2cf86e16c61c		rempt	Fix warning: implicit-fallthrough	Apr 4 2018
51a63dc059cd		rempt	Fix warning: implicit-fallthrough	Apr 4 2018
3ab313477298		rempt	Fix warnings: implicit-fallthrough	Apr 4 2018
de7f98d985f5		rempt	Fix warnings: initalization order	Apr 4 2018
b4d3490ce6fa		rempt	Fix warnings: possible fall-through	Apr 4 2018
b06b473eabab		rempt	Fix warnings: initalization order	Apr 4 2018

Changes (215)

		Path
M		CMakeLists.txt
M		build-tools/windows/build.cmd
M		cmake/modules/SIPMacros.cmake
M		krita/data/kritarc
M		krita/data/shortcuts/krita_default.shortcuts
M		krita/data/shortcuts/paint_tool_sai_compatible.shortcuts
M		krita/data/shortcuts/photoshop_compatible.shortcuts
M		krita/data/shortcuts/tablet_pro.shortcuts
M		krita/krita.action
M		krita/krita4.xmlgui
M		krita/kritamenu.action
M		krita/main.cc
M		libs/flake/KoDockRegistry.cpp
M		libs/flake/KoParameterShape.cpp
M		libs/flake/KoPathShapeLoader.cpp
M		libs/flake/KoShape.cpp
M		libs/flake/KoShapeManager.cpp
M		libs/flake/commands/KoKeepShapesSelectedCommand.cpp
P		libs/flake/commands/KoKeepShapesSelectedCommand.h Copied to libs/image/tiles3/KisTiledExtentManager.h
M		libs/flake/tests/TestSvgText.cpp
M		libs/flake/tests/TestSvgText.h
A		libs/flake/tests/data/svg_render/load_text_outline.png
A		libs/flake/tests/data/svg_render/load_text_outline_converted_to_path.png
M		libs/flake/text/KoSvgTextShape.cpp
M		libs/flake/text/KoSvgTextShape.h
M		libs/flake/text/KoSvgTextShapeMarkupConverter.cpp
M		libs/flake/tools/KoPathTool.cpp
M		libs/global/KisHandleStyle.cpp
M		libs/global/KisHandleStyle.h
M		libs/global/kis_thread_safe_signal_compressor.cpp
M		libs/image/CMakeLists.txt
M		libs/image/KisPrecisePaintDeviceWrapper.cpp
M		libs/image/KisPrecisePaintDeviceWrapper.h
M		libs/image/brushengine/kis_paint_information.cc
M		libs/image/commands/kis_node_property_list_command.cpp
M		libs/image/kis_base_node.cpp
M		libs/image/kis_base_node.h
M		libs/image/kis_layer_utils.cpp
M		libs/image/kis_math_toolbox.h
M		libs/image/kis_painter.cc
M		libs/image/kis_transform_mask.cpp
M		libs/image/lazybrush/kis_colorize_mask.cpp
M		libs/image/lazybrush/kis_colorize_mask.h
M		libs/image/tests/kis_painter_test.cpp
M		libs/image/tests/kis_painter_test.h
A		libs/image/tiles3/KisTiledExtentManager.cpp
P		libs/image/tiles3/KisTiledExtentManager.h Copied from libs/flake/commands/KoKeepShapesSelectedCommand.h
M		libs/image/tiles3/kis_memento_manager.cc
M		libs/image/tiles3/kis_memento_manager.h
M		libs/image/tiles3/kis_tile_hash_table.h
M		libs/image/tiles3/kis_tile_hash_table_p.h
M		libs/image/tiles3/kis_tiled_data_manager.cc
M		libs/image/tiles3/kis_tiled_data_manager.h
M		libs/libqml/plugins/kritasketchplugin/models/LayerModel.cpp
M		libs/libqml/plugins/kritasketchplugin/models/LayerModel.h
M		libs/libqml/plugins/kritasketchplugin/models/RecentImagesModel.cpp
M		libs/libqml/qml/panels/EditLayerPage.qml
M		libs/pigment/CMakeLists.txt
M		libs/pigment/resources/KoStopGradient.cpp
M		libs/pigment/resources/KoStopGradient.h
M		libs/psd/psd_pattern.cpp
M		libs/store/KoStore.cpp
M		libs/ui/CMakeLists.txt
M		libs/ui/KisDocument.cpp
M		libs/ui/KisDocument.h
M		libs/ui/KisImportExportManager.cpp
M		libs/ui/KisMainWindow.cpp
M		libs/ui/KisMainWindow.h
M		libs/ui/KisOpenPane.cpp
M		libs/ui/KisPaletteModel.cpp
M		libs/ui/KisReferenceImage.cpp
M		libs/ui/KisReferenceImage.h
M		libs/ui/KisReferenceImagesDecoration.cpp
M		libs/ui/KisTemplatesPane.cpp
A		libs/ui/KisUndoActionsUpdateManager.cpp
A		libs/ui/KisUndoActionsUpdateManager.h
D		libs/ui/KisUndoStackAction.cpp
D		libs/ui/KisUndoStackAction.h
M		libs/ui/KisView.cpp
M		libs/ui/KisView.h
M		libs/ui/KisViewManager.cpp
M		libs/ui/canvas/kis_canvas2.cpp
M		libs/ui/canvas/kis_guides_manager.cpp
M		libs/ui/dialogs/KisSessionManagerDialog.cpp
M		libs/ui/flake/KisReferenceImagesLayer.cpp
M		libs/ui/flake/kis_shape_layer_canvas.cpp
M		libs/ui/flake/kis_shape_layer_canvas.h
M		libs/ui/forms/wdgautogradient.ui
M		libs/ui/forms/wdgdisplaysettings.ui
M		libs/ui/forms/wdgnewimage.ui
M		libs/ui/kis_autogradient.cc
M		libs/ui/kis_categorized_item_delegate.cpp
M		libs/ui/kis_config.cc
M		libs/ui/kis_config.h
M		libs/ui/kis_paintop_box.cc
M		libs/ui/kis_popup_palette.cpp
M		libs/ui/kis_zoom_manager.cc
M		libs/ui/kisexiv2/kis_exif_io.cpp
M		libs/ui/kisexiv2/kis_exiv2.cpp
M		libs/ui/layerstyles/wdgblendingoptions.ui
M		libs/ui/tool/kis_tool_paint.cc
M		libs/ui/tool/kis_tool_paint.h
M		libs/ui/tool/kis_tool_shape.cc
M		libs/ui/tool/kis_tool_utils.cpp
M		libs/ui/tool/kis_tool_utils.h
M		libs/ui/tool/strokes/kis_color_picker_stroke_strategy.cpp
M		libs/ui/tool/strokes/kis_color_picker_stroke_strategy.h
M		libs/ui/widgets/KoFillConfigWidget.cpp
M		libs/ui/widgets/KoFillConfigWidget.h
M		libs/ui/widgets/kis_custom_image_widget.cc
V		libs/{ui/widgets/kis_gradient_slider.cpp → widgets/KisGradientSlider.cpp}
V		libs/{ui/widgets/kis_gradient_slider.h → widgets/KisGradientSlider.h}
V		libs/{ui/widgets/kis_gradient_slider_widget.cc → widgets/KisGradientSliderWidget.cpp}
V		libs/{ui/widgets/kis_gradient_slider_widget.h → widgets/KisGradientSliderWidget.h}
M		libs/ui/widgets/kis_image_from_clipboard_widget.cpp
M		libs/ui/widgets/kis_preset_live_preview_view.cpp
M		libs/ui/widgets/kis_workspace_chooser.cpp
M		libs/widgets/CMakeLists.txt
V		libs/{widgets/KisGradientSlider.cpp ← ui/widgets/kis_gradient_slider.cpp}
V		libs/{widgets/KisGradientSlider.h ← ui/widgets/kis_gradient_slider.h}
V		libs/{widgets/KisGradientSliderWidget.cpp ← ui/widgets/kis_gradient_slider_widget.cc}
V		libs/{widgets/KisGradientSliderWidget.h ← ui/widgets/kis_gradient_slider_widget.h}
M		libs/widgets/KoColorPopupAction.cpp
M		libs/widgets/KoColorSetWidget.cpp
M		libs/widgets/KoColorSetWidget.h
D		libs/widgets/KoDockWidgetTitleBar.cpp
D		libs/widgets/KoDockWidgetTitleBar.h
D		libs/widgets/KoDockWidgetTitleBarButton.cpp
D		libs/widgets/KoDockWidgetTitleBarButton.h
D		libs/widgets/KoDockWidgetTitleBar_p.h
M		libs/widgets/KoResourceTagStore.cpp
D		libs/widgets/KoRulerController.cpp
D		libs/widgets/KoRulerController.h
D		libs/widgets/KoRulerController_p.h
M		libs/widgets/KoTableView.cpp
M		libs/widgets/KoToolBoxDocker.cpp
M		libs/widgets/KoToolDocker.cpp
M		libs/widgets/kritawidgets.qrc
D		libs/widgets/pics/dark_docker_close.png
D		libs/widgets/pics/dark_docker_collapse_a.png
D		libs/widgets/pics/dark_docker_collapse_b.png
D		libs/widgets/pics/dark_docker_float.png
D		libs/widgets/pics/dark_docker_lock_a.png
D		libs/widgets/pics/dark_docker_lock_b.png
D		libs/widgets/pics/light_docker_close.png
D		libs/widgets/pics/light_docker_collapse_a.png
D		libs/widgets/pics/light_docker_collapse_b.png
D		libs/widgets/pics/light_docker_float.png
D		libs/widgets/pics/light_docker_lock_a.png
D		libs/widgets/pics/light_docker_lock_b.png
M		packaging/linux/appimage/build-image.sh
M		plugins/dockers/animation/animation_docker.cpp
M		plugins/dockers/animation/animation_docker.h
M		plugins/dockers/animation/kis_animation_utils.cpp
M		plugins/dockers/animation/kis_animation_utils.h
M		plugins/dockers/animation/kis_time_based_item_model.cpp
M		plugins/dockers/animation/kis_time_based_item_model.h
M		plugins/dockers/animation/timeline_docker.cpp
M		plugins/dockers/animation/timeline_frames_model.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/overview/overviewwidget.cc
M		plugins/dockers/overview/overviewwidget.h
M		plugins/extensions/metadataeditor/kis_meta_data_model.cpp
M		plugins/filters/asccdl/kis_asccdl_filter.cpp
M		plugins/filters/levelfilter/kis_level_filter.cpp
M		plugins/filters/levelfilter/wdg_level.ui
M		plugins/filters/threshold/threshold.cpp
M		plugins/filters/threshold/wdg_threshold.ui
M		plugins/flake/pathshapes/ellipse/EllipseShape.cpp
M		plugins/impex/csv/csv_loader.cpp
M		plugins/impex/libkra/kis_kra_loader.cpp
M		plugins/impex/libkra/kis_kra_savexml_visitor.cpp
M		plugins/impex/libkra/kis_kra_tags.h
M		plugins/impex/png/kis_png_export.cc
M		plugins/impex/tga/tga.h
M		plugins/impex/video/video_saver.cpp
M		plugins/impex/xcf/3rdparty/xcftools/flatten.c
M		plugins/paintops/colorsmudge/kis_colorsmudgeop.cpp
M		plugins/paintops/hairy/hairy_brush.cpp
M		plugins/paintops/libpaintop/forms/wdgpredefinedbrushchooser.ui
M		plugins/paintops/libpaintop/forms/wdgtexturechooser.ui
M		plugins/paintops/libpaintop/kis_brush_chooser.cpp
M		plugins/paintops/libpaintop/kis_color_source_option.cpp
M		plugins/paintops/libpaintop/kis_texture_option.cpp
M		plugins/python/CMakeLists.txt
A	(dir)	plugins/python/krita_script_starter/
A		plugins/python/krita_script_starter/Manual.html
A		plugins/python/krita_script_starter/__init__.py
A		plugins/python/krita_script_starter/bbdkss.ui
A		plugins/python/krita_script_starter/krita_script_starter.py
A		plugins/python/krita_script_starter/kritapykrita_krita_script_starter.desktop
M		plugins/tools/basictools/kis_tool_colorpicker.cc
M		plugins/tools/basictools/kis_tool_colorpicker.h
M		plugins/tools/basictools/kis_tool_move.cc
M		plugins/tools/basictools/kis_tool_move.h
M		plugins/tools/basictools/wdgcolorpicker.ui
M		plugins/tools/defaulttool/connectionTool/ChangeConnectionPointCommand.cpp
M		plugins/tools/defaulttool/defaulttool/DefaultTool.cpp
M		plugins/tools/defaulttool/defaulttool/DefaultToolGeometryWidget.cpp
M		plugins/tools/defaulttool/referenceimagestool/ToolReferenceImages.h
M		plugins/tools/defaulttool/referenceimagestool/ToolReferenceImagesWidget.cpp
M		plugins/tools/svgtexttool/CMakeLists.txt
A		plugins/tools/svgtexttool/FontSizeAction.cpp
A		plugins/tools/svgtexttool/FontSizeAction.h
M		plugins/tools/svgtexttool/SvgTextEditor.cpp
M		plugins/tools/svgtexttool/SvgTextEditor.h
M		plugins/tools/svgtexttool/SvgTextTool.cpp
M		plugins/tools/svgtexttool/SvgTextTool.h
M		plugins/tools/tool_crop/kis_constrained_rect.cpp
M		plugins/tools/tool_smart_patch/kis_tool_smart_patch_options_widget.cpp
M		plugins/tools/tool_transform2/kis_tool_transform.cc