Merge remote-tracking branch 'origin' into frameworks
5eb93da341b3
Actions

Authored by rempt.

Description

Merge remote-tracking branch 'origin' into frameworks

Conflicts:
krita/plugins/extensions/imagesize/dlg_canvassize.cc
krita/plugins/formats/exr/exr_converter.cc
krita/plugins/formats/jp2/jp2_converter.cc
krita/plugins/formats/jpeg/kis_jpeg_converter.cc
krita/plugins/formats/ora/ora_converter.h
krita/plugins/formats/ora/ora_export.cc
krita/plugins/formats/ppm/kis_ppm_import.cpp
krita/plugins/formats/psd/psd_export.cc
krita/plugins/formats/psd/psd_loader.h
krita/plugins/formats/psd/psd_saver.h
krita/plugins/formats/qml/qml_converter.h
krita/plugins/formats/tga/kis_tga_import.cpp
krita/plugins/formats/tiff/kis_tiff_converter.cc
krita/plugins/formats/xcf/kis_xcf_import.cpp
krita/ui/kis_png_converter.cpp
krita/ui/widgets/kis_color_space_selector.cc
krita/ui/widgets/kis_paintop_presets_popup.cpp
libs/flake/KoCanvasControllerWidget_p.h
libs/flake/KoToolManager.cpp
libs/koreport/koreport_itemplugin.desktop
plugins/reporting/barcode/koreport_barcodeplugin.desktop
plugins/reporting/chart/koreport_chartplugin.desktop
plugins/reporting/maps/koreport_mapsplugin.desktop
plugins/reporting/web/koreport_webplugin.desktop

Details

Committed

rempt

Aug 22 2015, 8:49 AM

Parents

R8:7288c7a0ec4a: Merge branch 'calligra/2.9'
R8:65b43d4cc65d: Add a few missing #includes

Branches

Unknown

Tags

Unknown

rempt committed R8:5eb93da341b3: Merge remote-tracking branch 'origin' into frameworks (authored by rempt).Aug 22 2015, 8:49 AM

Merged Changes

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

Commit	Author	Details	Committed
7288c7a0ec4a	rempt	Merge branch 'calligra/2.9'	Aug 22 2015
6f4c185c8d15	l10n daemon script	SVN_SILENT made messages (.desktop file) - always resolve ours	Aug 22 2015
952c2a4e427f	woltherav	Merge in krita-testing-wolthera (squashed)(GSoC 2015)	Aug 21 2015
422a57eadcf4	rempt	Less debug and more loading	Aug 21 2015
2026ede4ee8f	dkazakov	Make a transform tool work with Pass Through group layers	Aug 21 2015
4a525f8a6913	rempt	Fix parsing XML with MSVC 2012	Aug 21 2015
0d75f455db84	rempt	Remove more places where we used KIO	Aug 21 2015
38d0ef191b2e	dkazakov	Make all the lines of paintop options look the same	Aug 21 2015
a94e8f836da0	rempt	BUG:351560 Make sure a default KoColor is transparent	Aug 21 2015
4d249075275a	timotheegiet	update trashcan icons	Aug 21 2015
eed5788300f6	timotheegiet	add icons for stamp and clipboard brush tips	Aug 21 2015
9268accdd82f	timotheegiet	update outline selection tool icon	Aug 21 2015
c13663630eb7	timotheegiet	fix trashcan icons	Aug 21 2015
ba2ee44ae972	timotheegiet	update symmetry and trashcan icons	Aug 21 2015
0b451ca6a580	timotheegiet	update eraser and layer-visibility icons	Aug 21 2015
afc0d8740626	timotheegiet	replace layer-visibility icon	Aug 21 2015
9fb9cf74f4a6	kossebau	button.buttonGroupId is always >= 0 now	Aug 20 2015
f4f3fdde5b90	kossebau	Move shared code into KoToolBox::addButton()	Aug 20 2015
0179c9e61b82	kossebau	Make KoToolBox::addButton a private method, pass complete button argument	Aug 20 2015
39ff1268c788	kossebau	mark m_uniqueId as const	Aug 20 2015
cdd7a6162cae	dkazakov	[FEATURE] Make color picking with shortcuts work in Wrap Around mode	Aug 20 2015
de9c4cd8a5e6	rempt	Fix memory leak	Aug 20 2015
22e183289272	rempt	Pass parent	Aug 20 2015
0e24e8357e95	rempt	Fix memory leak	Aug 20 2015
02d393593659	rempt	Fix memory leak	Aug 20 2015
6a817efa0acf	rempt	Fix memory leak	Aug 20 2015
69cd737c2fba	rempt	Fix memory leak	Aug 20 2015
4704fe06da89	rempt	Fix memory leak by making the single K_STATIC_GLOBAL	Aug 20 2015
e83e7a892016	rempt	Fix memory leak: setDefaultPixel copies	Aug 20 2015
6a3782716834	rempt	Remove unused include	Aug 20 2015
db5fa565f15f	rempt	Coding style	Aug 20 2015
75d7115a8753	rempt	Fix memory leak	Aug 20 2015
da0e9330d644	rempt	Coding style: do not use abbreviations	Aug 20 2015
ec853e250af4	rempt	Initialize variable	Aug 20 2015
92ce2c4fea38	rempt	Initialize variable	Aug 20 2015
064d40236e3b	rempt	Initialize variable	Aug 20 2015
b1787396631b	kossebau	Get unique id for ToolHelper from counter instead of qrand()	Aug 20 2015
a1739a81a777	kossebau	Use QVector for improved memory usage	Aug 20 2015
36e77cf49766	dkazakov	[FEATURE] Make Fill Tool work in Wraparound mode!	Aug 20 2015
52e71e92a141	timotheegiet	fix themed workspace icon	Aug 20 2015
e40357e78cde	rempt	BUG:351497 Blacklist "photoshop":DateCreated" when saving	Aug 20 2015
b6011fb1c50c	dkazakov	[FEATURE] Implement 'Scalable smoothness' feature for Stabilizer smoother	Aug 20 2015
7da981dccb61	l10n daemon script	SVN_SILENT made messages (.desktop file)	Aug 20 2015
d12ee128e6bb	l10n daemon script	SVN_SILENT made messages (.desktop file) - always resolve ours	Aug 20 2015
90ddf7ba7843	scottpetrovic	fix themed icons on the kis widget chooser	Aug 20 2015
f47f4f546bad	scottpetrovic	update scratchpad themed icons to update on theme change	Aug 20 2015
1d1fcf665e37	scottpetrovic	update theme on toolbar items when needed	Aug 20 2015
dc906f05a448	scottpetrovic	update tooltips for toolbox icons	Aug 19 2015
83ae472b46fa	rempt	Only add shortcuts for Krita...	Aug 19 2015
5580b9847aca	timotheegiet	add themed icons for Resize canvas arrows	Aug 19 2015

