← Back to branch summary

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

« back to all changes in this revision

Viewing changes to libs/widgets/KoResourceItemChooser.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:
libs/widgets/KoResourceItemChooser.cpp
36
36
#include <QSplitter>
37
37
 
38
38
#include <kfiledialog.h>
39
 
#include <kiconloader.h>
40
39
#include <klocale.h>
41
40
#include <kdebug.h>
42
41
#include <klineedit.h>
48
47
#include <knewstuff3/uploaddialog.h>
49
48
#endif
50
49
 
 
50
#include <KoIcon.h>
 
51
 
51
52
#include "KoResourceServerAdapter.h"
52
53
#include "KoResourceItemView.h"
53
54
#include "KoResourceItemDelegate.h"
124
125
    QGridLayout* buttonLayout = new QGridLayout;
125
126
 
126
127
    QPushButton *button = new QPushButton( this );
127
 
    button->setIcon( SmallIcon("document-open") );
 
128
    button->setIcon(koIcon("document-open"));
128
129
    button->setToolTip( i18n("Import Resource") );
129
130
    button->setEnabled( true );
130
131
    d->buttonGroup->addButton( button, Button_Import );
131
132
    buttonLayout->addWidget( button, 0, 0 );
132
133
 
133
134
    button = new QPushButton( this );
134
 
    button->setIcon( SmallIcon("trash-empty") );
 
135
    button->setIcon(koIcon("trash-empty"));
135
136
    button->setToolTip( i18n("Delete Resource") );
136
137
    button->setEnabled( false );
137
138
    d->buttonGroup->addButton( button, Button_Remove );
138
139
    buttonLayout->addWidget( button, 0, 1 );
139
140
 
140
141
    button = new QPushButton( this );
141
 
    button->setIcon( SmallIcon("download") );
 
142
    button->setIcon(koIcon("download"));
142
143
    button->setToolTip( i18n("Download Resource") );
143
144
    button->setEnabled( true );
144
145
    button->hide();
146
147
    buttonLayout->addWidget( button, 0, 3 );
147
148
 
148
149
    button = new QPushButton( this );
149
 
    button->setIcon( SmallIcon("go-up") );
 
150
    button->setIcon(koIcon("go-up"));
150
151
    button->setToolTip( i18n("Share Resource") );
151
152
    button->setEnabled( false );
152
153
    button->hide();