unit_spin_boxes
1d9ab4f201cb
Actions

Authored by jospin on Sep 7 2016, 8:55 AM.

Description

Merge branch 'master' of git://anongit.kde.org/krita into jospin/unit_spin_boxes

Details

Committed

Sep 7 2016, 8:55 AM

Parents

R37:93ef7c8ef97e: Merge in new internal color picker dialog!
R37:a6529bee8d8e: Complete document awarness for unit management in default tool.

Branches

Unknown

Tags

Unknown

jospin committed R37:1d9ab4f201cb: Merge branch 'master' of git://anongit.kde.org/krita into jospin/unit_spin_boxes (authored by jospin).Sep 7 2016, 8:55 AM

Merged Changes

Commit	Author	Details	Committed
93ef7c8ef97e	woltherav	Merge in new internal color picker dialog!	Sep 6 2016
4049ee18949a	rempt	Add an extra skip to the ext-qt project	Sep 6 2016
91bdcfe38220	timotheegiet	new Eraser Switch Opacity feature	Sep 6 2016
9ad6d6f78374	rempt	Add missing include	Sep 6 2016
da4683f3ee18	rempt	ORA: convert the projection for the mergedimage when necessary	Sep 6 2016
848873cb158e	rempt	Open the first tab, not the last one	Sep 6 2016
8ff972648662	rempt	Move the version to 3.0.2 Alpha	Sep 6 2016
cab65204ef02	rempt	Update version to 3.0.1	Sep 6 2016
ec3132c6fb8c	dkazakov	Add a temporary workaround that partially fixes the Shift+drag problem	Sep 5 2016
daa8158130eb	dkazakov	Revert "Fix slowdown when doing Shift+Drag resizing gesture"	Sep 5 2016
2cae9e4bf56d	dkazakov	Revert "BUG:360677 KisUpdaterContext should not kill threads in waitForDone()"	Sep 5 2016
dc8ae57fbad4	dkazakov	Fix slowdown when doing Shift+Drag resizing gesture	Sep 5 2016
a1f897d9c9c0	dkazakov	Fix a memory leak in layer compositions on closing the image	Sep 5 2016
62de37112315	dkazakov	Fix a memory leak in KisOpenGLImageTextures::m_proofingTransform	Sep 5 2016
40e0b8d76a12	dkazakov	Fix a memory leak in KisImage::m_d::proofingConfig	Sep 5 2016

Changes (125)
Show All Changes

Very Large Commit