Changes (510)
Show All Changes

Very Large Commit

This commit is very large. Load each file individually.

				Path	Packages
	M			flow/templates/basic/empty-landscape.desktop
	M			gemini/calligragemini.desktop
	M			karbon/data/karbon_dock.desktop
	M			karbon/data/karbon_plugin.desktop
	M			karbon/data/karbon_viewplugin.desktop
	M			karbon/data/karbonpart.desktop
	M			karbon/stencils/CMOS/gnd_h.desktop
	M			karbon/stencils/CMOS/gnd_v.desktop
	M			karbon/stencils/CMOS/nmos_h.desktop
	M			karbon/stencils/CMOS/nmos_v.desktop
	M			karbon/stencils/CMOS/pmos_h.desktop
	M			karbon/stencils/CMOS/pmos_v.desktop
	M			karbon/stencils/CMOS/vdd_h.desktop
	M			karbon/stencils/CMOS/vdd_v.desktop
	M			karbon/stencils/Cisco/wireless_transport.desktop
	M			karbon/stencils/Cisco/wlan_controller.desktop
	M			karbon/stencils/Cisco/woman.desktop
	M			karbon/stencils/Cisco/woman_blue.desktop
	M			karbon/stencils/Cisco/woman_gold.desktop
	M			karbon/stencils/Cisco/woman_red.desktop
	M			karbon/stencils/Cisco/workgroup_director.desktop
	M			karbon/stencils/Cisco/workgroup_fcis.desktop
	M			karbon/stencils/Cisco/workgroup_switch.desktop
	M			karbon/stencils/Cisco/workgroup_switch_voice-enabled.desktop
	M			karbon/stencils/Cisco/workstation.desktop
	M			karbon/stencils/Cisco/www_server.desktop
	M			karbon/stencils/Cybernetics/sine.desktop
	M			karbon/stencils/Cybernetics/sum.desktop
	M			karbon/stencils/Flags/china_hong_kong.desktop
	M			karbon/stencils/Flags/china_macao.desktop
	M			karbon/stencils/Flags/china_prc.desktop
	M			karbon/stencils/Flags/china_roc.desktop
	M			karbon/stencils/Flags/libyan_arab_jamahiriya.desktop
	M			karbon/stencils/Gane_and_Sarson/alt-entity.desktop
	M			karbon/stencils/Gane_and_Sarson/collection.desktop
	M			karbon/stencils/Gane_and_Sarson/data_store.desktop
	M			karbon/stencils/Gane_and_Sarson/entity.desktop
	M			karbon/stencils/Jigsaw/collection.desktop
	M			karbon/stencils/LST/cn_subsystem.desktop
	M			karbon/stencils/LST/collection.desktop
	M			karbon/stencils/LST/convert_subsystem.desktop
	M			karbon/stencils/LST/decider_subsystem.desktop
	M			karbon/stencils/LST/decoder.desktop
	M			karbon/stencils/LST/distributor_subsystem.desktop
	M			karbon/stencils/LST/encoder.desktop
	M			karbon/stencils/LST/timer.desktop
	M			karbon/stencils/Lights/ACL.desktop
	M			karbon/stencils/Lights/Blacklight.desktop
	M			karbon/stencils/MSE/small_extension_node.desktop
	M			karbon/stencils/MSE/tacsat.desktop
	M			karbon/stencils/Map/Corner1.desktop
	M			karbon/stencils/Misc/collection.desktop
	M			karbon/stencils/Network/dat_external.desktop
	M			karbon/stencils/Network/disc.desktop
	M			karbon/stencils/Network/flash.desktop
	M			karbon/stencils/Network/genmonitor.desktop
	M			karbon/stencils/Network/modularswitch.desktop
	M			karbon/stencils/Network/monitor.desktop
	M			karbon/stencils/Network/patch-panel.desktop
	M			karbon/stencils/Network/pc_bigtower.desktop
	M			karbon/stencils/Network/pc_miditower.desktop
	M			karbon/stencils/Network/pc_minitower.desktop
	M			karbon/stencils/Optics/dfb_laser.desktop
	M			karbon/stencils/Optics/dfb_laser_vert.desktop
	M			karbon/stencils/Optics/edfa.desktop
	M			karbon/stencils/Optics/edfa_vert.desktop
	M			karbon/stencils/Optics/fibre.desktop
	M			karbon/stencils/Optics/fibre_vert.desktop
	M			karbon/stencils/Optics/lpg.desktop
	M			karbon/stencils/Optics/lpg_vert.desktop
	M			karbon/stencils/RDP/collection.desktop
	M			karbon/stencils/Racks/equipment_10u.desktop
	M			karbon/stencils/Racks/equipment_11u.desktop
	M			karbon/stencils/Racks/equipment_12u.desktop
	M			karbon/stencils/Racks/equipment_1u.desktop
	M			karbon/stencils/Racks/equipment_2u.desktop
	M			karbon/stencils/Racks/equipment_3u.desktop
	M			karbon/stencils/Racks/equipment_4u.desktop
	M			karbon/stencils/Racks/equipment_5u.desktop
	M			karbon/stencils/Racks/equipment_6u.desktop
	M			karbon/stencils/Racks/equipment_7u.desktop
	M			karbon/stencils/Racks/equipment_8u.desktop
	M			karbon/stencils/Racks/equipment_9u.desktop
	M			karbon/stencils/Renewable_Energy/collection.desktop
	M			karbon/stencils/Renewable_Energy/data_logger.desktop
	M			karbon/stencils/Renewable_Energy/meas_tower.desktop
	M			karbon/stencils/Renewable_Energy/solar_module.desktop
	M			karbon/stencils/Renewable_Energy/temp_humi_sensor.desktop
	M			karbon/stencils/Renewable_Energy/wind_turbine.desktop
	M			karbon/stencils/Renewable_Energy/wind_vane.desktop
	M			karbon/stencils/SDL/collection.desktop
	M			karbon/stencils/SDL/header.desktop
	M			karbon/stencils/SDL/state.desktop
	M			karbon/stencils/Scenegraph/subgraph.desktop
	M			karbon/stencils/Scenegraph/switch.desktop
	M			karbon/stencils/Scenegraph/transform.desktop
	M			karbon/stencils/Sybase/dataserver.desktop
	M			karbon/stencils/Sybase/repserver.desktop
	M			karbon/stencils/Sybase/rsm.desktop
	M			karbon/stencils/Sybase/stableq.desktop
	M			kexi/migration/mdb/src/keximdb/keximigrate_mdb.desktop
	M			kexi/migration/mysql/keximigrate_mysql.desktop
	M			kexi/migration/pqxx/keximigrate_pqxx.desktop
	M			kexi/migration/sybase/keximigrate_sybase.desktop
	M			kexi/migration/txt/keximigrate_txt.desktop
	M			kexi/migration/xbase/keximigrate_xbase.desktop
	A			krita/data/profiles/elles-icc-profiles/ACES-elle-V2-g10.icc
	A			krita/data/profiles/elles-icc-profiles/ACES-elle-V2-g22.icc
	A			krita/data/profiles/elles-icc-profiles/ACES-elle-V2-labl.icc
	P			krita/data/profiles/elles-icc-profiles/ACES-elle-V2-srgbtrc.icc Copied from krita/data/profiles/elles-icc-profiles/AllColorsRGB-elle-V2-srgbtrc.icc
	A			krita/data/profiles/elles-icc-profiles/ACES-elle-V4-g10.icc
	A			krita/data/profiles/elles-icc-profiles/ACES-elle-V4-g22.icc
	A			krita/data/profiles/elles-icc-profiles/ACES-elle-V4-labl.icc
	A			krita/data/profiles/elles-icc-profiles/ACES-elle-V4-srgbtrc.icc
	A			krita/data/profiles/elles-icc-profiles/ACEScg-elle-V2-g10.icc
	A			krita/data/profiles/elles-icc-profiles/ACEScg-elle-V2-g22.icc
	A			krita/data/profiles/elles-icc-profiles/ACEScg-elle-V2-labl.icc
	P			krita/data/profiles/elles-icc-profiles/ACEScg-elle-V2-srgbtrc.icc Copied from krita/data/profiles/elles-icc-profiles/AllColorsRGB-elle-V2-srgbtrc.icc
	A			krita/data/profiles/elles-icc-profiles/ACEScg-elle-V4-g10.icc
	A			krita/data/profiles/elles-icc-profiles/ACEScg-elle-V4-g22.icc
	A			krita/data/profiles/elles-icc-profiles/ACEScg-elle-V4-labl.icc
	A			krita/data/profiles/elles-icc-profiles/ACEScg-elle-V4-srgbtrc.icc
	M			krita/data/profiles/elles-icc-profiles/AllColorsRGB-elle-V2-g10.icc
	A			krita/data/profiles/elles-icc-profiles/AllColorsRGB-elle-V2-g22.icc
	A			krita/data/profiles/elles-icc-profiles/AllColorsRGB-elle-V2-labl.icc
	P			krita/data/profiles/elles-icc-profiles/AllColorsRGB-elle-V2-srgbtrc.icc Copied to multiple locations: krita/data/profiles/elles-icc-profiles/ACES-elle-V2-srgbtrc.icc krita/data/profiles/elles-icc-profiles/ACEScg-elle-V2-srgbtrc.icc krita/data/profiles/elles-icc-profiles/Rec2020-elle-V2-srgbtrc.icc
	M			krita/data/profiles/elles-icc-profiles/AllColorsRGB-elle-V4-g10.icc
	A			krita/data/profiles/elles-icc-profiles/AllColorsRGB-elle-V4-g22.icc
	A			krita/data/profiles/elles-icc-profiles/AllColorsRGB-elle-V4-labl.icc
	M			krita/data/profiles/elles-icc-profiles/AllColorsRGB-elle-V4-srgbtrc.icc
	M			krita/data/profiles/elles-icc-profiles/CIERGB-elle-V2-g10.icc
	M			krita/data/profiles/elles-icc-profiles/CIERGB-elle-V2-g22.icc
	A			krita/data/profiles/elles-icc-profiles/CIERGB-elle-V2-labl.icc
	M			krita/data/profiles/elles-icc-profiles/CIERGB-elle-V2-srgbtrc.icc
	M			krita/data/profiles/elles-icc-profiles/CIERGB-elle-V4-g10.icc
	M			krita/data/profiles/elles-icc-profiles/CIERGB-elle-V4-g22.icc
	A			krita/data/profiles/elles-icc-profiles/CIERGB-elle-V4-labl.icc
	M			krita/data/profiles/elles-icc-profiles/CIERGB-elle-V4-srgbtrc.icc
	M			krita/data/profiles/elles-icc-profiles/CMakeLists.txt
	M			krita/data/profiles/elles-icc-profiles/ClayRGB-elle-V2-g10.icc
	M			krita/data/profiles/elles-icc-profiles/ClayRGB-elle-V2-g22.icc
	A			krita/data/profiles/elles-icc-profiles/ClayRGB-elle-V2-labl.icc
	M			krita/data/profiles/elles-icc-profiles/ClayRGB-elle-V2-srgbtrc.icc
	M			krita/data/profiles/elles-icc-profiles/ClayRGB-elle-V4-g10.icc
	M			krita/data/profiles/elles-icc-profiles/ClayRGB-elle-V4-g22.icc
	A			krita/data/profiles/elles-icc-profiles/ClayRGB-elle-V4-labl.icc
	M			krita/data/profiles/elles-icc-profiles/ClayRGB-elle-V4-srgbtrc.icc
	A			krita/data/profiles/elles-icc-profiles/GNU General Public License v2.0 - GNU Project - Free Software Foundation (FSF).html
	M			krita/data/profiles/elles-icc-profiles/Gray-D50-elle-V2-g10.icc
	M			krita/data/profiles/elles-icc-profiles/Gray-D50-elle-V2-g18.icc
	M			krita/data/profiles/elles-icc-profiles/Gray-D50-elle-V2-g22.icc
	A			krita/data/profiles/elles-icc-profiles/Gray-D50-elle-V2-labl.icc
	A			krita/data/profiles/elles-icc-profiles/Gray-D50-elle-V2-rec709.icc
	M			krita/data/profiles/elles-icc-profiles/Gray-D50-elle-V2-srgbtrc.icc
	M			krita/data/profiles/elles-icc-profiles/Gray-D50-elle-V4-g10.icc
	M			krita/data/profiles/elles-icc-profiles/Gray-D50-elle-V4-g18.icc
	M			krita/data/profiles/elles-icc-profiles/Gray-D50-elle-V4-g22.icc
	A			krita/data/profiles/elles-icc-profiles/Gray-D50-elle-V4-labl.icc
	A			krita/data/profiles/elles-icc-profiles/Gray-D50-elle-V4-rec709.icc
	M			krita/data/profiles/elles-icc-profiles/Gray-D50-elle-V4-srgbtrc.icc
	M			krita/data/profiles/elles-icc-profiles/IdentityRGB-elle-V2-g10.icc
	A			krita/data/profiles/elles-icc-profiles/IdentityRGB-elle-V2-g22.icc
	A			krita/data/profiles/elles-icc-profiles/IdentityRGB-elle-V2-labl.icc
	M			krita/data/profiles/elles-icc-profiles/IdentityRGB-elle-V2-srgbtrc.icc
	M			krita/data/profiles/elles-icc-profiles/IdentityRGB-elle-V4-g10.icc
	A			krita/data/profiles/elles-icc-profiles/IdentityRGB-elle-V4-g22.icc
	A			krita/data/profiles/elles-icc-profiles/IdentityRGB-elle-V4-labl.icc
	M			krita/data/profiles/elles-icc-profiles/IdentityRGB-elle-V4-srgbtrc.icc
	M			krita/data/profiles/elles-icc-profiles/Lab-D50-Identity-elle-V2.icc
	M			krita/data/profiles/elles-icc-profiles/Lab-D50-Identity-elle-V4.icc
	M			krita/data/profiles/elles-icc-profiles/LargeRGB-elle-V2-g10.icc
	M			krita/data/profiles/elles-icc-profiles/LargeRGB-elle-V2-g18.icc
	A			krita/data/profiles/elles-icc-profiles/LargeRGB-elle-V2-g22.icc
	A			krita/data/profiles/elles-icc-profiles/LargeRGB-elle-V2-labl.icc
	M			krita/data/profiles/elles-icc-profiles/LargeRGB-elle-V2-srgbtrc.icc
	M			krita/data/profiles/elles-icc-profiles/LargeRGB-elle-V4-g10.icc
	M			krita/data/profiles/elles-icc-profiles/LargeRGB-elle-V4-g18.icc
	A			krita/data/profiles/elles-icc-profiles/LargeRGB-elle-V4-g22.icc
	A			krita/data/profiles/elles-icc-profiles/LargeRGB-elle-V4-labl.icc
	M			krita/data/profiles/elles-icc-profiles/LargeRGB-elle-V4-srgbtrc.icc
	A			krita/data/profiles/elles-icc-profiles/Rec2020-elle-V2-g10.icc
	A			krita/data/profiles/elles-icc-profiles/Rec2020-elle-V2-g22.icc
	A			krita/data/profiles/elles-icc-profiles/Rec2020-elle-V2-labl.icc
	A			krita/data/profiles/elles-icc-profiles/Rec2020-elle-V2-rec709.icc
	P			krita/data/profiles/elles-icc-profiles/Rec2020-elle-V2-srgbtrc.icc Copied from krita/data/profiles/elles-icc-profiles/AllColorsRGB-elle-V2-srgbtrc.icc
	A			krita/data/profiles/elles-icc-profiles/Rec2020-elle-V4-g10.icc
	A			krita/data/profiles/elles-icc-profiles/Rec2020-elle-V4-g22.icc
	A			krita/data/profiles/elles-icc-profiles/Rec2020-elle-V4-labl.icc
	A			krita/data/profiles/elles-icc-profiles/Rec2020-elle-V4-rec709.icc
	A			krita/data/profiles/elles-icc-profiles/Rec2020-elle-V4-srgbtrc.icc
	M			krita/data/profiles/elles-icc-profiles/WideRGB-elle-V2-g10.icc
	M			krita/data/profiles/elles-icc-profiles/WideRGB-elle-V2-g22.icc
	A			krita/data/profiles/elles-icc-profiles/WideRGB-elle-V2-labl.icc
	M			krita/data/profiles/elles-icc-profiles/WideRGB-elle-V2-srgbtrc.icc
	M			krita/data/profiles/elles-icc-profiles/WideRGB-elle-V4-g10.icc
	M			krita/data/profiles/elles-icc-profiles/WideRGB-elle-V4-g22.icc
	A			krita/data/profiles/elles-icc-profiles/WideRGB-elle-V4-labl.icc
	M			krita/data/profiles/elles-icc-profiles/WideRGB-elle-V4-srgbtrc.icc
	A			krita/data/profiles/elles-icc-profiles/XYZ-D50-Identity-elle-V4.icc
	A			krita/data/profiles/elles-icc-profiles/elles-well-behaved-icc-profile-descriptions.txt
	A			krita/data/profiles/elles-icc-profiles/gpl-2.0.txt
	A			krita/data/profiles/elles-icc-profiles/html-README-for-elles-well-behaved-icc-profiles.html
	A			krita/data/profiles/elles-icc-profiles/plain-text-README-for-elles-well-behaved-icc-profiles.txt
	M			krita/data/profiles/elles-icc-profiles/sRGB-elle-V2-g10.icc
	A			krita/data/profiles/elles-icc-profiles/sRGB-elle-V2-g22.icc
	A			krita/data/profiles/elles-icc-profiles/sRGB-elle-V2-labl.icc
	M			krita/data/profiles/elles-icc-profiles/sRGB-elle-V2-srgbtrc.icc
	M			krita/data/profiles/elles-icc-profiles/sRGB-elle-V4-g10.icc
	A			krita/data/profiles/elles-icc-profiles/sRGB-elle-V4-g22.icc
	A			krita/data/profiles/elles-icc-profiles/sRGB-elle-V4-labl.icc
	M			krita/data/profiles/elles-icc-profiles/sRGB-elle-V4-srgbtrc.icc
	M			krita/image/brushengine/kis_locked_properties_proxy.h
	M			krita/image/brushengine/kis_locked_properties_server.cpp
	M			krita/image/brushengine/kis_locked_properties_server.h
	M			krita/image/brushengine/kis_paint_information.cc
	M			krita/image/filter/kis_color_transformation_configuration.cc
	M			krita/image/kis_default_bounds.cpp
	M			krita/image/kis_default_bounds.h
	M			krita/image/kis_mask.cc
	M			krita/image/kis_paint_device.cc
	M			krita/image/kis_paint_device.h
	M			krita/image/kis_projection_leaf.cpp
	M			krita/image/kis_projection_leaf.h
	M			krita/image/kis_transform_mask.cpp
	M			krita/image/kis_update_scheduler.h
	M			krita/image/kis_wrapped_rect.h
	M			krita/integration/CMakeLists.txt
	M			krita/integration/thumbnail/krita_kra_thumbnail.desktop
	M			krita/integration/thumbnail/kritacreator.cpp
	V			krita/pics/{Breeze-dark → misc-dark}/dark_draw-eraser.svg
	P			krita/pics/Breeze-dark/dark_view-choose.svg Copied to krita/pics/dirty-preset.svg
	V			krita/pics/{Breeze-light → misc-light}/light_draw-eraser.svg
	M			krita/pics/CMakeLists.txt
	D			krita/pics/dark_novisible.png
	V			krita/pics/{ ← svg}/dark_novisible.svg
	D			krita/pics/dark_visible.png
	P			krita/pics/dark_visible.svg Copied from krita/pics/svg/dark_visible.svg
	P			krita/pics/dirty-preset.svg Copied from krita/pics/Breeze-dark/dark_view-choose.svg
	M			krita/pics/layerbox/dark_deletelayer.png
	M			krita/pics/layerbox/light_deletelayer.png
	M			krita/pics/layerbox/svg/dark_deletelayer.svg
	M			krita/pics/layerbox/svg/light_deletelayer.svg
	D			krita/pics/light_novisible.png
	P			krita/pics/light_novisible.svg Copied from krita/pics/svg/light_novisible.svg
	D			krita/pics/light_visible.png
	V			krita/pics/{ ← svg}/light_visible.svg
	V			krita/pics/{misc-dark ← Breeze-dark}/dark_draw-eraser.svg
	M			krita/pics/misc-dark/dark_symmetry-horizontal.svg
	M			krita/pics/misc-dark/dark_symmetry-vertical.svg
	V			krita/pics/{misc-light ← Breeze-light}/light_draw-eraser.svg
	M			krita/pics/misc-light/light_symmetry-horizontal.svg
	M			krita/pics/misc-light/light_symmetry-vertical.svg
	V			krita/pics/{novisible.svg ← svg/light_novisible.svg}
	V			krita/pics/{svg → }/dark_novisible.svg
	P			krita/pics/svg/dark_visible.svg Deleted after being copied to multiple locations: krita/pics/dark_visible.svg krita/pics/visible.svg
	P			krita/pics/svg/light_novisible.svg Deleted after being copied to multiple locations: krita/pics/light_novisible.svg krita/pics/novisible.svg
	V			krita/pics/{svg → }/light_visible.svg
	M			krita/pics/tools/16/dark_tool_outline_selection.png
	M			krita/pics/tools/16/light_tool_outline_selection.png
	M			krita/pics/tools/SVG/16/dark_tool_outline_selection.svg
	M			krita/pics/tools/SVG/16/light_tool_outline_selection.svg
	V			krita/pics/{visible.svg ← svg/dark_visible.svg}
	M			krita/plugins/assistants/RulerAssistant/kis_ruler_assistant_tool.h
	M			krita/plugins/extensions/dockers/advancedcolorselector/kis_minimal_shade_selector.cpp
	M			krita/plugins/extensions/dockers/advancedcolorselector/kis_shade_selector_line.cpp
	M			krita/plugins/extensions/dockers/digitalmixer/krita_digitalmixer.desktop
	M			krita/plugins/extensions/dockers/imagedocker/imagedocker_dock.cpp
	M			krita/plugins/extensions/dockers/imagedocker/kritaimagedocker.desktop
	M			krita/plugins/extensions/dockers/lut/krita_lutdocker.desktop
	M			krita/plugins/extensions/dockers/palettedocker/palettedocker_dock.cpp
	M			krita/plugins/extensions/dockers/specificcolorselector/specificcolorselector_dock.cc
	M			krita/plugins/extensions/gmic/kritagmic.desktop
	M			krita/plugins/extensions/imagesize/dlg_canvassize.cc
	M			krita/plugins/extensions/imagesize/pics/CMakeLists.txt
	D			krita/plugins/extensions/imagesize/pics/arrow_east.png
	D			krita/plugins/extensions/imagesize/pics/arrow_north.png
	D			krita/plugins/extensions/imagesize/pics/arrow_north_east.png
	D			krita/plugins/extensions/imagesize/pics/arrow_north_west.png
	D			krita/plugins/extensions/imagesize/pics/arrow_south.png
	D			krita/plugins/extensions/imagesize/pics/arrow_south_east.png
	D			krita/plugins/extensions/imagesize/pics/arrow_south_west.png
	D			krita/plugins/extensions/imagesize/pics/arrow_west.png
	A			krita/plugins/extensions/imagesize/pics/dark_arrow_east.png
	A			krita/plugins/extensions/imagesize/pics/dark_arrow_north.png
	A			krita/plugins/extensions/imagesize/pics/dark_arrow_north_east.png
	A			krita/plugins/extensions/imagesize/pics/dark_arrow_north_west.png
	A			krita/plugins/extensions/imagesize/pics/dark_arrow_south.png
	A			krita/plugins/extensions/imagesize/pics/dark_arrow_south_east.png
	A			krita/plugins/extensions/imagesize/pics/dark_arrow_south_west.png
	A			krita/plugins/extensions/imagesize/pics/dark_arrow_west.png
	A			krita/plugins/extensions/imagesize/pics/light_arrow_east.png
	A			krita/plugins/extensions/imagesize/pics/light_arrow_north.png
	A			krita/plugins/extensions/imagesize/pics/light_arrow_north_east.png
	A			krita/plugins/extensions/imagesize/pics/light_arrow_north_west.png
	A			krita/plugins/extensions/imagesize/pics/light_arrow_south.png
	A			krita/plugins/extensions/imagesize/pics/light_arrow_south_east.png
	A			krita/plugins/extensions/imagesize/pics/light_arrow_south_west.png
	A			krita/plugins/extensions/imagesize/pics/light_arrow_west.png
	M			krita/plugins/extensions/metadataeditor/kritametadataeditor.desktop
	M			krita/plugins/filters/colorsfilters/kis_color_balance_filter.cpp
	M			krita/plugins/filters/colorsfilters/kis_desaturate_filter.cpp
	M			krita/plugins/filters/colorsfilters/kis_hsv_adjustment_filter.cpp
	M			krita/plugins/filters/dodgeburn/DodgeBurn.cpp
	M			krita/plugins/filters/indexcolors/indexcolors.cpp
	M			krita/plugins/filters/indexcolors/kritaindexcolors.desktop
	M			krita/plugins/filters/normalize/kritanormalize.desktop
	M			krita/plugins/filters/posterize/posterize.cpp
	M			krita/plugins/filters/roundcorners/kritaroundcornersfilter.desktop
	M			krita/plugins/formats/bmp/kis_bmp_import.cpp
	M			krita/plugins/formats/bmp/krita_bmp_import.desktop
	M			krita/plugins/formats/eps/krita_eps_export.desktop
	M			krita/plugins/formats/eps/krita_eps_import.desktop
	M			krita/plugins/formats/exr/exr_converter.cc
	M			krita/plugins/formats/exr/krita_exr_export.desktop
	M			krita/plugins/formats/exr/krita_exr_import.desktop
	M			krita/plugins/formats/heightmap/krita_heightmap_export.desktop
	M			krita/plugins/formats/heightmap/krita_heightmap_import.desktop
	M			krita/plugins/formats/jp2/jp2_converter.cc
	M			krita/plugins/formats/jp2/krita_jp2_export.desktop
	M			krita/plugins/formats/jp2/krita_jp2_import.desktop
	M			krita/plugins/formats/jpeg/kis_jpeg_converter.cc
	M			krita/plugins/formats/jpeg/kis_jpeg_converter.h
	M			krita/plugins/formats/odg/krita_odg_import.desktop
	M			krita/plugins/formats/oiio/krita_oiio_export.desktop
	M			krita/plugins/formats/oiio/krita_oiio_import.desktop
	M			krita/plugins/formats/ora/ora_converter.cc
	M			krita/plugins/formats/ora/ora_converter.h
	M			krita/plugins/formats/ora/ora_export.cc
	M			krita/plugins/formats/ora/ora_import.cc
	M			krita/plugins/formats/pdf/kis_pdf_import.cpp
	M			krita/plugins/formats/png/kis_png_export.cc
	M			krita/plugins/formats/ppm/kis_ppm_import.cpp
	M			krita/plugins/formats/ppm/krita_ppm_export.desktop
	M			krita/plugins/formats/ppm/krita_ppm_import.desktop
	M			krita/plugins/formats/psd/krita_psd_export.desktop
	M			krita/plugins/formats/psd/krita_psd_import.desktop
	M			krita/plugins/formats/psd/psd_export.cc
	M			krita/plugins/formats/psd/psd_loader.cpp
	M			krita/plugins/formats/psd/psd_loader.h
	M			krita/plugins/formats/psd/psd_saver.cpp
	M			krita/plugins/formats/psd/psd_saver.h
	M			krita/plugins/formats/qml/krita_qml_export.desktop
	M			krita/plugins/formats/qml/qml_converter.h
	M			krita/plugins/formats/tga/kis_tga_import.cpp
	M			krita/plugins/formats/tga/krita_tga_export.desktop
	M			krita/plugins/formats/tga/krita_tga_import.desktop
	M			krita/plugins/formats/tiff/kis_tiff_converter.cc
	M			krita/plugins/formats/tiff/kis_tiff_converter.h
	M			krita/plugins/formats/xcf/kis_xcf_import.cpp
	M			krita/plugins/formats/xcf/krita_xcf_import.desktop
	M			krita/plugins/paintops/experiment/kis_experiment_paintop_settings_widget.cpp
	M			krita/plugins/paintops/experiment/kritaexperimentpaintop.desktop
	M			krita/plugins/paintops/hairy/kis_hairy_paintop_settings.cpp
	M			krita/plugins/paintops/hairy/kis_hairy_paintop_settings.h
	M			krita/plugins/paintops/libpaintop/forms/wdgclipboardbrush.ui
	M			krita/plugins/paintops/libpaintop/forms/wdgcustombrush.ui
	M			krita/plugins/paintops/libpaintop/kis_brush_chooser.cpp
	M			krita/plugins/paintops/libpaintop/kis_pressure_hsv_option.cpp
	M			krita/plugins/paintops/libpaintop/kis_pressure_hsv_option.h
	M			krita/plugins/paintops/sketch/kis_sketch_paintop_settings.cpp
	M			krita/plugins/paintops/tangentnormal/kis_normal_preview_widget.h
	M			krita/plugins/paintops/tangentnormal/kritatangentnormalpaintop.desktop
	M			krita/plugins/paintops/tangentnormal/wdgtangenttiltoption.ui
	M			krita/plugins/tools/defaulttools/kis_tool_brush.cc
	M			krita/plugins/tools/defaulttools/kis_tool_colorpicker.cc
	M			krita/plugins/tools/defaulttools/kis_tool_colorpicker.h
	M			krita/plugins/tools/defaulttools/kis_tool_fill.cc
	M			krita/plugins/tools/defaulttools/kis_tool_fill.h
	M			krita/plugins/tools/defaulttools/kis_tool_gradient.h
	M			krita/plugins/tools/defaulttools/kis_tool_measure.h
	M			krita/plugins/tools/defaulttools/kis_tool_move.h
	M			krita/plugins/tools/defaulttools/kis_tool_path.cc
	M			krita/plugins/tools/defaulttools/kis_tool_path.h
	M			krita/plugins/tools/selectiontools/kis_tool_select_path.cc
	M			krita/plugins/tools/selectiontools/kis_tool_select_path.h
	M			krita/plugins/tools/tool_crop/kis_tool_crop.h
	M			krita/plugins/tools/tool_grid/kis_tool_grid.h
	M			krita/plugins/tools/tool_perspectivegrid/kis_tool_perspectivegrid.h
	M			krita/plugins/tools/tool_polygon/kis_tool_polygon.h
	M			krita/plugins/tools/tool_polyline/kis_tool_polyline.h
	M			krita/plugins/tools/tool_text/kis_tool_text.h
	M			krita/plugins/tools/tool_text/kritatooltext.desktop
	M			krita/plugins/tools/tool_transform2/strokes/transform_stroke_strategy.cpp
	M			krita/plugins/tools/tool_transform2/tool_transform_args.cc
	M			krita/ui/CMakeLists.txt
	M			krita/ui/KisAutoSaveRecoveryDialog.cpp
	M			krita/ui/KisDocument.cpp
	M			krita/ui/KisMainWindow.cpp
	M			krita/ui/KisTemplateCreateDia.cpp
	M			krita/ui/KisView.cpp
	M			krita/ui/KisViewManager.cpp
	M			krita/ui/canvas/kis_grid_manager.cpp
	M			krita/ui/forms/wdgcolorspaceselector.ui
	A			krita/ui/forms/wdgcolorspaceselectoradvanced.ui
	M			krita/ui/kis_categorized_item_delegate.cpp
	M			krita/ui/kis_layer_manager.cc
	M			krita/ui/kis_md5_generator.h
	M			krita/ui/kis_paintop_box.cc
	M			krita/ui/kis_png_converter.cpp
	M			krita/ui/kis_png_converter.h
	M			krita/ui/kisexiv2/kis_iptc_io.cpp
	M			krita/ui/kra/kis_kra_load_visitor.cpp
	M			krita/ui/kra/kis_kra_saver.cpp
	M			krita/ui/ora/kis_open_raster_save_context.h
	M			krita/ui/ora/kis_open_raster_stack_save_visitor.cpp
	M			krita/ui/ora/ora_save_context.cc
	M			krita/ui/ora/ora_save_context.h
	M			krita/ui/processing/fill_processing_visitor.cpp
	M			krita/ui/tool/kis_delegated_tool.h
	M			krita/ui/tool/kis_painting_information_builder.h
	M			krita/ui/tool/kis_tool_freehand_helper.cpp
	M			krita/ui/tool/kis_tool_paint.cc
	M			krita/ui/tool/kis_tool_utils.cpp
	M			krita/ui/tool/kis_tool_utils.h
	A			krita/ui/widgets/kis_advanced_color_space_selector.cc
	P			krita/ui/widgets/kis_advanced_color_space_selector.h Copied from krita/ui/widgets/kis_color_space_selector.h
	A			krita/ui/widgets/kis_cie_tongue_widget.cpp
	A			krita/ui/widgets/kis_cie_tongue_widget.h
	M			krita/ui/widgets/kis_color_space_selector.cc
	P			krita/ui/widgets/kis_color_space_selector.h Copied to krita/ui/widgets/kis_advanced_color_space_selector.h
	M			krita/ui/widgets/kis_paintop_presets_popup.cpp
	M			krita/ui/widgets/kis_paintop_presets_popup.h
	M			krita/ui/widgets/kis_preset_chooser.cpp
	M			krita/ui/widgets/kis_slider_spin_box.cpp
	M			krita/ui/widgets/kis_widget_chooser.cpp
	M			krita/ui/widgets/kis_widget_chooser.h
	M			libs/basicflakes/tools/KoCreatePathTool.cpp
	M			libs/basicflakes/tools/KoCreatePathTool.h
	M			libs/flake/KoCanvasControllerWidget_p.h
	M			libs/flake/KoToolFactoryBase.cpp
	M			libs/flake/KoToolManager.cpp
	M			libs/flake/KoToolManager.h
	M			libs/flake/KoToolManager_p.cpp
	M			libs/flake/KoToolManager_p.h
	M			libs/flake/filtereffect.desktop
	M			libs/kopageapp/tools/kopa_tool.desktop
	M			libs/koplugin/KoServiceLocator.h
	M			libs/kotext/texteditingplugin.desktop
	M			libs/kundo2/kundo2stack.cpp
	M			libs/kundo2/kundo2stack.h
	M			libs/main/KoRecentDocumentsPane.cpp
	M			libs/main/calligradocker.desktop
	M			libs/odf/KoEncryptedStore.cpp
	M			libs/odf/KoEncryptedStore.h
	M			libs/odf/KoStore.cpp
	M			libs/odf/KoStore.h
	M			libs/odf/KoTarStore.cpp
	M			libs/odf/KoTarStore.h
	M			libs/odf/KoXmlReader.cpp
	M			libs/odf/KoZipStore.cpp
	M			libs/odf/KoZipStore.h
	M			libs/pigment/KoColor.cpp
	M			libs/pigment/KoColorProfile.h
	M			libs/pigment/colorprofiles/KoDummyColorProfile.cpp
	M			libs/pigment/colorprofiles/KoDummyColorProfile.h
	M			libs/pigment/resources/KoHashGeneratorProvider.cpp
	M			libs/rdf/calligra_semanticitem.desktop
	M			libs/widgets/KoResourceItemChooserSync.cpp
	M			libs/widgets/KoResourceItemChooserSync.h
	M			libs/widgets/KoResourceServer.h
	M			libs/widgets/KoToolBox.cpp
	M			libs/widgets/KoToolBox_p.h
	M			libs/widgets/KoZoomWidget.h
	M			plan/libs/kernel/plan_schedulerplugin.desktop
	M			plan/plan.desktop
	M			plan/plan_viewplugin.desktop
	M			plan/plugins/filters/icalendar/export/plan_icalendar_export.desktop
	M			plan/plugins/filters/kplato/import/plan_kplato_import.desktop
	M			plan/plugins/schedulers/rcps/planrcpsscheduler.desktop
	M			plan/plugins/schedulers/tj/plantjscheduler.desktop
	M			plan/plugins/scripting/planscripting.desktop
	M			plan/templates/Simple/Basicproject.desktop
	M			plan/workpackage/planwork.desktop
	M			plugins/colorengines/lcms2/colorprofiles/IccColorProfile.cpp
	M			plugins/colorengines/lcms2/colorprofiles/IccColorProfile.h
	M			plugins/colorengines/lcms2/colorprofiles/LcmsColorProfileContainer.cpp
	M			plugins/colorengines/lcms2/colorprofiles/LcmsColorProfileContainer.h
	M			plugins/colorengines/lcms2/kolcmsengine.desktop
	M			plugins/commentshape/calligra_shape_comment.desktop
	M			plugins/defaultTools/defaulttool/DefaultToolFactory.cpp
	M			plugins/dockers/calligra_docker_defaults.desktop
	M			plugins/formulashape/kformulapart.desktop
	M			plugins/kexi/spreadsheet/keximigrate_spreadsheet.desktop
	M			plugins/pluginshape/calligra_shape_plugin.desktop
	M			plugins/semanticitems/contact/calligra_semanticitem_contact.desktop
	M			plugins/semanticitems/event/calligra_semanticitem_event.desktop
	M			plugins/semanticitems/location/calligra_semanticitem_location.desktop
	M			plugins/staging/templateshape/calligra_shape_template.desktop
	M			plugins/vectorshape/calligra_shape_vector.desktop
	M			plugins/videoshape/calligra_shape_video.desktop
	M			servicetypes/calligra_filter.desktop
	M			servicetypes/calligra_part.desktop
	M			sheets/functions/kspreadreferencemodule.desktop
	M			sheets/functions/kspreadstatisticalmodule.desktop
	M			sheets/functions/kspreadtextmodule.desktop
	M			sheets/plugins/scripting/sheetsscripting.desktop
	M			sheets/sheets.desktop
	M			sheets/sheets_plugin.desktop
	M			sheets/sheets_viewplugin.desktop
	M			sheets/sheetspart.desktop
	M			stage/app/stage.desktop
	M			stage/data/kpr_pageeffect.desktop
	M			stage/templates/odf/flood_light.desktop
	M			stage/templates/odf/kde_events.desktop
	M			stage/templates/odf/rounded_square.desktop
	M			stage/templates/odf/simple_waves.desktop
	M			words/app/words.desktop
	M			words/part/author/author.desktop
	M			words/part/author/authorpart.desktop
	M			words/part/wordspart.desktop

