← Back to branch summary

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

« back to all changes in this revision

Viewing changes to plugins/textshape/dialogs/SimpleTableWidget.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/textshape/dialogs/SimpleTableWidget.cpp
23
23
#include <KoTextLayoutCellHelper.h>
24
24
#include <KoZoomHandler.h>
25
25
#include <KoColorPopupAction.h>
 
26
#include <KoIcon.h>
26
27
 
27
28
#include <KAction>
28
29
#include <KDebug>
46
47
    widget.mergeCells->setDefaultAction(tool->action("merge_tablecells"));
47
48
    widget.splitCells->setDefaultAction(tool->action("split_tablecells"));
48
49
 
49
 
     KAction *action = new KAction(KIcon("borderpainter"), "activate_borderpainter", this);
 
50
     KAction *action = new KAction(koIcon("borderpainter"), "activate_borderpainter", this);
50
51
    action->setToolTip(i18n("Select a border style and paint that style onto a table"));
51
52
    connect(action, SIGNAL(activated()), this, SLOT(restartPainting()));
52
53
    widget.border->setDefaultAction(action);
56
57
    fillBorderButton(QColor(0,0,0));
57
58
 
58
59
    KoColorPopupAction *actionBorderColor = new KoColorPopupAction(this);
59
 
    actionBorderColor->setIcon(KIcon("format-fill-color"));
 
60
    actionBorderColor->setIcon(koIcon("format-fill-color"));
60
61
    actionBorderColor->setText(i18n("Set Border Color..."));
61
62
    widget.border->addAction(actionBorderColor);
62
63
    connect(actionBorderColor, SIGNAL(colorChanged(const KoColor &)), this, SLOT(setBorderColor(const KoColor &)));