Diffusion Krita 47c167423219

Merge branch 'master' into petrovic/brusheditor-save
47c167423219
Actions

Authored by scottpetrovic on Jun 27 2017, 6:06 PM.

Description

Merge branch 'master' into petrovic/brusheditor-save

Details

Committed

scottpetrovic

Jun 27 2017, 6:06 PM

Parents

R37:9f36f1636775: Change the way how paintops are saved.
R37:220bfb92288f: add a save as new brush button to the editor. I hooked it up to the same save…

Branches

Unknown

Tags

Unknown

scottpetrovic committed R37:47c167423219: Merge branch 'master' into petrovic/brusheditor-save (authored by scottpetrovic).Jun 27 2017, 6:06 PM

Merged Changes

Commit		Author	Details	Committed
9f36f1636775	D6314	woltherav	Change the way how paintops are saved.	Jun 27 2017
7fcb82a92fb2		rempt	BUG:381710 Fix xml error in kritamenu.action	Jun 27 2017
9c2b35f88a90		rempt	Update the xmlgui to a high enough version number	Jun 27 2017
631f7b686071		rempt	Directly use the touch config so we can reconfigure on the fly	Jun 27 2017
883b79021b05		rempt	Expose the enable/disable touch config flag	Jun 27 2017
bfc1a2f21856		victorw	Fix two warnings pointing out an uninitialized variable and a bad if-statement…	Jun 26 2017
1e408032f880		dkazakov/rempt	Don't recalculate layer styles when they are explicitly disabled	Jun 26 2017
086ec30889c3		pino	fixuifiles	Jun 26 2017
a19026847750		victorw	Fix uninitialized value in positionSelector of DefaultToolGeometryWidget. It…	Jun 25 2017
463213b8e043		rempt	FEATURE: replace the gmic plugin with the gmic-qt plugin	Jun 25 2017
0363df89516e		victorw	Revert "Merge branch 'master' of git://anongit.kde.org/krita"	Jun 25 2017
c2025574aaf8		victorw	Merge branch 'master' of git://anongit.kde.org/krita	Jun 25 2017
67aa7b805149		victorw	Fix crash and safe assert when creating two documents in a row, due to bad…	Jun 25 2017
57cdbdafff66		rempt	FEATURE: replace the gmic plugin with the gmic-qt plugin	Jun 25 2017
10f8a399c1a5		scottpetrovic	a thousand is a big number for gaussian blur. let us make it use exponential…	Jun 25 2017

Changes (138)
Show All Changes

Very Large Commit

This commit is very large. Load each file individually.

		Path
