← Back to branch summary

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

« back to all changes in this revision

Viewing changes to krita/image/kis_selection_mask.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:
krita/image/kis_selection_mask.cpp
30
30
#include "kis_processing_visitor.h"
31
31
#include "kis_pixel_selection.h"
32
32
#include "kis_undo_adapter.h"
 
33
#include <KoIcon.h>
33
34
 
34
35
struct KisSelectionMask::Private
35
36
{
58
59
    delete m_d;
59
60
}
60
61
 
 
62
QIcon KisSelectionMask::icon() const {
 
63
    return koIcon("edit-paste");
 
64
}
 
65
 
61
66
bool KisSelectionMask::allowAsChild(KisNodeSP node) const
62
67
{
63
68
    Q_UNUSED(node);
98
103
KoDocumentSectionModel::PropertyList KisSelectionMask::sectionModelProperties() const
99
104
{
100
105
    KoDocumentSectionModel::PropertyList l = KisBaseNode::sectionModelProperties();
101
 
    l << KoDocumentSectionModel::Property(i18n("Active"), KIcon("local_selection_active"),KIcon("local_selection_inactive"),active());
 
106
    l << KoDocumentSectionModel::Property(i18n("Active"), koIcon("local_selection_active"), koIcon("local_selection_inactive"), active());
102
107
    return l;
103
108
}
104
109