Mercurial > trustbridge
comparison ui/mainwindow.cpp @ 661:320a64d58e62
(UI) Updated English strings. Removed Issuer fields.
author | Emanuel Schuetze <emanuel@intevation.de> |
---|---|
date | Thu, 26 Jun 2014 15:59:34 +0200 |
parents | c7405d526ead |
children | b00c26fbc695 |
comparison
equal
deleted
inserted
replaced
660:392ec26de687 | 661:320a64d58e62 |
---|---|
477 | 477 |
478 QToolButton *allRemoveButton = new QToolButton; | 478 QToolButton *allRemoveButton = new QToolButton; |
479 allRemoveButton->setToolButtonStyle(Qt::ToolButtonTextUnderIcon); | 479 allRemoveButton->setToolButtonStyle(Qt::ToolButtonTextUnderIcon); |
480 allRemoveButton->setIcon(QIcon(":/img/task-attempt.png")); | 480 allRemoveButton->setIcon(QIcon(":/img/task-attempt.png")); |
481 allRemoveButton->setIconSize(QSize(32, 32)); | 481 allRemoveButton->setIconSize(QSize(32, 32)); |
482 allRemoveButton->setText(tr("Insecure\ncertificates")); | 482 allRemoveButton->setText(tr("Revoked\ncertificates")); |
483 allRemoveButton->setFixedWidth(90); | 483 allRemoveButton->setFixedWidth(90); |
484 allRemoveButton->setFixedHeight(70); | 484 allRemoveButton->setFixedHeight(70); |
485 allRemoveButton->setCheckable(true); | 485 allRemoveButton->setCheckable(true); |
486 | 486 |
487 QToolButton *infoButton = new QToolButton; | 487 QToolButton *infoButton = new QToolButton; |
596 this, SLOT(listChanged(int))); | 596 this, SLOT(listChanged(int))); |
597 mUpdatesNew->hide(); | 597 mUpdatesNew->hide(); |
598 | 598 |
599 mUpdatesRemoveCertificates = | 599 mUpdatesRemoveCertificates = |
600 new QLabel("<h3>" + | 600 new QLabel("<h3>" + |
601 tr("Remove insecure certificates (%1/%2)").arg(0).arg(0) + | 601 tr("Remove revoked certificates (%1/%2)").arg(0).arg(0) + |
602 "</h3>"); | 602 "</h3>"); |
603 mUpdatesDetailsRemove = new QPushButton(tr("Show details")); | 603 mUpdatesDetailsRemove = new QPushButton(tr("Show details")); |
604 connect(mUpdatesDetailsRemove, | 604 connect(mUpdatesDetailsRemove, |
605 SIGNAL(clicked()), | 605 SIGNAL(clicked()), |
606 this, | 606 this, |
686 QVBoxLayout *removePanelLayout = new QVBoxLayout; | 686 QVBoxLayout *removePanelLayout = new QVBoxLayout; |
687 QVBoxLayout *removeHeaderLayout = new QVBoxLayout; | 687 QVBoxLayout *removeHeaderLayout = new QVBoxLayout; |
688 QVBoxLayout *removeCenterLayout = new QVBoxLayout; | 688 QVBoxLayout *removeCenterLayout = new QVBoxLayout; |
689 | 689 |
690 QLabel *removeHeaderLabel = | 690 QLabel *removeHeaderLabel = |
691 new QLabel("<h2>" + tr("Insecure certificates") + "</h2>"); | 691 new QLabel("<h2>" + tr("Revoked certificates") + "</h2>"); |
692 QLabel *removeHeaderText = new QLabel(tr("The following list of insecure root" | 692 QLabel *removeHeaderText = new QLabel(tr("Certificates can be corrupted" |
693 " certificates is managed by the BSI. The BSI validates independently the" | 693 " or stolen and misused in many ways. Therefore the BSI recommends" |
694 " authenticity, security and actuality of these certificates.")); | 694 " to remove all revoked certificates from your system.")); |
695 removeHeaderLayout->addWidget(removeHeaderLabel); | 695 removeHeaderLayout->addWidget(removeHeaderLabel); |
696 removeHeaderLayout->addWidget(removeHeaderText); | 696 removeHeaderLayout->addWidget(removeHeaderText); |
697 | 697 |
698 QLabel *removeCenterText = new QLabel(tr("If you have kept an insecure certificate" | 698 QLabel *removeCenterText = new QLabel(tr("The follwing unsecure certificates were" |
699 " you can selected it to uninstall." | 699 " revoked by the BSI. Already uninstalled certificates cannot be reinstalled." |
700 " Already uninstalled certificates cannot be reinstalled." | 700 " It is recommended that you select all certificates to uninstall if you still" |
701 " Unsecure certificates should be removed to keep your" | 701 " have revoked certificates installed.")); |
702 " email and internet communication secure.")); | |
703 removeCenterLayout->addWidget(removeCenterText); | 702 removeCenterLayout->addWidget(removeCenterText); |
704 mRemoveList = new CertificateListWidget(this); | 703 mRemoveList = new CertificateListWidget(this); |
705 connect(mRemoveList, SIGNAL(certChanged(bool, const Certificate&)), | 704 connect(mRemoveList, SIGNAL(certChanged(bool, const Certificate&)), |
706 this, SLOT(toggleInManual(bool, const Certificate&))); | 705 this, SLOT(toggleInManual(bool, const Certificate&))); |
707 | 706 |
812 tr("Install new trusted certificates (%1/%2)") | 811 tr("Install new trusted certificates (%1/%2)") |
813 .arg(mUpdatesNew->selectedCertCount()) | 812 .arg(mUpdatesNew->selectedCertCount()) |
814 .arg(mUpdatesNew->certificates().size()) + | 813 .arg(mUpdatesNew->certificates().size()) + |
815 "</h3>"); | 814 "</h3>"); |
816 mUpdatesRemoveCertificates->setText("<h3>" + | 815 mUpdatesRemoveCertificates->setText("<h3>" + |
817 tr("Remove insecure certificates (%1/%2)") | 816 tr("Remove revoked certificates (%1/%2)") |
818 .arg(mUpdatesRemove->selectedCertCount()) | 817 .arg(mUpdatesRemove->selectedCertCount()) |
819 .arg(mUpdatesRemove->certificates().size()) + | 818 .arg(mUpdatesRemove->certificates().size()) + |
820 "</h3>"); | 819 "</h3>"); |
821 } | 820 } |
822 | 821 |
892 .arg(mUpdatesNew->selectedCertCount()) | 891 .arg(mUpdatesNew->selectedCertCount()) |
893 .arg(mUpdatesNew->certificates().size()) + | 892 .arg(mUpdatesNew->certificates().size()) + |
894 "</h3>"); | 893 "</h3>"); |
895 | 894 |
896 mUpdatesRemoveCertificates->setText("<h3>" + | 895 mUpdatesRemoveCertificates->setText("<h3>" + |
897 tr("Remove insecure certificates (%1/%2)") | 896 tr("Remove revoked certificates (%1/%2)") |
898 .arg(mUpdatesRemove->selectedCertCount()) | 897 .arg(mUpdatesRemove->selectedCertCount()) |
899 .arg(mUpdatesRemove->certificates().size()) + | 898 .arg(mUpdatesRemove->certificates().size()) + |
900 "</h3>"); | 899 "</h3>"); |
901 mUpdatesManualCertificates->setText("<h3>" + | 900 mUpdatesManualCertificates->setText("<h3>" + |
902 tr("Manually changed certificates (%1)").arg(0) + | 901 tr("Manually changed certificates (%1)").arg(0) + |
1017 else { | 1016 else { |
1018 mUpdatesManual->removeCertificate(cert); | 1017 mUpdatesManual->removeCertificate(cert); |
1019 } | 1018 } |
1020 | 1019 |
1021 mUpdatesManualCertificates->setText("<h3>" + | 1020 mUpdatesManualCertificates->setText("<h3>" + |
1022 tr("Manualy changed Certificates (%1)") | 1021 tr("Manually changed certificates (%1)") |
1023 .arg(mUpdatesManual->certificates().size()) + | 1022 .arg(mUpdatesManual->certificates().size()) + |
1024 "</h3>"); | 1023 "</h3>"); |
1025 } | 1024 } |
1026 | 1025 |
1027 void MainWindow::removeFromManual(bool state, const Certificate &cert) | 1026 void MainWindow::removeFromManual(bool state, const Certificate &cert) |
1028 { | 1027 { |
1029 mUpdatesManual->removeCertificate(cert); | 1028 mUpdatesManual->removeCertificate(cert); |
1030 | 1029 |
1031 mUpdatesManualCertificates->setText("<h3>" + | 1030 mUpdatesManualCertificates->setText("<h3>" + |
1032 tr("Manualy changed Certificates (%1)") | 1031 tr("Manually changed certificates (%1)") |
1033 .arg(mUpdatesManual->certificates().size()) + | 1032 .arg(mUpdatesManual->certificates().size()) + |
1034 "</h3>"); | 1033 "</h3>"); |
1035 | 1034 |
1036 if (cert.isInstallCert()) { | 1035 if (cert.isInstallCert()) { |
1037 mInstallList->setCertState(state, cert); | 1036 mInstallList->setCertState(state, cert); |