← Back to branch summary

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

« back to all changes in this revision

Viewing changes to kexi/main/startup/KexiOpenProjectAssistant.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/main/startup/KexiOpenProjectAssistant.cpp
24
24
 
25
25
#include <KTabWidget>
26
26
 
 
27
#include <KoIcon.h>
27
28
#include <widget/KexiProjectSelectorWidget.h>
28
29
#include <widget/KexiConnectionSelectorWidget.h>
29
30
#include <widget/KexiFileWidget.h>
30
31
#include <kexiutils/KexiLinkWidget.h>
31
 
#include <kexidb/utils.h>
 
32
#include <db/utils.h>
32
33
#include <kexiprojectset.h>
33
34
#include <kexiprojectdata.h>
34
35
#include <kexi.h>
47
48
    tabWidget->setDocumentMode(true);
48
49
 
49
50
    m_fileSelectorWidget = new QWidget;
50
 
    tabWidget->addTab(m_fileSelectorWidget, KIcon(KexiDB::defaultFileBasedDriverIcon()),
 
51
    tabWidget->addTab(m_fileSelectorWidget, KIcon(KexiDB::defaultFileBasedDriverIconName()),
51
52
                      i18n("Projects Stored in File"));
52
53
    fileSelector = new KexiConnectionSelectorWidget(
53
54
        Kexi::connset(),
63
64
            this, SLOT(next()));
64
65
                      
65
66
    m_connSelectorWidget = new QWidget;
66
 
    tabWidget->addTab(m_connSelectorWidget, KIcon(KEXI_ICON_DATABASE_SERVER),
 
67
    tabWidget->addTab(m_connSelectorWidget, KIcon(KEXI_DATABASE_SERVER_ICON_NAME),
67
68
                      i18n("Projects Stored on Database Server"));
68
69
 
69
70
    setFocusWidget(tabWidget);
279
280
    //! @todo + _details
280
281
    if (!d->messageWidgetActionTryAgain) {
281
282
        d->messageWidgetActionTryAgain = new QAction(
282
 
            KIcon("view-refresh"), i18n("Try Again"), this);
 
283
            koIcon("view-refresh"), i18n("Try Again"), this);
283
284
        connect(d->messageWidgetActionTryAgain, SIGNAL(triggered()),
284
285
                this, SLOT(tryAgainActionTriggered()));
285
286
    }