Diffusion Krita 65b6d8a57330

Merge remote-tracking branch 'origin' into rempt/T9256-HDR-support
65b6d8a57330
Actions

Authored by rempt on Sep 14 2018, 8:55 AM.

Description

Merge remote-tracking branch 'origin' into rempt/T9256-HDR-support

Details

Committed

rempt

Sep 14 2018, 8:55 AM

Parents

R37:5db89dc523fb: Remove fax-related tiff options
R37:83a30f910e14: Use the right functions object

Branches

Unknown

Tags

Unknown

rempt committed R37:65b6d8a57330: Merge remote-tracking branch 'origin' into rempt/T9256-HDR-support (authored by rempt).Sep 14 2018, 8:55 AM

Merged Changes

Commit		Author	Details	Committed
5db89dc523fb		dkazakov	Remove fax-related tiff options	Sep 13 2018
75c39f3fa4a2		dkazakov	Reset modified state of the recovered files correctly	Sep 13 2018
bbcde7236398		dkazakov	Fix removing of autosave files in some cases	Sep 13 2018
c3a4f4cc95ab		dkazakov	Add forgotten license headers	Sep 13 2018
81aecaf862ca		rempt	Revert "Don't build qtwinextras"	Sep 13 2018
3aa6dbcc5eda		dkazakov	FEATURE: Undo for Move Tool	Sep 13 2018
6569f02b3dfa		rempt	Remember the last used filter bookmark	Sep 12 2018
dfb69fcd3d4e		rempt	Don't build qtwinextras	Sep 12 2018
90d95e9224b3		rempt	Use the patch for building with mingw 8.2	Sep 12 2018
f7d60afa6d92		rempt	Use the right functions object	Sep 12 2018
177c3f2e4f58		rempt	Add patch to make exiv2 build with mingw 8.2	Sep 12 2018
41c6768017d9		rempt	metadata: Show the first element of an array	Sep 11 2018
3e83d9554507		rempt	Move the metadata code into its own library	Sep 11 2018
eca385149bf5		rempt	Remove the dockwidget titlebar proxy style again.	Sep 11 2018
260b7c668588		rempt	Remove unimplemented method declaration.	Sep 11 2018
4c9c40b3e672		rempt	Use proper link, so the title gets styles as link	Sep 10 2018
b44dfa4d6c48		dkazakov	Make KisSelectionBasedProcessingHelper be exported	Sep 10 2018
9a1849eb1606		rempt	Update Qt to 5.11 on Windows and build with ssl	Sep 10 2018
064ee34cf9a9		rempt	Condense the news text some more and make the title bold	Sep 10 2018
6e809bc8076c		dkazakov	Fix selection cursor update when modifier is presses	Sep 9 2018
3014d62c9817		dkazakov	FEATURE: actions for rotate/scale/mirror/shear selection	Sep 9 2018
6069c8a300ab		rempt	Fix Windows build	Sep 9 2018
eb93795423ff		scottpetrovic	Condense News widget UI a bit	Sep 8 2018
75d94198e19c	D15335	safaalfulaij	Make checkboxes look better in the General settings page	Sep 8 2018
c40245270974		pino	fixuifiles	Sep 8 2018
5d8e118527ed	D15329	safaalfulaij	Fix the layout direction of 3 widgets	Sep 7 2018
85669bb602c1		rempt	Update the news widget to show more of the article	Sep 7 2018
237b0c53efc2		rempt	fix typo	Sep 7 2018
28009b7b7c34		rempt	Implement a basic news widget	Sep 7 2018
65a1598cd305		dkazakov	Fix painting of selection decoration over grids	Sep 6 2018
9d0a1bba3d5b	D15299	rempt	Disable pixel grid action of opengl is disabled	Sep 6 2018
fb16dc574813		dkazakov	Save state of "Antialias selection" into a config file	Sep 5 2018
b225d5c1dac6		dkazakov	Avoid code duplication in KisToolSelectBase::popupActionsMenu()	Sep 5 2018
f6323b7b8675		dkazakov	Remove now unused methods of KisSelectionToolConfigWidgetHelper	Sep 5 2018
a1dc9ad74941		dkazakov	Connect David Revoy's selection mode cursors to actual tools	Sep 5 2018
7368906e7778		dkazakov	Fix selectio mode shortcuts in Select Similar and Contiguous	Sep 5 2018
8c4110c9321b		dkazakov	We shouldn't switch selection move cursor when the user is dragging something	Sep 5 2018
1c8b8bbd402e		amedonosova	Fixes crash on gamut mask edit on Windows	Sep 5 2018
60305c70621e		dkazakov	Fix tooltips on selection mode buttons	Sep 5 2018
d7bc0ebf1dae		dkazakov	Make selection mode shortcuts configurable	Sep 5 2018
aa85c2ce3293		dkazakov	Fix update of selection buttons when changing mode with a shortcut	Sep 5 2018
21e2a2f7db30		dkazakov	Disable Instant preview for selection masks	Sep 5 2018

