[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-08-28 22:41:31
Message-ID: 1125268891.453595.8302.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 454449 by gateau:

Added call to setWindow() to all jobs so that their authentication dialog does
not appear below the main window.


 M  +1 -0      NEWS  
 M  +1 -1      app/configdialog.cpp  
 M  +2 -0      gvcore/document.cpp  
 M  +5 -0      gvcore/fileopobject.cpp  
 M  +1 -0      gvcore/fileviewstack.cpp  
 M  +3 -0      gvcore/imageloader.cpp  
 M  +3 -0      gvcore/thumbnailloadjob.cpp  


--- trunk/extragear/graphics/gwenview/NEWS #454448:454449
@@ -7,6 +7,7 @@
  - The click/double-click behaviour of the bookmark view has been changed to
    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.
 
 2005.08.21 - v1.2.92
 - New features:
--- trunk/extragear/graphics/gwenview/app/configdialog.cpp #454448:454449
@@ -277,7 +277,7 @@
 
 	KURL url;
 	url.setPath(dir);
-	if (KIO::NetAccess::del(url, this)) {
+	if (KIO::NetAccess::del(url, topLevelWidget()) ) {
 		KMessageBox::information( this,i18n("Cache emptied.") );
 	}
 }
--- trunk/extragear/graphics/gwenview/gvcore/document.cpp #454448:454449
@@ -29,6 +29,7 @@
 #include <qwmatrix.h>
 
 // KDE
+#include <kapplication.h>
 #include <kdebug.h>
 #include <kfilemetainfo.h>
 #include <kglobalsettings.h>
@@ -169,6 +170,7 @@
 
 	d->mURL = localURL; // this may be fixed after stat() is complete, but set at least something
 	d->mStatJob = KIO::stat( localURL, !localURL.isLocalFile() );
+	d->mStatJob->setWindow(KApplication::kApplication()->mainWidget());
 	connect( d->mStatJob, SIGNAL( result (KIO::Job *) ),
 	   this, SLOT( slotStatResult (KIO::Job *) ) );
 }
--- trunk/extragear/graphics/gwenview/gvcore/fileopobject.cpp #454448:454449
@@ -112,6 +112,7 @@
 
 // Copy the file
 	KIO::Job* copyJob=KIO::copy(mURLList,destURL,true);
+	copyJob->setWindow(mParent->topLevelWidget());
 	connect( copyJob, SIGNAL( result(KIO::Job*) ),
 		this, SLOT( slotResult(KIO::Job*) ) );
 
@@ -143,6 +144,7 @@
 
 // Move the file
 	KIO::Job* moveJob=KIO::move(mURLList,destURL,true);
+	moveJob->setWindow(mParent->topLevelWidget());
 	connect( moveJob, SIGNAL( result(KIO::Job*) ),
 		this, SLOT( slotResult(KIO::Job*) ) );
 
@@ -198,6 +200,7 @@
 		trashURL.addPath(mURLList.first().fileName());
 	}
 	KIO::Job* job=KIO::move(mURLList,trashURL);
+	job->setWindow(mParent->topLevelWidget());
 	connect( job, SIGNAL( result(KIO::Job*) ),
 		this, SLOT( slotResult(KIO::Job*) ) );
 }
@@ -239,6 +242,7 @@
 
 	// Delete the file
 	KIO::Job* removeJob=KIO::del(mURLList,false,true);
+	removeJob->setWindow(mParent->topLevelWidget());
 	connect( removeJob, SIGNAL( result(KIO::Job*) ),
 		this, SLOT( slotResult(KIO::Job*) ) );
 }
@@ -262,6 +266,7 @@
 	KURL destURL=srcURL;
 	destURL.setFileName(mNewFilename);
 	KIO::Job* job=KIO::move(srcURL,destURL);
+	job->setWindow(mParent->topLevelWidget());
 	connect( job, SIGNAL( result(KIO::Job*) ),
 		this, SLOT( slotResult(KIO::Job*) ) );
 }
--- trunk/extragear/graphics/gwenview/gvcore/fileviewstack.cpp #454448:454449
@@ -166,6 +166,7 @@
 
 	// Dir lister
 	mDirLister=new DirLister;
+	mDirLister->setMainWindow(topLevelWidget());
 	connect(mDirLister,SIGNAL(clear()),
 		this,SLOT(dirListerClear()) );
 
--- trunk/extragear/graphics/gwenview/gvcore/imageloader.cpp #454448:454449
@@ -27,6 +27,7 @@
 #include <qtimer.h>
 
 // KDE
+#include <kapplication.h>
 
 // Local
 #include "cache.h"
@@ -297,6 +298,7 @@
 	if( d->mSuspended || !d->mStatPending ) return;
 
 	KIO::Job* job=KIO::stat( d->mURL, false );
+	job->setWindow(KApplication::kApplication()->mainWidget());
 	connect(job, SIGNAL(result(KIO::Job*)),
 		this, SLOT(slotStatResult(KIO::Job*)) );
 	d->mStatPending = false;
@@ -352,6 +354,7 @@
 
 	// Start loading the image
 	KIO::Job* getJob=KIO::get( d->mURL, false, false);
+	getJob->setWindow(KApplication::kApplication()->mainWidget());
 
 	connect(getJob, SIGNAL(data(KIO::Job*, const QByteArray&)),
 		this, SLOT(slotDataReceived(KIO::Job*, const QByteArray&)) );
--- trunk/extragear/graphics/gwenview/gvcore/thumbnailloadjob.cpp #454448:454449
@@ -38,6 +38,7 @@
 #include <qtimer.h>
 
 // KDE 
+#include <kapplication.h>
 #include <kconfig.h>
 #include <kdebug.h>
 #include <kfileitem.h>
@@ -548,6 +549,7 @@
 	}
 	if( mOriginalTime == 0 ) { // KIO must be used
 		KIO::Job* job = KIO::stat(mCurrentURL,false);
+		job->setWindow(KApplication::kApplication()->mainWidget());
 		LOG( "KIO::stat orig " << mCurrentURL.url() );
 		addSubjob(job);
 	}
@@ -686,6 +688,7 @@
 		KURL url;
 		url.setPath(mTempPath);
 		KIO::Job* job=KIO::file_copy(mCurrentURL, url,-1,true,false,false);
+		job->setWindow(KApplication::kApplication()->mainWidget());
 		LOG("Download remote file " << mCurrentURL.prettyURL());
 		addSubjob(job);
 	}
[prev in list] [next in list] [prev in thread] [next in thread]