diff options
author | Dominik Riebeling <Dominik.Riebeling@gmail.com> | 2013-11-03 11:08:18 +0100 |
---|---|---|
committer | Dominik Riebeling <Dominik.Riebeling@gmail.com> | 2013-11-04 23:32:52 +0100 |
commit | 4d2ce949b3b41f8bf0af446fa20205ddd229e579 (patch) | |
tree | 01fa19471d9831b296bea5d7049f765e38b30bbb /rbutil/rbutilqt/themesinstallwindow.cpp | |
parent | 335ec75d60bba82f23fc47b20f9390e0cba9c9c5 (diff) | |
download | rockbox-4d2ce949b3b41f8bf0af446fa20205ddd229e579.tar.gz rockbox-4d2ce949b3b41f8bf0af446fa20205ddd229e579.zip |
Use cutelogger for Rockbox Utility internal trace.
Change tracing from qDebug() to use cutelogger, which is available under the
LGPL2.1. This allows to automatically add filename and line number to the log,
and also provides multiple log levels.
Change-Id: I5dbdaf902ba54ea99f07ae10a07467c52fdac910
Diffstat (limited to 'rbutil/rbutilqt/themesinstallwindow.cpp')
-rw-r--r-- | rbutil/rbutilqt/themesinstallwindow.cpp | 34 |
1 files changed, 17 insertions, 17 deletions
diff --git a/rbutil/rbutilqt/themesinstallwindow.cpp b/rbutil/rbutilqt/themesinstallwindow.cpp index 2003b41c02..c514c65b0c 100644 --- a/rbutil/rbutilqt/themesinstallwindow.cpp +++ b/rbutil/rbutilqt/themesinstallwindow.cpp | |||
@@ -28,6 +28,7 @@ | |||
28 | #include "systeminfo.h" | 28 | #include "systeminfo.h" |
29 | #include "rockboxinfo.h" | 29 | #include "rockboxinfo.h" |
30 | #include "version.h" | 30 | #include "version.h" |
31 | #include "Logger.h" | ||
31 | 32 | ||
32 | ThemesInstallWindow::ThemesInstallWindow(QWidget *parent) : QDialog(parent) | 33 | ThemesInstallWindow::ThemesInstallWindow(QWidget *parent) : QDialog(parent) |
33 | { | 34 | { |
@@ -79,7 +80,7 @@ void ThemesInstallWindow::downloadInfo() | |||
79 | = RockboxInfo(RbSettings::value(RbSettings::Mountpoint).toString()); | 80 | = RockboxInfo(RbSettings::value(RbSettings::Mountpoint).toString()); |
80 | 81 | ||
81 | themesInfo.open(); | 82 | themesInfo.open(); |
82 | qDebug() << "[Themes] downloading info to" << themesInfo.fileName(); | 83 | LOG_INFO() << "downloading info to" << themesInfo.fileName(); |
83 | themesInfo.close(); | 84 | themesInfo.close(); |
84 | 85 | ||
85 | QString infoUrl = SystemInfo::value(SystemInfo::ThemesInfoUrl).toString(); | 86 | QString infoUrl = SystemInfo::value(SystemInfo::ThemesInfoUrl).toString(); |
@@ -89,7 +90,7 @@ void ThemesInstallWindow::downloadInfo() | |||
89 | infoUrl.replace("%RELEASE%", installInfo.release()); | 90 | infoUrl.replace("%RELEASE%", installInfo.release()); |
90 | infoUrl.replace("%RBUTILVER%", VERSION); | 91 | infoUrl.replace("%RBUTILVER%", VERSION); |
91 | QUrl url = QUrl(infoUrl); | 92 | QUrl url = QUrl(infoUrl); |
92 | qDebug() << "[Themes] Info URL:" << url; | 93 | LOG_INFO() << "Info URL:" << url; |
93 | getter->setFile(&themesInfo); | 94 | getter->setFile(&themesInfo); |
94 | 95 | ||
95 | connect(getter, SIGNAL(done(bool)), this, SLOT(downloadDone(bool))); | 96 | connect(getter, SIGNAL(done(bool)), this, SLOT(downloadDone(bool))); |
@@ -101,13 +102,13 @@ void ThemesInstallWindow::downloadInfo() | |||
101 | void ThemesInstallWindow::downloadDone(int id, bool error) | 102 | void ThemesInstallWindow::downloadDone(int id, bool error) |
102 | { | 103 | { |
103 | downloadDone(error); | 104 | downloadDone(error); |
104 | qDebug() << "[Themes] Download" << id << "done, error:" << error; | 105 | LOG_INFO() << "Download" << id << "done, error:" << error; |
105 | } | 106 | } |
106 | 107 | ||
107 | 108 | ||
108 | void ThemesInstallWindow::downloadDone(bool error) | 109 | void ThemesInstallWindow::downloadDone(bool error) |
109 | { | 110 | { |
110 | qDebug() << "[Themes] Download done, error:" << error; | 111 | LOG_INFO() << "Download done, error:" << error; |
111 | 112 | ||
112 | disconnect(logger, SIGNAL(aborted()), getter, SLOT(abort())); | 113 | disconnect(logger, SIGNAL(aborted()), getter, SLOT(abort())); |
113 | disconnect(logger, SIGNAL(aborted()), this, SLOT(close())); | 114 | disconnect(logger, SIGNAL(aborted()), this, SLOT(close())); |
@@ -115,10 +116,10 @@ void ThemesInstallWindow::downloadDone(bool error) | |||
115 | 116 | ||
116 | QSettings iniDetails(themesInfo.fileName(), QSettings::IniFormat, this); | 117 | QSettings iniDetails(themesInfo.fileName(), QSettings::IniFormat, this); |
117 | QStringList tl = iniDetails.childGroups(); | 118 | QStringList tl = iniDetails.childGroups(); |
118 | qDebug() << "[Themes] Theme site result:" | 119 | LOG_INFO() << "Theme site result:" |
119 | << iniDetails.value("error/code").toString() | 120 | << iniDetails.value("error/code").toString() |
120 | << iniDetails.value("error/description").toString() | 121 | << iniDetails.value("error/description").toString() |
121 | << iniDetails.value("error/query").toString(); | 122 | << iniDetails.value("error/query").toString(); |
122 | 123 | ||
123 | if(error) { | 124 | if(error) { |
124 | logger->addItem(tr("Network error: %1.\n" | 125 | logger->addItem(tr("Network error: %1.\n" |
@@ -132,8 +133,8 @@ void ThemesInstallWindow::downloadDone(bool error) | |||
132 | } | 133 | } |
133 | // handle possible error codes | 134 | // handle possible error codes |
134 | if(iniDetails.value("error/code").toInt() != 0 || !iniDetails.contains("error/code")) { | 135 | if(iniDetails.value("error/code").toInt() != 0 || !iniDetails.contains("error/code")) { |
135 | qDebug() << "[Themes] Theme site returned an error:" | 136 | LOG_ERROR() << "Theme site returned an error:" |
136 | << iniDetails.value("error/code"); | 137 | << iniDetails.value("error/code"); |
137 | logger->addItem(tr("the following error occured:\n%1") | 138 | logger->addItem(tr("the following error occured:\n%1") |
138 | .arg(iniDetails.value("error/description", "unknown error").toString()), LOGERROR); | 139 | .arg(iniDetails.value("error/description", "unknown error").toString()), LOGERROR); |
139 | logger->setFinished(); | 140 | logger->setFinished(); |
@@ -152,7 +153,7 @@ void ThemesInstallWindow::downloadDone(bool error) | |||
152 | iniDetails.endGroup(); | 153 | iniDetails.endGroup(); |
153 | continue; | 154 | continue; |
154 | } | 155 | } |
155 | qDebug() << "[Themes] adding to list:" << tl.at(i); | 156 | LOG_INFO() << "adding to list:" << tl.at(i); |
156 | // convert to unicode and replace HTML-specific entities | 157 | // convert to unicode and replace HTML-specific entities |
157 | QByteArray raw = iniDetails.value("name").toByteArray(); | 158 | QByteArray raw = iniDetails.value("name").toByteArray(); |
158 | QTextCodec* codec = QTextCodec::codecForHtml(raw); | 159 | QTextCodec* codec = QTextCodec::codecForHtml(raw); |
@@ -175,7 +176,7 @@ void ThemesInstallWindow::downloadDone(bool error) | |||
175 | msg = iniDetails.value("status/msg." + lang).toString(); | 176 | msg = iniDetails.value("status/msg." + lang).toString(); |
176 | else | 177 | else |
177 | msg = iniDetails.value("status/msg").toString(); | 178 | msg = iniDetails.value("status/msg").toString(); |
178 | qDebug() << "[Themes] MOTD" << msg; | 179 | LOG_INFO() << "MOTD" << msg; |
179 | if(!msg.isEmpty()) | 180 | if(!msg.isEmpty()) |
180 | QMessageBox::information(this, tr("Information"), msg); | 181 | QMessageBox::information(this, tr("Information"), msg); |
181 | } | 182 | } |
@@ -240,7 +241,7 @@ void ThemesInstallWindow::updateDetails(QListWidgetItem* cur, QListWidgetItem* p | |||
240 | 241 | ||
241 | void ThemesInstallWindow::updateImage(bool error) | 242 | void ThemesInstallWindow::updateImage(bool error) |
242 | { | 243 | { |
243 | qDebug() << "[Themes] Updating image:"<< !error; | 244 | LOG_INFO() << "Updating image:"<< !error; |
244 | 245 | ||
245 | if(error) { | 246 | if(error) { |
246 | ui.themePreview->clear(); | 247 | ui.themePreview->clear(); |
@@ -266,8 +267,7 @@ void ThemesInstallWindow::updateImage(bool error) | |||
266 | 267 | ||
267 | void ThemesInstallWindow::resizeEvent(QResizeEvent* e) | 268 | void ThemesInstallWindow::resizeEvent(QResizeEvent* e) |
268 | { | 269 | { |
269 | qDebug() << "[Themes]" << e; | 270 | (void)e; |
270 | |||
271 | QPixmap p, q; | 271 | QPixmap p, q; |
272 | QSize img; | 272 | QSize img; |
273 | img.setHeight(ui.themePreview->height()); | 273 | img.setHeight(ui.themePreview->height()); |
@@ -344,13 +344,13 @@ void ThemesInstallWindow::install() | |||
344 | QDate().currentDate().toString("yyyyMMdd")).toString()); | 344 | QDate().currentDate().toString("yyyyMMdd")).toString()); |
345 | iniDetails.endGroup(); | 345 | iniDetails.endGroup(); |
346 | } | 346 | } |
347 | qDebug() << "[Themes] installing:" << themes; | 347 | LOG_INFO() << "installing:" << themes; |
348 | 348 | ||
349 | if(logger == NULL) | 349 | if(logger == NULL) |
350 | logger = new ProgressLoggerGui(this); | 350 | logger = new ProgressLoggerGui(this); |
351 | logger->show(); | 351 | logger->show(); |
352 | QString mountPoint = RbSettings::value(RbSettings::Mountpoint).toString(); | 352 | QString mountPoint = RbSettings::value(RbSettings::Mountpoint).toString(); |
353 | qDebug() << "[Themes] mountpoint:" << mountPoint; | 353 | LOG_INFO() << "mountpoint:" << mountPoint; |
354 | // show dialog with error if mount point is wrong | 354 | // show dialog with error if mount point is wrong |
355 | if(!QFileInfo(mountPoint).isDir()) { | 355 | if(!QFileInfo(mountPoint).isDir()) { |
356 | logger->addItem(tr("Mount point is wrong!"),LOGERROR); | 356 | logger->addItem(tr("Mount point is wrong!"),LOGERROR); |