[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:       2007-01-15 22:54:52
Message-ID: 1168901692.978694.2304.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 623915 by gateau:

Changed the ThumbnailDetailsDialog to work in "auto-apply" mode.


 M  +3 -1      NEWS  
 M  +6 -2      gvcore/filethumbnailview.cpp  
 M  +8 -9      gvcore/thumbnaildetailsdialog.cpp  
 M  +2 -3      gvcore/thumbnaildetailsdialog.h  


--- trunk/extragear/graphics/gwenview/NEWS #623914:623915
@@ -1,8 +1,10 @@
 2007.xx.yy - v
 - New features:
+ - Settings in the dialog to edit the thumbnail view details are now directly
+   applied, no need to click "Apply" anymore.
 
 - Fixes:
- - Bug 138467: Crash in Exiv2 readMetadata when reading image saved in Photoshop 
+ - Bug 138467: Crash in Exiv2 readMetadata when reading image saved in Photoshop
  - Bug 131162: Autorotate images preference setting is forgotten
  - Bug 132556: Gwenview asks to save the wrong file if the modified file is read-only
  - Bug 111641: When several printing images in a row, "Keep Ratio" keeps ratio of first image
--- trunk/extragear/graphics/gwenview/gvcore/filethumbnailview.cpp #623914:623915
@@ -135,6 +135,7 @@
 	int mItemDetails;
 
 	ImageLoader* mPrefetch;
+	ThumbnailDetailsDialog* mThumbnailsDetailDialog;
 
 	void updateWaitThumbnail(const FileThumbnailView* view) {
 		mWaitThumbnail=QPixmap(mThumbnailSize, mThumbnailSize);
@@ -171,6 +172,7 @@
 	d->mItemDetails=FileViewConfig::thumbnailDetails();
 	d->mPrefetch = NULL;
 	d->mThumbnailSize = 0;
+	d->mThumbnailsDetailDialog = 0;
 
 	setItemTextPos( QIconView::ItemTextPos(FileViewConfig::thumbnailTextPos()) );
 	setAutoArrange(true);
@@ -854,8 +856,10 @@
 
 
 void FileThumbnailView::showThumbnailDetailsDialog() {
-	ThumbnailDetailsDialog dlg(this);
-	dlg.exec();
+	if (!d->mThumbnailsDetailDialog) {
+		d->mThumbnailsDetailDialog = new ThumbnailDetailsDialog(this);
+	}
+	d->mThumbnailsDetailDialog->show();
 }
 
 
--- trunk/extragear/graphics/gwenview/gvcore/thumbnaildetailsdialog.cpp #623914:623915
@@ -38,8 +38,8 @@
 	
 ThumbnailDetailsDialog::ThumbnailDetailsDialog(FileThumbnailView* view)
 : KDialogBase(
-	view, 0, true /* modal */, QString::null, KDialogBase::Ok|KDialogBase::Cancel|KDialogBase::Apply,
-	KDialogBase::Ok, true /* separator */)
+	view, 0, false /* modal */, QString::null, KDialogBase::Close,
+	KDialogBase::Close, true /* separator */)
 , d(new ThumbnailDetailsDialog::Private)
 {
 	d->mView=view;
@@ -52,6 +52,11 @@
 	d->mContent->mShowFileDate->setChecked(details & FileThumbnailView::FILEDATE);
 	d->mContent->mShowFileSize->setChecked(details & FileThumbnailView::FILESIZE);
 	d->mContent->mShowImageSize->setChecked(details & FileThumbnailView::IMAGESIZE);
+
+	connect(d->mContent->mShowFileName, SIGNAL(toggled(bool)), SLOT(applyChanges()) );
+	connect(d->mContent->mShowFileDate, SIGNAL(toggled(bool)), SLOT(applyChanges()) );
+	connect(d->mContent->mShowFileSize, SIGNAL(toggled(bool)), SLOT(applyChanges()) );
+	connect(d->mContent->mShowImageSize, SIGNAL(toggled(bool)), SLOT(applyChanges()) );
 }
 
 ThumbnailDetailsDialog::~ThumbnailDetailsDialog() {
@@ -59,7 +64,7 @@
 }
 
 
-void ThumbnailDetailsDialog::slotApply() {
+void ThumbnailDetailsDialog::applyChanges() {
 	int details=
 		(d->mContent->mShowFileName->isChecked() ? FileThumbnailView::FILENAME : 0)
 		| (d->mContent->mShowFileDate->isChecked() ? FileThumbnailView::FILEDATE : 0)
@@ -70,10 +75,4 @@
 }
 
 
-void ThumbnailDetailsDialog::slotOk() {
-	slotApply();
-	accept();
-}
-
-
 } // namespace
--- trunk/extragear/graphics/gwenview/gvcore/thumbnaildetailsdialog.h #623914:623915
@@ -34,9 +34,8 @@
 	ThumbnailDetailsDialog(FileThumbnailView* view);
 	~ThumbnailDetailsDialog();
 
-protected:
-	virtual void slotApply();
-	virtual void slotOk();
+private slots:
+	void applyChanges();
 
 private:
 	struct Private;
[prev in list] [next in list] [prev in thread] [next in thread]