This commit is very large. Load each file individually.

				Path	Packages
	M			3rdparty/ext_qt/CMakeLists.txt
	M			CMakeLists.txt
	M			krita/krita.xmlgui
	M			libs/image/brushengine/kis_paintop_settings.cpp
	M			libs/image/brushengine/kis_paintop_settings.h
	M			libs/image/kis_image.cc
	M			libs/image/kis_image.h
	M			libs/image/kis_image_config.cpp
	M			libs/image/kis_image_config.h
	M			libs/image/kis_types.h
	M			libs/image/kis_update_scheduler.cpp
	M			libs/image/kis_updater_context.cpp
	M			libs/image/kis_updater_context.h
	M			libs/image/tests/kis_strokes_queue_test.cpp
	M			libs/image/tests/kis_updater_context_test.cpp
	M			libs/pigment/KoColorConversions.cpp
	M			libs/pigment/KoColorDisplayRendererInterface.cpp
	M			libs/pigment/KoColorDisplayRendererInterface.h
	M			libs/pigment/KoColorSpaceTraits.h
	M			libs/pigment/resources/KoColorSet.cpp
	M			libs/pigment/resources/KoColorSet.h
	M			libs/ui/CMakeLists.txt
	M			libs/ui/KisColorsetChooser.cpp
	M			libs/ui/KisViewManager.cpp
	M			libs/ui/KisViewManager.h
	M			libs/ui/canvas/kis_canvas2.cpp
	M			libs/ui/canvas/kis_canvas2.h
	M			libs/ui/canvas/kis_display_color_converter.cpp
	M			libs/ui/dialogs/kis_dlg_image_properties.cc
	M			libs/ui/dialogs/kis_dlg_image_properties.h
	A			libs/ui/dialogs/kis_dlg_internal_color_selector.cpp
	A			libs/ui/dialogs/kis_dlg_internal_color_selector.h
	M			libs/ui/dialogs/kis_dlg_layer_style.cpp
	M			libs/ui/dialogs/kis_dlg_preferences.cc
	M			libs/ui/dialogs/kis_dlg_preferences.h
	M			libs/ui/forms/wdgautogradient.ui
	M			libs/ui/forms/wdgcolorsettings.ui
	M			libs/ui/forms/wdgdisplaysettings.ui
	A			libs/ui/forms/wdgdlginternalcolorselector.ui
	M			libs/ui/forms/wdggeneralsettings.ui
	M			libs/ui/forms/wdgimageproperties.ui
	M			libs/ui/forms/wdgnewimage.ui
	M			libs/ui/forms/wdgpaintactioneditor.ui
	M			libs/ui/forms/wdgpaintopsettings.ui
	M			libs/ui/kis_autogradient.cc
	M			libs/ui/kis_autogradient.h
	M			libs/ui/kis_config.cc
	M			libs/ui/kis_config.h
	M			libs/ui/kis_control_frame.cpp
	M			libs/ui/kis_control_frame.h
	M			libs/ui/kis_custom_pattern.cc
	M			libs/ui/kis_paintop_box.cc
	M			libs/ui/kis_paintop_box.h
	M			libs/ui/kis_popup_palette.cpp
	M			libs/ui/kis_popup_palette.h
	M			libs/ui/kra/kis_kra_loader.cpp
	M			libs/ui/kra/kis_kra_saver.cpp
	M			libs/ui/layerstyles/WdgColorOverlay.ui
	M			libs/ui/layerstyles/WdgSatin.ui
	M			libs/ui/layerstyles/WdgStroke.ui
	M			libs/ui/layerstyles/wdgBevelAndEmboss.ui
	M			libs/ui/layerstyles/wdgInnerGlow.ui
	M			libs/ui/layerstyles/wdgdropshadow.ui
	M			libs/ui/opengl/kis_opengl_image_textures.cpp
	M			libs/ui/opengl/kis_opengl_image_textures.h
	M			libs/ui/recorder/kis_recorded_paint_action_editor.cc
	M			libs/ui/recorder/kis_recorded_paint_action_editor.h
	M			libs/ui/tool/kis_tool_freehand.cc
	M			libs/ui/tool/kis_tool_freehand.h
	V			libs/{ui ← }/widgets/KoDualColorButton.cpp
	V			libs/{ui ← }/widgets/KoDualColorButton.h
	A			libs/ui/widgets/kis_color_button.cpp
	A			libs/ui/widgets/kis_color_button.h
	V			{libs/ui/widgets/kis_color_input.cpp ← plugins/dockers/specificcolorselector/kis_color_input.cc}
	V			{libs/ui/widgets ← plugins/dockers/specificcolorselector}/kis_color_input.h
	M			libs/ui/widgets/kis_custom_image_widget.cc
	M			libs/ui/widgets/kis_paintop_presets_popup.cpp
	M			libs/ui/widgets/kis_paintop_presets_popup.h
	A			libs/ui/widgets/kis_screen_color_picker.cpp
	A			libs/ui/widgets/kis_screen_color_picker.h
	A			libs/ui/widgets/kis_spinbox_color_selector.cpp
	P			libs/ui/widgets/kis_spinbox_color_selector.h Copied from plugins/dockers/animation/kis_equalizer_widget.h
	A			libs/ui/widgets/kis_visual_color_selector.cpp
	A			libs/ui/widgets/kis_visual_color_selector.h
	M			libs/widgets/CMakeLists.txt
	M			libs/widgets/KoColorPatch.cpp
	M			libs/widgets/KoColorPatch.h
	M			libs/widgets/KoColorSetWidget.cpp
	M			libs/widgets/KoColorSetWidget.h
	M			libs/widgets/KoColorSetWidget_p.h
	V			libs/{ → ui}/widgets/KoDualColorButton.cpp
	V			libs/{ → ui}/widgets/KoDualColorButton.h
	M			libs/widgets/KoEditColorSetDialog.cpp
	M			plugins/dockers/animation/onion_skins_docker.cpp
	M			plugins/dockers/animation/onion_skins_docker.ui
	M			plugins/dockers/compositiondocker/compositiondocker_dock.cpp
	M			plugins/dockers/compositiondocker/compositionmodel.cpp
	M			plugins/dockers/compositiondocker/compositionmodel.h
	M			plugins/dockers/digitalmixer/digitalmixer_dock.cc
	M			plugins/dockers/digitalmixer/digitalmixer_dock.h
	M			plugins/dockers/palettedocker/palettedocker_dock.cpp
	M			plugins/dockers/palettedocker/wdgpalettedock.ui
	M			plugins/dockers/specificcolorselector/CMakeLists.txt
	V			{plugins/dockers/specificcolorselector/kis_color_input.cc → libs/ui/widgets/kis_color_input.cpp}
	V			{plugins/dockers/specificcolorselector → libs/ui/widgets}/kis_color_input.h
	M			plugins/dockers/specificcolorselector/kis_specific_color_selector_widget.cc
	M			plugins/extensions/layersplit/dlg_layersplit.cpp
	M			plugins/extensions/layersplit/dlg_layersplit.h
	M			plugins/extensions/layersplit/layersplit.cpp
	M			plugins/extensions/layersplit/wdg_layersplit.ui
	M			plugins/filters/colors/kis_wdg_color_to_alpha.cpp
	M			plugins/filters/colors/kis_wdg_color_to_alpha.h
	M			plugins/filters/colors/wdgcolortoalphabase.ui
	M			plugins/filters/indexcolors/kiswdgindexcolors.cpp
	M			plugins/filters/indexcolors/kiswdgindexcolors.h
	M			plugins/generators/pattern/wdgpatternoptions.ui
	M			plugins/generators/solid/colorgenerator.cpp
	M			plugins/generators/solid/kis_wdg_color.cpp
	M			plugins/generators/solid/kis_wdg_color.h
	M			plugins/generators/solid/wdgcoloroptions.ui
	M			plugins/impex/jpeg/kis_jpeg_export.cc
	M			plugins/impex/jpeg/kis_wdg_options_jpeg.ui
	M			plugins/impex/ora/ora_converter.cc
	M			plugins/impex/png/kis_png_export.cc
	M			plugins/impex/png/kis_wdg_options_png.ui