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

List:       kde-commits
Subject:    branches/extragear/kde3/graphics/digikam/utilities/cameragui
From:       Gilles Caulier <caulier.gilles () gmail ! com>
Date:       2009-05-14 12:52:18
Message-ID: 1242305538.333087.5188.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 967940 by cgilles:

backport commit #967936 from trunk


 M  +7 -6      cameraui.cpp  
 M  +15 -15    cameraui.h  


--- branches/extragear/kde3/graphics/digikam/utilities/cameragui/cameraui.cpp #967939:967940
@@ -7,7 +7,7 @@
  * Description : Camera interface dialog
  *
  * Copyright (C) 2004-2005 by Renchi Raju <renchi@pooh.tam.uiuc.edu>
- * Copyright (C) 2006-2008 by Gilles Caulier <caulier dot gilles at gmail dot com>
+ * Copyright (C) 2006-2009 by Gilles Caulier <caulier dot gilles at gmail dot com>
  *
  * This program is free software; you can redistribute it
  * and/or modify it under the terms of the GNU General
@@ -1190,9 +1190,10 @@
     }
 
     // -- Download camera items -------------------------------
+    // Since we show camera items in reverse order, downloading need to be done also in reverse order.
 
-    for (IconItem* item = d->view->firstItem(); item;
-         item = item->nextItem())
+    for (IconItem* item = d->view->lastItem(); item;
+         item = item->prevItem())
     {
         if (onlySelected && !(item->isSelected()))
             continue;
@@ -1663,7 +1664,7 @@
     emit signalAlbumSettingsChanged();
 }
 
-void CameraUI::slotFirstItem(void)
+void CameraUI::slotFirstItem()
 {
     CameraIconViewItem *currItem = dynamic_cast<CameraIconViewItem*>(d->view->firstItem());
     d->view->clearSelection();
@@ -1672,7 +1673,7 @@
        d->view->setCurrentItem(currItem);
 }
 
-void CameraUI::slotPrevItem(void)
+void CameraUI::slotPrevItem()
 {
     CameraIconViewItem *currItem = dynamic_cast<CameraIconViewItem*>(d->view->currentItem());
     d->view->clearSelection();
@@ -1681,7 +1682,7 @@
        d->view->setCurrentItem(currItem->prevItem());
 }
 
-void CameraUI::slotNextItem(void)
+void CameraUI::slotNextItem()
 {
     CameraIconViewItem *currItem = dynamic_cast<CameraIconViewItem*>(d->view->currentItem());
     d->view->clearSelection();
--- branches/extragear/kde3/graphics/digikam/utilities/cameragui/cameraui.h #967939:967940
@@ -2,24 +2,24 @@
  *
  * This file is a part of digiKam project
  * http://www.digikam.org
- * 
+ *
  * Date        : 2004-09-16
  * Description : Camera interface dialog
- * 
+ *
  * Copyright (C) 2004-2005 by Renchi Raju <renchi@pooh.tam.uiuc.edu>
- * Copyright (C) 2006-2008 by Gilles Caulier <caulier dot gilles at gmail dot com>
+ * Copyright (C) 2006-2009 by Gilles Caulier <caulier dot gilles at gmail dot com>
  *
  * This program is free software; you can redistribute it
  * and/or modify it under the terms of the GNU General
  * Public License as published by the Free Software Foundation;
  * either version 2, or (at your option)
  * any later version.
- * 
+ *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
- * 
+ *
  * ============================================================ */
 
 #ifndef CAMERAUI_H
@@ -62,15 +62,15 @@
     bool isClosed() const;
 
     bool autoRotateJpegFiles() const;
-    
+
     /** Get status of JPEG conversion files to lossless format during download.*/
     bool convertLosslessJpegFiles() const;
     QString losslessFormat();
 
     QString cameraTitle() const;
-    
+
 signals:
-    
+
     void signalLastDestination(const KURL&);
     void signalAlbumSettingsChanged();
 
@@ -79,10 +79,10 @@
     void slotDownload(bool onlySelected, bool deleteAfter, Album *album=0);
 
 protected:
-    
+
     void closeEvent(QCloseEvent* e);
     void keyPressEvent(QKeyEvent *e);
-    
+
 private:
 
     void readSettings();
@@ -111,7 +111,7 @@
 
     void slotIncreaseThumbSize();
     void slotDecreaseThumbSize();
-    
+
     void slotUpload();
     void slotUploadItems(const KURL::List&);
     void slotDownloadSelected();
@@ -129,20 +129,20 @@
     void slotSkipped(const QString&, const QString&);
     void slotDeleted(const QString&, const QString&, bool);
     void slotLocked(const QString&, const QString&, bool);
-    
+
     void slotNewSelection(bool);
     void slotItemsSelected(CameraIconViewItem* item, bool selected);
-    
+
     void slotExifFromFile(const QString& folder, const QString& file);
     void slotExifFromData(const QByteArray& exifData);
 
     void slotFirstItem(void);
-    void slotPrevItem(void);    
+    void slotPrevItem(void);
     void slotNextItem(void);
     void slotLastItem(void);
 
 private:
-    
+
     CameraUIPriv* d;
 };
 
[prev in list] [next in list] [prev in thread] [next in thread]