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

« back to all changes in this revision

Viewing changes to plugins/musicshape/SimpleEntryTool.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
* 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:
24
24
 
25
25
#include <kdebug.h>
26
26
#include <klocale.h>
27
 
#include <kicon.h>
28
27
#include <KFileDialog>
29
28
#include <KInputDialog>
30
29
#include <KAction>
31
30
 
 
31
#include <KoIcon.h>
32
32
#include <KoCanvasBase.h>
33
33
#include <KoSelection.h>
34
34
#include <KoShapeManager.h>
87
87
    QActionGroup* actionGroup = new QActionGroup(this);
88
88
    connect(actionGroup, SIGNAL(triggered(QAction*)), this, SLOT(activeActionChanged(QAction*)));
89
89
 
90
 
    KAction* importAction = new KAction(KIcon("document-import"), i18n("Import"), this);
 
90
    KAction* importAction = new KAction(koIcon("document-import"), i18n("Import"), this);
91
91
    addAction("import", importAction);
92
92
    connect(importAction, SIGNAL(triggered()), this, SLOT(importSheet()));
93
93
 
94
 
    KAction* exportAction = new KAction(KIcon("document-export"), i18n("Export"), this);
 
94
    KAction* exportAction = new KAction(koIcon("document-export"), i18n("Export"), this);
95
95
    addAction("export", exportAction);
96
96
    connect(exportAction, SIGNAL(triggered()), this, SLOT(exportSheet()));
97
97
 
98
 
    KAction* addBars = new KAction(KIcon("list-add"), i18n("Add measures"), this);
 
98
    KAction* addBars = new KAction(koIcon("list-add"), i18n("Add measures"), this);
99
99
    addAction("add_bars", addBars);
100
100
    connect(addBars, SIGNAL(triggered()), this, SLOT(addBars()));
101
101