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/configure.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/configure.cpp')
-rw-r--r-- | rbutil/rbutilqt/configure.cpp | 31 |
1 files changed, 16 insertions, 15 deletions
diff --git a/rbutil/rbutilqt/configure.cpp b/rbutil/rbutilqt/configure.cpp index 456e65cdd9..5a78c6f6a1 100644 --- a/rbutil/rbutilqt/configure.cpp +++ b/rbutil/rbutilqt/configure.cpp | |||
@@ -47,6 +47,7 @@ | |||
47 | #include "rbutilqt.h" | 47 | #include "rbutilqt.h" |
48 | 48 | ||
49 | #include "systrace.h" | 49 | #include "systrace.h" |
50 | #include "Logger.h" | ||
50 | 51 | ||
51 | #define DEFAULT_LANG "English (en)" | 52 | #define DEFAULT_LANG "English (en)" |
52 | #define DEFAULT_LANG_CODE "en" | 53 | #define DEFAULT_LANG_CODE "en" |
@@ -125,7 +126,7 @@ Config::Config(QWidget *parent,int index) : QDialog(parent) | |||
125 | 126 | ||
126 | void Config::accept() | 127 | void Config::accept() |
127 | { | 128 | { |
128 | qDebug() << "[Config] checking configuration"; | 129 | LOG_INFO() << "checking configuration"; |
129 | QString errormsg = tr("The following errors occurred:") + "<ul>"; | 130 | QString errormsg = tr("The following errors occurred:") + "<ul>"; |
130 | bool error = false; | 131 | bool error = false; |
131 | 132 | ||
@@ -154,7 +155,7 @@ void Config::accept() | |||
154 | QUrl p = proxy; | 155 | QUrl p = proxy; |
155 | p.setPassword(proxy.password().toUtf8().toBase64()); | 156 | p.setPassword(proxy.password().toUtf8().toBase64()); |
156 | RbSettings::setValue(RbSettings::Proxy, p.toString()); | 157 | RbSettings::setValue(RbSettings::Proxy, p.toString()); |
157 | qDebug() << "[Config] setting proxy to:" << proxy.toString(QUrl::RemovePassword); | 158 | LOG_INFO() << "setting proxy to:" << proxy.toString(QUrl::RemovePassword); |
158 | // proxy type | 159 | // proxy type |
159 | QString proxyType; | 160 | QString proxyType; |
160 | if(ui.radioNoProxy->isChecked()) proxyType = "none"; | 161 | if(ui.radioNoProxy->isChecked()) proxyType = "none"; |
@@ -240,7 +241,7 @@ void Config::accept() | |||
240 | 241 | ||
241 | void Config::abort() | 242 | void Config::abort() |
242 | { | 243 | { |
243 | qDebug() << "[Config] aborted."; | 244 | LOG_INFO() << "aborted."; |
244 | this->close(); | 245 | this->close(); |
245 | } | 246 | } |
246 | 247 | ||
@@ -334,7 +335,7 @@ void Config::showProxyPassword(bool show) | |||
334 | 335 | ||
335 | void Config::showDisabled(bool show) | 336 | void Config::showDisabled(bool show) |
336 | { | 337 | { |
337 | qDebug() << "[Config] disabled targets shown:" << show; | 338 | LOG_INFO() << "disabled targets shown:" << show; |
338 | if(show) | 339 | if(show) |
339 | QMessageBox::warning(this, tr("Showing disabled targets"), | 340 | QMessageBox::warning(this, tr("Showing disabled targets"), |
340 | tr("You just enabled showing targets that are marked disabled. " | 341 | tr("You just enabled showing targets that are marked disabled. " |
@@ -349,7 +350,7 @@ void Config::setDevices() | |||
349 | { | 350 | { |
350 | 351 | ||
351 | // setup devices table | 352 | // setup devices table |
352 | qDebug() << "[Config] setting up devices list"; | 353 | LOG_INFO() << "setting up devices list"; |
353 | 354 | ||
354 | QStringList platformList; | 355 | QStringList platformList; |
355 | if(ui.showDisabled->isChecked()) | 356 | if(ui.showDisabled->isChecked()) |
@@ -393,7 +394,7 @@ void Config::setDevices() | |||
393 | SystemInfo::CurName).toString() + | 394 | SystemInfo::CurName).toString() + |
394 | " (" +ServerInfo::platformValue(platformList.at(it), | 395 | " (" +ServerInfo::platformValue(platformList.at(it), |
395 | ServerInfo::CurStatus).toString() +")"; | 396 | ServerInfo::CurStatus).toString() +")"; |
396 | qDebug() << "[Config] add supported device:" << brands.at(c) << curname; | 397 | LOG_INFO() << "add supported device:" << brands.at(c) << curname; |
397 | w2 = new QTreeWidgetItem(w, QStringList(curname)); | 398 | w2 = new QTreeWidgetItem(w, QStringList(curname)); |
398 | w2->setData(0, Qt::UserRole, platformList.at(it)); | 399 | w2->setData(0, Qt::UserRole, platformList.at(it)); |
399 | 400 | ||
@@ -516,7 +517,7 @@ void Config::setSystemProxy(bool checked) | |||
516 | proxy.setPort(ui.proxyPort->text().toInt()); | 517 | proxy.setPort(ui.proxyPort->text().toInt()); |
517 | // show system values in input box | 518 | // show system values in input box |
518 | QUrl envproxy = System::systemProxy(); | 519 | QUrl envproxy = System::systemProxy(); |
519 | qDebug() << "[Config] setting system proxy" << envproxy; | 520 | LOG_INFO() << "setting system proxy" << envproxy; |
520 | 521 | ||
521 | ui.proxyHost->setText(envproxy.host()); | 522 | ui.proxyHost->setText(envproxy.host()); |
522 | ui.proxyPort->setText(QString("%1").arg(envproxy.port())); | 523 | ui.proxyPort->setText(QString("%1").arg(envproxy.port())); |
@@ -524,7 +525,7 @@ void Config::setSystemProxy(bool checked) | |||
524 | ui.proxyPass->setText(envproxy.password()); | 525 | ui.proxyPass->setText(envproxy.password()); |
525 | 526 | ||
526 | if(envproxy.host().isEmpty() || envproxy.port() == -1) { | 527 | if(envproxy.host().isEmpty() || envproxy.port() == -1) { |
527 | qDebug() << "[Config] sytem proxy is invalid."; | 528 | LOG_WARNING() << "system proxy is invalid."; |
528 | QMessageBox::warning(this, tr("Proxy Detection"), | 529 | QMessageBox::warning(this, tr("Proxy Detection"), |
529 | tr("The System Proxy settings are invalid!\n" | 530 | tr("The System Proxy settings are invalid!\n" |
530 | "Rockbox Utility can't work with this proxy settings. " | 531 | "Rockbox Utility can't work with this proxy settings. " |
@@ -571,7 +572,7 @@ QStringList Config::findLanguageFiles() | |||
571 | langs.append(a); | 572 | langs.append(a); |
572 | } | 573 | } |
573 | langs.sort(); | 574 | langs.sort(); |
574 | qDebug() << "[Config] available lang files:" << langs; | 575 | LOG_INFO() << "available lang files:" << langs; |
575 | 576 | ||
576 | return langs; | 577 | return langs; |
577 | } | 578 | } |
@@ -592,7 +593,7 @@ QString Config::languageName(const QString &qmFile) | |||
592 | 593 | ||
593 | void Config::updateLanguage() | 594 | void Config::updateLanguage() |
594 | { | 595 | { |
595 | qDebug() << "[Config] update selected language"; | 596 | LOG_INFO() << "update selected language"; |
596 | 597 | ||
597 | // remove all old translators | 598 | // remove all old translators |
598 | for(int i = 0; i < RbUtilQt::translators.size(); ++i) { | 599 | for(int i = 0; i < RbUtilQt::translators.size(); ++i) { |
@@ -603,7 +604,7 @@ void Config::updateLanguage() | |||
603 | QList<QListWidgetItem*> a = ui.listLanguages->selectedItems(); | 604 | QList<QListWidgetItem*> a = ui.listLanguages->selectedItems(); |
604 | if(a.size() > 0) | 605 | if(a.size() > 0) |
605 | language = lang.value(a.at(0)->text()); | 606 | language = lang.value(a.at(0)->text()); |
606 | qDebug() << "[Config] new language:" << language; | 607 | LOG_INFO() << "new language:" << language; |
607 | 608 | ||
608 | QString applang = QLocale::system().name(); | 609 | QString applang = QLocale::system().name(); |
609 | QTranslator *translator = new QTranslator(qApp); | 610 | QTranslator *translator = new QTranslator(qApp); |
@@ -668,7 +669,7 @@ void Config::refreshMountpoint() | |||
668 | ui.mountPoint->addItem(QDir::toNativeSeparators(mps.at(i)), description); | 669 | ui.mountPoint->addItem(QDir::toNativeSeparators(mps.at(i)), description); |
669 | } | 670 | } |
670 | else { | 671 | else { |
671 | qDebug() << "[Config] mountpoint not writable, skipping:" << mps.at(i); | 672 | LOG_WARNING() << "mountpoint not writable, skipping:" << mps.at(i); |
672 | } | 673 | } |
673 | } | 674 | } |
674 | if(!mountpoint.isEmpty()) { | 675 | if(!mountpoint.isEmpty()) { |
@@ -682,7 +683,7 @@ void Config::updateMountpoint(QString m) | |||
682 | { | 683 | { |
683 | if(!m.isEmpty()) { | 684 | if(!m.isEmpty()) { |
684 | mountpoint = QDir::fromNativeSeparators(m); | 685 | mountpoint = QDir::fromNativeSeparators(m); |
685 | qDebug() << "[Config] Mountpoint set to" << mountpoint; | 686 | LOG_INFO() << "Mountpoint set to" << mountpoint; |
686 | } | 687 | } |
687 | } | 688 | } |
688 | 689 | ||
@@ -695,7 +696,7 @@ void Config::updateMountpoint(int idx) | |||
695 | QString mp = ui.mountPoint->itemText(idx); | 696 | QString mp = ui.mountPoint->itemText(idx); |
696 | if(!mp.isEmpty()) { | 697 | if(!mp.isEmpty()) { |
697 | mountpoint = QDir::fromNativeSeparators(mp); | 698 | mountpoint = QDir::fromNativeSeparators(mp); |
698 | qDebug() << "[Config] Mountpoint set to" << mountpoint; | 699 | LOG_INFO() << "Mountpoint set to" << mountpoint; |
699 | } | 700 | } |
700 | } | 701 | } |
701 | 702 | ||
@@ -715,7 +716,7 @@ void Config::setMountpoint(QString m) | |||
715 | ui.mountPoint->addItem(QDir::toNativeSeparators(m)); | 716 | ui.mountPoint->addItem(QDir::toNativeSeparators(m)); |
716 | ui.mountPoint->setCurrentIndex(ui.mountPoint->findText(m)); | 717 | ui.mountPoint->setCurrentIndex(ui.mountPoint->findText(m)); |
717 | } | 718 | } |
718 | qDebug() << "[Config] Mountpoint set to" << mountpoint; | 719 | LOG_INFO() << "Mountpoint set to" << mountpoint; |
719 | } | 720 | } |
720 | 721 | ||
721 | 722 | ||