diff options
author | Timothy Pearson <[email protected]> | 2014-09-22 00:02:37 -0500 |
---|---|---|
committer | Timothy Pearson <[email protected]> | 2014-09-22 00:02:37 -0500 |
commit | d2be9f66f9f0767685a6999c4a8f91fd27ce0611 (patch) | |
tree | c4fa6e8e1236b1f087b485be8d20f62d5eebbeec /tdenewstuff | |
parent | f6d69d45cf25180a8285b2dd5c146a0481fd09ce (diff) | |
download | tdelibs-d2be9f66f9f0767685a6999c4a8f91fd27ce0611.tar.gz tdelibs-d2be9f66f9f0767685a6999c4a8f91fd27ce0611.zip |
Add initial load screen to TDENewStuff
Fix remaining issues with OCS data sources
This resolves Bug 2093
Diffstat (limited to 'tdenewstuff')
-rw-r--r-- | tdenewstuff/downloaddialog.cpp | 65 | ||||
-rw-r--r-- | tdenewstuff/provider.cpp | 9 |
2 files changed, 56 insertions, 18 deletions
diff --git a/tdenewstuff/downloaddialog.cpp b/tdenewstuff/downloaddialog.cpp index 586fb76b7..9744275e4 100644 --- a/tdenewstuff/downloaddialog.cpp +++ b/tdenewstuff/downloaddialog.cpp @@ -53,6 +53,8 @@ struct DownloadDialog::Private { TQString m_providerlist; TQWidget *m_page; + TQFrame *m_loadingFrame; + TQLabel *m_loadingLabel; TDEListView *m_lvtmp_r, *m_lvtmp_d, *m_lvtmp_l; TQPtrList<Entry> m_installlist; TQMap<TDEIO::Job*, Provider*> m_variantjobs; @@ -145,6 +147,14 @@ void DownloadDialog::init(Engine *engine) m_engine = engine; d->m_page = NULL; + // Provide graphical feedback to the user while the intial provider load is taking place + d->m_loadingFrame = addPage(i18n("Welcome"), i18n("Welcome"), TQPixmap(TQString(""))); + d->m_loadingLabel = new TQLabel(d->m_loadingFrame); + d->m_loadingLabel->setText(i18n("Loading data providers...")); + TQVBoxLayout *box = new TQVBoxLayout(d->m_loadingFrame); + box->add(d->m_loadingLabel); + box->addItem(new TQSpacerItem(0, 0, TQSizePolicy::MinimumExpanding, TQSizePolicy::MinimumExpanding)); + connect(this, TQT_SIGNAL(aboutToShowPage(TQWidget*)), TQT_SLOT(slotPage(TQWidget*))); if(!engine) @@ -199,6 +209,8 @@ void DownloadDialog::clear() void DownloadDialog::slotProviders(Provider::List *list) { + d->m_loadingLabel->setText(i18n("Loading data listings...")); + Provider *p; /*TQFrame *frame;*/ @@ -225,12 +237,6 @@ void DownloadDialog::addProvider(Provider *p) int ret; TQPixmap pix; - if(m_map.count() == 0) - { - frame = addPage(i18n("Welcome"), i18n("Welcome"), TQPixmap(TQString(""))); - delete frame; - } - kdDebug() << "addProvider()/begin" << endl; ret = true; @@ -249,6 +255,10 @@ void DownloadDialog::addProvider(Provider *p) } } if(!ret) pix = TDEGlobal::iconLoader()->loadIcon("knewstuff", TDEIcon::Panel); + if (d->m_loadingFrame) { + delete d->m_loadingFrame; + d->m_loadingFrame = NULL; + } frame = addPage(p->name(), p->name(), pix); m_frame = frame; @@ -383,6 +393,17 @@ void DownloadDialog::slotResult(TDEIO::Job *job) if((!m_filter.isEmpty()) && (d->m_variantjobs[job])) { Provider *p = d->m_variantjobs[job]; + + /*bool jobsActive = false; + TQMap<TDEIO::Job*, Provider*>::Iterator it; + for ( it = d->m_variantjobs.begin(); it != d->m_variantjobs.end(); ++it ) { + if (it.data() == p) { + if (it.key() != job) { + jobsActive = true; + } + } + }*/ + if(d->m_newproviders[p]) { addProvider(p); @@ -393,9 +414,15 @@ void DownloadDialog::slotResult(TDEIO::Job *job) /*if(m_jobs[job]) addEntry(entry); else*/ - if(d->m_variantjobs[job]) addEntry(entry, d->m_variants[job]); + if(d->m_variantjobs[job]) { + addEntry(entry, d->m_variants[job]); + } } } + + if(d->m_variantjobs[job]) { + d->m_variantjobs.remove(job); + } } int DownloadDialog::installStatus(Entry *entry) @@ -615,11 +642,14 @@ void DownloadDialog::slotJobResult( TDEIO::Job *job ) // See previous note regarding OpenDesktop.org if (e->payload().url().contains(OPENDESKTOP_REDIRECT_URL)) { - TQString realURL = mJobData.mid(mJobData.find("<a href=\"/CONTENT/content-files/")); - realURL = realURL.mid(0, realURL.find("Click here</a>")-2); - realURL = realURL.mid(realURL.find("/CONTENT/content-files")); - realURL = e->payload().protocol() + "://opendesktop.org" + realURL; - e->setPayload(realURL); + int pos = mJobData.find("<a href=\"/CONTENT/content-files/"); + if (pos >= 0) { + TQString realURL = mJobData.mid(pos); + realURL = realURL.mid(0, realURL.find("\">")); + realURL = realURL.mid(strlen("<a href=\"")); + realURL = e->payload().protocol() + "://opendesktop.org" + realURL; + e->setPayload(realURL); + } } slotInstallPhase2(); @@ -634,7 +664,7 @@ void DownloadDialog::install(Entry *e) TQPixmap pix = TDEGlobal::iconLoader()->loadIcon("ok", TDEIcon::Small); TQString lang = TDEGlobal::locale()->language(); - + if(m_entryitem) { m_entryitem->setPixmap(0, pix); @@ -663,6 +693,13 @@ void DownloadDialog::install(Entry *e) void DownloadDialog::slotInstalled(TDEIO::Job *job) { + TQPushButton *de, *in; + in = *(m_buttons[d->m_page]->at(0)); + de = *(m_buttons[d->m_page]->at(1)); + + if(in) in->setEnabled(true); + if(de) de->setEnabled(true); + bool ret = job && (job->error() == 0); if(ret) { @@ -891,7 +928,7 @@ void DownloadDialog::loadProvider(Provider *p) TQString url = it.key(); TQStringList urlvariants = it.data(); - TDEIO::TransferJob *variantjob = TDEIO::get(url); + TDEIO::TransferJob *variantjob = TDEIO::get(url, false, false); d->m_newproviders[p] = p; d->m_variantjobs[variantjob] = p; d->m_variants[variantjob] = urlvariants; diff --git a/tdenewstuff/provider.cpp b/tdenewstuff/provider.cpp index 4157c5025..5bf754598 100644 --- a/tdenewstuff/provider.cpp +++ b/tdenewstuff/provider.cpp @@ -313,15 +313,16 @@ void Provider::slotJobResult( TDEIO::Job *job ) desiredCategories = desiredCategoryList.join("x"); // int maxEntries = 10; - int maxEntries = 50; + //int maxEntries = 50; + int maxEntries = 100; setDownloadUrl( KURL( mBaseURL ) ); setUploadUrl( KURL( mBaseURL ) ); setNoUploadUrl( KURL( mBaseURL ) ); - d_prov(this)->mDownloadUrlLatest = KURL( mBaseURL + "content/data?categories=" + desiredCategories + "&search=&sortmode=new&page=1&pagesize=" + TQString("%1").arg(maxEntries) ); - d_prov(this)->mDownloadUrlScore = KURL( mBaseURL + "content/data?categories=" + desiredCategories + "&search=&sortmode=high&page=1&pagesize=" + TQString("%1").arg(maxEntries) ); - d_prov(this)->mDownloadUrlDownloads = KURL( mBaseURL + "content/data?categories=" + desiredCategories + "&search=&sortmode=down&page=1&pagesize=" + TQString("%1").arg(maxEntries) ); + d_prov(this)->mDownloadUrlLatest = KURL( mBaseURL + "content/data?categories=" + desiredCategories + "&search=&sortmode=new&page=0&pagesize=" + TQString("%1").arg(maxEntries) ); + d_prov(this)->mDownloadUrlScore = KURL( mBaseURL + "content/data?categories=" + desiredCategories + "&search=&sortmode=high&page=0&pagesize=" + TQString("%1").arg(maxEntries) ); + d_prov(this)->mDownloadUrlDownloads = KURL( mBaseURL + "content/data?categories=" + desiredCategories + "&search=&sortmode=down&page=0&pagesize=" + TQString("%1").arg(maxEntries) ); mLoaded = true; emit providerLoaded(); |