Mercurial > trustbridge
comparison ui/mainwindow.cpp @ 669:7147550ee15d
Always include previous certificates in choices for the installer
| author | Andre Heinecke <andre.heinecke@intevation.de> |
|---|---|
| date | Thu, 26 Jun 2014 17:42:52 +0200 |
| parents | 911b94a475e0 |
| children | e8bc1215904e |
comparison
equal
deleted
inserted
replaced
| 668:ef6d3dc9e930 | 669:7147550ee15d |
|---|---|
| 937 QStringList unselected; | 937 QStringList unselected; |
| 938 | 938 |
| 939 choices << mUpdatesNew->selectedCertificates(); | 939 choices << mUpdatesNew->selectedCertificates(); |
| 940 choices << mUpdatesRemove->selectedCertificates(); | 940 choices << mUpdatesRemove->selectedCertificates(); |
| 941 | 941 |
| 942 choices << mUpdatesManual->selectedCertificates(); | 942 choices << mUpdatesManual->selectedCertificates(); |
| 943 | |
| 944 /* Also include the old certificates */ | |
| 945 choices << mInstallList->selectedCertificates(); | |
| 946 choices << mRemoveList->selectedCertificates(); | |
| 947 | |
| 943 QStringList unselectedManuals = mUpdatesManual->unselectedCertificates(); | 948 QStringList unselectedManuals = mUpdatesManual->unselectedCertificates(); |
| 944 for(int i = 0; i < unselectedManuals.size(); i++) { | 949 for(int i = 0; i < unselectedManuals.size(); i++) { |
| 945 if (unselectedManuals.at(i).startsWith("I:")) { | 950 if (unselectedManuals.at(i).startsWith("I:")) { |
| 946 QString certLine = unselectedManuals.at(i); | 951 QString certLine = unselectedManuals.at(i); |
| 947 certLine[0] = 'R'; | 952 certLine[0] = 'R'; |