← Back to branch summary

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

« back to all changes in this revision

Viewing changes to kexi/plugins/forms/kexiformmanager.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:
kexi/plugins/forms/kexiformmanager.cpp
24
24
#include "kexiformview.h"
25
25
#include "kexidatasourcepage.h"
26
26
 
 
27
#include <KoIcon.h>
 
28
 
27
29
#include <QToolButton>
28
30
#include <KAction>
29
31
#include <KToggleAction>
161
163
    }
162
164
    else {
163
165
        d->dragConnectionAction = new KToggleAction(
164
 
            KIcon("signalslot"), i18n("Connect Signals/Slots"), d->collection);
 
166
            koIcon("signalslot"), i18n("Connect Signals/Slots"), d->collection);
165
167
        d->dragConnectionAction->setObjectName("drag_connection");
166
168
//        d->widgetActionGroup->addAction(d->dragConnectionAction);
167
169
        connect(d->dragConnectionAction, SIGNAL(triggered()),
171
173
#endif
172
174
 
173
175
    d->pointerAction = new KToggleAction(
174
 
        KIcon("mouse_pointer"), i18n("Pointer"), d->collection);
 
176
        koIcon("mouse_pointer"), i18n("Pointer"), d->collection);
175
177
    d->pointerAction->setObjectName("edit_pointer");
176
178
    d->widgetActionGroup->addAction(d->pointerAction);
177
179
    connect(d->pointerAction, SIGNAL(triggered()),
216
218
#ifdef KEXI_DEBUG_GUI
217
219
    KConfigGroup generalGroup(KGlobal::config()->group("General"));
218
220
    if (generalGroup.readEntry("ShowInternalDebugger", false)) {
219
 
        KAction *a = new KAction(KIcon("run-build-file"), i18n("Show Form UI Code"), this);
 
221
        KAction *a = new KAction(koIcon("run-build-file"), i18n("Show Form UI Code"), this);
220
222
        d->collection->addAction("show_form_ui", a);
221
223
        a->setShortcut(Qt::CTRL + Qt::Key_U);
222
224
        connect(a, SIGNAL(triggered()), this, SLOT(showFormUICode()));