← Back to branch summary

~ubuntu-branches/ubuntu/trusty/digikam/trusty

« back to all changes in this revision

Viewing changes to utilities/imageeditor/canvas/dimginterface.h

  • Committer: Bazaar Package Importer
  • Author(s): Luka Renko
  • Date: 2010-02-04 07:46:57 UTC
  • mfrom: (3.2.10 sid)
  • Revision ID: james.westby@ubuntu.com-20100204074657-hqzwjn4timlfw265
Tags: 2:1.1.0-1ubuntu1
https://launchpad.net/bugs/501135
https://launchpad.net/bugs/500581
https://launchpad.net/bugs/350280
https://launchpad.net/bugs/510346
* New upstream release:
  - Rename in BQM fails with multi dot names (LP: #501135)
  - Add collection with similar name fails (LP: #500581)
  - Add SMB folder error message (LP: #350280)
  - Zoom indicators indicate wrong magnification (LP: #510346)
* Merge with Debian, remaining changes:
  - Export .pot name and copy to plugins in debian/rules
  - Build-depend on libkipi7-dev, libkexiv2-8-dev and 
    libkdcraw8-dev (KDE 4.3 -> 4.4)
  - Build-depend on libmarble-dev (was disabled temporarily 
    in Debian due to 4.3.4 regression)

Show diffs side-by-side

added added

removed removed

Lines of Context:
utilities/imageeditor/canvas/dimginterface.h
63
63
    void   load(const QString& filename, IOFileSettingsContainer *iofileSettings);
64
64
    void   applyTransform(const IccTransform& transform);
65
65
    void   updateColorManagement();
66
 
 
67
 
    void   setICCSettings(ICCSettingsContainer *cmSettings);
68
66
    void   setSoftProofingEnabled(bool enabled);
69
 
    void   setExposureSettings(ExposureSettingsContainer *expoSettings);
 
67
 
 
68
    void   setICCSettings(ICCSettingsContainer* cmSettings);
 
69
    ICCSettingsContainer* getICCSettings();
 
70
 
 
71
    void   setExposureSettings(ExposureSettingsContainer* expoSettings);
 
72
    ExposureSettingsContainer* getExposureSettings();
 
73
 
70
74
    void   setExifOrient(bool exifOrient);
71
75
    void   setDisplayingWidget(QWidget *widget);
72
76
 
151
155
    QByteArray            getIptc();
152
156
    QByteArray            getXmp();
153
157
 
154
 
    ICCSettingsContainer *getICCSettings();
155
 
 
156
158
    QString               getImageFileName();
157
159
    QString               getImageFilePath();
158
160
    QString               getImageFormat();
159
161
 
160
 
    QColor                underExposureColor();
161
 
    QColor                overExposureColor();
162
 
 
163
162
protected Q_SLOTS:
164
163
 
165
164
    void   slotImageLoaded(const LoadingDescription& loadingDescription, const DImg& img);