← Back to branch summary

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

« back to all changes in this revision

Viewing changes to kexi/core/KexiWindow.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/core/KexiWindow.cpp
29
29
#include "kexipartinfo.h"
30
30
#include "kexiproject.h"
31
31
 
32
 
#include <kexidb/connection.h>
33
 
#include <kexidb/utils.h>
 
32
#include <db/connection.h>
 
33
#include <db/utils.h>
34
34
#include <kexiutils/utils.h>
35
35
#include <kexiutils/SmallToolButton.h>
36
36
#include <kexiutils/FlowLayout.h>
42
42
 
43
43
#include <KDebug>
44
44
#include <KApplication>
45
 
#include <KIconLoader>
46
45
#include <KToolBar>
47
46
#include <KActionCollection>
48
47
#include <KDialog>
257
256
    */
258
257
    /*TODO
259
258
    // "data_execute"
260
 
      a = new KAction(KIcon("system-run"), i18n("&Execute"), this);
 
259
      a = new KAction(koIcon("system-run"), i18n("&Execute"), this);
261
260
      //a->setToolTip(i18n("")); //TODO
262
261
      //a->setWhatsThis(i18n("")); //TODO */
263
262
 
354
353
    if (view)
355
354
        d->stack->removeWidget(view);
356
355
 
 
356
    d->setIndexForView(mode, -1);
 
357
 
357
358
    d->openedViewModes |= mode;
358
359
    d->openedViewModes ^= mode;
359
360
}
510
511
    dirtyChanged(d->viewThatRecentlySetDirtyFlag); //update
511
512
}
512
513
 
513
 
QString KexiWindow::itemIcon()
 
514
QString KexiWindow::itemIconName()
514
515
{
515
516
    if (!d->part || !d->part->info()) {
516
517
        KexiView *v = selectedView();
519
520
        }
520
521
        return QString();
521
522
    }
522
 
    return d->part->info()->itemIcon();
 
523
    return d->part->info()->itemIconName();
523
524
}
524
525
 
525
526
KexiPart::GUIClient* KexiWindow::guiClient() const
1014
1015
        v->windowAttached();
1015
1016
}
1016
1017
 
 
1018
bool KexiWindow::saveSettings()
 
1019
{
 
1020
    bool result = true;
 
1021
    for (int i = 0; i < d->stack->count(); ++i) {
 
1022
        KexiView *view = qobject_cast<KexiView*>(d->stack->widget(i));
 
1023
        if (!view->saveSettings()) {
 
1024
            result = false;
 
1025
        }
 
1026
    }
 
1027
    return result;
 
1028
}
 
1029
 
1017
1030
Kexi::ViewMode KexiWindow::creatingViewsMode() const
1018
1031
{
1019
1032
    return d->creatingViewsMode;