← Back to branch summary

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

« back to all changes in this revision

Viewing changes to words/part/pagetool/KWPageToolFactory.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:
words/part/pagetool/KWPageToolFactory.cpp
20
20
#include "KWPageToolFactory.h"
21
21
#include "KWPageTool.h"
22
22
#include <KoCanvasBase.h>
 
23
#include <KoIcon.h>
23
24
 
24
25
#include <klocale.h>
25
26
#include <kdebug.h>
29
30
{
30
31
    setToolTip(i18n("Page layout"));
31
32
    setToolType(dynamicToolType()+",calligrawords");
32
 
    setIcon("tool-pagelayout");
 
33
    setIconName(koIconNameCStr("tool_pagelayout"));
33
34
    setPriority(25);
34
35
    setActivationShapeId("flake/always");
35
36
}
47
48
{
48
49
    return new KWPageTool(canvas);
49
50
}
 
51