Merge remote-tracking branch 'origin' into frameworks5eb93da341b3Actions

Description

Details

Merged Changes

Changes (510)Show All Changes

Very Large Commit

R8:5eb93da341b3

flow/templates/basic/empty-landscape.desktop

gemini/calligragemini.desktop

karbon/data/karbon_dock.desktop

karbon/data/karbon_plugin.desktop

karbon/data/karbon_viewplugin.desktop

karbon/data/karbonpart.desktop

karbon/stencils/CMOS/gnd_h.desktop

karbon/stencils/CMOS/gnd_v.desktop

karbon/stencils/CMOS/nmos_h.desktop

karbon/stencils/CMOS/nmos_v.desktop

karbon/stencils/CMOS/pmos_h.desktop

karbon/stencils/CMOS/pmos_v.desktop

karbon/stencils/CMOS/vdd_h.desktop

karbon/stencils/CMOS/vdd_v.desktop

karbon/stencils/Cisco/wireless_transport.desktop

karbon/stencils/Cisco/wlan_controller.desktop

karbon/stencils/Cisco/woman.desktop

karbon/stencils/Cisco/woman_blue.desktop

karbon/stencils/Cisco/woman_gold.desktop

karbon/stencils/Cisco/woman_red.desktop

karbon/stencils/Cisco/workgroup_director.desktop

