diff options
Diffstat (limited to 'rbutil/rbutilqt/configure.cpp')
-rw-r--r-- | rbutil/rbutilqt/configure.cpp | 44 |
1 files changed, 20 insertions, 24 deletions
diff --git a/rbutil/rbutilqt/configure.cpp b/rbutil/rbutilqt/configure.cpp index 0752b1f2a5..b455727185 100644 --- a/rbutil/rbutilqt/configure.cpp +++ b/rbutil/rbutilqt/configure.cpp | |||
@@ -92,7 +92,7 @@ Config::Config(QWidget *parent,int index) : QDialog(parent) | |||
92 | 92 | ||
93 | void Config::accept() | 93 | void Config::accept() |
94 | { | 94 | { |
95 | qDebug() << "Config::accept()"; | 95 | qDebug() << "[Config] checking configuration"; |
96 | QString errormsg = tr("The following errors occurred:") + "<ul>"; | 96 | QString errormsg = tr("The following errors occurred:") + "<ul>"; |
97 | bool error = false; | 97 | bool error = false; |
98 | 98 | ||
@@ -106,7 +106,7 @@ void Config::accept() | |||
106 | } | 106 | } |
107 | 107 | ||
108 | RbSettings::setValue(RbSettings::Proxy, proxy.toString()); | 108 | RbSettings::setValue(RbSettings::Proxy, proxy.toString()); |
109 | qDebug() << "new proxy:" << proxy; | 109 | qDebug() << "[Config] setting proxy to:" << proxy; |
110 | // proxy type | 110 | // proxy type |
111 | QString proxyType; | 111 | QString proxyType; |
112 | if(ui.radioNoProxy->isChecked()) proxyType = "none"; | 112 | if(ui.radioNoProxy->isChecked()) proxyType = "none"; |
@@ -192,7 +192,7 @@ void Config::accept() | |||
192 | 192 | ||
193 | void Config::abort() | 193 | void Config::abort() |
194 | { | 194 | { |
195 | qDebug() << "Config::abort()"; | 195 | qDebug() << "[Config] aborted."; |
196 | this->close(); | 196 | this->close(); |
197 | } | 197 | } |
198 | 198 | ||
@@ -260,7 +260,6 @@ void Config::updateCacheInfo(QString path) | |||
260 | qint64 sz = 0; | 260 | qint64 sz = 0; |
261 | for(int i = 0; i < fs.size(); i++) { | 261 | for(int i = 0; i < fs.size(); i++) { |
262 | sz += fs.at(i).size(); | 262 | sz += fs.at(i).size(); |
263 | qDebug() << fs.at(i).fileName() << fs.at(i).size(); | ||
264 | } | 263 | } |
265 | ui.cacheSize->setText(tr("Current cache size is %L1 kiB.") | 264 | ui.cacheSize->setText(tr("Current cache size is %L1 kiB.") |
266 | .arg(sz/1024)); | 265 | .arg(sz/1024)); |
@@ -269,15 +268,15 @@ void Config::updateCacheInfo(QString path) | |||
269 | 268 | ||
270 | void Config::setDevices() | 269 | void Config::setDevices() |
271 | { | 270 | { |
272 | 271 | ||
273 | // setup devices table | 272 | // setup devices table |
274 | qDebug() << "Config::setDevices()"; | 273 | qDebug() << "[Config] setting up devices list"; |
275 | 274 | ||
276 | QStringList platformList = RbSettings::platforms(); | 275 | QStringList platformList = RbSettings::platforms(); |
277 | 276 | ||
278 | QMap <QString, QString> manuf; | 277 | QMap <QString, QString> manuf; |
279 | QMap <QString, QString> devcs; | 278 | QMap <QString, QString> devcs; |
280 | for(int it = 0; it < platformList.size(); it++) | 279 | for(int it = 0; it < platformList.size(); it++) |
281 | { | 280 | { |
282 | QString curname = RbSettings::name(platformList.at(it)); | 281 | QString curname = RbSettings::name(platformList.at(it)); |
283 | QString curbrand = RbSettings::brand(platformList.at(it)); | 282 | QString curbrand = RbSettings::brand(platformList.at(it)); |
@@ -300,7 +299,6 @@ void Config::setDevices() | |||
300 | QTreeWidgetItem *w2; | 299 | QTreeWidgetItem *w2; |
301 | QTreeWidgetItem *w3 = 0; | 300 | QTreeWidgetItem *w3 = 0; |
302 | for(int c = 0; c < brands.size(); c++) { | 301 | for(int c = 0; c < brands.size(); c++) { |
303 | qDebug() << brands.at(c); | ||
304 | w = new QTreeWidgetItem(); | 302 | w = new QTreeWidgetItem(); |
305 | w->setFlags(Qt::ItemIsEnabled); | 303 | w->setFlags(Qt::ItemIsEnabled); |
306 | w->setText(0, brands.at(c)); | 304 | w->setText(0, brands.at(c)); |
@@ -308,12 +306,12 @@ void Config::setDevices() | |||
308 | 306 | ||
309 | // go through platforms again for sake of order | 307 | // go through platforms again for sake of order |
310 | for(int it = 0; it < platformList.size(); it++) { | 308 | for(int it = 0; it < platformList.size(); it++) { |
311 | 309 | ||
312 | QString curname = RbSettings::name(platformList.at(it)); | 310 | QString curname = RbSettings::name(platformList.at(it)); |
313 | QString curbrand = RbSettings::brand(platformList.at(it)); | 311 | QString curbrand = RbSettings::brand(platformList.at(it)); |
314 | 312 | ||
315 | if(curbrand != brands.at(c)) continue; | 313 | if(curbrand != brands.at(c)) continue; |
316 | qDebug() << "adding:" << brands.at(c) << curname; | 314 | qDebug() << "[Config] add supported device:" << brands.at(c) << curname; |
317 | w2 = new QTreeWidgetItem(w, QStringList(curname)); | 315 | w2 = new QTreeWidgetItem(w, QStringList(curname)); |
318 | w2->setData(0, Qt::UserRole, platformList.at(it)); | 316 | w2->setData(0, Qt::UserRole, platformList.at(it)); |
319 | 317 | ||
@@ -330,7 +328,7 @@ void Config::setDevices() | |||
330 | ui.treeDevices->setCurrentItem(w3); // hilight old selection | 328 | ui.treeDevices->setCurrentItem(w3); // hilight old selection |
331 | 329 | ||
332 | // tts / encoder tab | 330 | // tts / encoder tab |
333 | 331 | ||
334 | //encoders | 332 | //encoders |
335 | updateEncState(); | 333 | updateEncState(); |
336 | 334 | ||
@@ -343,7 +341,7 @@ void Config::setDevices() | |||
343 | if(index < 0) index = 0; | 341 | if(index < 0) index = 0; |
344 | ui.comboTts->setCurrentIndex(index); | 342 | ui.comboTts->setCurrentIndex(index); |
345 | updateTtsState(index); | 343 | updateTtsState(index); |
346 | 344 | ||
347 | } | 345 | } |
348 | 346 | ||
349 | 347 | ||
@@ -351,7 +349,7 @@ void Config::updateTtsState(int index) | |||
351 | { | 349 | { |
352 | QString ttsName = ui.comboTts->itemData(index).toString(); | 350 | QString ttsName = ui.comboTts->itemData(index).toString(); |
353 | TTSBase* tts = TTSBase::getTTS(this,ttsName); | 351 | TTSBase* tts = TTSBase::getTTS(this,ttsName); |
354 | 352 | ||
355 | if(tts->configOk()) | 353 | if(tts->configOk()) |
356 | { | 354 | { |
357 | ui.configTTSstatus->setText(tr("Configuration OK")); | 355 | ui.configTTSstatus->setText(tr("Configuration OK")); |
@@ -380,7 +378,7 @@ void Config::updateEncState() | |||
380 | RbSettings::setValue(RbSettings::Platform, olddevice); | 378 | RbSettings::setValue(RbSettings::Platform, olddevice); |
381 | 379 | ||
382 | EncBase* enc = EncBase::getEncoder(this,encoder); | 380 | EncBase* enc = EncBase::getEncoder(this,encoder); |
383 | 381 | ||
384 | if(enc->configOk()) | 382 | if(enc->configOk()) |
385 | { | 383 | { |
386 | ui.configEncstatus->setText(tr("Configuration OK")); | 384 | ui.configEncstatus->setText(tr("Configuration OK")); |
@@ -390,7 +388,7 @@ void Config::updateEncState() | |||
390 | { | 388 | { |
391 | ui.configEncstatus->setText(tr("Configuration INVALID")); | 389 | ui.configEncstatus->setText(tr("Configuration INVALID")); |
392 | ui.configEncstatusimg->setPixmap(QPixmap(QString::fromUtf8(":/icons/dialog-error.png"))); | 390 | ui.configEncstatusimg->setPixmap(QPixmap(QString::fromUtf8(":/icons/dialog-error.png"))); |
393 | } | 391 | } |
394 | } | 392 | } |
395 | 393 | ||
396 | void Config::setNoProxy(bool checked) | 394 | void Config::setNoProxy(bool checked) |
@@ -456,7 +454,7 @@ QStringList Config::findLanguageFiles() | |||
456 | langs.append(a); | 454 | langs.append(a); |
457 | } | 455 | } |
458 | langs.sort(); | 456 | langs.sort(); |
459 | qDebug() << "Config::findLanguageFiles()" << langs; | 457 | qDebug() << "[Config] available lang files:" << langs; |
460 | 458 | ||
461 | return langs; | 459 | return langs; |
462 | } | 460 | } |
@@ -477,11 +475,11 @@ QString Config::languageName(const QString &qmFile) | |||
477 | 475 | ||
478 | void Config::updateLanguage() | 476 | void Config::updateLanguage() |
479 | { | 477 | { |
480 | qDebug() << "updateLanguage()"; | 478 | qDebug() << "[Config] update selected language"; |
481 | QList<QListWidgetItem*> a = ui.listLanguages->selectedItems(); | 479 | QList<QListWidgetItem*> a = ui.listLanguages->selectedItems(); |
482 | if(a.size() > 0) | 480 | if(a.size() > 0) |
483 | language = lang.value(a.at(0)->text()); | 481 | language = lang.value(a.at(0)->text()); |
484 | qDebug() << language; | 482 | qDebug() << "[Config] new language:" << language; |
485 | } | 483 | } |
486 | 484 | ||
487 | 485 | ||
@@ -518,7 +516,7 @@ void Config::browseCache() | |||
518 | cbrowser->setDir(ui.cachePath->text()); | 516 | cbrowser->setDir(ui.cachePath->text()); |
519 | connect(cbrowser, SIGNAL(itemChanged(QString)), this, SLOT(setCache(QString))); | 517 | connect(cbrowser, SIGNAL(itemChanged(QString)), this, SLOT(setCache(QString))); |
520 | cbrowser->show(); | 518 | cbrowser->show(); |
521 | 519 | ||
522 | } | 520 | } |
523 | 521 | ||
524 | void Config::setMountpoint(QString m) | 522 | void Config::setMountpoint(QString m) |
@@ -643,12 +641,10 @@ void Config::cacheClear() | |||
643 | QDir dir(cache); | 641 | QDir dir(cache); |
644 | QStringList fn; | 642 | QStringList fn; |
645 | fn = dir.entryList(QStringList("*"), QDir::Files, QDir::Name); | 643 | fn = dir.entryList(QStringList("*"), QDir::Files, QDir::Name); |
646 | qDebug() << fn; | ||
647 | 644 | ||
648 | for(int i = 0; i < fn.size(); i++) { | 645 | for(int i = 0; i < fn.size(); i++) { |
649 | QString f = cache + fn.at(i); | 646 | QString f = cache + fn.at(i); |
650 | QFile::remove(f); | 647 | QFile::remove(f); |
651 | qDebug() << "removed:" << f; | ||
652 | } | 648 | } |
653 | updateCacheInfo(RbSettings::value(RbSettings::CachePath).toString()); | 649 | updateCacheInfo(RbSettings::value(RbSettings::CachePath).toString()); |
654 | } | 650 | } |
@@ -658,7 +654,7 @@ void Config::configTts() | |||
658 | { | 654 | { |
659 | int index = ui.comboTts->currentIndex(); | 655 | int index = ui.comboTts->currentIndex(); |
660 | TTSBase* tts = TTSBase::getTTS(this,ui.comboTts->itemData(index).toString()); | 656 | TTSBase* tts = TTSBase::getTTS(this,ui.comboTts->itemData(index).toString()); |
661 | 657 | ||
662 | EncTtsCfgGui gui(this,tts,TTSBase::getTTSName(RbSettings::value(RbSettings::Tts).toString())); | 658 | EncTtsCfgGui gui(this,tts,TTSBase::getTTSName(RbSettings::value(RbSettings::Tts).toString())); |
663 | gui.exec(); | 659 | gui.exec(); |
664 | updateTtsState(ui.comboTts->currentIndex()); | 660 | updateTtsState(ui.comboTts->currentIndex()); |