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

List:       kde-commits
Subject:    extragear/graphics/gwenview
From:       Aurélien Gâteau <aurelien.gateau () free ! fr>
Date:       2005-09-01 22:53:49
Message-ID: 1125615229.656445.30369.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 456038 by gateau:

Folders are no longer included in the image list of KIPI albums.
CCMAIL:gwenview-general@lists.sf.net


 M  +1 -0      NEWS  
 M  +1 -1      app/mainwindow.cpp  
 M  +18 -0     gvcore/fileviewstack.cpp  
 M  +1 -0      gvcore/fileviewstack.h  
 M  +6 -2      gvcore/kipiinterface.cpp  


--- trunk/extragear/graphics/gwenview/NEWS #456037:456038
@@ -8,6 +8,7 @@
    match the behaviour of the folder view.
  - Icons of the folder KPart have been enhanced.
  - Authentication dialogs should now always appear over the main window.
+ - Folders are no longer included in the image list of KIPI albums.
 
 2005.08.21 - v1.2.92
 - New features:
--- trunk/extragear/graphics/gwenview/app/mainwindow.cpp #456037:456038
@@ -421,7 +421,7 @@
 }
 
 void MainWindow::modifyImage(ImageUtils::Orientation orientation) {
-	const KURL::List& urls=mFileViewStack->selectedURLs();
+	const KURL::List& urls=mFileViewStack->selectedImageURLs();
 	if (mFileViewStack->isVisible() && urls.size()>1) {
 		BatchManipulator manipulator(this, urls, orientation);
 		connect(&manipulator, SIGNAL(imageModified(const KURL&)),
--- trunk/extragear/graphics/gwenview/gvcore/fileviewstack.cpp #456037:456038
@@ -677,6 +677,24 @@
 }
 
 
+KURL::List FileViewStack::selectedImageURLs() const {
+	KURL::List list;
+
+	KFileItemListIterator it( *currentFileView()->selectedItems() );
+	for ( ; it.current(); ++it ) {
+		KFileItem* item=it.current();
+		if (!Archive::fileItemIsDirOrArchive(item)) {
+			list.append(item->url());
+		}
+	}
+	if (list.isEmpty()) {
+		const KFileItem* item=currentFileView()->shownFileItem();
+		if (item && !Archive::fileItemIsDirOrArchive(item)) list.append(item->url());
+	}
+	return list;
+}
+
+
 void FileViewStack::openParentDir() {
 	KURL url(mDirURL.upURL());
 	emit urlChanged(url);
--- trunk/extragear/graphics/gwenview/gvcore/fileviewstack.h #456037:456038
@@ -124,6 +124,7 @@
 	void setFocus();
 
 	KURL::List selectedURLs() const;
+	KURL::List selectedImageURLs() const;
 	/**
 	 * If set to true, no error messages will be displayed.
 	 */
--- trunk/extragear/graphics/gwenview/gvcore/kipiinterface.cpp #456037:456038
@@ -35,6 +35,7 @@
 #include <libkipi/imageinfoshared.h>
 
 // Local
+#include "archive.h"
 #include "fileviewbase.h"
 #include "fileviewstack.h"
 #include "imageutils/jpegcontent.h"
@@ -132,7 +133,10 @@
 	KURL::List list;
 	KFileItemListIterator it( *d->mFileView->currentFileView()->items() );
 	for ( ; it.current(); ++it ) {
-		list.append(it.current()->url());
+		KFileItem* item=it.current();
+		if (!Archive::fileItemIsDirOrArchive(item)) {
+			list.append(it.current()->url());
+		}
 	}
 	KURL url=d->mFileView->dirURL();
 	return KIPI::ImageCollection(new ImageCollection(url, url.fileName(), list));
@@ -141,7 +145,7 @@
 
 KIPI::ImageCollection KIPIInterface::currentSelection() {
 	LOG("");
-	KURL::List list=d->mFileView->selectedURLs();
+	KURL::List list=d->mFileView->selectedImageURLs();
 	KURL url=d->mFileView->dirURL();
 	return KIPI::ImageCollection(new ImageCollection(url, i18n("%1 (Selected \
Images)").arg(url.fileName()), list));  }


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