karbon/stencils/Cisco/workgroup_fcis.desktop

karbon/stencils/Cisco/workgroup_switch.desktop

karbon/stencils/Cisco/workgroup_switch_voice-enabled.desktop

karbon/stencils/Cisco/workstation.desktop

karbon/stencils/Cisco/www_server.desktop

karbon/stencils/Cybernetics/sine.desktop

karbon/stencils/Cybernetics/sum.desktop

karbon/stencils/Flags/china_hong_kong.desktop

karbon/stencils/Flags/china_macao.desktop

karbon/stencils/Flags/china_prc.desktop

karbon/stencils/Flags/china_roc.desktop

karbon/stencils/Flags/libyan_arab_jamahiriya.desktop

karbon/stencils/Gane_and_Sarson/alt-entity.desktop

karbon/stencils/Gane_and_Sarson/collection.desktop

karbon/stencils/Gane_and_Sarson/data_store.desktop

karbon/stencils/Gane_and_Sarson/entity.desktop

karbon/stencils/Jigsaw/collection.desktop

karbon/stencils/LST/cn_subsystem.desktop

karbon/stencils/LST/collection.desktop

karbon/stencils/LST/convert_subsystem.desktop

karbon/stencils/LST/decider_subsystem.desktop

karbon/stencils/LST/decoder.desktop

