GitLab

run through levels are a kind of super-z-index used in textdocuments

This is already a tiny part of preparation for Qt5, where QtGui is split
into QtGui and QtWidgets. If we use explicit module names in our includes,
we are liable to churn like this.

Since KDE applications always have all Qt modules in the include path
anyway, direct includes always work (both in Qt4 and Qt5), and since we
already used direct includes in thousands of places, this change makes
our code more consistent, too.

when specifying a length which is bigger than the actual segment
length, the function now returns 1.0

At the moment it's an empty class but soon it will be used to pass various settings like
showFormttingCharacters in text etc.

The paintDecorations method has been removed. any such functionality can be done much better
using the KoShapePaintingContext.

REVIEW: 102809

KoResourceManager was used in two places: the canvas and document
classes. This gave rise to endless confusion about which resource
manager should be used where and contains what. The KoResourceManager
api also contained methods that were only relevant when used from
a document and others that were only relevant when used from a canvas.

This patch splits the resourcemanager into two public and one private
class. The public classes are KoDocumentResourceManager and
KoCanvasResourceManager, the private class is KoResourceManager. The
public classes defer to the private class for code-sharing purposes.

The old KoCanvasResource and KoDocumentResource enums have been taken
into the classes themselves.

KoShapeControllerBase is _not_ (aha! got you!) the base class for
KoShapeController, instead it's an interface that document classes that
own shapes can implement to allow adding/removing shapes to their
internal shape data structure.

In other words, it's a base class for documents whose content is based
on shapes, in other words, a KoShapeBasedDocumentBase class...

Until 2006, it was called KoShapeControllerInterface, which made
sort of sense.

As discussed on irc:

15:29:42 < boud> I'm getting completely confused between KoShapeController and KoShapeControllerBase...
16:04:43 < sebsauer> boud: a good indicator that they are bad designed
16:10:03 < boud> yes, I totally agree
16:12:10 < svuorela> they need a AbstractKoShapeControllerBaseInterface to derive from
16:13:42 < boud> with one implemenation: SimpeKoShapeControllerBaseInterfaceImpl
16:14:14 < boud> I was browsing the git log, and it turns out that last summer I was hurting because of this design as well
16:15:53 < boud> actually, KoShapeControllerBase used to be called KoShapeControllerInterface, but that was renamed in 2006
16:17:19 < boud> jaham called it "Interface" -- and that still seems more accurate, since most methods are pure abstract. Thomas Zander renamed it.
16:24:49 < boud> I really wish I could get the shapecontroller right out of the canvasbase
16:27:18 < boemann> boud: to be far the renaming was idscussed on the ml and base is if it also implements base behaviour
16:27:22 < boemann> be fair
16:27:43 < sebsauer> lol re AbstractKoShapeControllerBaseInterface ... maybe turn it to a AbstractKoShapeControllerBaseInterfaceFactory ?
16:28:11 < sebsauer> or even a AbstractKoShapeControllerBaseInterfaceFactorySingleton
16:28:17 < boemann> sebsauer: no a factory cant return interfaces :)
16:28:27 < sebsauer> boemann: in C++ it can :-)
16:28:38 < sebsauer> interfaces without pure virtual
16:28:40 < sebsauer> 's
16:28:51 < boemann> ok it can but not accoring to our defs
16:29:22 < sebsauer> but yes, it's not nice and also misses a strategy-pattern
16:30:01 < boemann>  AbstractKoShapeControllerStrategyBaseInterfaceFactorySingleton
16:30:16 < sebsauer> sounds like a good name
16:30:30 < boemann> ok boud go ahead implementing our new design ;)
16:30:34 < sebsauer> :)
16:32:05 < svuorela> it's especially a good name for people who are paid by character ...
16:32:31 < boemann> :)
16:32:53 < boud> boemann: but this class doesn't implement the base behaviour for KoShapeController...
16:33:10 < boud> boemann: it's kind of an interface a document class implements so KoShapeController can add/remove shapes to the document
16:33:28 < boemann> oh
16:33:33 < boemann> nasty
16:33:43 < boud> the ***base renamings were last year, this was already in 2006
16:33:55 < boemann> ah
16:34:15 < boemann> i'd say we need to rename it
16:34:25 < boud> and every time, every time I look at these classes I am just as confused as you were just now -- surely KoShapeController must implement KoShapeControllerBase?
16:34:55 < boud> maybe KoShapeControllerDelegate?
16:35:21 < boemann> yeah
16:35:41 < boemann> if not a completely different name
16:36:25 < boud> it also creates a KoResourceManager and sets that on the shape factories for some reason... need to dig in again
16:36:34 < sebsauer> Ko42
16:37:20 < boud> lol
16:37:59 < svuorela> that's a great name. and then it can be subclassed to Ko43 when more virtuals are needed
16:38:26 < boud> how about KoShapeBasedDocumentBase...
16:38:53 < boemann> fine with me
16:39:05 < sebsauer> :-)
16:39:23 < boud> ok, will do
16:39:32 < svuorela> KoBasedShapeBasedDocumentBasedBase
16:39:32 < boud> I can't think of anything better
16:40:08 < boud> done..

