diff options
-rw-r--r-- | rbutil/rbutilqt/base/rbsettings.cpp | 4 | ||||
-rw-r--r-- | rbutil/rbutilqt/base/zipinstaller.cpp | 8 | ||||
-rw-r--r-- | rbutil/rbutilqt/browsedirtree.cpp | 2 | ||||
-rw-r--r-- | rbutil/rbutilqt/install.cpp | 10 | ||||
-rw-r--r-- | rbutil/rbutilqt/rbutilqt.cpp | 26 |
5 files changed, 25 insertions, 25 deletions
diff --git a/rbutil/rbutilqt/base/rbsettings.cpp b/rbutil/rbutilqt/base/rbsettings.cpp index fec68b5336..8ab340faa3 100644 --- a/rbutil/rbutilqt/base/rbsettings.cpp +++ b/rbutil/rbutilqt/base/rbsettings.cpp | |||
@@ -119,13 +119,13 @@ void RbSettings::ensureRbSettingsExists() | |||
119 | { | 119 | { |
120 | userSettings = new QSettings(QCoreApplication::instance()->applicationDirPath() | 120 | userSettings = new QSettings(QCoreApplication::instance()->applicationDirPath() |
121 | + "/RockboxUtility.ini", QSettings::IniFormat, NULL); | 121 | + "/RockboxUtility.ini", QSettings::IniFormat, NULL); |
122 | qDebug() << "config: portable"; | 122 | qDebug() << "[Settings] configuration: portable"; |
123 | } | 123 | } |
124 | else | 124 | else |
125 | { | 125 | { |
126 | userSettings = new QSettings(QSettings::IniFormat, | 126 | userSettings = new QSettings(QSettings::IniFormat, |
127 | QSettings::UserScope, "rockbox.org", "RockboxUtility",NULL); | 127 | QSettings::UserScope, "rockbox.org", "RockboxUtility",NULL); |
128 | qDebug() << "config: system"; | 128 | qDebug() << "[Settings] configuration: system"; |
129 | } | 129 | } |
130 | } | 130 | } |
131 | } | 131 | } |
diff --git a/rbutil/rbutilqt/base/zipinstaller.cpp b/rbutil/rbutilqt/base/zipinstaller.cpp index 268ae49935..6a59cdad02 100644 --- a/rbutil/rbutilqt/base/zipinstaller.cpp +++ b/rbutil/rbutilqt/base/zipinstaller.cpp | |||
@@ -31,7 +31,7 @@ ZipInstaller::ZipInstaller(QObject* parent): QObject(parent) | |||
31 | 31 | ||
32 | void ZipInstaller::install() | 32 | void ZipInstaller::install() |
33 | { | 33 | { |
34 | qDebug() << "[ZipInstall] install()"; | 34 | qDebug() << "[ZipInstall] initializing installation"; |
35 | 35 | ||
36 | runner = 0; | 36 | runner = 0; |
37 | connect(this, SIGNAL(cont()), this, SLOT(installContinue())); | 37 | connect(this, SIGNAL(cont()), this, SLOT(installContinue())); |
@@ -51,7 +51,7 @@ void ZipInstaller::abort() | |||
51 | 51 | ||
52 | void ZipInstaller::installContinue() | 52 | void ZipInstaller::installContinue() |
53 | { | 53 | { |
54 | qDebug() << "[ZipInstall] installContinue"; | 54 | qDebug() << "[ZipInstall] continuing installation"; |
55 | 55 | ||
56 | runner++; // this gets called when a install finished, so increase first. | 56 | runner++; // this gets called when a install finished, so increase first. |
57 | qDebug() << "[ZipInstall] runner done:" << runner << "/" << m_urllist.size(); | 57 | qDebug() << "[ZipInstall] runner done:" << runner << "/" << m_urllist.size(); |
@@ -75,7 +75,7 @@ void ZipInstaller::installContinue() | |||
75 | 75 | ||
76 | void ZipInstaller::installStart() | 76 | void ZipInstaller::installStart() |
77 | { | 77 | { |
78 | qDebug() << "[ZipInstall] installStart"; | 78 | qDebug() << "[ZipInstall] starting installation"; |
79 | 79 | ||
80 | emit logItem(tr("Downloading file %1.%2").arg(QFileInfo(m_url).baseName(), | 80 | emit logItem(tr("Downloading file %1.%2").arg(QFileInfo(m_url).baseName(), |
81 | QFileInfo(m_url).completeSuffix()),LOGINFO); | 81 | QFileInfo(m_url).completeSuffix()),LOGINFO); |
@@ -105,7 +105,7 @@ void ZipInstaller::installStart() | |||
105 | 105 | ||
106 | void ZipInstaller::downloadDone(bool error) | 106 | void ZipInstaller::downloadDone(bool error) |
107 | { | 107 | { |
108 | qDebug() << "[ZipInstall] downloadDone, error:" << error; | 108 | qDebug() << "[ZipInstall] download done, error:" << error; |
109 | QStringList zipContents; // needed later | 109 | QStringList zipContents; // needed later |
110 | // update progress bar | 110 | // update progress bar |
111 | 111 | ||
diff --git a/rbutil/rbutilqt/browsedirtree.cpp b/rbutil/rbutilqt/browsedirtree.cpp index c2441f27cd..fa8aa74bff 100644 --- a/rbutil/rbutilqt/browsedirtree.cpp +++ b/rbutil/rbutilqt/browsedirtree.cpp | |||
@@ -44,7 +44,7 @@ BrowseDirtree::BrowseDirtree(QWidget *parent, const QString &caption) : QDialog( | |||
44 | 44 | ||
45 | void BrowseDirtree::setDir(const QDir &dir) | 45 | void BrowseDirtree::setDir(const QDir &dir) |
46 | { | 46 | { |
47 | qDebug() << "BrowseDirtree::setDir()" << model.index(dir.absolutePath()); | 47 | qDebug() << "[BrowseDirtree] setDir()" << model.index(dir.absolutePath()); |
48 | 48 | ||
49 | // do not try to hilight directory if it's not valid. | 49 | // do not try to hilight directory if it's not valid. |
50 | if(!dir.exists()) return; | 50 | if(!dir.exists()) return; |
diff --git a/rbutil/rbutilqt/install.cpp b/rbutil/rbutilqt/install.cpp index d3854b06fc..099575fec4 100644 --- a/rbutil/rbutilqt/install.cpp +++ b/rbutil/rbutilqt/install.cpp | |||
@@ -92,7 +92,7 @@ void Install::accept() | |||
92 | logger = new ProgressLoggerGui(this); | 92 | logger = new ProgressLoggerGui(this); |
93 | logger->show(); | 93 | logger->show(); |
94 | QString mountPoint = RbSettings::value(RbSettings::Mountpoint).toString(); | 94 | QString mountPoint = RbSettings::value(RbSettings::Mountpoint).toString(); |
95 | qDebug() << "mountpoint:" << RbSettings::value(RbSettings::Mountpoint).toString(); | 95 | qDebug() << "[Install] mountpoint:" << RbSettings::value(RbSettings::Mountpoint).toString(); |
96 | // show dialog with error if mount point is wrong | 96 | // show dialog with error if mount point is wrong |
97 | if(!QFileInfo(mountPoint).isDir()) { | 97 | if(!QFileInfo(mountPoint).isDir()) { |
98 | logger->addItem(tr("Mount point is wrong!"),LOGERROR); | 98 | logger->addItem(tr("Mount point is wrong!"),LOGERROR); |
@@ -128,7 +128,7 @@ void Install::accept() | |||
128 | myversion = "r" + version.value("bleed_rev"); | 128 | myversion = "r" + version.value("bleed_rev"); |
129 | } | 129 | } |
130 | else { | 130 | else { |
131 | qDebug() << "no build selected -- this shouldn't happen"; | 131 | qDebug() << "[Install] no build selected -- this shouldn't happen"; |
132 | return; | 132 | return; |
133 | } | 133 | } |
134 | RbSettings::sync(); | 134 | RbSettings::sync(); |
@@ -212,7 +212,7 @@ void Install::changeBackupPath() | |||
212 | // Zip installer has finished | 212 | // Zip installer has finished |
213 | void Install::done(bool error) | 213 | void Install::done(bool error) |
214 | { | 214 | { |
215 | qDebug() << "Install::done, error:" << error; | 215 | qDebug() << "[Install] done, error:" << error; |
216 | 216 | ||
217 | if(error) | 217 | if(error) |
218 | { | 218 | { |
@@ -285,7 +285,7 @@ void Install::setVersionStrings(QMap<QString, QString>& ver) | |||
285 | 285 | ||
286 | if(version.value("arch_rev").isEmpty()) { | 286 | if(version.value("arch_rev").isEmpty()) { |
287 | ui.radioArchived->setEnabled(false); | 287 | ui.radioArchived->setEnabled(false); |
288 | qDebug() << "no information about archived version available!"; | 288 | qDebug() << "[Install] no information about archived version available!"; |
289 | } | 289 | } |
290 | if(version.value("rel_rev").isEmpty()) { | 290 | if(version.value("rel_rev").isEmpty()) { |
291 | ui.radioStable->setEnabled(false); | 291 | ui.radioStable->setEnabled(false); |
@@ -316,7 +316,7 @@ void Install::setVersionStrings(QMap<QString, QString>& ver) | |||
316 | ui.radioCurrent->setFont(font); | 316 | ui.radioCurrent->setFont(font); |
317 | } | 317 | } |
318 | 318 | ||
319 | qDebug() << "Install::setVersionStrings" << version; | 319 | qDebug() << "[Install] setting version strings to:" << version; |
320 | } | 320 | } |
321 | 321 | ||
322 | 322 | ||
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() | |||
172 | void RbUtilQt::downloadDone(bool error) | 172 | void 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) | |||
229 | void RbUtilQt::downloadBleedingDone(bool error) | 229 | void 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 | ||
305 | void RbUtilQt::updateSettings() | 305 | void 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 | ||
506 | void RbUtilQt::installdone(bool error) | 506 | void 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 | ||
771 | void RbUtilQt::installBootloaderPost(bool error) | 771 | void 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 | ||
1127 | void RbUtilQt::updateInfo() | 1127 | void 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); |