[prev in list] [next in list] [prev in thread] [next in thread]
List: kde-commits
Subject: kdenox/konq-embed/dropin
From: Eva Brucherseifer <eva () kde ! org>
Date: 2006-05-28 18:13:19
Message-ID: 1148839999.481263.14071.nullmailer () svn ! kde ! org
[Download RAW message or body]
SVN commit 545989 by eva:
- moved download dialog to khtml_ext
- some changes while trying to fix the problem, that download dialog is
not closed when the user closes konq
M +20 -0 khtml/khtml_ext.cpp
M +5 -5 kio/jobclasses.cpp
M +1 -1 kio/progressbase.cpp
--- trunk/kdenox/konq-embed/dropin/khtml/khtml_ext.cpp #545988:545989
@@ -169,6 +169,26 @@
job->addMetaData("MaxCacheSize", "0"); // Don't store in http cache.
job->addMetaData("cache", "cache"); // Use entry from cache if available.
// job->setAutoErrorHandlingEnabled( true );
+ QObject::connect(kapp, SIGNAL(aboutToQuit()), job, SLOT( kill() ));
+
+ ProgressDlg* defaultProgress = new ProgressDlg(kapp->mainWidget());
+ defaultProgress->slotTransferring( job, url );
+ defaultProgress->setOnlyClean( true );
+ defaultProgress->setJob(job);
+
+ QObject::connect( job, SIGNAL( percent( KIO::Job*, unsigned long ) ),
+ defaultProgress, SLOT( slotPercent( KIO::Job*, unsigned long ) ) );
+ QObject::connect( job, SIGNAL( infoMessage( KIO::Job*, const QString & ) ),
+ defaultProgress, SLOT( slotInfoMessage( KIO::Job*, const QString & ) ) );
+ QObject::connect( job, SIGNAL( totalSize( KIO::Job*, KIO::filesize_t ) ),
+ defaultProgress, SLOT( slotTotalSize( KIO::Job*, KIO::filesize_t ) ) );
+ QObject::connect( job, SIGNAL( processedSize( KIO::Job*, KIO::filesize_t ) ),
+ defaultProgress, SLOT( slotProcessedSize( KIO::Job*, KIO::filesize_t ) ) );
+ QObject::connect( job, SIGNAL( speed( KIO::Job*, unsigned long ) ),
+ defaultProgress, SLOT( slotSpeed( KIO::Job*, unsigned long ) ) );
+
+ defaultProgress->show();
+
} //end if(!saved)
}
}
--- trunk/kdenox/konq-embed/dropin/kio/jobclasses.cpp #545988:545989
@@ -677,7 +677,7 @@
{
if (m_showProgressInfo)
{
- defaultProgress = new ::ProgressDlg(qApp->mainWidget());
+/* defaultProgress = new ::ProgressDlg(qApp->mainWidget());
defaultProgress->slotTransferring( this, m_src );
defaultProgress->setOnlyClean( true );
defaultProgress->setJob(this);
@@ -691,7 +691,7 @@
connect( this, SIGNAL( processedSize( KIO::Job*, KIO::filesize_t ) ),
defaultProgress, SLOT( slotProcessedSize( KIO::Job*, KIO::filesize_t ) ) );
connect( this, SIGNAL( speed( KIO::Job*, unsigned long ) ),
- defaultProgress, SLOT( slotSpeed( KIO::Job*, unsigned long ) ) );
+ defaultProgress, SLOT( slotSpeed( KIO::Job*, unsigned long ) ) );*/
}
QObject::connect( this, SIGNAL( data( KIO::Job *, const QByteArray & ) ),
@@ -701,7 +701,7 @@
QObject::connect( this, SIGNAL( result( KIO::Job * ) ),
SLOT( slotResult( KIO::Job * ) ) );
- defaultProgress->exec();
+ //defaultProgress->exec();
TransferJob::start(slave);
}
@@ -717,7 +717,7 @@
else if (m_iodevice->writeBlock(data) != data.size())
{
// ### TODO: add error handling here.
- // emit error(this);
+// emit error(this);
}
}
@@ -731,7 +731,7 @@
data.duplicate(myData(), bytesread);
if ( bytesread < MAX_CHUNK_SIZE ) {
- // emit result(this);
+ emit result(this);
}
}
--- trunk/kdenox/konq-embed/dropin/kio/progressbase.cpp #545988:545989
@@ -35,7 +35,7 @@
ProgressBase::~ProgressBase()
{
- slotStop();
+ //slotStop();
}
void ProgressBase::setJob( KIO::Job *job )
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic