calligra
af2daaae4cad
Actions

Authored by Sven Langkamp <sven.langkamp@gmail.com>.

Description

Merge branch 'master' of git://anongit.kde.org/calligra

Conflicts:
libs/basicflakes/CMakeLists.txt

Details

Committed

Sven Langkamp <sven.langkamp@gmail.com>

Dec 29 2012, 10:50 AM

Parents

R8:971b05816abf: Unlock the image after saving a multilayer tiff file
R8:a8b3f36b39bc: better integration of pencil tool into Krita, moves pencil tool to…

Branches

Unknown

Tags

Unknown

Sven Langkamp <sven.langkamp@gmail.com> committed R8:af2daaae4cad: Merge branch 'master' of git://anongit.kde.org/calligra (authored by Sven Langkamp <sven.langkamp@gmail.com>).Dec 29 2012, 10:50 AM

Merged Changes

Commit	Author	Details	Committed
971b05816abf	Boudewijn Rempt	Unlock the image after saving a multilayer tiff file	Dec 29 2012
4c27788c4c95	Boudewijn Rempt	Change incremental save shortcut to ctrl-alt-s	Dec 29 2012
98f566eba0f7	Boudewijn Rempt	Use the document name for the filename when creating a named document	Dec 29 2012
f1dedc96c379	Boudewijn Rempt	remove unused enum	Dec 29 2012
e1fe5e15067c	Friedrich W. H. Kossebau	DeQ3K3fy Sheets' Latex export filter dialog	Dec 29 2012
bab4cd3319f5	Friedrich W. H. Kossebau	Make all includes more consistent, i.e. do not use a Qt*/ or KDE/ module prefix	Dec 29 2012
6d9480005ab2	Friedrich W. H. Kossebau	Use const-ref in foreach where possible	Dec 28 2012
f56a9458000a	Friedrich W. H. Kossebau	Remove usage of toAscii/fromAscii (basically replace with toLatin/fromLatin)	Dec 28 2012
a23f73c45570	Sebastian Sauer	Compile with dbus disabled.	Dec 28 2012
e45adcd36866	Sebastian Sauer	Compile libs with dbus disabled.	Dec 28 2012
6962c2a26c8c	Sebastian Sauer	Consistency++	Dec 28 2012
4389af7a2b29	Sebastian Sauer	Compile on Android.	Dec 28 2012
abc39b0d2b3a	Sebastian Sauer	Remove unused variable	Dec 28 2012
e1682c2c44c7	Friedrich W. H. Kossebau	Remove hopefully last occurrence of QString::null	Dec 28 2012
9fbe43288eff	Friedrich W. H. Kossebau	little code improvement: const ref and QString() for KPrSoundData constructor	Dec 28 2012
9e06f7e004fe	Friedrich W. H. Kossebau	Use QString::isEmpty() instead of == ""	Dec 28 2012
0aa30141277f	Friedrich W. H. Kossebau	Give the basicflakes lib its own basicflakes_export.h	Dec 28 2012

Changes (268)
Show All Changes

Very Large Commit

