[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    extragear/graphics/digikam/digikam
From:       Gilles Caulier <caulier.gilles () kdemail ! net>
Date:       2007-02-02 13:18:30
Message-ID: 1170422310.764523.2266.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 629353 by cgilles:

digiKam from trunk : Preview Mode pop-up menu : add "Move to Trash" current item option

 M  +3 -4      albumwidgetstack.cpp  
 M  +3 -1      digikamview.cpp  
 M  +0 -2      imagepreviewview.cpp  
 M  +2 -2      imagepreviewwidget.cpp  


--- trunk/extragear/graphics/digikam/digikam/albumwidgetstack.cpp #629352:629353
@@ -122,9 +122,8 @@
         else if (previewMode() == PreviewImageMode)
         {
             //FIXME
-            //d->imagePreviewView->setImageInfo();
-            slotPreviewLoaded();
-            //setPreviewMode(AlbumWidgetStack::PreviewAlbumMode);
+            d->imagePreviewView->setImageInfo();
+            //slotPreviewLoaded();
         }
     }    
     else
@@ -174,7 +173,7 @@
 
 void AlbumWidgetStack::slotPreviewLoaded()
 {
-    setPreviewMode(AlbumWidgetStack::PreviewImageMode);
+    setPreviewMode(PreviewImageMode);
 }
 
 }  // namespace Digikam
--- trunk/extragear/graphics/digikam/digikam/digikamview.cpp #629352:629353
@@ -883,6 +883,7 @@
 {
     if (d->albumWidgetStack->previewMode() == AlbumWidgetStack::PreviewAlbumMode)
     {
+        // We will toggle to Preview Item Mode.
         AlbumIconItem *item=0;
 
         if (!iconItem)
@@ -900,11 +901,12 @@
         }
 
         bool hasPrev = d->iconView->firstItem() != item;
-        bool hasNext = d->iconView->lastItem() != item;
+        bool hasNext = d->iconView->lastItem()  != item;
         d->albumWidgetStack->setPreviewItem(item->imageInfo(), hasPrev, hasNext);
     }
     else
     {
+        // We go back to Album Mode.
         d->albumWidgetStack->setPreviewMode( AlbumWidgetStack::PreviewAlbumMode );
     }
 }
--- trunk/extragear/graphics/digikam/digikam/imagepreviewview.cpp #629352:629353
@@ -167,10 +167,8 @@
         popmenu.insertItem(SmallIcon("editimage"), i18n("Edit..."), 12);
         popmenu.insertItem(i18n("Open With"), &openWithMenu, 13);
 
-        /* FIXME
         popmenu.insertSeparator();
         popmenu.insertItem(SmallIcon("edittrash"), i18n("Move to Trash"), 14);
-        */
 
         // Bulk assignment/removal of tags --------------------------
 
--- trunk/extragear/graphics/digikam/digikam/imagepreviewwidget.cpp #629352:629353
@@ -94,12 +94,12 @@
 
     if (d->path.isEmpty())
     {
-        d->pixmap  = QPixmap(contentsRect().size());
+        d->pixmap = QPixmap(contentsRect().size());
 
         updatePixmap();
         update();
         unsetCursor();
-        emit previewFailed();
+        return;
     }
 
     if (!d->previewThread)
[prev in list] [next in list] [prev in thread] [next in thread]