summaryrefslogtreecommitdiff
path: root/rbutil/rbutilqt/rbutilqt.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'rbutil/rbutilqt/rbutilqt.cpp')
-rw-r--r--rbutil/rbutilqt/rbutilqt.cpp26
1 files changed, 13 insertions, 13 deletions
diff --git a/rbutil/rbutilqt/rbutilqt.cpp b/rbutil/rbutilqt/rbutilqt.cpp
index e159c34ed8..c8513b1187 100644
--- a/rbutil/rbutilqt/rbutilqt.cpp
+++ b/rbutil/rbutilqt/rbutilqt.cpp
@@ -163,7 +163,7 @@ void RbUtilQt::downloadInfo()
163 daily->setCache(true); 163 daily->setCache(true);
164 else 164 else
165 daily->setCache(false); 165 daily->setCache(false);
166 qDebug() << "downloading build info"; 166 qDebug() << "[RbUtil] downloading build info";
167 daily->setFile(&buildInfo); 167 daily->setFile(&buildInfo);
168 daily->getFile(QUrl(RbSettings::value(RbSettings::ServerConfUrl).toString())); 168 daily->getFile(QUrl(RbSettings::value(RbSettings::ServerConfUrl).toString()));
169} 169}
@@ -172,12 +172,12 @@ void RbUtilQt::downloadInfo()
172void RbUtilQt::downloadDone(bool error) 172void RbUtilQt::downloadDone(bool error)
173{ 173{
174 if(error) { 174 if(error) {
175 qDebug() << "network error:" << daily->error(); 175 qDebug() << "[RbUtil] network error:" << daily->error();
176 QMessageBox::critical(this, tr("Network error"), 176 QMessageBox::critical(this, tr("Network error"),
177 tr("Can't get version information.")); 177 tr("Can't get version information."));
178 return; 178 return;
179 } 179 }
180 qDebug() << "network status:" << daily->error(); 180 qDebug() << "[RbUtil] network status:" << daily->error();
181 181
182 buildInfo.open(); 182 buildInfo.open();
183 QSettings info(buildInfo.fileName(), QSettings::IniFormat, this); 183 QSettings info(buildInfo.fileName(), QSettings::IniFormat, this);
@@ -229,7 +229,7 @@ void RbUtilQt::downloadDone(bool error)
229void RbUtilQt::downloadBleedingDone(bool error) 229void RbUtilQt::downloadBleedingDone(bool error)
230{ 230{
231 if(error) { 231 if(error) {
232 qDebug() << "network error:" << bleeding->error(); 232 qDebug() << "[RbUtil] network error:" << bleeding->error();
233 } 233 }
234 else { 234 else {
235 bleedingInfo.open(); 235 bleedingInfo.open();
@@ -237,7 +237,7 @@ void RbUtilQt::downloadBleedingDone(bool error)
237 bleedingInfo.close(); 237 bleedingInfo.close();
238 versmap.insert("bleed_rev", info.value("bleeding/rev").toString()); 238 versmap.insert("bleed_rev", info.value("bleeding/rev").toString());
239 versmap.insert("bleed_date", info.value("bleeding/timestamp").toString()); 239 versmap.insert("bleed_date", info.value("bleeding/timestamp").toString());
240 qDebug() << "versmap =" << versmap; 240 qDebug() << "[RbUtil] version map:" << versmap;
241 241
242 m_gotInfo = true; 242 m_gotInfo = true;
243 } 243 }
@@ -253,7 +253,7 @@ void RbUtilQt::downloadDone(int id, bool error)
253 QMessageBox::about(this, "Network Error", errorString); 253 QMessageBox::about(this, "Network Error", errorString);
254 m_networkerror = daily->errorString(); 254 m_networkerror = daily->errorString();
255 } 255 }
256 qDebug() << "downloadDone:" << id << "error:" << error; 256 qDebug() << "[RbUtil] downloadDone:" << id << "error:" << error;
257} 257}
258 258
259 259
@@ -304,7 +304,7 @@ void RbUtilQt::configDialog()
304 304
305void RbUtilQt::updateSettings() 305void RbUtilQt::updateSettings()
306{ 306{
307 qDebug() << "updateSettings()"; 307 qDebug() << "[RbUtil] updating current settings";
308 updateDevice(); 308 updateDevice();
309 updateManual(); 309 updateManual();
310 if(RbSettings::value(RbSettings::ProxyType) == "system") { 310 if(RbSettings::value(RbSettings::ProxyType) == "system") {
@@ -505,7 +505,7 @@ bool RbUtilQt::smallInstallInner()
505 505
506void RbUtilQt::installdone(bool error) 506void RbUtilQt::installdone(bool error)
507{ 507{
508 qDebug() << "install done"; 508 qDebug() << "[RbUtil] install done";
509 m_installed = true; 509 m_installed = true;
510 m_error = error; 510 m_error = error;
511} 511}
@@ -715,7 +715,7 @@ void RbUtilQt::installBootloader()
715 tree.exec(); 715 tree.exec();
716 716
717 backupDestination = tree.getSelected() + "/" + targetFolder; 717 backupDestination = tree.getSelected() + "/" + targetFolder;
718 qDebug() << backupDestination; 718 qDebug() << "[RbUtil] backing up to" << backupDestination;
719 // backup needs to be done after the logger has been set up. 719 // backup needs to be done after the logger has been set up.
720 } 720 }
721 } 721 }
@@ -770,7 +770,7 @@ void RbUtilQt::installBootloader()
770 770
771void RbUtilQt::installBootloaderPost(bool error) 771void RbUtilQt::installBootloaderPost(bool error)
772{ 772{
773 qDebug() << __func__ << error; 773 qDebug() << "[RbUtil] Bootloader Post-Installation, error state:" << error;
774 // if an error occured don't perform post install steps. 774 // if an error occured don't perform post install steps.
775 if(error) { 775 if(error) {
776 m_error = true; 776 m_error = true;
@@ -859,7 +859,7 @@ void RbUtilQt::installVoice()
859 859
860 voiceurl += RbSettings::value(RbSettings::CurBuildserverModel).toString() + "-" + 860 voiceurl += RbSettings::value(RbSettings::CurBuildserverModel).toString() + "-" +
861 versmap.value("arch_date") + "-english.zip"; 861 versmap.value("arch_date") + "-english.zip";
862 qDebug() << voiceurl; 862 qDebug() << "[RbUtil] voicefile URL:" << voiceurl;
863 863
864 installer->setUrl(voiceurl); 864 installer->setUrl(voiceurl);
865 installer->setLogSection("Voice"); 865 installer->setLogSection("Voice");
@@ -1053,7 +1053,7 @@ void RbUtilQt::downloadManual(void)
1053 section = "Manual (HTML)"; 1053 section = "Manual (HTML)";
1054 } 1054 }
1055 manualurl = RbSettings::value(RbSettings::ManualUrl).toString() + "/" + target; 1055 manualurl = RbSettings::value(RbSettings::ManualUrl).toString() + "/" + target;
1056 qDebug() << "manualurl =" << manualurl; 1056 qDebug() << "[RbUtil] Manual URL:" << manualurl;
1057 1057
1058 ProgressLoggerGui* logger = new ProgressLoggerGui(this); 1058 ProgressLoggerGui* logger = new ProgressLoggerGui(this);
1059 logger->show(); 1059 logger->show();
@@ -1126,7 +1126,7 @@ void RbUtilQt::installPortable(void)
1126 1126
1127void RbUtilQt::updateInfo() 1127void RbUtilQt::updateInfo()
1128{ 1128{
1129 qDebug() << "RbUtilQt::updateInfo()"; 1129 qDebug() << "[RbUtil] updating server info";
1130 1130
1131 QSettings log(RbSettings::value(RbSettings::Mountpoint).toString() 1131 QSettings log(RbSettings::value(RbSettings::Mountpoint).toString()
1132 + "/.rockbox/rbutil.log", QSettings::IniFormat, this); 1132 + "/.rockbox/rbutil.log", QSettings::IniFormat, this);