Diffusion Calligra eb17f69ae0d3

Merge branch 'calligra/2.9' into krita-optimize-zachmann
eb17f69ae0d3
Actions

Authored by zachmann.

Description

Merge branch 'calligra/2.9' into krita-optimize-zachmann

Details

Committed

zachmann

Jul 6 2015, 5:28 PM

Parents

R8:e40724caf52d: Fixed saving of sections inside tables.
R8:c6978280553b: Use the KisColorTransformationConfiguration

Branches

Unknown

Tags

Unknown

References

krita-optimize-zachmann

zachmann committed R8:eb17f69ae0d3: Merge branch 'calligra/2.9' into krita-optimize-zachmann (authored by zachmann).Jul 6 2015, 5:28 PM

Merged Changes

Commit		Author	Details	Committed
e40724caf52d		deniskuplyakov	Fixed saving of sections inside tables.	Jul 6 2015
efc662e6bd29		dkazakov	Change exactBounds() to handle non-transparent default pixel properly	Jul 6 2015
92604b7ee7c4		dkazakov	Fix compilation	Jul 6 2015
cba0220701bc		kossebau	No need to link kowidgetutils against KDE4_KDEUI_LIBS	Jul 6 2015
c8107156e7d5		kossebau	No need to link koplugin to KDE4_KDEUI_LIBS	Jul 6 2015
41dfb34fda9a		kossebau	No need to link koversion against QT_QTCORE_LIBRARY	Jul 6 2015
1a2f26cbc7b0		kossebau	Remove unneeded kdemacros.h includes	Jul 6 2015
a633f3d31937		kossebau	No need to link koplugin with koversion	Jul 6 2015
2d1634ddcef0		dkazakov	Fix crash/problem when saving a pattern to a .kra file	Jul 6 2015
c5f13168ca4f		dkazakov	[FEATURE] Add possibility to continue a Crop Tool action	Jul 6 2015
c09866ad4968		l10n daemon script	SVN_SILENT made messages (.desktop file)	Jul 6 2015
9f818f95048a		kossebau	Plan schedulers do not need to link koodf	Jul 5 2015
3c894a465509		kossebau	kexirelationdesignshape only needs to link kowidgets & flake, not komain	Jul 5 2015
f9c57372adec	D141	kossebau	Use buildtime Calligra version for Words printing creator stamp	Jul 5 2015
08f0e0662e1a		rempt	Put the tool options in the docker by default for 2.9.6	Jul 5 2015
c5c91492192f		dkazakov	Activate Cut/Copy Sharp actions in the menu	Jul 5 2015
ccd86260ebac		aspotashev	advancedcolorselector: Fix UI layout	Jul 5 2015
0d8d13d1627f		stefanobonicatti	Optional optimization for sliders should be false if not set	Jul 5 2015
dd0d39d23262		l10n daemon script	SVN_SILENT made messages (after extraction)	Jul 5 2015
cf34f92c06fe		dkazakov	Make Group Layer return correct extent and exact bounds when in pass-through…	Jul 4 2015
adece4dc5134		dkazakov	Fix visibility of nested pass-through nodes	Jul 4 2015
8a4b961aafaa		dkazakov	Fix projection leaf order when the passthrough groups are nested	Jul 4 2015
1a3e977b1d1d		dkazakov	Finish continuation of the transformation action	Jul 4 2015
4d7bbea13835		staniek	Fix KexiWelcomeStatusBarGuiUpdater's file rename	Jul 3 2015
e4f2a626ce39		staniek	Kexi: Fix compacting databases	Jul 3 2015
1815fdb849db		stefanobonicatti	Added an optional optimization to slider spin box	Jul 3 2015
594bf674fd81		stefanobonicatti	BUG:348599 Fix node activating on the wrong image	Jul 3 2015
15975a078d94		stefanobonicatti	Fix assert when restoring selection during a document switch	Jul 3 2015
e6056cf15588		Jonathan Ringstad/dkazakov	Fix a misprint in psd_pattern.cpp	Jul 3 2015
4d9dfe7055c2		stefanobonicatti	Do not crash when a node is not present in the dummies graph	Jul 3 2015
f9244de29adb	D134	stefanobonicatti	BUG:349792 Fix deleting a color in the palette docker	Jul 3 2015
94f657bbfbda		staniek	Kexi recent files: use file's base name a good replacement for captions	Jul 2 2015
88971bf2c530		stefanobonicatti	BUG:349823 Fix scale to image size while adding a file layer	Jul 2 2015
5da07a2895e9	D130	kossebau	Rename libkispsd to kritapsd	Jul 1 2015
3cb0709b703e		kossebau	Rename libglobal to kritaglobal	Jul 1 2015
f8fbd8786763		staniek	Fix left margin for Kexi's global search box (dependent on style)	Jul 1 2015
d94f4809f399		staniek	Calligradb: +docs for driver's behaviour	Jul 1 2015
530bf6ca8e8d		C. Boemann	Fix crash with some cases of pagebreak, and make page break work correctly on…	Jun 30 2015
71dbfd32990f		l10n daemon script	SVN_SILENT made messages (.desktop file)	Jun 30 2015
732719d7344f		l10n daemon script	SVN_SILENT made messages (after extraction)	Jun 30 2015
f6d4f4bf40de		dkazakov	Fix compilation	Jun 30 2015
e98e4141e0a3		dkazakov	Implemented continuation of the transform with clicking on canvas	Jun 30 2015
1836aab229af		Stuart Dickson	Fix for windows	Jun 30 2015
1e281474bfe8		C. Boemann	Handle Column breaks	Jun 29 2015

