[Digikam-devel] extragear/graphics/digikam/utilities/cameragui

[Gilles Caulier]

SVN commit 528511 by cgilles:

digikam from trunk : camera gui bug fix with gphoto camera : please to sidebar to enable current item selected in camera icon view in all cases (like main interface do), especially with metadata tab if none Exif information cannot be get from camera.

CCMAIL: digikam-devel at kde.org

 M  +8 -3      cameraui.cpp  
 M  +1 -1      cameraui.h  


--- trunk/extragear/graphics/digikam/utilities/cameragui/cameraui.cpp #528510:528511
@@ -152,10 +152,10 @@
     ImagePropertiesSideBarCamGui *rightSidebar;
 };    
 
-CameraUI::CameraUI(QWidget* parent, const QString& title,
+CameraUI::CameraUI(QWidget* parent, const QString& cameraTitle,
                    const QString& model, const QString& port,
                    const QString& path)
-        : KDialogBase(Plain, title,
+        : KDialogBase(Plain, cameraTitle,
                       Help|User1|User2|User3|Close, Close,
                       parent, 0, false, true,
                       i18n("D&elete"),
@@ -804,7 +804,8 @@
 {
     kdDebug() << "Size of Exif metadata from camera = " << exifData.size() << endl;
     CameraIconViewItem* item = dynamic_cast<CameraIconViewItem*>(d->view->currentItem());
-    d->rightSidebar->itemChanged(item->itemInfo(), KURL::KURL(), exifData, d->view, item);
+    KURL url(item->itemInfo()->folder + "/" + item->itemInfo()->name);
+    d->rightSidebar->itemChanged(item->itemInfo(), url, exifData, d->view, item);
 }
 
 void CameraUI::slotItemsSelected(CameraIconViewItem* item, bool selected)
@@ -813,7 +814,11 @@
     d->deleteMenu->setItemEnabled(0, selected);
 
     if (selected)
+    {
+        KURL url(item->itemInfo()->folder + "/" + item->itemInfo()->name);
+        d->rightSidebar->itemChanged(item->itemInfo(), url, QByteArray(), d->view, item);
         d->controller->getExif(item->itemInfo()->folder, item->itemInfo()->name);
+    }
     else
         d->rightSidebar->slotNoCurrentItem();
 }
--- trunk/extragear/graphics/digikam/utilities/cameragui/cameraui.h #528510:528511
@@ -48,7 +48,7 @@
 
 public:
 
-    CameraUI(QWidget* parent, const QString& title,
+    CameraUI(QWidget* parent, const QString& cameraTitle,
              const QString& model, const QString& port,
              const QString& path);
     ~CameraUI();