← Back to branch summary

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

« back to all changes in this revision

Viewing changes to krita/plugins/extensions/dockers/tasksetdocker/tasksetdocker_dock.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/plugins/extensions/dockers/tasksetdocker/tasksetdocker_dock.cpp
29
29
#include <klocale.h>
30
30
#include <KActionCollection>
31
31
 
 
32
#include <KoIcon.h>
 
33
 
32
34
#include <KoCanvasBase.h>
33
35
#include <KoResourceItemChooser.h>
34
36
#include <KoResourceServerAdapter.h>
85
87
    m_model = new TasksetModel(this);
86
88
    tasksetView->setModel(m_model);
87
89
    tasksetView->setItemDelegate(new KisTasksetDelegate(this));
88
 
    recordButton->setIcon(KIcon("media-record"));
 
90
    recordButton->setIcon(koIcon("media-record"));
89
91
    recordButton->setCheckable(true);
90
 
    clearButton->setIcon(KIcon("edit-delete"));
91
 
    saveButton->setIcon(KIcon("document-save"));
 
92
    clearButton->setIcon(koIcon("edit-delete"));
 
93
    saveButton->setIcon(koIcon("document-save"));
92
94
    saveButton->setEnabled(false);
93
95
 
94
 
    chooserButton->setIcon(KIcon("document-multiple"));
 
96
    chooserButton->setIcon(koIcon("document-multiple"));
95
97
 
96
98
    KGlobal::mainComponent().dirs()->addResourceType("kis_taskset", "data", "krita/taskset/");
97
99
    m_rserver = new KoResourceServer<TasksetResource>("kis_taskset", "*.kts");