This reverts commit c1bd38582fdcaa961a45de335765ce54f0a3c350.

The reason for the latest problems was that run-through can have only two states; either
Foreground or Background whereas Foreground is always the default.

This fixes all testcases provided by Thorsten and Lassi while still keeps the other
testcase provided Thorsten, Uzak and myself working like before.

This patch has been generated by "port-kundo2.sh forward".

The test was okay but it tried to compare two qreals direct. If we use
qFuzzyCompare to compare the reals it turns out that the calculations
were correct

This test checked whether the bounding rect of a shapegroup was the union
of all the boundingrects of the shapes in the group.

However, the documentation for KoShapeGroup says:

    /// a group in flake doesn't have a size, this funcion just returns QSizeF(0,0)
    virtual QSizeF size() const;

The boundingrect uses outlinerect which uses size to calculate the bounding
rect. This means that the boundingrect for a KoShapeGroup is empty as well.

In all places in the code where we used the string "koffice" in any
capitalisation, use "calligra" instead.

There is no need for the EXPORT macro here. The file is just a header and is included in the tests.

r1187091 | scripty | 2010-10-18 11:00:47 +0200 (Mon, 18 Oct 2010) | 1 line
Changed paths:
   M /trunk/koffice/filters/kspread/excel/export/kspread_excel_export.desktop
   M /trunk/koffice/filters/kword/dcm/kword_dcm_import.desktop
   M /trunk/koffice/filters/kword/html-odf/html-odf_export.desktop
   M /trunk/koffice/kplato/templates/Simple/Basicproject.desktop
   M /trunk/koffice/kpresenter/plugins/pageeffects/fade/kpr_pageeffect_fade.desktop
   M /trunk/koffice/kpresenter/plugins/pageeffects/spacerotation/kpr_pageeffect_spacerotation.desktop
   M /trunk/koffice/kpresenter/plugins/pageeffects/swapeffect/kpr_pageeffect_swapeffect.desktop
   M /trunk/koffice/krita/data/templates/comics/.directory
   M /trunk/koffice/krita/data/templates/comics/BD-EuroTemplate.desktop
   M /trunk/koffice/krita/data/templates/comics/Comics-USTemplate.desktop
   M /trunk/koffice/krita/data/templates/comics/Manga-JpTemplate.desktop
   M /trunk/koffice/krita/data/templates/comics/a4_waffle_grid.desktop
   M /trunk/koffice/krita/plugins/extensions/dockers/colorselectorng/krita_colorselectorng.desktop
   M /trunk/koffice/krita/plugins/filters/phongbumpmap/kritaphongbumpmapfilter.desktop
   M /trunk/koffice/krita/plugins/paintops/hatching/kritahatchingpaintop.desktop
   M /trunk/koffice/krita/plugins/paintops/sketch/kritasketchpaintop.desktop
   M /trunk/koffice/libs/koreport/koreport_itemplugin.desktop
   M /trunk/koffice/plugins/commentshape/commentshape.desktop
   M /trunk/koffice/plugins/pluginshape/pluginshape.desktop
   M /trunk/koffice/plugins/reporting/barcode/koreport_barcodeplugin.desktop
   M /trunk/koffice/plugins/reporting/chart/koreport_chartplugin.desktop
   M /trunk/koffice/plugins/reporting/shape/koreport_shapeplugin.desktop
   M /trunk/koffice/plugins/treeshape/treeshape.desktop
   M /trunk/koffice/tools/f-office/freoffice.desktop
   M /trunk/koffice/tools/okularodpgenerator/libokularGenerator_odp.desktop
   M /trunk/koffice/tools/okularodpgenerator/okularApplication_odp.desktop
   M /trunk/koffice/tools/okularodpgenerator/okularOdp.desktop