This commit is very large. Load each file individually.

				Path	Packages
	M			active/main.cpp
	M			active/src/CAAbstractDocumentHandler.h
	M			active/src/CACanvasController.cpp
	M			active/src/CACanvasItem.cpp
	M			active/src/CACanvasItem.h
	M			active/src/CAImageProvider.cpp
	M			active/src/CAImageProvider.h
	M			active/src/CAPresentationHandler.cpp
	M			active/src/MainWindow.cpp
	M			filters/karbon/image/ImageExport.cpp
	M			filters/karbon/pdf/SvgOutputDev.cpp
	M			filters/karbon/xfig/XFigImportFilter.cpp
	M			filters/karbon/xfig/XFigOdgWriter.h
	M			filters/sheets/CMakeLists.txt
	M			filters/sheets/excel/sidewinder/XlsRecordOutputStream.cpp
	M			filters/sheets/excel/sidewinder/formulas.cpp
	M			filters/sheets/excel/sidewinder/objects.cpp
	M			filters/sheets/excel/sidewinder/recordsxml2cpp.cpp
	M			filters/sheets/excel/sidewinder/utils.cpp
	M			filters/sheets/html/htmlimport.cc
	M			filters/sheets/latex/export/CMakeLists.txt
	D			filters/sheets/latex/export/kspreadlatexexportdiaImpl.cc
	V			filters/sheets/latex/export/{kspreadlatexexportdiaImpl.h → latexexportdialog.h}
	M			filters/sheets/latex/export/latexexport.cc
	M			filters/sheets/latex/export/latexexportAdaptor.cc
	M			filters/sheets/latex/export/latexexportAdaptor.h
	D			filters/sheets/latex/export/latexexportdia.ui
	A			filters/sheets/latex/export/latexexportdialog.cc
	V			filters/sheets/latex/export/{latexexportdialog.h ← kspreadlatexexportdiaImpl.h}
	A			filters/sheets/latex/export/latexexportwidget.ui
	M			filters/sheets/xlsx/XlsxUtils.h
	M			filters/sheets/xlsx/XlsxXmlChartReader.cpp
	M			filters/sheets/xlsx/XlsxXmlWorksheetReader.cpp
	M			filters/stage/powerpoint/PptToOdp.cpp
	M			filters/words/epub/OdtHtmlConverter.cpp
	M			filters/words/epub/exportepub2.cpp
	M			filters/words/epub/exporthtml.cpp
	M			filters/words/mobi/OdtMobiHtmlConverter.cpp
	M			filters/words/mobi/PalmDocCompression.cpp
	M			filters/words/mobi/exportmobi.cpp
	M			filters/words/rtf/import/rtf-qt/src/PictDestination.cpp
	M			karbon/ui/KarbonKoDocument.cpp
	M			kexi/core/kexiactionproxy.cpp
	M			kexi/core/kexiprojectdata.cpp
	M			kexi/core/kexitemplateloader.cpp
	M			kexi/formeditor/commands.cpp
	M			kexi/formeditor/connectiondialog.cpp
	M			kexi/formeditor/formIO.cpp
	M			kexi/formeditor/utils.cpp
	M			kexi/formeditor/widgetwithsubpropertiesinterface.cpp
	M			kexi/kexidb/drivers/odbc/odbcdriver.cpp
	M			kexi/kexidb/drivers/odbc/odbcspecialcolumnsqueryunit.cpp
	M			kexi/kexidb/drivers/odbc/odbctablesqueryunit.cpp
	M			kexi/kexidb/drivers/pqxx/pqxxdriver.cpp
	M			kexi/kexidb/drivers/sybase/sybaseconnection.cpp
	M			kexi/kexidb/drivers/xbase/xbaseexport.cpp
	M			kexi/kexiutils/tests/TestIdentifier.h
	M			kexi/main/startup/KexiStartup.cpp
	M			kexi/main/startup/KexiWelcomeStatusBar.cpp
	M			kexi/plugins/scripting/kexidb/kexidbmodule.cpp
	M			kexi/plugins/scripting/kexiscripting/kexiscriptdesignview.cpp
	M			kexi/tests/newapi/parser_test.h
	M			kexi/widget/fields/KexiFieldListModel.cpp
	M			kexi/widget/fields/KexiFieldListView.cpp
	M			kexi/widget/kexicharencodingcombobox.cpp
	M			kexi/widget/kexidbdrivercombobox.cpp
	M			krita/benchmarks/kis_composition_benchmark.h
	M			krita/benchmarks/kis_low_memory_benchmark.h
	M			krita/image/brushengine/kis_paintop_registry.cc
	M			krita/image/kis_count_visitor.cpp
	M			krita/image/kis_filter_strategy.cc
	M			krita/image/kis_math_toolbox.cpp
	M			krita/image/kis_node.cpp
	M			krita/image/kis_paint_layer.cc
	M			krita/image/metadata/kis_meta_data_filter_registry.cc
	M			krita/image/metadata/kis_meta_data_filter_registry_model.cc
	M			krita/image/metadata/kis_meta_data_io_backend.cc
	M			krita/image/metadata/kis_meta_data_merge_strategy_registry.cc
	M			krita/image/recorder/kis_recorded_action_factory_registry.cc
	M			krita/image/recorder/kis_recorded_path_paint_action.cpp
	M			krita/image/tests/kis_action_recorder_test.cpp
	M			krita/image/tests/kis_convolution_painter_test.cpp
	M			krita/image/tests/kis_cs_conversion_test.cpp
	M			krita/image/tests/kis_filter_job_test.cpp
	M			krita/image/tests/kis_filter_mask_test.cpp
	M			krita/image/tests/kis_filter_test.cpp
	M			krita/image/tests/kis_fixed_paint_device_test.cpp
	M			krita/image/tests/kis_paint_device_test.cpp
	M			krita/image/tests/kis_paint_layer_test.cpp
	M			krita/image/tests/kis_selection_test.cpp
	M			krita/image/tests/kis_transform_worker_test.cpp
	M			krita/image/tests/kis_transparency_mask_test.cpp
	M			krita/image/tests/kis_walkers_test.cpp
	M			krita/image/tiles3/kis_memento_manager.cc
	M			krita/image/tiles3/kis_tiled_data_manager.cc
	M			krita/image/tiles3/swap/kis_tile_compressor_2.cpp
	M			krita/plugins/extensions/dockers/lut/ocio_display_filter.cpp
	M			krita/plugins/extensions/imagesplit/imagesplit.cpp
	M			krita/plugins/extensions/metadataeditor/kis_entry_editor.cc
	M			krita/plugins/extensions/metadataeditor/kis_meta_data_editor.cc
	M			krita/plugins/extensions/shiva/ShivaGeneratorConfigWidget.cpp
	M			krita/plugins/extensions/shiva/shivafilter.cpp
	M			krita/plugins/extensions/shiva/shivafiltersplugin.cpp
	M			krita/plugins/extensions/shiva/shivagenerator.cpp
	M			krita/plugins/extensions/shiva/shivageneratorsplugin.cpp
	M			krita/plugins/filters/colorsfilters/kis_perchannel_filter.cpp
	M			krita/plugins/filters/phongbumpmap/phong_pixel_processor.cpp
	M			krita/plugins/filters/tests/kis_all_filter_test.cpp
	M			krita/plugins/filters/tests/kis_crash_filter_test.cpp
	M			krita/plugins/formats/exr/exr_converter.cc
	M			krita/plugins/formats/psd/psd_layer_record.cpp
	M			krita/plugins/formats/psd/psd_utils.cpp
	M			krita/plugins/formats/tiff/kis_tiff_converter.cc
	M			krita/plugins/formats/tiff/kis_tiff_export.cc
	M			krita/plugins/paintops/libbrush/abr_struct_parser.cpp
	M			krita/plugins/paintops/libbrush/kis_brush_registry.cpp
	M			krita/plugins/paintops/libbrush/kis_gbr_brush.cpp
	M			krita/plugins/paintops/libbrush/tests/kis_auto_brush_test.cpp
	M			krita/plugins/paintops/libbrush/tests/kis_brush_test.cpp
	M			krita/plugins/paintops/libbrush/tests/kis_imagepipe_brush_test.h
	M			krita/plugins/paintops/libpaintop/kis_pressure_opacity_option.cpp
	M			krita/plugins/paintops/libpaintop/kis_texture_option.cpp
	M			krita/plugins/paintops/mypaint/mypaint_brush_resource.cpp
	M			krita/plugins/paintops/mypaint/mypaint_paintop_factory.cpp
	M			krita/plugins/tools/selectiontools/kis_tool_select_magnetic.cc
	M			krita/sdk/createtest.py
	M			krita/ui/canvas/kis_prescaled_projection.cpp
	M			krita/ui/input/kis_input_manager.h
	M			krita/ui/kis_clipboard.cc
	M			krita/ui/kis_cursor.cc
	M			krita/ui/kis_doc2.cc
	M			krita/ui/kis_node_model.cpp
	M			krita/ui/kis_painting_assistant.cc
	M			krita/ui/kis_png_converter.cpp
	M			krita/ui/kis_ui_action_factory_registry.cpp
	M			krita/ui/kis_view2.cpp
	M			krita/ui/kis_workspace_resource.cpp
	M			krita/ui/kisexiv2/kis_exif_io.cpp
	M			krita/ui/kisexiv2/kis_exiv2.cpp
	M			krita/ui/kisexiv2/kis_iptc_io.cpp
	M			krita/ui/kisexiv2/kis_xmp_io.cpp
	M			krita/ui/opengl/kis_opengl_shader.cpp
	M			krita/ui/recorder/kis_recorded_action_creator_factory_registry.cc
	M			krita/ui/tests/kis_dummies_facade_base_test.h
	M			krita/ui/tests/kis_input_manager_test.h
	M			krita/ui/tests/kis_model_index_converter_test.h
	M			krita/ui/tests/kis_zoom_and_pan_test.h
	M			krita/ui/widgets/kis_color_space_selector.cc
	M			krita/ui/widgets/kis_custom_image_widget.cc
	M			krita/ui/widgets/kis_preset_selector_strip.cpp
	M			libs/basicflakes/CMakeLists.txt
	P			libs/basicflakes/basicflakes_export.h Copied from libs/flake/flake_export.h
	M			libs/basicflakes/tools/KoCreatePathTool.h
	M			libs/db/connection.cpp
	M			libs/db/tests/ConnectionTest.h
	M			libs/db/tests/TestUtils.h
	M			libs/flake/KoCanvasController.cpp
	M			libs/flake/KoCanvasController.h
	M			libs/flake/KoCanvasControllerWidget.cpp
	M			libs/flake/KoInputDeviceHandlerRegistry.cpp
	M			libs/flake/KoUnavailShape.cpp
	M			libs/kopageapp/KoPAView.cpp
	M			libs/koplugin/KoPluginLoader.cpp
	M			libs/kotext/BibliographyGenerator.cpp
	M			libs/kotext/InsertTextLocator_p.h
	M			libs/kotext/KoTextRdfCore.cpp
	M			libs/kotext/ToCBibGeneratorInfo.cpp
	M			libs/kotext/opendocument/KoTextWriter_p.cpp
	M			libs/kotext/styles/KoCharacterStyle.cpp
	M			libs/kotext/styles/KoListLevelProperties.cpp
	M			libs/kundo2/kundo2group.cpp
	M			libs/kundo2/kundo2stack.cpp
	M			libs/main/CMakeLists.txt
	M			libs/main/KoApplication.cpp
	M			libs/main/KoApplicationAdaptor.h
	M			libs/main/KoDocument.cpp
	M			libs/main/KoDocumentInfo.cpp
	M			libs/main/KoFilterChain.cpp
	M			libs/main/KoFindText.cpp
	M			libs/main/KoFindToolbar.cpp
	M			libs/main/KoMainWindow.cpp
	M			libs/main/KoModeBox.cpp
	M			libs/main/KoPartAdaptor.h
	M			libs/main/KoProgressUpdater.cpp
	M			libs/main/KoView.cpp
	M			libs/main/KoViewAdaptor.h
	M			libs/odf/KoCellValue.cpp
	M			libs/odf/KoEncryptedStore.cpp
	M			libs/odf/KoOdfBibliographyConfiguration.cpp
	M			libs/odf/KoProperties.cpp
	M			libs/odf/KoShadowStyle.cpp
	M			libs/odf/tests/TestKoElementReference.h
	M			libs/odf/tests/storedroptest.cpp
	M			libs/pigment/resources/KoColorSet.cpp
	M			libs/pigment/resources/KoPattern.cpp
	M			libs/textlayout/KoTextLayoutArea.cpp
	M			libs/textlayout/RunAroundHelper.cpp
	M			libs/widgets/KoCsvImportDialog.cpp
	M			libs/widgets/KoResourceServer.h
	M			libs/widgets/KoResourceServerProvider.cpp
	M			libs/widgets/KoResourceTagging.cpp
	M			plan/libs/kernel/kptschedule.cpp
	M			plan/libs/kernel/kptschedulerplugin.cpp
	M			plan/libs/kernel/tests/CalendarTester.cpp
	M			plan/libs/models/kptitemmodelbase.cpp
	M			plan/plugins/schedulers/rcps/KPlatoRCPSScheduler.cpp
	M			plan/plugins/schedulers/rcps/tests/ProjectTester.cpp
	M			plan/plugins/schedulers/tj/tests/SchedulerTester.cpp
	M			plan/plugins/schedulers/tj/tests/TaskJuggler.cpp
	M			plan/workpackage/main.cpp
	M			plugins/chartshape/CellRegion.cpp
	M			plugins/chartshape/ChartTableModel.cpp
	M			plugins/chartshape/tests/TestDataSet.cpp
	M			plugins/chartshape/tests/TestProxyModel.cpp
	M			plugins/chartshape/tests/odf/TestLoadingBase.cpp
	M			plugins/colorengines/lcms2/IccColorSpaceEngine.cpp
	M			plugins/colorengines/lcms2/colorprofiles/LcmsColorProfileContainer.cpp
	M			plugins/colorengines/lcms2/tests/TestKoColorSpaceRegistry.cpp
	M			plugins/formulashape/Dictionary.cpp
	M			plugins/formulashape/tests/TestLayout.cpp
	M			plugins/musicshape/core/MusicXmlReader.cpp
	M			plugins/musicshape/core/tests/MusicXmlWriterTest.cpp
	M			plugins/pathshapes/enhancedpath/EnhancedPathFormula.cpp
	M			plugins/pathshapes/enhancedpath/EnhancedPathShape.cpp
	M			plugins/reporting/barcode/3of9.cpp
	M			plugins/reporting/barcode/3of9paint.cpp
	M			plugins/reporting/barcode/code128.cpp
	M			plugins/reporting/barcode/code128paint.cpp
	M			plugins/reporting/barcode/ext3of9.cpp
	M			plugins/reporting/barcode/ext3of9paint.cpp
	M			plugins/staging/googledocs/googledocumentservice.cpp
	M			plugins/staging/threedshape/SceneObject.cpp
	M			plugins/textshape/ReviewTool.cpp
	M			plugins/textshape/TextTool.cpp
	M			plugins/textshape/dialogs/BibliographyConfigureDialog.cpp
	M			plugins/textshape/dialogs/BibliographyTemplate.cpp
	M			plugins/textshape/dialogs/InsertBibliographyDialog.cpp
	M			plugins/textshape/dialogs/SimpleParagraphWidget.cpp
	M			sheets/CMakeLists.txt
	M			sheets/DependencyManager.cpp
	M			sheets/FunctionModuleRegistry.cpp
	M			sheets/Global.h
	M			sheets/StyleManager.cpp
	M			sheets/commands/AutoFillCommand.cpp
	M			sheets/interfaces/MapAdaptor.h
	M			sheets/interfaces/SheetAdaptor.h
	M			sheets/interfaces/ViewAdaptor.h
	M			sheets/part/Doc.cpp
	M			sheets/part/View.cpp
	M			sheets/part/dialogs/SheetSelectPage.cpp
	M			sheets/plugins/scripting/ScriptingPart.cpp
	M			sheets/plugins/scripting/ScriptingWidgets.cpp
	M			sheets/plugins/solver/Solver.cpp
	M			stage/part/KPrCustomSlideShows.cpp
	M			stage/part/KPrCustomSlideShowsModel.cpp
	M			stage/part/KPrPresentationToolAdaptor.h
	M			stage/part/KPrSoundData.cpp
	M			stage/part/KPrSoundData.h
	M			stage/part/animations/strategy/KPrSmilValues.cpp
	M			stage/part/commands/KPrDeleteSlidesCommand.cpp
	M			stage/part/ui/KPrHtmlExportDialog.h
	M			tools/okularodpgenerator/OkularOdpGenerator.cpp
	M			tools/slidecompare/combinedview.cpp
	M			tools/slidecompare/kpresenterslideloader.cpp
	M			tools/slidecompare/slideview.cpp
	M			words/part/KWDocument.cpp
	M			words/part/KWOdfWriter.cpp
	M			words/part/KWView.cpp