karbon/stencils/LST/distributor_subsystem.desktop

karbon/stencils/LST/encoder.desktop

karbon/stencils/LST/timer.desktop

karbon/stencils/Lights/ACL.desktop

karbon/stencils/Lights/Blacklight.desktop

karbon/stencils/MSE/small_extension_node.desktop

karbon/stencils/MSE/tacsat.desktop

karbon/stencils/Map/Corner1.desktop

karbon/stencils/Misc/collection.desktop

karbon/stencils/Network/dat_external.desktop

karbon/stencils/Network/disc.desktop

karbon/stencils/Network/flash.desktop

karbon/stencils/Network/genmonitor.desktop

karbon/stencils/Network/modularswitch.desktop

karbon/stencils/Network/monitor.desktop

karbon/stencils/Network/patch-panel.desktop

karbon/stencils/Network/pc_bigtower.desktop

karbon/stencils/Network/pc_miditower.desktop

karbon/stencils/Network/pc_minitower.desktop

karbon/stencils/Optics/dfb_laser.desktop

karbon/stencils/Optics/dfb_laser_vert.desktop

karbon/stencils/Optics/edfa.desktop

karbon/stencils/Optics/edfa_vert.desktop

karbon/stencils/Optics/fibre.desktop

karbon/stencils/Optics/fibre_vert.desktop

karbon/stencils/Optics/lpg.desktop

karbon/stencils/Optics/lpg_vert.desktop

karbon/stencils/RDP/collection.desktop

karbon/stencils/Racks/equipment_10u.desktop

karbon/stencils/Racks/equipment_11u.desktop

Merge remote-tracking branch 'origin' into frameworks
5eb93da341b3
Actions

Changes (510)
Show All Changes