SVN_SILENT made messages (.desktop file)

------------------------------------------------------------------------
r1187125 | breitmeyer | 2010-10-18 13:20:06 +0200 (Mon, 18 Oct 2010) | 2 lines
Changed paths:
   M /trunk/koffice/plugins/chartshape/PlotArea.cpp

fixed a crash caused by  unbalanced save restore calls on KoStyleStack


------------------------------------------------------------------------
r1187130 | breitmeyer | 2010-10-18 13:37:33 +0200 (Mon, 18 Oct 2010) | 2 lines
Changed paths:
   M /trunk/koffice/plugins/chartshape/ChartProxyModel.cpp
   M /trunk/koffice/plugins/chartshape/ChartShape.cpp

added some functionality for colors data series in stock charts

------------------------------------------------------------------------
r1187131 | mlaurent | 2010-10-18 13:41:55 +0200 (Mon, 18 Oct 2010) | 2 lines
Changed paths:
   M /trunk/koffice/krita/plugins/filters/blur/kis_wdg_blur.cpp
   M /trunk/koffice/krita/plugins/filters/blur/kis_wdg_blur.h
   M /trunk/koffice/krita/plugins/filters/blur/kis_wdg_gaussian_blur.cpp
   M /trunk/koffice/krita/plugins/filters/blur/kis_wdg_gaussian_blur.h
   M /trunk/koffice/krita/plugins/filters/blur/kis_wdg_lens_blur.cpp
   M /trunk/koffice/krita/plugins/filters/blur/kis_wdg_lens_blur.h
   M /trunk/koffice/krita/plugins/filters/blur/kis_wdg_motion_blur.cpp
   M /trunk/koffice/krita/plugins/filters/blur/kis_wdg_motion_blur.h

Fix mem leak

------------------------------------------------------------------------
r1187132 | mlaurent | 2010-10-18 13:45:58 +0200 (Mon, 18 Oct 2010) | 2 lines
Changed paths:
   M /trunk/koffice/krita/plugins/filters/colors/kis_wdg_color_to_alpha.cpp
   M /trunk/koffice/krita/plugins/filters/colors/kis_wdg_color_to_alpha.h
   M /trunk/koffice/krita/plugins/filters/fastcolortransfer/kis_wdg_fastcolortransfer.cpp
   M /trunk/koffice/krita/plugins/filters/noisefilter/kis_wdg_noise.cpp
   M /trunk/koffice/krita/plugins/filters/randompickfilter/kis_wdg_random_pick.cpp
   M /trunk/koffice/krita/plugins/filters/unsharp/kis_wdg_unsharp.cpp
   M /trunk/koffice/krita/plugins/filters/unsharp/kis_wdg_unsharp.h
   M /trunk/koffice/krita/plugins/filters/wavefilter/kis_wdg_wave.cpp

Fix mem leak

------------------------------------------------------------------------
r1187133 | mlaurent | 2010-10-18 13:47:16 +0200 (Mon, 18 Oct 2010) | 2 lines
Changed paths:
   M /trunk/koffice/krita/plugins/formats/tiff/kis_dlg_options_tiff.cpp

Fix mem leak


------------------------------------------------------------------------
r1187142 | lassin | 2010-10-18 14:34:08 +0200 (Mon, 18 Oct 2010) | 2 lines
Changed paths:
   M /trunk/koffice/filters/kpresenter/pptx/PptxXmlSlideReader.cpp
   M /trunk/koffice/filters/libmsooxml/MsooXmlCommonReader.cpp
   M /trunk/koffice/filters/libmsooxml/MsooXmlCommonReader.h
   M /trunk/koffice/filters/libmsooxml/MsooXmlCommonReaderDrawingMLImpl.h