Changes (229)
Show All Changes

Very Large Commit

This commit is very large. Load each file individually.

		Path
M		3rdparty/ext_exiv2/CMakeLists.txt
A		3rdparty/ext_qt/0001-adapted-to-changed-C-API.patch
V		{interfaces ← libs/widgets}/KoGenericRegistryModel.h
M		krita/krita.action
M		krita/krita4.xmlgui
M		krita/kritamenu.action
M		libs/CMakeLists.txt
M		libs/image/CMakeLists.txt
V		libs/{image/commands_new ← ui}/kis_transaction_based_command.cpp
V		libs/{image/commands_new ← ui}/kis_transaction_based_command.h
V		libs/image/{ ← metadata}/kis_exif_info_visitor.h
M		libs/image/kis_image.cc
M		libs/image/kis_image.h
M		libs/image/kis_processing_applicator.cpp
M		libs/image/kis_processing_visitor.cpp
M		libs/image/kis_processing_visitor.h
M		libs/image/kis_selection_mask.cpp
D		libs/image/metadata
V		libs/image/{metadata → }/kis_exif_info_visitor.h
V		libs/{image → }/metadata/kis_legacy_importer.cc
V		libs/{image → }/metadata/kis_legacy_importer.h
V		libs/{image → }/metadata/kis_meta_data_entry.cc
V		libs/{image → }/metadata/kis_meta_data_entry.h
V		libs/{image → }/metadata/kis_meta_data_filter.cc
V		libs/{image → }/metadata/kis_meta_data_filter.h
V		libs/{image → }/metadata/kis_meta_data_filter_p.cc
V		libs/{image → }/metadata/kis_meta_data_filter_p.h
V		libs/{image → }/metadata/kis_meta_data_filter_registry.cc
V		libs/{image → }/metadata/kis_meta_data_filter_registry.h
V		libs/{image → }/metadata/kis_meta_data_filter_registry_model.cc
V		libs/{image → }/metadata/kis_meta_data_filter_registry_model.h
V		libs/{image → }/metadata/kis_meta_data_io_backend.cc
V		libs/{image → }/metadata/kis_meta_data_io_backend.h
V		libs/{image → }/metadata/kis_meta_data_merge_strategy.cc
V		libs/{image → }/metadata/kis_meta_data_merge_strategy.h
V		libs/{image → }/metadata/kis_meta_data_merge_strategy_p.cc
V		libs/{image → }/metadata/kis_meta_data_merge_strategy_p.h
V		libs/{image → }/metadata/kis_meta_data_merge_strategy_registry.cc
V		libs/{image → }/metadata/kis_meta_data_merge_strategy_registry.h
V		libs/{image → }/metadata/kis_meta_data_parser.cc
V		libs/{image → }/metadata/kis_meta_data_parser.h
V		libs/{image → }/metadata/kis_meta_data_parser_p.h
V		libs/{image → }/metadata/kis_meta_data_schema.cc
V		libs/{image → }/metadata/kis_meta_data_schema.h
V		libs/{image → }/metadata/kis_meta_data_schema_p.h
V		libs/{image → }/metadata/kis_meta_data_schema_registry.cc
V		libs/{image → }/metadata/kis_meta_data_schema_registry.h
V		libs/{image → }/metadata/kis_meta_data_store.cc
V		libs/{image → }/metadata/kis_meta_data_store.h
V		libs/{image → }/metadata/kis_meta_data_type_info.cc
V		libs/{image → }/metadata/kis_meta_data_type_info.h
V		libs/{image → }/metadata/kis_meta_data_type_info_p.h
V		libs/{image → }/metadata/kis_meta_data_validator.cc
V		libs/{image → }/metadata/kis_meta_data_validator.h
V		libs/{image → }/metadata/kis_meta_data_value.cc
V		libs/{image → }/metadata/kis_meta_data_value.h
A		libs/image/processing/KisSelectionBasedProcessingHelper.cpp
A		libs/image/processing/KisSelectionBasedProcessingHelper.h
M		libs/image/processing/kis_mirror_processing_visitor.cpp
M		libs/image/processing/kis_mirror_processing_visitor.h
M		libs/image/processing/kis_transform_processing_visitor.cpp
M		libs/image/processing/kis_transform_processing_visitor.h
M		libs/image/tests/CMakeLists.txt
M		libs/image/tests/kis_image_test.cpp
V		libs/{image → metadata}/tests/kis_meta_data_test.cpp
V		libs/{image → metadata}/tests/kis_meta_data_test.h
M		libs/impex/ExifCheck.h
M		libs/libkis/Node.cpp
M		libs/libkis/Node.h
A	(dir)	libs/metadata/
A		libs/metadata/CMakeLists.txt
V		libs/{ ← image}/metadata/kis_legacy_importer.cc
V		libs/{ ← image}/metadata/kis_legacy_importer.h
V		libs/{ ← image}/metadata/kis_meta_data_entry.cc
V		libs/{ ← image}/metadata/kis_meta_data_entry.h
V		libs/{ ← image}/metadata/kis_meta_data_filter.cc
V		libs/{ ← image}/metadata/kis_meta_data_filter.h
V		libs/{ ← image}/metadata/kis_meta_data_filter_p.cc
V		libs/{ ← image}/metadata/kis_meta_data_filter_p.h
V		libs/{ ← image}/metadata/kis_meta_data_filter_registry.cc
V		libs/{ ← image}/metadata/kis_meta_data_filter_registry.h
V		libs/{ ← image}/metadata/kis_meta_data_filter_registry_model.cc
V		libs/{ ← image}/metadata/kis_meta_data_filter_registry_model.h
V		libs/{ ← image}/metadata/kis_meta_data_io_backend.cc
V		libs/{ ← image}/metadata/kis_meta_data_io_backend.h
V		libs/{ ← image}/metadata/kis_meta_data_merge_strategy.cc
V		libs/{ ← image}/metadata/kis_meta_data_merge_strategy.h
V		libs/{ ← image}/metadata/kis_meta_data_merge_strategy_p.cc
V		libs/{ ← image}/metadata/kis_meta_data_merge_strategy_p.h
V		libs/{ ← image}/metadata/kis_meta_data_merge_strategy_registry.cc
V		libs/{ ← image}/metadata/kis_meta_data_merge_strategy_registry.h
V		libs/{ ← image}/metadata/kis_meta_data_parser.cc
V		libs/{ ← image}/metadata/kis_meta_data_parser.h
V		libs/{ ← image}/metadata/kis_meta_data_parser_p.h
V		libs/{ ← image}/metadata/kis_meta_data_schema.cc
V		libs/{ ← image}/metadata/kis_meta_data_schema.h
V		libs/{ ← image}/metadata/kis_meta_data_schema_p.h
V		libs/{ ← image}/metadata/kis_meta_data_schema_registry.cc
V		libs/{ ← image}/metadata/kis_meta_data_schema_registry.h
V		libs/{ ← image}/metadata/kis_meta_data_store.cc
V		libs/{ ← image}/metadata/kis_meta_data_store.h
V		libs/{ ← image}/metadata/kis_meta_data_type_info.cc
V		libs/{ ← image}/metadata/kis_meta_data_type_info.h
V		libs/{ ← image}/metadata/kis_meta_data_type_info_p.h
V		libs/{ ← image}/metadata/kis_meta_data_validator.cc
V		libs/{ ← image}/metadata/kis_meta_data_validator.h
V		libs/{ ← image}/metadata/kis_meta_data_value.cc
V		libs/{ ← image}/metadata/kis_meta_data_value.h
A	(dir)	libs/metadata/tests/
A		libs/metadata/tests/CMakeLists.txt
V		libs/{metadata ← image}/tests/kis_meta_data_test.cpp
V		libs/{metadata ← image}/tests/kis_meta_data_test.h
M		libs/ui/CMakeLists.txt
M		libs/ui/KisApplication.cpp
M		libs/ui/KisDocument.cpp
M		libs/ui/KisDocument.h
M		libs/ui/KisMainWindow.cpp
M		libs/ui/KisMultiFeedRSSModel.cpp
M		libs/ui/KisNetworkAccessManager.cpp
M		libs/ui/KisView.cpp
M		libs/ui/KisViewManager.cpp
M		libs/ui/KisWelcomePageWidget.cpp
M		libs/ui/actions/kis_selection_action_factories.cpp
M		libs/ui/canvas/kis_canvas_decoration.cc
M		libs/ui/canvas/kis_canvas_decoration.h
M		libs/ui/canvas/kis_canvas_widget_base.cpp
M		libs/ui/canvas/kis_grid_decoration.cpp
M		libs/ui/canvas/kis_guides_decoration.cpp
A		libs/ui/forms/KisNewsPage.ui
M		libs/ui/forms/KisWelcomePage.ui
M		libs/ui/forms/wdggeneralsettings.ui
M		libs/ui/forms/wdgimageproperties.ui
M		libs/ui/forms/wdgselectionoptions.ui
M		libs/ui/kis_action.h
M		libs/ui/kis_action_manager.cpp
M		libs/ui/kis_layer_manager.cc
M		libs/ui/kis_node_manager.cpp
M		libs/ui/kis_node_manager.h
M		libs/ui/kis_painting_assistants_decoration.cpp
M		libs/ui/kis_png_converter.cpp
M		libs/ui/kis_selection_decoration.cc
V		libs/{ui → image/commands_new}/kis_transaction_based_command.cpp
V		libs/{ui → image/commands_new}/kis_transaction_based_command.h
M		libs/ui/kisexiv2/kis_exif_io.cpp
M		libs/ui/kisexiv2/kis_exif_io.h
M		libs/ui/kisexiv2/kis_exiv2.cpp
M		libs/ui/kisexiv2/kis_exiv2.h
M		libs/ui/kisexiv2/kis_iptc_io.cpp
M		libs/ui/kisexiv2/kis_iptc_io.h
M		libs/ui/kisexiv2/kis_xmp_io.cpp
M		libs/ui/kisexiv2/kis_xmp_io.h
M		libs/ui/operations/kis_filter_selection_operation.cpp
M		libs/ui/tests/kis_exiv2_test.cpp
M		libs/ui/tests/kis_node_manager_test.cpp
M		libs/ui/tests/kis_node_manager_test.h
M		libs/ui/tests/kis_shape_layer_test.cpp
A		libs/ui/tool/KisToolChangesTracker.cpp
P		libs/ui/tool/KisToolChangesTracker.h Copied from plugins/extensions/imagesize/imagesize.h
P		libs/ui/tool/KisToolChangesTrackerData.cpp Copied from plugins/extensions/imagesize/imagesize.h
P		libs/ui/tool/KisToolChangesTrackerData.h Copied from plugins/extensions/imagesize/imagesize.h
M		libs/ui/tool/kis_selection_tool_config_widget_helper.cpp
M		libs/ui/tool/kis_selection_tool_config_widget_helper.h
M		libs/ui/tool/kis_selection_tool_helper.cpp
M		libs/ui/tool/kis_stabilized_events_sampler.h
M		libs/ui/tool/kis_tool_select_base.h
A		libs/ui/widgets/KisNewsWidget.cpp
A		libs/ui/widgets/KisNewsWidget.h
M		libs/ui/widgets/kis_filter_selector_widget.cc
M		libs/ui/widgets/kis_meta_data_merge_strategy_chooser_widget.cc
M		libs/ui/widgets/kis_selection_options.cc
M		libs/ui/widgets/kis_selection_options.h
V		{libs/widgets → interfaces}/KoGenericRegistryModel.h
M		plugins/dockers/animation/timeline_frames_item_delegate.cpp
M		plugins/dockers/gamutmask/gamutmask_dock.cpp
M		plugins/dockers/gamutmask/gamutmask_dock.h
M		plugins/extensions/imagesize/imagesize.cc
P		plugins/extensions/imagesize/imagesize.h Copied to multiple locations: libs/ui/tool/KisToolChangesTracker.h libs/ui/tool/KisToolChangesTrackerData.cpp libs/ui/tool/KisToolChangesTrackerData.h
M		plugins/extensions/metadataeditor/kis_entry_editor.cc
M		plugins/extensions/metadataeditor/kis_entry_editor.h
M		plugins/extensions/metadataeditor/kis_meta_data_editor.cc
M		plugins/extensions/metadataeditor/kis_meta_data_model.cpp
M		plugins/extensions/metadataeditor/metadataeditor.cc
M		plugins/extensions/pykrita/sip/krita/Node.sip
M		plugins/extensions/rotateimage/rotateimage.cc
M		plugins/extensions/rotateimage/rotateimage.h
M		plugins/extensions/shearimage/shearimage.cc
M		plugins/extensions/shearimage/shearimage.h
M		plugins/impex/exr/exr_converter.cc
M		plugins/impex/heif/HeifExport.cpp
M		plugins/impex/heif/HeifImport.cpp
M		plugins/impex/jpeg/kis_jpeg_converter.cc
M		plugins/impex/jpeg/kis_jpeg_export.cc
M		plugins/impex/jpeg/kis_jpeg_export.h
M		plugins/impex/libkra/kis_kra_load_visitor.cpp
M		plugins/impex/libkra/kis_kra_save_visitor.cpp
M		plugins/impex/ora/ora_save_context.cc
M		plugins/impex/ora/ora_save_context.h
M		plugins/impex/png/kis_png_export.cc
M		plugins/impex/tiff/kis_dlg_options_tiff.cpp
M		plugins/impex/tiff/kis_tiff_converter.cc
M		plugins/impex/tiff/kis_tiff_converter.h
M		plugins/impex/tiff/kis_tiff_writer_visitor.cpp
M		plugins/impex/tiff/kis_wdg_options_tiff.ui
M		plugins/tools/basictools/kis_tool_move.cc
M		plugins/tools/basictools/kis_tool_move.h
M		plugins/tools/basictools/kis_tool_movetooloptionswidget.cpp
M		plugins/tools/basictools/kis_tool_movetooloptionswidget.h
M		plugins/tools/selectiontools/kis_tool_select_contiguous.cc
M		plugins/tools/selectiontools/kis_tool_select_contiguous.h
M		plugins/tools/selectiontools/kis_tool_select_elliptical.cc
M		plugins/tools/selectiontools/kis_tool_select_elliptical.h
M		plugins/tools/selectiontools/kis_tool_select_outline.cc
M		plugins/tools/selectiontools/kis_tool_select_outline.h
M		plugins/tools/selectiontools/kis_tool_select_path.cc
M		plugins/tools/selectiontools/kis_tool_select_path.h
M		plugins/tools/selectiontools/kis_tool_select_polygonal.cc
M		plugins/tools/selectiontools/kis_tool_select_polygonal.h
M		plugins/tools/selectiontools/kis_tool_select_rectangular.cc
M		plugins/tools/selectiontools/kis_tool_select_rectangular.h
M		plugins/tools/selectiontools/kis_tool_select_similar.cc
M		plugins/tools/selectiontools/kis_tool_select_similar.h
M		plugins/tools/tool_smart_patch/kis_tool_smart_patch.cpp
M		plugins/tools/tool_transform2/CMakeLists.txt
M		plugins/tools/tool_transform2/kis_tool_transform.cc
M		plugins/tools/tool_transform2/kis_tool_transform.h
M		plugins/tools/tool_transform2/tool_transform_args.cc
M		plugins/tools/tool_transform2/tool_transform_args.h
D		plugins/tools/tool_transform2/tool_transform_changes_tracker.cpp
D		plugins/tools/tool_transform2/tool_transform_changes_tracker.h