← Back to branch summary

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

« back to all changes in this revision

Viewing changes to kexi/widget/KexiProjectSelectorWidget.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/KexiProjectSelectorWidget.cpp
19
19
 
20
20
#include "KexiProjectSelectorWidget.h"
21
21
 
22
 
#include <kexidb/drivermanager.h>
23
 
#include <kexidb/connectiondata.h>
24
 
#include <kexidb/utils.h>
 
22
#include <db/drivermanager.h>
 
23
#include <db/connectiondata.h>
 
24
#include <db/utils.h>
25
25
#include <core/kexi.h>
 
26
#include <KoIcon.h>
26
27
 
27
28
#include <kapplication.h>
28
 
#include <kiconloader.h>
29
29
#include <kmimetype.h>
30
30
#include <klocale.h>
31
31
#include <kdebug.h>
45
45
    Private() {
46
46
        selectable = true;
47
47
    }
48
 
    QPixmap fileicon, dbicon;
 
48
    QIcon fileicon, dbicon;
49
49
    bool showProjectNameColumn;
50
50
    bool showConnectionColumns;
51
51
    bool selectable;
111
111
    d->showConnectionColumns = showConnectionColumns;
112
112
    list()->installEventFilter(this);
113
113
 
114
 
    const QString iconname(KexiDB::defaultFileBasedDriverIcon());
115
 
    d->fileicon = KIconLoader::global()->loadMimeTypeIcon(iconname, KIconLoader::Desktop);
116
 
    setWindowIcon(KIcon(iconname));
117
 
    d->dbicon = SmallIcon("server-database");
 
114
    d->fileicon = KIcon(KexiDB::defaultFileBasedDriverIconName());
 
115
    setWindowIcon(d->fileicon);
 
116
    d->dbicon = koIcon("server-database");
118
117
// list->setHScrollBarMode( QScrollView::AlwaysOn );
119
118
 
120
119
    QTreeWidgetItem *headerItem = list()->headerItem();
306
305
    KexiDB::ConnectionData _cdata(cdata);
307
306
    KexiProjectSet *prj_set = new KexiProjectSet(_cdata);
308
307
    init(prj_set, showProjectNameColumn, showConnectionColumns);
309
 
    setButtonGuiItem(Ok, KGuiItem(i18n("&Open"), "document-open",
 
308
    setButtonGuiItem(Ok, KGuiItem(i18n("&Open"), koIconName("document-open"),
310
309
                                  i18n("Open Database Connection")));
311
310
 
312
311
    m_sel->label()->setText(i18n("Select a project on <b>%1</b> database server to open:",