Mercurial > trustbridge
comparison ui/mainwindow.cpp @ 920:e48ad80c3aca
Merged.
| author | Emanuel Schuetze <emanuel@intevation.de> |
|---|---|
| date | Thu, 21 Aug 2014 13:58:59 +0200 |
| parents | e5fd2d0cf42f |
| children | ca997bc0f790 |
comparison
equal
deleted
inserted
replaced
| 919:e15637472a99 | 920:e48ad80c3aca |
|---|---|
| 1156 unselected << mUpdatesNew->unselectedCertificates(); | 1156 unselected << mUpdatesNew->unselectedCertificates(); |
| 1157 unselected << mUpdatesRemove->unselectedCertificates(); | 1157 unselected << mUpdatesRemove->unselectedCertificates(); |
| 1158 unselected << mInstallList->unselectedCertificates(); | 1158 unselected << mInstallList->unselectedCertificates(); |
| 1159 unselected << mRemoveList->unselectedCertificates(); | 1159 unselected << mRemoveList->unselectedCertificates(); |
| 1160 | 1160 |
| 1161 #ifdef Q_OS_WIN | |
| 1162 if (!is_admin() || !is_system_install()) { | |
| 1163 QMessageBox::information(this, | |
| 1164 tr("Installation as normal user."), | |
| 1165 tr("TrustBridge does not have the necessary privileges to install the certificates silently.") + "\n" + | |
| 1166 tr("Windows will explicitly ask you to verify every modification TrustBridge intends to make.")); | |
| 1167 } | |
| 1168 #endif | |
| 1169 | |
| 1161 QProgressDialog *progress = new QProgressDialog(this); | 1170 QProgressDialog *progress = new QProgressDialog(this); |
| 1162 progress->setWindowModality(Qt::WindowModal); | 1171 progress->setWindowModality(Qt::WindowModal); |
| 1163 progress->setLabelText(tr("Installing certificates...")); | 1172 progress->setLabelText(tr("Installing certificates...")); |
| 1164 progress->setCancelButton(0); | 1173 progress->setCancelButton(0); |
| 1165 progress->setRange(0,0); | 1174 progress->setRange(0,0); |