summaryrefslogtreecommitdiff
path: root/utils/rbutilqt/themesinstallwindow.cpp
diff options
context:
space:
mode:
authorDominik Riebeling <Dominik.Riebeling@gmail.com>2022-03-16 22:19:00 +0100
committerDominik Riebeling <Dominik.Riebeling@gmail.com>2022-03-19 09:19:11 +0100
commita0459de4d5b4bbb062536146cdefaad796480c7c (patch)
treeff4267ff88b1eb7938957218c1bde7159bb281cc /utils/rbutilqt/themesinstallwindow.cpp
parent08b42791ffddec7c51a3e887654f4d476d780b91 (diff)
downloadrockbox-a0459de4d5b4bbb062536146cdefaad796480c7c.tar.gz
rockbox-a0459de4d5b4bbb062536146cdefaad796480c7c.zip
rbutil: HttpGet: Return NetworkError in done signal.
Return the status value instead of simply a bool. Change-Id: I2bffaac0087418656e80c74dc352011a4ea32ab1
Diffstat (limited to 'utils/rbutilqt/themesinstallwindow.cpp')
-rw-r--r--utils/rbutilqt/themesinstallwindow.cpp13
1 files changed, 6 insertions, 7 deletions
diff --git a/utils/rbutilqt/themesinstallwindow.cpp b/utils/rbutilqt/themesinstallwindow.cpp
index e6043de892..5be60050d6 100644
--- a/utils/rbutilqt/themesinstallwindow.cpp
+++ b/utils/rbutilqt/themesinstallwindow.cpp
@@ -100,7 +100,7 @@ void ThemesInstallWindow::downloadInfo()
100} 100}
101 101
102 102
103void ThemesInstallWindow::downloadDone(bool error) 103void ThemesInstallWindow::downloadDone(QNetworkReply::NetworkError error)
104{ 104{
105 LOG_INFO() << "Download done, error:" << error; 105 LOG_INFO() << "Download done, error:" << error;
106 106
@@ -116,7 +116,7 @@ void ThemesInstallWindow::downloadDone(bool error)
116 << iniDetails.value("error/description").toString() 116 << iniDetails.value("error/description").toString()
117 << iniDetails.value("error/query").toString(); 117 << iniDetails.value("error/query").toString();
118 118
119 if(error) { 119 if(error != QNetworkReply::NoError) {
120 logger->addItem(tr("Network error: %1.\n" 120 logger->addItem(tr("Network error: %1.\n"
121 "Please check your network and proxy settings.") 121 "Please check your network and proxy settings.")
122 .arg(getter->errorString()), LOGERROR); 122 .arg(getter->errorString()), LOGERROR);
@@ -236,19 +236,18 @@ void ThemesInstallWindow::updateDetails(QListWidgetItem* cur, QListWidgetItem* p
236} 236}
237 237
238 238
239void ThemesInstallWindow::updateImage(bool error) 239void ThemesInstallWindow::updateImage(QNetworkReply::NetworkError error)
240{ 240{
241 LOG_INFO() << "Updating image:"<< !error; 241 LOG_INFO() << "Updating image:"<< !error;
242 242
243 if(error) { 243 if(error != QNetworkReply::NoError) {
244 ui.themePreview->clear(); 244 ui.themePreview->clear();
245 ui.themePreview->setText(tr("Retrieving theme preview failed.\n" 245 ui.themePreview->setText(tr("Retrieving theme preview failed.\n"
246 "HTTP response code: %1").arg(igetter.httpResponse())); 246 "HTTP response code: %1").arg(igetter.httpResponse()));
247 return; 247 return;
248 } 248 }
249 249 else {
250 QPixmap p; 250 QPixmap p;
251 if(!error) {
252 imgData = igetter.readAll(); 251 imgData = igetter.readAll();
253 if(imgData.isNull()) return; 252 if(imgData.isNull()) return;
254 p.loadFromData(imgData); 253 p.loadFromData(imgData);