jeirmeister/Cockatrice
1
0
Fork 0
mirror of https://github.com/Cockatrice/Cockatrice.git synced 2026-04-27 07:48:01 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions

[PictureLoader] Fix status bar not updating (#6023)

Browse source 
* [PictureLoader] Fix status bar not updating

* rename methods
This commit is contained in:
RickyRister 2025-07-05 20:14:46 -07:00 • committed by GitHub
parent 0b9b39fef7
commit 686e90d0ed
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
5 changed files with 13 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

4
cockatrice/src/client/ui/picture_loader/picture_loader.cpp
View file

@ -36,8 +36,8 @@ PictureLoader::PictureLoader() : QObject(nullptr)
mainWindow->statusBar()->addPermanentWidget(statusBar);
}
connect(worker, &PictureLoaderWorker::imageLoadQueued, statusBar, &PictureLoaderStatusBar::addQueuedImageLoad);
connect(worker, &PictureLoaderWorker::imageLoadSuccessful, statusBar,
connect(worker, &PictureLoaderWorker::imageRequestQueued, statusBar, &PictureLoaderStatusBar::addQueuedImageLoad);
connect(worker, &PictureLoaderWorker::imageRequestSucceeded, statusBar,
&PictureLoaderStatusBar::addSuccessfulImageLoad);
}

4
cockatrice/src/client/ui/picture_loader/picture_loader_worker.cpp
View file

@ -72,7 +72,7 @@ void PictureLoaderWorker::queueRequest(const QUrl &url, PictureLoaderWorkerWork
makeRequest(url, worker);
} else {
requestLoadQueue.append(qMakePair(url, worker));
emit imageLoadQueued(url, worker->cardToDownload.getCard(), worker->cardToDownload.getSetName());
emit imageRequestQueued(url, worker->cardToDownload.getCard(), worker->cardToDownload.getSetName());
processQueuedRequests();
}
}
@ -82,7 +82,7 @@ QNetworkReply *PictureLoaderWorker::makeRequest(const QUrl &url, PictureLoaderWo
// Check for cached redirects
QUrl cachedRedirect = getCachedRedirect(url);
if (!cachedRedirect.isEmpty()) {
emit imageLoadSuccessful(url);
emit imageRequestSucceeded(url);
return makeRequest(cachedRedirect, worker);
}

4
cockatrice/src/client/ui/picture_loader/picture_loader_worker.h
View file

@ -71,8 +71,8 @@ private slots:
signals:
void imageLoadEnqueued(const CardInfoPtr &card);
void imageLoaded(CardInfoPtr card, const QImage &image);
void imageLoadQueued(const QUrl &url, const CardInfoPtr &card, const QString &setName);
void imageLoadSuccessful(const QUrl &url);
void imageRequestQueued(const QUrl &url, const CardInfoPtr &card, const QString &setName);
void imageRequestSucceeded(const QUrl &url);
};
#endif // PICTURE_LOADER_WORKER_H

2
cockatrice/src/client/ui/picture_loader/picture_loader_worker_work.cpp
View file

@ -23,6 +23,7 @@ PictureLoaderWorkerWork::PictureLoaderWorkerWork(const PictureLoaderWorker *work
connect(this, &PictureLoaderWorkerWork::urlRedirected, worker, &PictureLoaderWorker::cacheRedirect);
connect(this, &PictureLoaderWorkerWork::cachedUrlInvalidated, worker, &PictureLoaderWorker::removedCachedUrl);
connect(this, &PictureLoaderWorkerWork::imageLoaded, worker, &PictureLoaderWorker::handleImageLoaded);
connect(this, &PictureLoaderWorkerWork::requestSucceeded, worker, &PictureLoaderWorker::imageRequestSucceeded);
// Hook up signals to settings
connect(&SettingsCache::instance(), SIGNAL(picDownloadChanged()), this, SLOT(picDownloadChanged()));
@ -97,6 +98,7 @@ void PictureLoaderWorkerWork::handleNetworkReply(QNetworkReply *reply)
handleFailedReply(reply);
} else {
handleSuccessfulReply(reply);
emit requestSucceeded(reply->url());
}
reply->deleteLater();

5
cockatrice/src/client/ui/picture_loader/picture_loader_worker_work.h
View file

@ -53,6 +53,11 @@ signals:
* Note that this object will delete itself as this signal is emitted.
*/
void imageLoaded(CardInfoPtr card, const QImage &image);
/**
* Emitted when a request did not return a 400 or 500 response
*/
void requestSucceeded(const QUrl &url);
void requestImageDownload(const QUrl &url, PictureLoaderWorkerWork *instance);
void urlRedirected(const QUrl &originalUrl, const QUrl &redirectUrl);