← Back to branch summary

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

« back to all changes in this revision

Viewing changes to kexi/widget/relations/KexiRelationsView.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/widget/relations/KexiRelationsView.cpp
29
29
#include <kcombobox.h>
30
30
#include <klocale.h>
31
31
#include <KDebug>
32
 
#include <kiconloader.h>
33
32
#include <kpushbutton.h>
34
33
#include <KMenu>
35
34
#include <KDialog>
36
35
 
37
 
#include <kexidb/connection.h>
38
 
#include <kexidb/utils.h>
 
36
#include <db/connection.h>
 
37
#include <db/utils.h>
 
38
 
 
39
#include <KoIcon.h>
 
40
 
39
41
#include <kexiutils/utils.h>
40
42
 
41
43
#include <kexiproject.h>
120
122
    d->areaPopup = new KMenu(this);
121
123
    d->areaPopup->setObjectName("areaPopup");
122
124
 
123
 
    d->appendSelectedFieldAction = new KAction(KIcon("add_field"), i18n("&Append Field"), this);
 
125
    d->appendSelectedFieldAction = new KAction(koIcon("add_field"), i18n("&Append Field"), this);
124
126
    d->appendSelectedFieldAction->setObjectName("relationsview_appendField");
125
127
    connect(d->appendSelectedFieldAction, SIGNAL(triggered()),
126
128
            this, SLOT(appendSelectedFields()));
127
129
 
128
 
    d->appendSelectedFieldsAction = new KAction(KIcon("add_field"), i18n("&Append Fields"), this);
 
130
    d->appendSelectedFieldsAction = new KAction(koIcon("add_field"), i18n("&Append Fields"), this);
129
131
    d->appendSelectedFieldsAction->setObjectName("relationsview_appendFields");
130
132
    connect(d->appendSelectedFieldsAction, SIGNAL(triggered()),
131
133
            this, SLOT(appendSelectedFields()));
132
134
 
133
 
    d->openSelectedTableAction = new KAction(KIcon("document-open"), i18n("&Open Table"), this);
 
135
    d->openSelectedTableAction = new KAction(koIcon("document-open"), i18n("&Open Table"), this);
134
136
    d->openSelectedTableAction->setObjectName("relationsview_openTable");
135
137
    connect(d->openSelectedTableAction, SIGNAL(triggered()),
136
138
            this, SLOT(openSelectedTable()));
137
139
 
138
 
    d->designSelectedTableAction = new KAction(KIcon("document-properties"), i18n("&Design Table"), this);
 
140
    d->designSelectedTableAction = new KAction(koIcon("document-properties"), i18n("&Design Table"), this);
139
141
    connect(d->designSelectedTableAction, SIGNAL(triggered()),
140
142
            this, SLOT(designSelectedTable()));
141
143
    d->designSelectedTableAction->setObjectName("relationsview_designTable");
380
382
    if (currentTableContainer /*&& currentTableContainer->schema()->table()*/) {
381
383
        /*! @todo what about query? */
382
384
        d->tableQueryPopup->clear();
383
 
        d->tableQueryPopup->addTitle(KIcon("table"),
 
385
        d->tableQueryPopup->addTitle(koIcon("table"),
384
386
                                     QString(d->scrollArea->focusedTableContainer()->schema()->name()) + " : " + i18n("Table"));
385
387
        QStringList selectedFieldNames(currentTableContainer->selectedFieldNames());
386
388
        if (currentTableContainer && !selectedFieldNames.isEmpty()) {