Fixed pptx bug where slide with two containers with same Id would mess with each other's styles.


------------------------------------------------------------------------
r1187145 | lukast | 2010-10-18 14:49:46 +0200 (Mon, 18 Oct 2010) | 3 lines
Changed paths:
   M /trunk/koffice/krita/image/kis_curve_rect_mask_generator.cpp

Fix the softbrush rect mask too.

CCBUG:252144

------------------------------------------------------------------------
r1187158 | breitmeyer | 2010-10-18 15:27:44 +0200 (Mon, 18 Oct 2010) | 2 lines
Changed paths:
   M /trunk/koffice/plugins/chartshape/kdchart/src/KDChartModelDataCache_p.h

fix from sebastian for inconsistent DataModelCaches


------------------------------------------------------------------------
r1187162 | breitmeyer | 2010-10-18 15:50:39 +0200 (Mon, 18 Oct 2010) | 2 lines
Changed paths:
   M /trunk/koffice/plugins/chartshape/ChartConfigWidget.cpp

added the support for 3D bubble charts again


------------------------------------------------------------------------
r1187164 | lassin | 2010-10-18 15:52:24 +0200 (Mon, 18 Oct 2010) | 2 lines
Changed paths:
   M /trunk/koffice/filters/kpresenter/pptx/PptxXmlSlideReader.cpp
   M /trunk/koffice/filters/libmsooxml/MsooXmlCommonReaderDrawingMLImpl.h
   M /trunk/koffice/filters/libmsooxml/MsooXmlCommonReaderDrawingMLMethods.h
   M /trunk/koffice/filters/libmsooxml/MsooXmlUtils.cpp
   M /trunk/koffice/filters/libmsooxml/MsooXmlUtils.h

Fixed pptx cases where partial list override would override list for everything in the frame.


------------------------------------------------------------------------
r1187173 | breitmeyer | 2010-10-18 16:24:36 +0200 (Mon, 18 Oct 2010) | 3 lines
Changed paths:
   M /trunk/koffice/filters/kspread/xlsx/XlsxXmlChartReader.cpp

fixed bubble chart bubble sizes by writing the bubble size into the
internal table


------------------------------------------------------------------------
r1187180 | breitmeyer | 2010-10-18 16:58:09 +0200 (Mon, 18 Oct 2010) | 2 lines
Changed paths:
   M /trunk/koffice/filters/kspread/xlsx/XlsxXmlChartReader.cpp

Fixed bubble chart bubble sizes if no refernces are in the document

------------------------------------------------------------------------
r1187181 | langkamp | 2010-10-18 17:03:15 +0200 (Mon, 18 Oct 2010) | 3 lines
Changed paths:
   M /trunk/koffice/krita/CMakeLists.txt
   M /trunk/koffice/krita/plugins/tools/defaulttools/kis_tool_line.cc
   M /trunk/koffice/krita/plugins/tools/tool_star/kis_tool_star.cc
   M /trunk/koffice/krita/ui/tool/kis_tool_ellipse_base.cpp
   M /trunk/koffice/krita/ui/tool/kis_tool_freehand.cc
   M /trunk/koffice/krita/ui/tool/kis_tool_paint.cc
   M /trunk/koffice/krita/ui/tool/kis_tool_paint.h
   M /trunk/koffice/krita/ui/tool/kis_tool_polyline_base.cpp
   M /trunk/koffice/krita/ui/tool/kis_tool_rectangle_base.cpp

don't paint on local selections with painting tools
BUG:252453


------------------------------------------------------------------------
r1187214 | rempt | 2010-10-18 18:48:07 +0200 (Mon, 18 Oct 2010) | 1 line
Changed paths:
   M /trunk/koffice/plugins/colorengines/CMakeLists.txt

better message
------------------------------------------------------------------------
r1187215 | langkamp | 2010-10-18 18:53:19 +0200 (Mon, 18 Oct 2010) | 3 lines
Changed paths:
   M /trunk/koffice/krita/plugins/extensions/imagesize/imagesize.cc
   M /trunk/koffice/krita/ui/kis_layer_manager.cc

