Diffusion Krita 7718eca89876

Merge branch 'master' into petrovic/welcome-screen
7718eca89876
Actions

Authored by scottpetrovic on Jun 30 2018, 2:15 AM.

Description

Merge branch 'master' into petrovic/welcome-screen

Details

Committed

scottpetrovic

Jun 30 2018, 2:15 AM

Parents

R37:49e11e4f30ca: Merge branch 'master' into petrovic/welcome-screen
R37:b0c70d4c9be9: Refactoring to Enable KisPaletteView to Be Used in More Widgets

Branches

Unknown

Tags

Unknown

scottpetrovic committed R37:7718eca89876: Merge branch 'master' into petrovic/welcome-screen (authored by scottpetrovic).Jun 30 2018, 2:15 AM

Merged Changes

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

Commit		Author	Details	Committed
b0c70d4c9be9		mzhou	Refactoring to Enable KisPaletteView to Be Used in More Widgets	Jun 30 2018
a8ca98974df7		scottpetrovic	Simplify display of Warp transformation grid	Jun 29 2018
ae2463497d42	D13775	pino	Use KFormat also in performance preferences	Jun 28 2018
bef246fb2f97		dkazakov	Fix copying base files	Jun 28 2018
6ee5e646da16		dkazakov	Fix misprints docker scripts	Jun 28 2018
b91b70d40c15		dkazakov	Update docker build scripts	Jun 28 2018
88d97c3fadbb		l10n daemon script	SVN_SILENT made messages (.desktop file) - always resolve ours	Jun 28 2018
439ea1d84966		mzhou	Modified resizeEvent(QResizeEvent *) in KisPaintOpPresetsPopup so that it…	Jun 27 2018
8ec37504a5f2		mzhou	Updated from origin	Jun 27 2018
6ce029dd97d1		mzhou	Some fix following Boud's suggestions on code review	Jun 27 2018
411dc8606d49		rempt	Add comment	Jun 27 2018
9500a7f78e66		rempt	Modernize initalization	Jun 27 2018
2b63d0abae94		rempt	Be more lenient when loading gpl palettes	Jun 27 2018
153ecfbba19e		mzhou	Removed unnecessary member "popupButton" from KisPaintopPresetsPopup	Jun 26 2018
fba564457f58		mzhou	Remove unnecessary includes in KisApplication	Jun 26 2018
46bd76e9536f		mzhou	Fixed text string in KisPaletteView: "Spot Color" -> "Spot color"	Jun 26 2018
7dd8c64611ac		mzhou	Ready to submit the refactor to move palette view into kritawidgets	Jun 26 2018
468f2aa0d23b		mzhou	Changes that can be submitted isolated	Jun 26 2018
4a3af9aba041		rempt	Check the whether the selected channel exists	Jun 26 2018
0d9fadebc4b3		rempt	Warn the user when using an unsupported version of Windows	Jun 26 2018
240af8a39594		rempt	Hide the color sliders config page	Jun 26 2018
ccd566bc18f4		rempt	debug--	Jun 26 2018
8d8dc773da21		woltherav	CPMT: Fix the exporter so it produces clean acbf files.	Jun 25 2018
4dc097c927e4		dkazakov	Fix initialization of the global assistants color	Jun 25 2018
67823cd55eb0	D13437	dkazakov	Save global color to KRA file	Jun 25 2018
cb3736e1eaa7		rempt	Update gmic to 2.3.0	Jun 25 2018
eadfec3dd43e	D13703	net147/dkazakov	Do not scroll pop-up palette when setting document offset	Jun 25 2018
0c4e2c7e8509		mzhou	PaletteListWidget now shows preview correctly	Jun 25 2018
3009d2675deb		mzhou	Fixed licensing information	Jun 25 2018
b5922f29f28a		mzhou	Change order of methods in colorsetentry to improve readability	Jun 25 2018
966960a31c1a		mzhou	PaletteListWidget setup	Jun 25 2018
b3dbe8d07ea7		mzhou	Added KisPaletteListWidget	Jun 24 2018
f3b44d4a895b		mzhou	Finished reversing the depedency of KisDlgInternalColorSelector	Jun 24 2018
be8e99cd3c14		mzhou	Added other new untracked files for compiling and testing remotely	Jun 18 2018
aba9f9d9b376		mzhou	B B B B B B B B B B B B B B B B B B A A A A A A A A A A A A A A A A A A A A A A…	Jun 18 2018
485fa710dafd		mzhou	Add the PaletteList files	Jun 18 2018
d816c6e1612d		mzhou	Added new files	Jun 18 2018
8bb4eeeb2b34		mzhou	Better way to solve the popup positioning problem	Jun 18 2018
62bbf37bda06		mzhou	fix popup positioning	Jun 18 2018
acd533aea157		mzhou	Removed files that was supposed to be moved but actually copied Not ready for…	Jun 18 2018
8616f332022b		mzhou	Removing files unrelated to patch T8646	Jun 18 2018
bcf4c2581108		mzhou	Minor fix before making patch T8646	Jun 18 2018
647410738e1e		mzhou	add licensing info to new kis_dlg_internal_color_selector files T8646	Jun 18 2018
876c11bc977b		mzhou	The internal color selector is partially moved to kritawidgets. It is now…	Jun 18 2018
f2b635c19542		mzhou	in the middles of moving internal color selector checkout to master to see if I…	Jun 17 2018
fcc13596bbf3		mzhou	added palette model test file	Jun 11 2018
b748c7e5c5d4		mzhou	merged moving kispaletteview	Jun 11 2018
5ba43658f4c5		mzhou	add files relevent to moving KisPaletteView	Jun 11 2018
af843ed483f0		rempt	Fix build: tests need to include a moc file	Jun 4 2018
455f46aea55d		mzhou	Moved KisPaletteView to kritawidgets The next step is to modify…	Jun 4 2018