Changes (90)

				Path	Packages
	M			flow/part/flow.appdata.xml
	M			flow/stencils/Flags/benin.desktop
	M			flow/stencils/Flags/mauritius.desktop
	M			interfaces/KoGenericRegistry.h
	M			karbon/data/karbon.appdata.xml
	M			kexi/kexi.appdata.xml
	M			kexi/main/KexiSearchLineEdit.cpp
	M			kexi/main/KexiSearchLineEdit.h
	M			kexi/main/startup/KexiRecentProjectsModel.cpp
	M			kexi/main/startup/KexiWelcomeStatusBar.cpp
	M			kexi/plugins/shapes/relationdesign/CMakeLists.txt
	M			krita/image/CMakeLists.txt
	P			krita/image/kis_crop_saved_extra_data.cpp Copied from krita/image/tests/kis_projection_leaf_test.h
	P			krita/image/kis_crop_saved_extra_data.h Copied from krita/image/tests/kis_projection_leaf_test.h
	M			krita/image/kis_group_layer.cc
	M			krita/image/kis_group_layer.h
	M			krita/image/kis_image.cc
	M			krita/image/kis_image.h
	M			krita/image/kis_paint_device.cc
	M			krita/image/kis_paint_device.h
	M			krita/image/kis_processing_applicator.cpp
	M			krita/image/kis_processing_applicator.h
	M			krita/image/kis_projection_leaf.cpp
	M			krita/image/kis_stroke_strategy_undo_command_based.cpp
	M			krita/image/kis_stroke_strategy_undo_command_based.h
	M			krita/image/tests/kis_paint_device_test.cpp
	M			krita/image/tests/kis_paint_device_test.h
	M			krita/image/tests/kis_projection_leaf_test.cpp
	P			krita/image/tests/kis_projection_leaf_test.h Copied to multiple locations: krita/image/kis_crop_saved_extra_data.cpp krita/image/kis_crop_saved_extra_data.h libs/kundo2/kundo2commandextradata.cpp libs/kundo2/kundo2commandextradata.h
	M			krita/krita.rc
	M			krita/libglobal/CMakeLists.txt
	M			krita/libpsd/CMakeLists.txt
	M			krita/libpsd/asl/kis_asl_reader.cpp
	M			krita/libpsd/asl/kis_asl_xml_parser.cpp
	M			krita/libpsd/asl/kis_asl_xml_writer.cpp
	M			krita/libpsd/psd_pattern.cpp
	M			krita/libpsd/tests/CMakeLists.txt
	M			krita/plugins/extensions/dockers/advancedcolorselector/wdg_color_selector_settings.ui
	M			krita/plugins/extensions/dockers/defaultdockers/kis_layer_box.cpp
	M			krita/plugins/extensions/dockers/palettedocker/palettedocker_dock.cpp
	M			krita/plugins/formats/psd/CMakeLists.txt
	M			krita/plugins/tools/tool_crop/kis_tool_crop.cc
	M			krita/plugins/tools/tool_crop/kis_tool_crop.h
	M			krita/plugins/tools/tool_transform2/kis_tool_transform.cc
	M			krita/plugins/tools/tool_transform2/kis_tool_transform.h
	M			krita/plugins/tools/tool_transform2/strokes/transform_stroke_strategy.cpp
	M			krita/plugins/tools/tool_transform2/strokes/transform_stroke_strategy.h
	M			krita/plugins/tools/tool_transform2/tool_transform_args.cc
	M			krita/plugins/tools/tool_transform2/tool_transform_args.h
	M			krita/ui/flake/kis_node_dummies_graph.cpp
	M			krita/ui/kis_config.cc
	M			krita/ui/kis_file_layer.cpp
	M			krita/ui/kis_node_manager.cpp
	M			krita/ui/kis_paintop_box.cc
	M			krita/ui/widgets/kis_slider_spin_box.cpp
	M			krita/ui/widgets/kis_slider_spin_box.h
	M			libs/db/driver.h
	M			libs/db/drivers/sqlite/sqlitevacuum.cpp
	M			libs/koplugin/CMakeLists.txt
	M			libs/kotext/opendocument/KoTextWriter_p.cpp
	M			libs/kundo2/CMakeLists.txt
	P			libs/kundo2/kundo2commandextradata.cpp Copied from krita/image/tests/kis_projection_leaf_test.h
	P			libs/kundo2/kundo2commandextradata.h Copied from krita/image/tests/kis_projection_leaf_test.h
	M			libs/kundo2/kundo2stack.cpp
	M			libs/kundo2/kundo2stack.h
	M			libs/kundo2/kundo2stack_p.h
	M			libs/main/KoDocument.h
	M			libs/odf/KoStyleStack.h
	M			libs/pigment/resources/KoColorSet.cpp
	M			libs/pigment/resources/KoColorSet.h
	M			libs/pigment/resources/KoPattern.cpp
	M			libs/pigment/resources/KoPattern.h
	M			libs/textlayout/KoTextDocumentLayout.cpp
	M			libs/textlayout/KoTextLayoutArea.cpp
	M			libs/textlayout/KoTextLayoutArea.h
	M			libs/textlayout/KoTextLayoutArea_p.h
	M			libs/textlayout/KoTextLayoutRootAreaProvider.h
	M			libs/version/CMakeLists.txt
	M			libs/widgetutils/CMakeLists.txt
	M			plan/main.cpp
	M			plan/plan.appdata.xml
	M			plan/plugins/schedulers/rcps/CMakeLists.txt
	M			plan/plugins/schedulers/tj/CMakeLists.txt
	M			plan/workpackage/main.cpp
	M			sheets/sheets.appdata.xml
	M			stage/templates/odf/skyline_monotone_wide.desktop
	M			stage/templates/odf/skyline_morning_wide.desktop
	M			stage/templates/odf/skyline_night_wide.desktop
	M			words/part/KWRootAreaProvider.cpp
	M			words/part/KWView.cpp