← Back to branch summary

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

« back to all changes in this revision

Viewing changes to stage/part/KPrPresentationDrawStrategy.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:
stage/part/KPrPresentationDrawStrategy.cpp
25
25
 
26
26
#include <kiconloader.h>
27
27
 
 
28
#include <KoIcon.h>
28
29
#include <KoPACanvas.h>
29
30
 
30
31
#include "KPrPresentationTool.h"
35
36
{
36
37
    m_widget = new KPrPresentationDrawWidget(canvas());
37
38
    // TODO
38
 
    KIconLoader kicon("stage");
39
 
    QPixmap pix(kicon.loadIcon("pen.png", kicon.Small));
 
39
    KIconLoader iconLoader(QLatin1String("stage"));
 
40
    QPixmap pix(iconLoader.loadIcon(koIconName("pen"), KIconLoader::Small));
40
41
    const qreal factor = 1.2;
41
 
    pix = pix.scaledToHeight(pix.height()*factor);
42
 
    pix = pix.scaledToWidth(pix.width()*factor);
 
42
    const int oldWidth = pix.width();
 
43
    const int oldHeight = pix.height();
 
44
    pix = pix.scaled(oldWidth*factor, oldHeight*factor);
43
45
    QCursor cur(pix);
44
46
    QApplication::setOverrideCursor(cur);
45
47