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

List:       kde-commits
Subject:    KDE/kdegraphics/gwenview
From:       Aurélien Gâteau <agateau () kde ! org>
Date:       2010-11-12 21:20:45
Message-ID: 20101112212045.5A08CAC89E () svn ! kde ! org
[Download RAW message or body]

SVN commit 1196244 by gateau:

Update General.Name in metaInfoModel when document is saved under a new url

 M  +2 -2      lib/document/document.cpp  
 M  +2 -1      lib/imagemetainfomodel.cpp  
 M  +2 -2      lib/imagemetainfomodel.h  
 M  +1 -0      tests/documenttest.cpp  


--- trunk/KDE/kdegraphics/gwenview/lib/document/document.cpp #1196243:1196244
@@ -103,8 +103,7 @@
 	d->mExiv2Image.reset();
 	d->mKind = MimeTypeUtils::KIND_UNKNOWN;
 	d->mFormat = QByteArray();
-	KFileItem fileItem(KFileItem::Unknown, KFileItem::Unknown, d->mUrl);
-	d->mImageMetaInfoModel.setFileItem(fileItem);
+	d->mImageMetaInfoModel.setUrl(d->mUrl);
 	d->mUndoStack.clear();
 	d->mErrorString.clear();
 
@@ -244,6 +243,7 @@
 		d->mUndoStack.setClean();
 		SaveJob* saveJob = static_cast<SaveJob*>(job);
 		d->mUrl = saveJob->newUrl();
+		d->mImageMetaInfoModel.setUrl(d->mUrl);
 		saved(saveJob->oldUrl(), d->mUrl);
 	}
 }
--- trunk/KDE/kdegraphics/gwenview/lib/imagemetainfomodel.cpp #1196243:1196244
@@ -292,7 +292,8 @@
 }
 
 
-void ImageMetaInfoModel::setFileItem(const KFileItem& item) {
+void ImageMetaInfoModel::setUrl(const KUrl& url) {
+	KFileItem item(KFileItem::Unknown, KFileItem::Unknown, url);
 	QString sizeString = KGlobal::locale()->formatByteSize(item.size());
 
 	d->setGroupEntryValue(GeneralGroup, "General.Name", item.name());
--- trunk/KDE/kdegraphics/gwenview/lib/imagemetainfomodel.h #1196243:1196244
@@ -30,7 +30,7 @@
 
 // Local
 
-class KFileItem;
+class KUrl;
 
 namespace Exiv2 { class Image; }
 
@@ -44,7 +44,7 @@
 	ImageMetaInfoModel();
 	~ImageMetaInfoModel();
 
-	void setFileItem(const KFileItem&);
+	void setUrl(const KUrl&);
 	void setImageSize(const QSize&);
 	void setExiv2Image(const Exiv2::Image*);
 
--- trunk/KDE/kdegraphics/gwenview/tests/documenttest.cpp #1196243:1196244
@@ -334,6 +334,7 @@
 	QVERIFY(waitUntilJobIsDone(doc->save(destUrl, "png")));
 	QCOMPARE(doc->format().data(), "png");
 	QCOMPARE(doc->url(), destUrl);
+	QCOMPARE(doc->metaInfo()->getValueForKey("General.Name"), destUrl.fileName());
 
 	QVERIFY2(doc->loadingState() == Document::Loaded,
 		"Document is supposed to finish loading before saving"
[prev in list] [next in list] [prev in thread] [next in thread]