Mercurial > trustbridge
comparison ui/mainwindow.cpp @ 1082:a12e6172d82c
Extend logging to all choices and SW updates.
| author | Andre Heinecke <andre.heinecke@intevation.de> |
|---|---|
| date | Thu, 11 Sep 2014 12:05:59 +0200 |
| parents | edbf5e5e88f4 |
| children | 508c96e72f62 |
comparison
equal
deleted
inserted
replaced
| 1081:edbf5e5e88f4 | 1082:a12e6172d82c |
|---|---|
| 392 QDateTime swAvailableLastMod = mSettings.value("Software/availableDate").toDateTime(); | 392 QDateTime swAvailableLastMod = mSettings.value("Software/availableDate").toDateTime(); |
| 393 | 393 |
| 394 if (swAvailableLastMod.isValid()) { | 394 if (swAvailableLastMod.isValid()) { |
| 395 qDebug() << "Installed an update: " << swInstalledLastMod << | 395 qDebug() << "Installed an update: " << swInstalledLastMod << |
| 396 " available " << swAvailableLastMod; | 396 " available " << swAvailableLastMod; |
| 397 syslog_info_printf ("Software has been updated to version: %s\n", | |
| 398 QApplication::applicationVersion().toUtf8().constData()); | |
| 397 if (swInstalledLastMod == swAvailableLastMod) { | 399 if (swInstalledLastMod == swAvailableLastMod) { |
| 398 QString fileName = mSettings.value("Software/available").toString(); | 400 QString fileName = mSettings.value("Software/available").toString(); |
| 399 if (fileName.isEmpty()) { | 401 if (fileName.isEmpty()) { |
| 400 qDebug() << "Software marked as available but no filename set."; | 402 qDebug() << "Software marked as available but no filename set."; |
| 401 } else { | 403 } else { |
| 1241 progress->setCancelButton(0); | 1243 progress->setCancelButton(0); |
| 1242 progress->setRange(0,0); | 1244 progress->setRange(0,0); |
| 1243 progress->setMinimumDuration(0); | 1245 progress->setMinimumDuration(0); |
| 1244 progress->show(); | 1246 progress->show(); |
| 1245 | 1247 |
| 1248 CertificateList *instList = mListToInstall.isValid() ? | |
| 1249 &mListToInstall : | |
| 1250 &mInstalledList; | |
| 1251 | |
| 1246 InstallWrapper *instWrap = new InstallWrapper(this, | 1252 InstallWrapper *instWrap = new InstallWrapper(this, |
| 1247 mListToInstall.isValid() ? | 1253 instList->fileName(), |
| 1248 mListToInstall.fileName() : | |
| 1249 mInstalledList.fileName(), | |
| 1250 choices); | 1254 choices); |
| 1255 | |
| 1256 syslog_info_printf ("Installing certificate list: '%s' Version '%s'\n", | |
| 1257 instList->fileName().toUtf8().constData(), | |
| 1258 instList->date().toString().toUtf8().constData()); | |
| 1251 /* Clean up object and progress dialog */ | 1259 /* Clean up object and progress dialog */ |
| 1252 connect(instWrap, SIGNAL(finished()), instWrap, SLOT(deleteLater())); | 1260 connect(instWrap, SIGNAL(finished()), instWrap, SLOT(deleteLater())); |
| 1253 connect(instWrap, SIGNAL(finished()), progress, SLOT(deleteLater())); | 1261 connect(instWrap, SIGNAL(finished()), progress, SLOT(deleteLater())); |
| 1254 connect(instWrap, SIGNAL(finished()), progress, SLOT(cancel())); | 1262 connect(instWrap, SIGNAL(finished()), progress, SLOT(cancel())); |
| 1255 connect(instWrap, SIGNAL(installationSuccessful()), | 1263 connect(instWrap, SIGNAL(installationSuccessful()), |