Add progress and error signals to tdenewstuff

This relates to Bug 2127
pull/16/head
Timothy Pearson 10 years ago
parent 58c3aed2bb
commit a71fa0953d

@ -659,6 +659,9 @@ void DownloadDialog::slotJobResult( TDEIO::Job *job )
} }
} }
// Reset for next load
mJobData = TQString::null;
slotInstallPhase2(); slotInstallPhase2();
} }

@ -234,7 +234,7 @@ TQDomElement Provider::createDomElement( TQDomDocument &doc, TQDomElement &paren
void Provider::slotJobData( TDEIO::Job *, const TQByteArray &data ) void Provider::slotJobData( TDEIO::Job *, const TQByteArray &data )
{ {
kdDebug() << "ProviderLoader::slotJobData()" << endl; kdDebug() << "Provider::slotJobData()" << endl;
if ( data.size() == 0 ) return; if ( data.size() == 0 ) return;
@ -369,6 +369,8 @@ void ProviderLoader::load( const TQString &type, const TQString &providersList )
TQT_SLOT( slotJobResult( TDEIO::Job * ) ) ); TQT_SLOT( slotJobResult( TDEIO::Job * ) ) );
connect( job, TQT_SIGNAL( data( TDEIO::Job *, const TQByteArray & ) ), connect( job, TQT_SIGNAL( data( TDEIO::Job *, const TQByteArray & ) ),
TQT_SLOT( slotJobData( TDEIO::Job *, const TQByteArray & ) ) ); TQT_SLOT( slotJobData( TDEIO::Job *, const TQByteArray & ) ) );
connect( job, TQT_SIGNAL( percent (TDEIO::Job *, unsigned long) ),
TQT_SIGNAL( percent (TDEIO::Job *, unsigned long) ) );
// job->dumpObjectInfo(); // job->dumpObjectInfo();
} }
@ -388,6 +390,8 @@ void ProviderLoader::slotJobResult( TDEIO::Job *job )
{ {
if ( job->error() ) { if ( job->error() ) {
job->showErrorDialog( TQT_TQWIDGET(parent()) ); job->showErrorDialog( TQT_TQWIDGET(parent()) );
emit error();
return;
} }
kdDebug() << "--PROVIDERS-START--" << endl << mJobData << "--PROV_END--" kdDebug() << "--PROVIDERS-START--" << endl << mJobData << "--PROV_END--"
@ -396,6 +400,7 @@ void ProviderLoader::slotJobResult( TDEIO::Job *job )
TQDomDocument doc; TQDomDocument doc;
if ( !doc.setContent( mJobData ) ) { if ( !doc.setContent( mJobData ) ) {
KMessageBox::error( TQT_TQWIDGET(parent()), i18n("Error parsing providers list.") ); KMessageBox::error( TQT_TQWIDGET(parent()), i18n("Error parsing providers list.") );
emit error();
return; return;
} }
@ -403,6 +408,8 @@ void ProviderLoader::slotJobResult( TDEIO::Job *job )
if ( providers.isNull() ) { if ( providers.isNull() ) {
kdDebug() << "No document in Providers.xml." << endl; kdDebug() << "No document in Providers.xml." << endl;
emit error();
return;
} }
TQDomNode n; TQDomNode n;

@ -42,7 +42,7 @@ namespace KNS {
* *
* @author Cornelius Schumacher (schumacher@kde.org) * @author Cornelius Schumacher (schumacher@kde.org)
* \par Maintainer: * \par Maintainer:
* Josef Spillner (spillner@kde.org) * Timothy Pearson (kb9vqf@pearsoncomputing.net)
*/ */
class KDE_EXPORT Provider : public TQObject class KDE_EXPORT Provider : public TQObject
{ {
@ -215,6 +215,8 @@ class KDE_EXPORT ProviderLoader : public TQObject
* Indicates that the list of providers has been successfully loaded. * Indicates that the list of providers has been successfully loaded.
*/ */
void providersLoaded( Provider::List * ); void providersLoaded( Provider::List * );
void percent(TDEIO::Job *job, unsigned long percent);
void error();
protected slots: protected slots:
void slotJobData( TDEIO::Job *, const TQByteArray & ); void slotJobData( TDEIO::Job *, const TQByteArray & );

Loading…
Cancel
Save