M		krita/krita.xmlgui
M		krita/kritamenu.action
M		libs/flake/KoFlake.cpp
M		libs/image/layerstyles/kis_layer_style_projection_plane.cpp
M		libs/ui/dialogs/kis_dlg_preferences.cc
M		libs/ui/forms/wdggeneralsettings.ui
M		libs/ui/input/kis_input_manager.cpp
M		libs/ui/input/kis_input_manager_p.cpp
M		libs/ui/input/kis_input_manager_p.h
M		libs/ui/input/wintab/kis_tablet_support_x11.cpp
M		libs/ui/kis_paintop_box.cc
M		plugins/extensions/CMakeLists.txt
D		plugins/extensions/gmic
D		plugins/extensions/gmic/3rdparty
D		plugins/extensions/gmic/3rdparty/gmic
D		plugins/extensions/gmic/3rdparty/gmic/CImg.h
D		plugins/extensions/gmic/3rdparty/gmic/gimp_update169.gmic
D		plugins/extensions/gmic/3rdparty/gmic/gmic.cpp
D		plugins/extensions/gmic/3rdparty/gmic/gmic.h
D		plugins/extensions/gmic/3rdparty/gmic/gmic_def.gmic
D		plugins/extensions/gmic/3rdparty/gmic/gmic_def.h
D		plugins/extensions/gmic/3rdparty/gmic/gmic_stdlib.h
D		plugins/extensions/gmic/3rdparty/gmic/update1610.gmic
D		plugins/extensions/gmic/CMakeLists.txt
D		plugins/extensions/gmic/Category.cpp
D		plugins/extensions/gmic/Category.h
D		plugins/extensions/gmic/Command.cpp
D		plugins/extensions/gmic/Command.h
D		plugins/extensions/gmic/Component.cpp
D		plugins/extensions/gmic/Component.h
D		plugins/extensions/gmic/Parameter.cpp
D		plugins/extensions/gmic/Parameter.h
D		plugins/extensions/gmic/TODO
D		plugins/extensions/gmic/gmic.xmlgui
D		plugins/extensions/gmic/gmic_def.gmic.blacklist
D		plugins/extensions/gmic/gmicparser.cpp
D		plugins/extensions/gmic/kis_export_gmic_processing_visitor.cpp
D		plugins/extensions/gmic/kis_export_gmic_processing_visitor.h
D		plugins/extensions/gmic/kis_filter_preview_widget.cpp
D		plugins/extensions/gmic/kis_filter_preview_widget.h
V		plugins/extensions/{gmic/kis_gmic_applicator.cpp → qmic/kis_qmic_applicator.cpp}
V		plugins/extensions/{gmic/kis_gmic_applicator.h → qmic/kis_qmic_applicator.h}
D		plugins/extensions/gmic/kis_gmic_blacklister.cpp
D		plugins/extensions/gmic/kis_gmic_blacklister.h
D		plugins/extensions/gmic/kis_gmic_command.cpp
D		plugins/extensions/gmic/kis_gmic_command.h
V		plugins/extensions/{gmic/kis_gmic_data.cpp → qmic/kis_qmic_data.cpp}
V		plugins/extensions/{gmic/kis_gmic_data.h → qmic/kis_qmic_data.h}
D		plugins/extensions/gmic/kis_gmic_filter_model.cpp
D		plugins/extensions/gmic/kis_gmic_filter_model.h
D		plugins/extensions/gmic/kis_gmic_filter_proxy_model.cpp
D		plugins/extensions/gmic/kis_gmic_filter_proxy_model.h
D		plugins/extensions/gmic/kis_gmic_filter_settings.cpp
D		plugins/extensions/gmic/kis_gmic_filter_settings.h
D		plugins/extensions/gmic/kis_gmic_input_output_widget.cpp
D		plugins/extensions/gmic/kis_gmic_input_output_widget.h
D		plugins/extensions/gmic/kis_gmic_parser.cpp
D		plugins/extensions/gmic/kis_gmic_parser.h
D		plugins/extensions/gmic/kis_gmic_plugin.cpp
D		plugins/extensions/gmic/kis_gmic_plugin.h
V		plugins/extensions/{gmic/kis_gmic_progress_manager.cpp → qmic/kis_qmic_progress_manager.cpp}
V		plugins/extensions/{gmic/kis_gmic_progress_manager.h → qmic/kis_qmic_progress_manager.h}
D		plugins/extensions/gmic/kis_gmic_settings_widget.cpp
D		plugins/extensions/gmic/kis_gmic_settings_widget.h
V		plugins/extensions/{gmic/kis_gmic_simple_convertor.cpp → qmic/kis_qmic_simple_convertor.cpp}
V		plugins/extensions/{gmic/kis_gmic_simple_convertor.h → qmic/kis_qmic_simple_convertor.h}
D		plugins/extensions/gmic/kis_gmic_small_applicator.cpp
D		plugins/extensions/gmic/kis_gmic_small_applicator.h
V		plugins/extensions/{gmic/kis_gmic_synchronize_image_size_command.cpp → qmic/kis_qmic_synchronize_image_size_command.cpp}
V		plugins/extensions/{gmic/kis_gmic_synchronize_image_size_command.h → qmic/kis_qmic_synchronize_image_size_command.h}
V		plugins/extensions/{gmic/kis_gmic_synchronize_layers_command.cpp → qmic/kis_qmic_synchronize_layers_command.cpp}
V		plugins/extensions/{gmic/kis_gmic_synchronize_layers_command.h → qmic/kis_qmic_synchronize_layers_command.h}
D		plugins/extensions/gmic/kis_gmic_updater.cpp
D		plugins/extensions/gmic/kis_gmic_updater.h
D		plugins/extensions/gmic/kis_gmic_widget.cpp
D		plugins/extensions/gmic/kis_gmic_widget.h
D		plugins/extensions/gmic/kis_html_delegate.cpp
D		plugins/extensions/gmic/kis_html_delegate.h
V		plugins/extensions/{gmic/kis_import_gmic_processing_visitor.cpp → qmic/kis_import_qmic_processing_visitor.cpp}
V		plugins/extensions/{gmic/kis_import_gmic_processing_visitor.h → qmic/kis_import_qmic_processing_visitor.h}
V		plugins/extensions/{gmic → qmic}/kis_input_output_mapper.cpp
V		plugins/extensions/{gmic → qmic}/kis_input_output_mapper.h
V		plugins/extensions/{gmic/kritagmic.json → qmic/kritaqmic.json}
D		plugins/extensions/gmic/tests
D		plugins/extensions/gmic/tests/CMakeLists.txt
V	(dir)	plugins/extensions/{gmic/tests/data/ → qmic/tests/data}
V		plugins/extensions/{gmic → qmic}/tests/data/00_BG.png
V		plugins/extensions/{gmic → qmic}/tests/data/01_ColorMarks.png
V		plugins/extensions/{gmic → qmic}/tests/data/02_Artline.png
V		plugins/extensions/{gmic → qmic}/tests/data/gmic_def_1603_krita.xml
V		plugins/extensions/{gmic → qmic}/tests/data/gmic_def_1610_gimp.xml
V		plugins/extensions/{gmic → qmic}/tests/data/gmic_def_1610_krita.xml
V		plugins/extensions/{gmic → qmic}/tests/data/poster_rodents_bunnysize.jpg
D		plugins/extensions/gmic/tests/kis_gmic_benchmarks.cpp
V		plugins/extensions/{gmic/tests/kis_gmic_benchmarks.h → qmic/tests/kis_qmic_tests.h}
D		plugins/extensions/gmic/tests/kis_gmic_tests.cpp
D		plugins/extensions/gmic/tests/kis_gmic_tests.h
D		plugins/extensions/gmic/wdg_gmic.ui
D		plugins/extensions/gmic/wdg_gmic_input_output.ui
A	(dir)	plugins/extensions/qmic/
A		plugins/extensions/qmic/CMakeLists.txt
A		plugins/extensions/qmic/PluginSettings.cpp
A		plugins/extensions/qmic/PluginSettings.h
A		plugins/extensions/qmic/QMic.cpp
A		plugins/extensions/qmic/QMic.h
A		plugins/extensions/qmic/WdgQMicSettings.ui
A		plugins/extensions/qmic/gmic.h
V		plugins/extensions/{qmic/kis_import_qmic_processing_visitor.cpp ← gmic/kis_import_gmic_processing_visitor.cpp}
V		plugins/extensions/{qmic/kis_import_qmic_processing_visitor.h ← gmic/kis_import_gmic_processing_visitor.h}
V		plugins/extensions/{qmic ← gmic}/kis_input_output_mapper.cpp
V		plugins/extensions/{qmic ← gmic}/kis_input_output_mapper.h
V		plugins/extensions/{qmic/kis_qmic_applicator.cpp ← gmic/kis_gmic_applicator.cpp}
V		plugins/extensions/{qmic/kis_qmic_applicator.h ← gmic/kis_gmic_applicator.h}
V		plugins/extensions/{qmic/kis_qmic_data.cpp ← gmic/kis_gmic_data.cpp}
V		plugins/extensions/{qmic/kis_qmic_data.h ← gmic/kis_gmic_data.h}
V		plugins/extensions/{qmic/kis_qmic_progress_manager.cpp ← gmic/kis_gmic_progress_manager.cpp}
V		plugins/extensions/{qmic/kis_qmic_progress_manager.h ← gmic/kis_gmic_progress_manager.h}
V		plugins/extensions/{qmic/kis_qmic_simple_convertor.cpp ← gmic/kis_gmic_simple_convertor.cpp}
V		plugins/extensions/{qmic/kis_qmic_simple_convertor.h ← gmic/kis_gmic_simple_convertor.h}
V		plugins/extensions/{qmic/kis_qmic_synchronize_image_size_command.cpp ← gmic/kis_gmic_synchronize_image_size_command.cpp}
V		plugins/extensions/{qmic/kis_qmic_synchronize_image_size_command.h ← gmic/kis_gmic_synchronize_image_size_command.h}
V		plugins/extensions/{qmic/kis_qmic_synchronize_layers_command.cpp ← gmic/kis_gmic_synchronize_layers_command.cpp}
V		plugins/extensions/{qmic/kis_qmic_synchronize_layers_command.h ← gmic/kis_gmic_synchronize_layers_command.h}
V		plugins/extensions/{qmic/kritaqmic.json ← gmic/kritagmic.json}
A	(dir)	plugins/extensions/qmic/tests/
A		plugins/extensions/qmic/tests/CMakeLists.txt
V	(dir)	plugins/extensions/{qmic/tests/data/ ← gmic/tests/data}
V		plugins/extensions/{qmic ← gmic}/tests/data/00_BG.png
V		plugins/extensions/{qmic ← gmic}/tests/data/01_ColorMarks.png
V		plugins/extensions/{qmic ← gmic}/tests/data/02_Artline.png
V		plugins/extensions/{qmic ← gmic}/tests/data/gmic_def_1603_krita.xml
V		plugins/extensions/{qmic ← gmic}/tests/data/gmic_def_1610_gimp.xml
V		plugins/extensions/{qmic ← gmic}/tests/data/gmic_def_1610_krita.xml
V		plugins/extensions/{qmic ← gmic}/tests/data/poster_rodents_bunnysize.jpg
A		plugins/extensions/qmic/tests/kis_qmic_tests.cpp
V		plugins/extensions/{qmic/tests/kis_qmic_tests.h ← gmic/tests/kis_gmic_benchmarks.h}
M		plugins/filters/blur/kis_wdg_gaussian_blur.cpp
M		plugins/tools/defaulttool/defaulttool/DefaultToolGeometryWidget.cpp