← Back to branch summary

~smartboyhw/ubuntu/raring/calligra/2.6.0-0ubuntu1

« back to all changes in this revision

Viewing changes to karbon/ui/widgets/KarbonCanvas.cpp

  • Committer: Package Import Robot
  • Author(s): Philip Muškovac
  • Date: 2012-10-23 21:09:16 UTC
  • mfrom: (1.1.13)
  • Revision ID: package-import@ubuntu.com-20121023210916-m82w6zxnxhaxz7va
Tags: 1:2.5.90-0ubuntu1
https://launchpad.net/bugs/1070436
https://launchpad.net/bugs/1071686
* New upstream alpha release (LP: #1070436)
  - Add libkactivities-dev and libopenimageio-dev to build-depends
  - Add kubuntu_build_calligraactive.diff to build calligraactive by default
  - Add package for calligraauthor and move files that are shared between
    calligrawords and calligraauthor to calligrawords-common
* Document the patches
* Remove numbers from patches so they follow the same naming scheme as
  the rest of our patches.
* calligra-data breaks replaces krita-data (<< 1:2.5.3) (LP: #1071686)

Show diffs side-by-side

added added

removed removed

Lines of Context:
karbon/ui/widgets/KarbonCanvas.cpp
31
31
 
32
32
#include "KarbonCanvas.h"
33
33
#include "KarbonDocument.h"
 
34
#include <KarbonKoDocument.h>
34
35
#include "KarbonPart.h"
35
36
#include <KarbonOutlinePaintingStrategy.h>
36
37
 
79
80
    KoToolProxy *toolProxy;
80
81
 
81
82
    KarbonDocument *document;
82
 
    KarbonPart *part;
 
83
    KarbonKoDocument *part;
83
84
    QPoint origin;         ///< the origin of the document page rect
84
85
    bool showMargins;      ///< should page margins be shown
85
86
    QPoint documentOffset; ///< the offset of the virtual canvas from the viewport
88
89
    KoGridData pixelGrid;  ///< pixel grid data
89
90
};
90
91
 
91
 
KarbonCanvas::KarbonCanvas(KarbonPart *p)
 
92
KarbonCanvas::KarbonCanvas(KarbonKoDocument *p)
92
93
        : QWidget() , KoCanvasBase(p), d(new KarbonCanvasPrivate())
93
94
{
94
95
    d->part = p;
373
374
    return d->documentOffset;
374
375
}
375
376
 
 
377
KarbonKoDocument *KarbonCanvas::document() const
 
378
{
 
379
    return d->part;
 
380
}
 
381
 
376
382
void KarbonCanvas::enableOutlineMode(bool on)
377
383
{
378
384
    if (on)