[Digikam-devel] [Bug 129450] cannot exit preview mode within empty album

[Gilles Caulier]

------- You are receiving this mail because: -------
You are the assignee for the bug, or are watching the assignee.
         
http://bugs.kde.org/show_bug.cgi?id=129450         
caulier.gilles free fr changed:

           What    |Removed                     |Added
----------------------------------------------------------------------------
             Status|UNCONFIRMED                 |RESOLVED
         Resolution|                            |FIXED



------- Additional Comments From caulier.gilles free fr  2006-06-20 12:15 -------
SVN commit 553177 by cgilles:

digikam from trunk : fix image preview mode rules with empty album (3)
BUG: 129450

 M  +9 -0      albumwidgetstack.cpp  
 M  +3 -3      digikamview.cpp  


--- trunk/extragear/graphics/digikam/digikam/albumwidgetstack.cpp #553176:553177
 @ -136,8 +136,17  @
 
 void AlbumWidgetStack::setPreviewItem(const QString& path)
 {
+    if (path.isNull())
+    {
+        d->previewItemWidget->setImagePath();
+        slotPreviewFailed();
+    }
+    
     if (previewMode() == PreviewItemMode)
+    {
+        visibleWidget()->setFocus();
         d->previewItemWidget->setImagePath(path);
+    }
 }
 
 int AlbumWidgetStack::previewMode(void)
--- trunk/extragear/graphics/digikam/digikam/digikamview.cpp #553176:553177
 @ -754,6 +754,8  @
     AlbumIconItem *currItem = dynamic_cast<AlbumIconItem*>(d->iconView->currentItem());
     if (currItem)
         slot_imagePreview(currItem);
+    else
+        slot_imagePreview(0);
 }
 
 void DigikamView::slotEditImage()
 @ -767,6 +769,7  @
 {
     if (d->albumPreviews->previewMode() == AlbumWidgetStack::PreviewAlbumMode)
     {
+        d->albumPreviews->setPreviewItem();
         d->albumPreviews->setPreviewMode( AlbumWidgetStack::PreviewItemMode );
         AlbumIconItem *item=0;
 
 @ -774,10 +777,7  @
         {
             item = d->iconView->firstSelectedItem();
             if (!item) 
-            {
-                d->albumPreviews->setPreviewItem();
                 return;
-            }
         }
         else
         {