Changes (137)
Show All Changes

Very Large Commit

This commit is very large. Load each file individually.

				Path	Packages
	M			3rdparty/ext_gmic/CMakeLists.txt
	M			build-tools/docker/README.md
	M			build-tools/docker/bin/bootstrap-deps.sh
	A			build-tools/docker/bin/bootstrap-root.sh
	A			build-tools/docker/bin/enter
	D			build-tools/docker/bin/enter_container
	A			build-tools/docker/bin/find_default_container_file.inc
	A			build-tools/docker/bin/find_up
	A			build-tools/docker/bin/install_nvidia_drivers.sh
	A			build-tools/docker/bin/qtcreator
	M			build-tools/docker/bin/run_container
	A			build-tools/docker/bin/start
	A			build-tools/docker/bin/stop
	A			build-tools/docker/bin/sudoenter
	M			build-tools/docker/default-home/devenv.inc
	M			build-tools/docker/default-home/run_cmake.sh
	M			krita/main.cc
	M			libs/flake/KoCanvasControllerWidget.cpp
	M			libs/global/CMakeLists.txt
	V			libs/{global ← ui}/kis_config_notifier.cpp
	V			libs/{global ← ui}/kis_config_notifier.h
	M			libs/global/kis_dom_utils.h
	M			libs/image/generator/kis_generator_layer.cpp
	M			libs/image/kis_warptransform_worker.h
	M			libs/pigment/resources/KoColorSet.cpp
	M			libs/pigment/resources/KoColorSetEntry.cpp
	M			libs/pigment/resources/KoColorSetEntry.h
	M			libs/ui/CMakeLists.txt
	V			libs/{ui → widgets}/KisColorsetChooser.cpp
	V			libs/{ui → widgets}/KisColorsetChooser.h
	M			libs/ui/KisDocument.cpp
	M			libs/ui/KisDocument.h
	V			libs/{ui → widgets}/KisPaletteModel.cpp
	V			libs/{ui → widgets}/KisPaletteModel.h
	V			libs/{ui/dialogs/kis_dlg_internal_color_selector.cpp → widgets/KisDlgInternalColorSelector.cpp}
	V			libs/{ui/dialogs/kis_dlg_internal_color_selector.h → widgets/KisDlgInternalColorSelector.h}
	M			libs/ui/dialogs/kis_dlg_preferences.cc
	V			libs/{ui/forms/wdgdlginternalcolorselector.ui → widgets/WdgDlgInternalColorSelector.ui}
	M			libs/ui/kis_config.cc
	M			libs/ui/kis_config.h
	V			libs/{ui → global}/kis_config_notifier.cpp
	V			libs/{ui → global}/kis_config_notifier.h
	M			libs/ui/kis_painting_assistant.cc
	M			libs/ui/kis_painting_assistant.h
	M			libs/ui/kis_painting_assistants_decoration.cpp
	M			libs/ui/kis_painting_assistants_decoration.h
	M			libs/ui/kis_paintop_box.cc
	V			libs/{ui → widgets}/kis_palette_delegate.cpp
	P			libs/ui/kis_palette_delegate.h Deleted after being copied to multiple locations: libs/widgets/KisScreenColorPickerBase.cpp libs/widgets/KisScreenColorPickerBase.h libs/widgets/kis_palette_delegate.h
	V			libs/{ui → widgets}/kis_palette_view.cpp
	V			libs/{ui → widgets}/kis_palette_view.h
	M			libs/ui/opengl/kis_texture_tile_update_info.h
	V			libs/{ui → }/widgets/KisColorSelectorConfiguration.h
	V			libs/ui/widgets/{KisScreenColorPicker.cpp ← kis_screen_color_picker.cpp}
	V			libs/ui/widgets/{KisScreenColorPicker.h ← kis_screen_color_picker.h}
	V			libs/{ui → }/widgets/KisVisualColorSelector.cpp
	V			libs/{ui → }/widgets/KisVisualColorSelector.h
	V			libs/{ui → }/widgets/KisVisualColorSelectorShape.cpp
	V			libs/{ui → }/widgets/KisVisualColorSelectorShape.h
	V			libs/{ui → }/widgets/KisVisualEllipticalSelectorShape.cpp
	V			libs/{ui → }/widgets/KisVisualEllipticalSelectorShape.h
	V			libs/{ui → }/widgets/KisVisualRectangleSelectorShape.cpp
	V			libs/{ui → }/widgets/KisVisualRectangleSelectorShape.h
	V			libs/{ui → }/widgets/KisVisualTriangleSelectorShape.cpp
	V			libs/{ui → }/widgets/KisVisualTriangleSelectorShape.h
	M			libs/ui/widgets/KoDualColorButton.cpp
	V			libs/{ui → }/widgets/kis_color_button.cpp
	V			libs/{ui → }/widgets/kis_color_button.h
	V			libs/{ui → }/widgets/kis_color_input.cpp
	V			libs/{ui → }/widgets/kis_color_input.h
	M			libs/ui/widgets/kis_iconwidget.h
	M			libs/ui/widgets/kis_paintop_presets_popup.cpp
	M			libs/ui/widgets/kis_paintop_presets_popup.h
	V			libs/{ui → }/widgets/kis_popup_button.cc
	V			libs/{ui → }/widgets/kis_popup_button.h
	V			libs/ui/widgets/{kis_screen_color_picker.cpp → KisScreenColorPicker.cpp}
	V			libs/ui/widgets/{kis_screen_color_picker.h → KisScreenColorPicker.h}
	V			libs/{ui → }/widgets/kis_spinbox_color_selector.cpp
	V			libs/{ui → }/widgets/kis_spinbox_color_selector.h
	M			libs/widgets/CMakeLists.txt
	V			libs/{ ← ui}/widgets/KisColorSelectorConfiguration.h
	V			libs/{widgets ← ui}/KisColorsetChooser.cpp
	V			libs/{widgets ← ui}/KisColorsetChooser.h
	V			libs/{widgets/KisDlgInternalColorSelector.cpp ← ui/dialogs/kis_dlg_internal_color_selector.cpp}
	V			libs/{widgets/KisDlgInternalColorSelector.h ← ui/dialogs/kis_dlg_internal_color_selector.h}
	V			libs/{widgets ← ui}/KisPaletteModel.cpp
	V			libs/{widgets ← ui}/KisPaletteModel.h
	P			libs/widgets/KisScreenColorPickerBase.cpp Copied from libs/ui/kis_palette_delegate.h
	P			libs/widgets/KisScreenColorPickerBase.h Copied from libs/ui/kis_palette_delegate.h
	V			libs/{ ← ui}/widgets/KisVisualColorSelector.cpp
	V			libs/{ ← ui}/widgets/KisVisualColorSelector.h
	V			libs/{ ← ui}/widgets/KisVisualColorSelectorShape.cpp
	V			libs/{ ← ui}/widgets/KisVisualColorSelectorShape.h
	V			libs/{ ← ui}/widgets/KisVisualEllipticalSelectorShape.cpp
	V			libs/{ ← ui}/widgets/KisVisualEllipticalSelectorShape.h
	V			libs/{ ← ui}/widgets/KisVisualRectangleSelectorShape.cpp
	V			libs/{ ← ui}/widgets/KisVisualRectangleSelectorShape.h
	V			libs/{ ← ui}/widgets/KisVisualTriangleSelectorShape.cpp
	V			libs/{ ← ui}/widgets/KisVisualTriangleSelectorShape.h
	V			libs/{widgets/WdgDlgInternalColorSelector.ui ← ui/forms/wdgdlginternalcolorselector.ui}
	V			libs/{ ← ui}/widgets/kis_color_button.cpp
	V			libs/{ ← ui}/widgets/kis_color_button.h
	V			libs/{ ← ui}/widgets/kis_color_input.cpp
	V			libs/{ ← ui}/widgets/kis_color_input.h
	V			libs/{widgets ← ui}/kis_palette_delegate.cpp
	V			libs/{widgets ← ui}/kis_palette_delegate.h
	V			libs/{widgets ← ui}/kis_palette_view.cpp
	V			libs/{widgets ← ui}/kis_palette_view.h
	V			libs/{ ← ui}/widgets/kis_popup_button.cc
	V			libs/{ ← ui}/widgets/kis_popup_button.h
	V			libs/{ ← ui}/widgets/kis_spinbox_color_selector.cpp
	V			libs/{ ← ui}/widgets/kis_spinbox_color_selector.h
	M			plugins/assistants/Assistants/SplineAssistant.cc
	M			plugins/assistants/Assistants/VanishingPointAssistant.cc
	M			plugins/assistants/Assistants/kis_assistant_tool.cc
	M			plugins/assistants/Assistants/kis_assistant_tool.h
	M			plugins/dockers/advancedcolorselector/kis_color_selector_settings.cpp
	M			plugins/dockers/palettedocker/palettedocker_dock.cpp
	M			plugins/dockers/palettedocker/palettedocker_dock.h
	M			plugins/extensions/pykrita/plugin/utilities.cpp
	M			plugins/impex/kra/kra_converter.cpp
	M			plugins/impex/libkra/kis_kra_loader.cpp
	M			plugins/impex/libkra/kis_kra_saver.cpp
	M			plugins/impex/libkra/kis_kra_saver.h
	M			plugins/impex/libkra/kis_kra_tags.h
	M			plugins/paintops/particle/kis_particle_paintop_settings_widget.h
	M			plugins/python/comics_project_management_tools/comics_exporter.py
	M			plugins/python/comics_project_management_tools/exporters/CPMT_ACBF_XML_Exporter.py
	M			plugins/python/comics_project_management_tools/exporters/CPMT_EPUB_exporter.py
	M			plugins/python/lastdocumentsdocker/kritapykrita_lastdocumentsdocker.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/tools/tool_transform2/kis_tool_transform_config_widget.cpp
	M			plugins/tools/tool_transform2/kis_warp_transform_strategy.cpp
	M			plugins/tools/tool_transform2/tool_transform_args.h
	M			plugins/tools/tool_transform2/wdg_tool_transform.ui