Diffusion Krita d5f4f5ca1865

Merge branch 'master' into rempt/T1625-python-scripting
d5f4f5ca1865
Actions

Authored by rempt on Dec 13 2016, 2:08 PM.

Description

Merge branch 'master' into rempt/T1625-python-scripting

Details

Committed

rempt

Dec 13 2016, 2:08 PM

Parents

R37:506b74495e39: Also escape : when saving predefined image sizes
R37:2ea44a2444e4: Implement some more of the scripting API

Branches

Unknown

Tags

Unknown

rempt committed R37:d5f4f5ca1865: Merge branch 'master' into rempt/T1625-python-scripting (authored by rempt).Dec 13 2016, 2:08 PM

Merged Changes

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

Commit		Author	Details	Committed
506b74495e39		rempt	Also escape : when saving predefined image sizes	Dec 13 2016
5169180016eb		rempt	Should be two words	Dec 13 2016
e7a35329b23e		rempt	Merge branch 'rempt/impex-refactoring'	Dec 13 2016
ca924bc5880d		rempt	Up the xmlgui version to higher than 3.1	Dec 13 2016
aed9a2c9127b		rempt	Make the color selector in the popup palette configurable	Dec 13 2016
dd95f23848fe	D3645	aspotashev/dkazakov	Import kundo2_aware_xgettext.sh from calligra.git repo	Dec 12 2016
86f7c6548574		rempt	BUG:369165 Add insert as file layer on dropping an image	Dec 12 2016
d8ce65b6146c		dkazakov	Fix High-Quality filtering on AMD GPU	Dec 12 2016
6731573f9e09		rempt	File layers also cannot be transformed.	Dec 11 2016
8d14d91f3870		dkazakov	Connect Timothee's icon to the pivot point feature	Dec 10 2016
a4e97e22e8a0		dkazakov	Merge remote-tracking branch 'origin/kazakov/scale-from-pivot-point-T119' into…	Dec 10 2016
96e6d6ee119a		dkazakov	Fix strings problems reported by the localization team	Dec 10 2016
5b011f37fa18		rempt	Check whether the path is absolute	Dec 10 2016
55ff96a4bcf4		rempt	BUG:364208 Fix the interaction between show canvas/only and show dockers	Dec 10 2016
050f8354c150		dkazakov	Fix a NaN transformation when using 4-point perspective transform	Dec 9 2016
62f8c3b3b293		dkazakov	Sync layer scroll-visibility in the timeline when using PgUp and PgDown	Dec 9 2016
aa2f46dd8b7a		dkazakov	Fix crash when trying to apply transformation to empty layer	Dec 9 2016
468b55efec50		dkazakov	Fix (almost) a deadlock when converting image color space	Dec 9 2016
aeced4a1c199		dkazakov	All shortcuts should be configurable when no document is open	Dec 9 2016
794790e27cf0		rempt	History docker: Replace the menu popup with a dialog	Dec 8 2016
be6738b373a8		rempt	BUG:353591 Remove tags associated with bundles	Dec 8 2016
5ce167b6194e		dkazakov	Fix double initialization of actions in the action manager	Dec 8 2016
bd6c098fb3ef		dkazakov	Fix undoing shortcut changes when pressing Cancel button	Dec 8 2016
413c190013a5		dkazakov	Added a sanity check for actions, fixed composition actions	Dec 8 2016
f85b84fed8c4		dkazakov	Fix formatting and unused variables	Dec 8 2016
81453d3fd546		dkazakov	Fix propertizing Color History and Common Colors actions	Dec 8 2016
e1d0a836186b		dkazakov	Fixed multiple shortcuts bugs	Dec 8 2016
327138fe723f		dkazakov	Reword the shortcuts conflict message	Dec 8 2016
27c7921d4cf7		rempt	BUG:372613 Fix the out-of-gamut warning color configuration	Dec 8 2016
3cf1052a1ca1		rempt	debug--	Dec 8 2016
fe2da396005d		rempt	Remove unused variable	Dec 8 2016
46396e6d10bf		rempt	CCBUG:373074 Disable the transform tool on vector layers	Dec 8 2016
77cea2e49786		timotheegiet	fix transform tool option size	Dec 8 2016
37c793e5778c		rempt	Make sure the dialog has a title that fits with the menu text	Dec 7 2016
b9f71c61cb3a		timotheegiet	update transform tool settings icons	Dec 7 2016
dc36d85fe434		rempt	Select the mimetype of split images by default to the mimetype of the current…	Dec 7 2016
b19050f8f53a		rempt	CCBUG:373077 Image split: show error dialogs only once	Dec 7 2016
e264e421c4ff		rempt	More html instead of docbook-qt	Dec 7 2016
c7e3e3162cd8		rempt	Use html instead of docbook, tooltips instead of whatsthis	Dec 7 2016
7c7f9ecbe27b		rempt	Do not use docbook, use html	Dec 7 2016
32eb74e447f6		rempt	Better fix for the file dialog default location	Dec 7 2016
b399c504a6de		rempt	BUG:373193 Try harder to make the splash a dialog	Dec 7 2016
661b85120933		rempt	BUG:373205 Disable the quick-group actions if the active node is a mask	Dec 7 2016
c8f69a1cdf2f		rempt	BUG:373267 Always save the merged image as 8 bit sRGB, no profile	Dec 7 2016
9ce742572826		rempt	These two methods are never overridden, so shouldn't be virtual	Dec 7 2016
4e243f158cb1		timotheegiet	new icon for transform from pivot	Dec 7 2016
6e1746554184		rempt	Fix layout of the warp transform tool options pane	Dec 7 2016
6a2d3f78089f		rempt	Don't hard-code the open dialog for QDesktopServices::PicturesLocation	Dec 7 2016
5814085b6401		rempt	BUG:373334 Fix installing proifles with complex filenames	Dec 7 2016
3440091533ad		rempt	Fix layout of monitor profiles by using a QFormLayout	Dec 7 2016