fix scale layer for shape layers
CCBUG:251168


------------------------------------------------------------------------
r1187223 | langkamp | 2010-10-18 19:36:55 +0200 (Mon, 18 Oct 2010) | 3 lines
Changed paths:
   M /trunk/koffice/krita/ui/kis_layer_manager.cc

fix mirroring of layers
CCBUG:251168


------------------------------------------------------------------------
r1187238 | uzak | 2010-10-18 20:55:45 +0200 (Mon, 18 Oct 2010) | 2 lines
Changed paths:
   M /trunk/koffice/filters/kpresenter/powerpoint/PptToOdp.cpp
   M /trunk/koffice/filters/kpresenter/powerpoint/PptToOdp.h

PPT: DocumentContainer/SlideHeadersFootersContainer/HeadersFootersAtom saved by MS Office 2003 require corrections.


------------------------------------------------------------------------
r1187326 | mlaurent | 2010-10-19 00:19:29 +0200 (Tue, 19 Oct 2010) | 2 lines
Changed paths:
   M /trunk/koffice/krita/plugins/generators/solid/kis_wdg_color.cpp
   M /trunk/koffice/krita/plugins/paintops/curvebrush/kis_curve_paintop_settings_widget.cpp

Fix mem leak


------------------------------------------------------------------------
r1187362 | zachmann | 2010-10-19 05:15:23 +0200 (Tue, 19 Oct 2010) | 7 lines
Changed paths:
   M /trunk/koffice/karbon/plugins/tools/CalligraphyTool/KarbonCalligraphicShapeFactory.cpp
   M /trunk/koffice/karbon/plugins/tools/CalligraphyTool/KarbonCalligraphicShapeFactory.h
   M /trunk/koffice/kformula/flake/KoFormulaShapeFactory.cpp
   M /trunk/koffice/kformula/flake/KoFormulaShapeFactory.h
   M /trunk/koffice/kspread/shape/TableShapeFactory.cpp
   M /trunk/koffice/kspread/shape/TableShapeFactory.h
   M /trunk/koffice/libs/flake/KoConnectionShapeFactory.cpp
   M /trunk/koffice/libs/flake/KoConnectionShapeFactory.h
   M /trunk/koffice/libs/flake/KoPathShapeFactory.cpp
   M /trunk/koffice/libs/flake/KoPathShapeFactory.h
   M /trunk/koffice/libs/flake/KoShapeFactoryBase.cpp
   M /trunk/koffice/libs/flake/KoShapeFactoryBase.h
   M /trunk/koffice/libs/flake/tests/TestKoShapeFactory.cpp
   M /trunk/koffice/plugins/artistictextshape/ArtisticTextShapeFactory.cpp
   M /trunk/koffice/plugins/artistictextshape/ArtisticTextShapeFactory.h
   M /trunk/koffice/plugins/chartshape/ChartShapeFactory.cpp
   M /trunk/koffice/plugins/chartshape/ChartShapeFactory.h
   M /trunk/koffice/plugins/commentshape/CommentShapeFactory.cpp
   M /trunk/koffice/plugins/commentshape/CommentShapeFactory.h
   M /trunk/koffice/plugins/divineProportion/DivineProportionShapeFactory.cpp
   M /trunk/koffice/plugins/divineProportion/DivineProportionShapeFactory.h
   M /trunk/koffice/plugins/dockers/shapecollection/CollectionShapeFactory.cpp
   M /trunk/koffice/plugins/dockers/shapecollection/CollectionShapeFactory.h
   M /trunk/koffice/plugins/musicshape/MusicShapeFactory.cpp
   M /trunk/koffice/plugins/musicshape/MusicShapeFactory.h
   M /trunk/koffice/plugins/pathshapes/ellipse/EllipseShapeFactory.cpp
   M /trunk/koffice/plugins/pathshapes/ellipse/EllipseShapeFactory.h
   M /trunk/koffice/plugins/pathshapes/enhancedpath/EnhancedPathShapeFactory.cpp
   M /trunk/koffice/plugins/pathshapes/enhancedpath/EnhancedPathShapeFactory.h
   M /trunk/koffice/plugins/pathshapes/rectangle/RectangleShapeFactory.cpp
   M /trunk/koffice/plugins/pathshapes/rectangle/RectangleShapeFactory.h
   M /trunk/koffice/plugins/pathshapes/spiral/SpiralShapeFactory.cpp
   M /trunk/koffice/plugins/pathshapes/spiral/SpiralShapeFactory.h
   M /trunk/koffice/plugins/pathshapes/star/StarShapeFactory.cpp
   M /trunk/koffice/plugins/pathshapes/star/StarShapeFactory.h
   M /trunk/koffice/plugins/pictureshape/PictureShapeFactory.cpp
   M /trunk/koffice/plugins/pictureshape/PictureShapeFactory.h
   M /trunk/koffice/plugins/pluginshape/PluginShapeFactory.cpp
   M /trunk/koffice/plugins/pluginshape/PluginShapeFactory.h
   M /trunk/koffice/plugins/textshape/TextShapeFactory.cpp
   M /trunk/koffice/plugins/textshape/TextShapeFactory.h
   M /trunk/koffice/plugins/treeshape/TreeShapeFactory.cpp
   M /trunk/koffice/plugins/treeshape/TreeShapeFactory.h
   M /trunk/koffice/plugins/vectorshape/VectorShapeFactory.cpp
   M /trunk/koffice/plugins/vectorshape/VectorShapeFactory.h
   M /trunk/koffice/plugins/videoshape/VideoShapeFactory.cpp
   M /trunk/koffice/plugins/videoshape/VideoShapeFactory.h

