[prev in list] [next in list] [prev in thread] [next in thread]
List: kde-commits
Subject: kdenox/konq-embed/dropin/kio
From: Eva Brucherseifer <eva () kde ! org>
Date: 2006-05-28 17:42:35
Message-ID: 1148838155.978033.10611.nullmailer () svn ! kde ! org
[Download RAW message or body]
SVN commit 545978 by eva:
- added a canceled signal (closes the dialog once the job is canceled
from outside, fire the signal from kill() function
- made download dialog modal again
M +3 -2 jobclasses.cpp
M +6 -0 jobclasses.h
--- trunk/kdenox/konq-embed/dropin/kio/jobclasses.cpp #545977:545978
@@ -175,6 +175,7 @@
void SimpleJob::kill()
{
Scheduler::self()->releaseJob( this, true );
+ emit canceled( this );
Job::kill();
}
@@ -676,7 +677,7 @@
{
if (m_showProgressInfo)
{
- defaultProgress = new ::ProgressDlg(qApp->mainWidget(), "", true);
+ defaultProgress = new ::ProgressDlg(qApp->mainWidget());
defaultProgress->slotTransferring( this, m_src );
defaultProgress->setOnlyClean( true );
defaultProgress->setJob(this);
@@ -700,7 +701,7 @@
QObject::connect( this, SIGNAL( result( KIO::Job * ) ),
SLOT( slotResult( KIO::Job * ) ) );
- defaultProgress->show();
+ defaultProgress->exec();
TransferJob::start(slave);
}
--- trunk/kdenox/konq-embed/dropin/kio/jobclasses.h #545977:545978
@@ -89,6 +89,8 @@
void processedSize( KIO::Job *, unsigned long size );
void speed( KIO::Job *, unsigned long bytesPerSecond );
+
+ void canceled( KIO::Job * );
protected:
@@ -282,6 +284,10 @@
static const int MAX_CHUNK_SIZE = 64*1024;
+ protected slots:
+ virtual void dataReq() { KIO::TransferJob::dataReq(); }
+ virtual void kill() { KIO::TransferJob::kill(); }
+
private slots:
void slotStoredData( KIO::Job *job, const QByteArray &data );
void slotStoredDataReq( KIO::Job *job, QByteArray &data );
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic