← Back to branch summary

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

« back to all changes in this revision

Viewing changes to krita/ui/kis_composite_ops_model.cc

  • 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/ui/kis_composite_ops_model.cc
18
18
 */
19
19
 
20
20
#include <KoCompositeOp.h>
 
21
 
 
22
#include <KoIcon.h>
 
23
 
21
24
#include "kis_composite_ops_model.h"
22
25
#include "kis_debug.h"
23
26
#include "kis_config.h"
80
83
        BaseClass::Index index = BaseClass::getIndex(idx.row());
81
84
        
82
85
        if(!BaseClass::isHeader(index) && BaseClass::m_categories[index.first].entries[index.second].disabled)
83
 
            return QIcon::fromTheme("dialog-warning");
 
86
            return koIcon("dialog-warning");
84
87
    }
85
88
    
86
89
    return BaseClass::data(idx, role);