The attached patch adds the KoShapeLoadingContext the the
KoShapeFactoryBase::supports method so that information stored in there can be
used to determine if the factory supports the shape.

It removes some wrong test form the KarbonCalligraphicShapeFactory and optimizes
the KoPathShapeFactory to check for the namespace only ones.



svn path=/branches/work/koffice-essen/; revision=1187383

KoShapeFactoryBase::supports method so that information stored in there can be
used to determine if the factory supports the shape.

It removes some wrong test form the KarbonCalligraphicShapeFactory and optimizes
the KoPathShapeFactory to check for the namespace only ones.

svn path=/trunk/koffice/; revision=1187362

There is no reason for the registries and the factories the registries
contain to be QObjects. The only thing it was used for was the
parent-child relation so the factories would be deleted on shutdown.

The objects would thus both be in the hashmap and in the list of
children of the registry, effectively clouding the ownership relation.

To make all registries in KOffice consistent in usage, the destructors
of the registries now delete their contents, there is no parent-child
relationship anymore.

It also saves memory and makes it clear where all these objects are
destroyed

svn path=/branches/work/koffice-essen/; revision=1183433

- adjusted TestShapeGroupCommand. also some positions changed due to the
  due to the way, they are computed. absolutePositions of shapes are the
  same.
- added a test for scaling a group. with group size 0,0 it doesn't fail
o fixed a bug when ungrouping a shape
- we have to do the same calculation as in
  KoShape::absoluteTransformation
- added a test for this
o added comment in KisShapeLayer::transform, that krtia doesn't support
  inheriting transformations. currently no krita enabled shape uses
  this.

BUG: 227512

svn path=/trunk/koffice/; revision=1175147

svn path=/trunk/koffice/; revision=1175005

svn path=/trunk/koffice/; revision=1171564

o) fix ungrouping of scaled shapes
o) add unit test for both

BUG: 227512

svn path=/trunk/koffice/; revision=1171560

Its good practice to add a license header; so GPL is better than no
license. :-)

svn path=/trunk/koffice/; revision=1169686

CCMAIL: koffice-devel@kde.org

the setCursor method exists on several Qt classes and nowhere
does it return anything; so lets follow that example since
nobody in KOffice svn was using the return value anyway.

Also fix the problem that in kspread the new method ended up
being a slot.

svn path=/trunk/koffice/; revision=1158520

svn path=/trunk/koffice/; revision=1156966

svn path=/trunk/koffice/; revision=1145827