Changes (209)
Show All Changes

Very Large Commit

This commit is very large. Load each file individually.

				Path	Packages
	M			Messages.sh
	M			krita/data/actions/ConnectionTool.action
	M			krita/data/profiles/elles-icc-profiles/CMakeLists.txt
	M			krita/krita.action
	M			krita/krita.xmlgui
	M			krita/kritamenu.action
	A			krita/pics/misc-dark/dark_pivot-point.svg
	M			krita/pics/misc-dark/misc-dark-icons.qrc
	A			krita/pics/misc-light/light_pivot-point.svg
	M			krita/pics/misc-light/misc-light-icons.qrc
	D			krita/pics/tool_transform/dark_transform_icons_cage.png
	M			krita/pics/tool_transform/dark_transform_icons_cage.svg
	D			krita/pics/tool_transform/dark_transform_icons_liquify_erase.png
	M			krita/pics/tool_transform/dark_transform_icons_liquify_erase.svg
	D			krita/pics/tool_transform/dark_transform_icons_liquify_main.png
	M			krita/pics/tool_transform/dark_transform_icons_liquify_main.svg
	D			krita/pics/tool_transform/dark_transform_icons_liquify_move.png
	M			krita/pics/tool_transform/dark_transform_icons_liquify_move.svg
	D			krita/pics/tool_transform/dark_transform_icons_liquify_offset.png
	M			krita/pics/tool_transform/dark_transform_icons_liquify_offset.svg
	D			krita/pics/tool_transform/dark_transform_icons_liquify_resize.png
	M			krita/pics/tool_transform/dark_transform_icons_liquify_resize.svg
	D			krita/pics/tool_transform/dark_transform_icons_liquify_rotate.png
	M			krita/pics/tool_transform/dark_transform_icons_liquify_rotate.svg
	D			krita/pics/tool_transform/dark_transform_icons_liquify_rotateCCW.png
	A			krita/pics/tool_transform/dark_transform_icons_liquify_rotateCCW.svg
	D			krita/pics/tool_transform/dark_transform_icons_main.png
	M			krita/pics/tool_transform/dark_transform_icons_main.svg
	M			krita/pics/tool_transform/dark_transform_icons_mirror_x.svg
	M			krita/pics/tool_transform/dark_transform_icons_mirror_y.svg
	D			krita/pics/tool_transform/dark_transform_icons_penPressure.png
	M			krita/pics/tool_transform/dark_transform_icons_penPressure.svg
	D			krita/pics/tool_transform/dark_transform_icons_penPressure_locked.png
	A			krita/pics/tool_transform/dark_transform_icons_penPressure_locked.svg
	D			krita/pics/tool_transform/dark_transform_icons_perspective.png
	M			krita/pics/tool_transform/dark_transform_icons_perspective.svg
	M			krita/pics/tool_transform/dark_transform_icons_rotate_ccw.svg
	M			krita/pics/tool_transform/dark_transform_icons_rotate_cw.svg
	D			krita/pics/tool_transform/dark_transform_icons_warp.png
	M			krita/pics/tool_transform/dark_transform_icons_warp.svg
	D			krita/pics/tool_transform/light_transform_icons_cage.png
	M			krita/pics/tool_transform/light_transform_icons_cage.svg
	D			krita/pics/tool_transform/light_transform_icons_liquify_erase.png
	M			krita/pics/tool_transform/light_transform_icons_liquify_erase.svg
	D			krita/pics/tool_transform/light_transform_icons_liquify_main.png
	M			krita/pics/tool_transform/light_transform_icons_liquify_main.svg
	D			krita/pics/tool_transform/light_transform_icons_liquify_move.png
	M			krita/pics/tool_transform/light_transform_icons_liquify_move.svg
	D			krita/pics/tool_transform/light_transform_icons_liquify_offset.png
	M			krita/pics/tool_transform/light_transform_icons_liquify_offset.svg
	D			krita/pics/tool_transform/light_transform_icons_liquify_resize.png
	M			krita/pics/tool_transform/light_transform_icons_liquify_resize.svg
	D			krita/pics/tool_transform/light_transform_icons_liquify_rotate.png
	M			krita/pics/tool_transform/light_transform_icons_liquify_rotate.svg
	D			krita/pics/tool_transform/light_transform_icons_liquify_rotateCCW.png
	A			krita/pics/tool_transform/light_transform_icons_liquify_rotateCCW.svg
	D			krita/pics/tool_transform/light_transform_icons_main.png
	M			krita/pics/tool_transform/light_transform_icons_main.svg
	M			krita/pics/tool_transform/light_transform_icons_mirror_x.svg
	M			krita/pics/tool_transform/light_transform_icons_mirror_y.svg
	D			krita/pics/tool_transform/light_transform_icons_penPressure.png
	M			krita/pics/tool_transform/light_transform_icons_penPressure.svg
	D			krita/pics/tool_transform/light_transform_icons_penPressure_locked.png
	A			krita/pics/tool_transform/light_transform_icons_penPressure_locked.svg
	D			krita/pics/tool_transform/light_transform_icons_perspective.png
	M			krita/pics/tool_transform/light_transform_icons_perspective.svg
	M			krita/pics/tool_transform/light_transform_icons_rotate_ccw.svg
	M			krita/pics/tool_transform/light_transform_icons_rotate_cw.svg
	D			krita/pics/tool_transform/light_transform_icons_warp.png
	M			krita/pics/tool_transform/light_transform_icons_warp.svg
	M			krita/pics/tool_transform/tool-transform-icons.qrc
	D			krita/pics/tool_transform/transform_icons_base.svg
	V			{krita_xgettext.sh → kundo2_aware_xgettext.sh}
	V			{kundo2_aware_xgettext.sh ← krita_xgettext.sh}
	M			libs/image/kis_image.cc
	M			libs/image/kis_image.h
	M			libs/image/kis_image_config.cpp
	M			libs/image/kis_layer.cc
	M			libs/image/kis_legacy_undo_adapter.cpp
	M			libs/image/kis_update_time_monitor.cpp
	M			libs/pigment/KoColorSpace.h
	M			libs/pigment/KoLabColorSpaceTraits.h
	M			libs/ui/KisApplication.cpp
	M			libs/ui/KisMainWindow.cpp
	M			libs/ui/KisResourceBundle.cpp
	M			libs/ui/KisView.cpp
	M			libs/ui/KisViewManager.cpp
	M			libs/ui/KisViewManager.h
	M			libs/ui/actions/kis_selection_action_factories.cpp
	M			libs/ui/canvas/kis_canvas2.cpp
	M			libs/ui/dialogs/kis_delayed_save_dialog.cpp
	P			libs/ui/dialogs/kis_delayed_save_dialog.h Copied to libs/widgetutils/KisActionsSnapshot.h
	M			libs/ui/dialogs/kis_dlg_preferences.cc
	M			libs/ui/dialogs/kis_dlg_preferences.h
	M			libs/ui/dialogs/kis_dlg_stroke_selection_properties.cpp
	M			libs/ui/forms/wdgpaintopsettings.ui
	M			libs/ui/kis_action.cpp
	M			libs/ui/kis_action.h
	M			libs/ui/kis_action_manager.cpp
	M			libs/ui/kis_action_manager.h
	M			libs/ui/kis_config.cc
	M			libs/ui/kis_config.h
	M			libs/ui/kis_filter_manager.cc
	M			libs/ui/kis_layer_manager.cc
	M			libs/ui/kis_node_manager.cpp
	M			libs/ui/kis_paintop_box.cc
	M			libs/ui/kis_paintop_settings_widget.cpp
	M			libs/ui/kis_png_converter.cpp
	M			libs/ui/kis_png_converter.h
	M			libs/ui/kis_popup_palette.cpp
	M			libs/ui/kis_popup_palette.h
	M			libs/ui/kis_zoom_manager.cc
	M			libs/ui/tool/kis_tool.cc
	M			libs/ui/widgets/KisVisualColorSelector.cpp
	M			libs/ui/widgets/KisVisualColorSelector.h
	M			libs/ui/widgets/kis_custom_image_widget.cc
	M			libs/ui/widgets/kis_paintop_presets_chooser_popup.cpp
	M			libs/ui/widgets/kis_paintop_presets_popup.cpp
	M			libs/ui/widgets/kis_paintop_presets_popup.h
	M			libs/ui/widgets/kis_preset_chooser.cpp
	M			libs/ui/widgets/kis_preset_chooser.h
	M			libs/ui/widgets/kis_preset_selector_strip.cpp
	M			libs/ui/widgets/kis_preset_selector_strip.h
	M			libs/ui/widgets/kis_tool_options_popup.cpp
	M			libs/widgets/CMakeLists.txt
	A			libs/widgets/KisColorSelectorInterface.cpp
	A			libs/widgets/KisColorSelectorInterface.h
	M			libs/widgets/KoColorPopupAction.cpp
	M			libs/widgets/KoResourceItemChooserSync.cpp
	M			libs/widgets/KoResourceServer.h
	M			libs/widgets/KoTagFilterWidget.cpp
	M			libs/widgets/KoTriangleColorSelector.cpp
	M			libs/widgets/KoTriangleColorSelector.h
	M			libs/widgets/KoZoomController.cpp
	M			libs/widgets/KoZoomController.h
	M			libs/widgets/KoZoomController_p.h
	M			libs/widgetutils/CMakeLists.txt
	A			libs/widgetutils/KisActionsSnapshot.cpp
	P			libs/widgetutils/KisActionsSnapshot.h Copied from libs/ui/dialogs/kis_delayed_save_dialog.h
	M			libs/widgetutils/KoFileDialog.cpp
	M			libs/widgetutils/KoFileDialog.h
	M			libs/widgetutils/kis_action_registry.cpp
	M			libs/widgetutils/kis_action_registry.h
	M			libs/widgetutils/xmlgui/KisShortcutsDialog.cpp
	M			libs/widgetutils/xmlgui/KisShortcutsDialog.h
	M			libs/widgetutils/xmlgui/kactionconflictdetector.cpp
	M			plugins/dockers/advancedcolorselector/kis_color_selector_ng_docker_widget.cpp
	M			plugins/dockers/animation/animation_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_layers_header.cpp
	M			plugins/dockers/animation/timeline_layers_header.h
	M			plugins/dockers/compositiondocker/compositiondocker_dock.cpp
	M			plugins/dockers/compositiondocker/compositiondocker_dock.h
	M			plugins/dockers/historydocker/CMakeLists.txt
	A			plugins/dockers/historydocker/DlgConfigureHistoryDock.cpp
	P			plugins/dockers/historydocker/DlgConfigureHistoryDock.h Copied from plugins/dockers/historydocker/HistoryDock.h
	M			plugins/dockers/historydocker/HistoryDock.cpp
	P			plugins/dockers/historydocker/HistoryDock.h Copied to plugins/dockers/historydocker/DlgConfigureHistoryDock.h
	M			plugins/dockers/historydocker/KisUndoView.cpp
	M			plugins/dockers/historydocker/KisUndoView.h
	M			plugins/extensions/clonesarray/dlg_clonesarray.cpp
	M			plugins/extensions/imagesplit/dlg_imagesplit.cpp
	M			plugins/extensions/imagesplit/dlg_imagesplit.h
	M			plugins/extensions/imagesplit/imagesplit.cpp
	M			plugins/extensions/imagesplit/imagesplit.h
	M			plugins/extensions/resourcemanager/dlg_bundle_manager.cpp
	M			plugins/extensions/waveletdecompose/waveletdecompose.cpp
	M			plugins/impex/libkra/kis_kra_saver.cpp
	M			plugins/impex/ora/ora_converter.cc
	M			plugins/impex/ora/ora_save_context.cc
	M			plugins/impex/raw/3rdparty/libkdcraw/src/dcrawsettingswidget.cpp
	M			plugins/impex/video/video_saver.cpp
	M			plugins/paintops/libpaintop/CMakeLists.txt
	M			plugins/paintops/libpaintop/forms/wdgautobrush.ui
	A			plugins/paintops/libpaintop/forms/wdgpredefinedbrushchooser.ui
	M			plugins/paintops/libpaintop/kis_brush_chooser.cpp
	M			plugins/paintops/libpaintop/kis_brush_chooser.h
	M			plugins/paintops/libpaintop/kis_brush_selection_widget.cpp
	M			plugins/paintops/libpaintop/kis_brush_selection_widget.h
	M			plugins/paintops/libpaintop/kis_spacing_selection_widget.cpp
	M			plugins/paintops/libpaintop/sensors/SensorFadeConfiguration.ui
	M			plugins/paintops/libpaintop/sensors/SensorTimeConfiguration.ui
	M			plugins/paintops/libpaintop/sensors/kis_dynamic_sensor_fade.cpp
	M			plugins/paintops/libpaintop/sensors/kis_dynamic_sensor_time.cc
	M			plugins/paintops/libpaintop/sensors/kis_dynamic_sensor_time.h
	M			plugins/tools/karbonplugins/tools/CalligraphyTool/KarbonCalligraphyOptionWidget.cpp
	M			plugins/tools/tool_transform2/kis_free_transform_strategy.cpp
	M			plugins/tools/tool_transform2/kis_free_transform_strategy.h
	M			plugins/tools/tool_transform2/kis_liquify_transform_strategy.cpp
	M			plugins/tools/tool_transform2/kis_perspective_transform_strategy.cpp
	M			plugins/tools/tool_transform2/kis_perspective_transform_strategy.h
	M			plugins/tools/tool_transform2/kis_simplified_action_policy_strategy.cpp
	M			plugins/tools/tool_transform2/kis_simplified_action_policy_strategy.h
	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_tool_transform_config_widget.h
	M			plugins/tools/tool_transform2/kis_transform_strategy_base.cpp
	M			plugins/tools/tool_transform2/kis_transform_strategy_base.h
	M			plugins/tools/tool_transform2/kis_transform_utils.cpp
	M			plugins/tools/tool_transform2/kis_transform_utils.h
	M			plugins/tools/tool_transform2/kis_warp_transform_strategy.cpp
	M			plugins/tools/tool_transform2/kis_warp_transform_strategy.h
	M			plugins/tools/tool_transform2/tool_transform_args.cc
	M			plugins/tools/tool_transform2/tool_transform_args.h
	M			plugins/tools/tool_transform2/wdg_tool_transform.ui