← Back to branch summary

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

« back to all changes in this revision

Viewing changes to flow/plugins/dockers/stencilboxdocker/StencilBoxDocker.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:
flow/plugins/dockers/stencilboxdocker/StencilBoxDocker.cpp
32
32
#include <KoShapeGroup.h>
33
33
#include <KoZoomHandler.h>
34
34
#include <KoProperties.h>
 
35
#include <KoIcon.h>
35
36
 
36
37
#include <klocale.h>
37
38
#include <kcombobox.h>
38
39
#include <kdebug.h>
39
 
#include <kiconloader.h>
40
40
#include <kstandarddirs.h>
41
41
#include <kcomponentdata.h>
42
42
#include <kdesktopfile.h>
43
43
#include <kconfiggroup.h>
44
 
#include <kicon.h>
45
44
#include <kmessagebox.h>
46
45
#include <klineedit.h>
47
46
#include <kapplication.h>
98
97
    setWidget(mainWidget);
99
98
 
100
99
    m_menu = new QMenu();
101
 
    QAction* ghnsAction = m_menu->addAction(KIcon("get-hot-new-stuff"), i18n("Get more stencils"));
102
 
    QAction* installAction = m_menu->addAction(KIcon("document-open-folder"), i18n("Install stencil"));
 
100
    QAction *ghnsAction = m_menu->addAction(koIcon("get-hot-new-stuff"), i18n("Get more stencils"));
 
101
    QAction *installAction = m_menu->addAction(koIcon("document-open-folder"), i18n("Install stencil"));
103
102
 
104
103
    connect(ghnsAction, SIGNAL(triggered()), this, SLOT(getHotNewStuff()));
105
104
    connect(installAction, SIGNAL(triggered()), this, SLOT(installStencil()));
106
105
 
107
106
    m_button = new QToolButton;
108
 
    m_button->setIcon(SmallIcon("list-add"));
 
107
    m_button->setIcon(koIcon("list-add"));
109
108
    m_button->setToolTip(i18n("More shapes"));
110
109
    m_button->setMenu(m_menu);
111
110
    m_button->setPopupMode(QToolButton::InstantPopup);
227
226
            temp.id = shapeTemplate.id;
228
227
            temp.name = shapeTemplate.name;
229
228
            temp.toolTip = shapeTemplate.toolTip;
230
 
            temp.icon = KIcon(shapeTemplate.icon);
 
229
            temp.icon = KIcon(shapeTemplate.iconName);
231
230
            temp.properties = shapeTemplate.properties;
232
231
 
233
232
            if(familyMap.contains(shapeTemplate.family))
248
247
            temp.id = factory->id();
249
248
            temp.name = factory->name();
250
249
            temp.toolTip = factory->toolTip();
251
 
            temp.icon = KIcon(factory->icon());
 
250
            temp.icon = KIcon(factory->iconName());
252
251
            temp.properties = 0;
253
252
 
254
253
            if(familyMap.contains(factory->family()))