← Back to branch summary

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

« back to all changes in this revision

Viewing changes to plugins/vectorshape/VectorTool.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:
plugins/vectorshape/VectorTool.cpp
25
25
#include <QToolButton>
26
26
#include <QGridLayout>
27
27
#include <KLocale>
28
 
#include <KIconLoader>
29
28
#include <KUrl>
30
29
#include <KFileDialog>
31
30
#include <KIO/Job>
32
31
 
 
32
#include <KoIcon.h>
33
33
#include <KoCanvasBase.h>
34
34
#include <KoImageCollection.h>
35
35
#include <KoSelection.h>
72
72
    QToolButton *button = 0;
73
73
 
74
74
    button = new QToolButton(optionWidget);
75
 
    button->setIcon(SmallIcon("document-open"));
76
 
    button->setToolTip(i18n( "Open EMF/WMF Shape"));
 
75
    button->setIcon(koIcon("document-open"));
 
76
    button->setToolTip(i18n("Open Vector Image (EMF/WMF/SVM)"));
77
77
    layout->addWidget(button, 0, 0);
78
78
    connect(button, SIGNAL(clicked(bool)), this, SLOT(changeUrlPressed()));
79
79