← Back to branch summary

~ubuntu-branches/ubuntu/trusty/digikam/trusty

« back to all changes in this revision

Viewing changes to core/imageplugins/decorate/imageplugin_decorate.cpp

  • Committer: Package Import Robot
  • Author(s): Mark Purcell
  • Date: 2012-09-27 21:41:30 UTC
  • mfrom: (1.2.43)
  • mto: This revision was merged to the branch mainline in revision 86.
  • Revision ID: package-import@ubuntu.com-20120927214130-i8v3ufr21nesp29i
Tags: 4:3.0.0~beta1a-1
http://bugs.debian.org/688142
* New upstream release

* Fix "wrongly conflicts phonon-backend-vlc" dropped (Closes: #688142)
* debian/watch include download.kde.org

* digikam 3.0.0 uses features from unreleased kdegraphics >=4.10 & ships 
a private version of the kdegraphics libs - this is not the Debian way :-(
* Unsatisfactory Conflicts: libkipi8, libkexiv2-10, libkdcraw20, libksane0
* Suspend digikam-dbg >130Mb

Show diffs side-by-side

added added

removed removed

Lines of Context:
core/imageplugins/decorate/imageplugin_decorate.cpp
46
46
K_PLUGIN_FACTORY( DecorateFactory, registerPlugin<ImagePlugin_Decorate>(); )
47
47
K_EXPORT_PLUGIN ( DecorateFactory("digikamimageplugin_decorate") )
48
48
 
49
 
class ImagePlugin_Decorate::ImagePlugin_DecoratePriv
 
49
class ImagePlugin_Decorate::Private
50
50
{
51
51
public:
52
52
 
53
 
    ImagePlugin_DecoratePriv() :
 
53
    Private() :
54
54
        textureAction(0),
55
55
        borderAction(0),
56
56
        insertTextAction(0)
64
64
 
65
65
ImagePlugin_Decorate::ImagePlugin_Decorate(QObject* const parent, const QVariantList&)
66
66
    : ImagePlugin(parent, "ImagePlugin_Decorate"),
67
 
      d(new ImagePlugin_DecoratePriv)
 
67
      d(new Private)
68
68
{
69
69
    d->insertTextAction = new KAction(KIcon("insert-text"), i18n("Insert Text..."), this);
70
70
    d->insertTextAction->setShortcut(KShortcut(Qt::SHIFT+Qt::CTRL+Qt::Key_T));
102
102
 
103
103
void ImagePlugin_Decorate::slotInsertText()
104
104
{
105
 
    InsertTextTool* tool = new InsertTextTool(this);
106
 
    loadTool(tool);
 
105
    loadTool(new InsertTextTool(this));
107
106
}
108
107
 
109
108
void ImagePlugin_Decorate::slotBorder()
110
109
{
111
 
    BorderTool* tool = new BorderTool(this);
112
 
    loadTool(tool);
 
110
    loadTool(new BorderTool(this));
113
111
}
114
112
 
115
113
void ImagePlugin_Decorate::slotTexture()
116
114
{
117
 
    TextureTool* tool = new TextureTool(this);
118
 
    loadTool(tool);
 
115
    loadTool(new TextureTool(this));
119
116
}
120
117
 
121
118
} // namespace DigikamDecorateImagePlugin