← Back to branch summary

~ubuntu-branches/ubuntu/saucy/digikam/saucy

« back to all changes in this revision

Viewing changes to libs/imageproperties/imagepropertiessidebarcamgui.cpp

  • Committer: Bazaar Package Importer
  • Author(s): Scott Kitterman
  • Date: 2010-12-21 23:19:11 UTC
  • mfrom: (1.2.33 upstream) (3.1.7 experimental)
  • Revision ID: james.westby@ubuntu.com-20101221231911-z9jip7s5aht1jqn9
Tags: 2:1.7.0-1ubuntu1
* Merge from Debian Experimental. Remaining Ubuntu changes:
  - Export .pot name and copy to plugins in debian/rules
  - Version build-depends on kipi-plugins-dev to ensure build is against the
    same version on all archs
* Drop debian/patches/kubuntu_01_linker.diff, incoporated upstream
* Remove patches directory and unused patches

Show diffs side-by-side

added added

removed removed

Lines of Context:
libs/imageproperties/imagepropertiessidebarcamgui.cpp
87
87
    CameraItemPropertiesTab*    cameraItemTab;
88
88
};
89
89
 
90
 
ImagePropertiesSideBarCamGui::ImagePropertiesSideBarCamGui(QWidget *parent,
91
 
                                                           SidebarSplitter *splitter,
92
 
                                                           KMultiTabBarPosition side,
93
 
                                                           bool mimimizedDefault)
94
 
                            : Sidebar(parent, splitter, side, mimimizedDefault),
95
 
                              d(new ImagePropertiesSideBarCamGuiPriv)
 
90
ImagePropertiesSideBarCamGui::ImagePropertiesSideBarCamGui(QWidget* parent,
 
91
        SidebarSplitter* splitter,
 
92
        KMultiTabBarPosition side,
 
93
        bool mimimizedDefault)
 
94
    : Sidebar(parent, splitter, side, mimimizedDefault),
 
95
      d(new ImagePropertiesSideBarCamGuiPriv)
96
96
{
97
97
    d->cameraItemTab = new CameraItemPropertiesTab(parent);
98
98
    d->metadataTab   = new ImagePropertiesMetaDataTab(parent);
119
119
}
120
120
 
121
121
void ImagePropertiesSideBarCamGui::itemChanged(GPItemInfo* itemInfo, const KUrl& url,
122
 
                                               const QByteArray& exifData,
123
 
                                               CameraIconView* view, CameraIconItem* item)
 
122
        const QByteArray& exifData,
 
123
        CameraIconView* view, CameraIconItem* item)
124
124
{
125
125
    if (!itemInfo)
 
126
    {
126
127
        return;
 
128
    }
127
129
 
128
130
    d->metaData.setExif(exifData);
129
131
    d->itemInfo           = itemInfo;
160
162
void ImagePropertiesSideBarCamGui::slotChangedTab(QWidget* tab)
161
163
{
162
164
    if (!d->itemInfo)
 
165
    {
163
166
        return;
 
167
    }
164
168
 
165
169
    setCursor(Qt::WaitCursor);
166
170