Mercurial > trustbridge

comparison ui/mainwindow.cpp @ 659:c7405d526ead

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
(UI) Updated English strings.
author Emanuel Schuetze <emanuel@intevation.de>
date Thu, 26 Jun 2014 12:31:55 +0200
parents 37ffc8ddb698
children 320a64d58e62
comparison
equal deleted inserted replaced
658:ac5c0ad4dd04 659:c7405d526ead
441 QImage *logoImage = new QImage(":/img/logo.png"); 441 QImage *logoImage = new QImage(":/img/logo.png");
442 QLabel *logo = new QLabel; 442 QLabel *logo = new QLabel;
443 logo->setBackgroundRole(QPalette::Base); 443 logo->setBackgroundRole(QPalette::Base);
444 logo->setPixmap(QPixmap::fromImage(*logoImage)); 444 logo->setPixmap(QPixmap::fromImage(*logoImage));
445 QLabel *title = new QLabel("<h1>" + QString::fromLatin1(APPNAME) + "</h1>"); 445 QLabel *title = new QLabel("<h1>" + QString::fromLatin1(APPNAME) + "</h1>");
446 QLabel *subTitle = new QLabel("This Software installs and removes Certificates"); 446 QLabel *subTitle = new QLabel("Trust in your digital communication");
447 headerTextLayout->addWidget(title); 447 headerTextLayout->addWidget(title);
448 headerTextLayout->addWidget(subTitle); 448 headerTextLayout->addWidget(subTitle);
449 headerLayout->addWidget(logo); 449 headerLayout->addWidget(logo);
450 headerLayout->addLayout(headerTextLayout); 450 headerLayout->addLayout(headerTextLayout);
451 headerLayout->setStretch(0, 0); 451 headerLayout->setStretch(0, 0);
468 468
469 QToolButton *allInstallButton = new QToolButton; 469 QToolButton *allInstallButton = new QToolButton;
470 allInstallButton->setToolButtonStyle(Qt::ToolButtonTextUnderIcon); 470 allInstallButton->setToolButtonStyle(Qt::ToolButtonTextUnderIcon);
471 allInstallButton->setIcon(QIcon(":/img/document-encrypt.png")); 471 allInstallButton->setIcon(QIcon(":/img/document-encrypt.png"));
472 allInstallButton->setIconSize(QSize(32, 32)); 472 allInstallButton->setIconSize(QSize(32, 32));
473 allInstallButton->setText(tr("Trusted\nCertificates")); 473 allInstallButton->setText(tr("Trusted\ncertificates"));
474 allInstallButton->setFixedWidth(90); 474 allInstallButton->setFixedWidth(90);
475 allInstallButton->setFixedHeight(70); 475 allInstallButton->setFixedHeight(70);
476 allInstallButton->setCheckable(true); 476 allInstallButton->setCheckable(true);
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("Certificates\nto remove")); 482 allRemoveButton->setText(tr("Insecure\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;
488 infoButton->setToolButtonStyle(Qt::ToolButtonTextUnderIcon); 488 infoButton->setToolButtonStyle(Qt::ToolButtonTextUnderIcon);
489 infoButton->setIcon(QIcon(":/img/dialog-information.png")); 489 infoButton->setIcon(QIcon(":/img/dialog-information.png"));
490 infoButton->setIconSize(QSize(32, 32)); 490 infoButton->setIconSize(QSize(32, 32));
491 infoButton->setText(tr("Information")); 491 infoButton->setText(tr("Information\nand help"));
492 infoButton->setFixedWidth(90); 492 infoButton->setFixedWidth(90);
493 infoButton->setFixedHeight(70); 493 infoButton->setFixedHeight(70);
494 infoButton->setCheckable(true); 494 infoButton->setCheckable(true);
495 495
496 mButtonGroup->addButton(updatesButton); 496 mButtonGroup->addButton(updatesButton);
531 QHBoxLayout *updatesHeaderSearchLayout = new QHBoxLayout; 531 QHBoxLayout *updatesHeaderSearchLayout = new QHBoxLayout;
532 532
533 mUpdatesHeader = 533 mUpdatesHeader =
534 new QLabel("<h2>" + tr("Updates (%1/%2)").arg(0).arg(0)+ "</h2>"); 534 new QLabel("<h2>" + tr("Updates (%1/%2)").arg(0).arg(0)+ "</h2>");
535 mLastCertUpdate = 535 mLastCertUpdate =
536 new QLabel(tr("Last certificate update: %1").arg("")); 536 new QLabel(tr("Last update of certificates: %1").arg(""));
537 mLastSWupdate = 537 mLastSWupdate =
538 new QLabel(tr("Last Software update: %1").arg("")); 538 new QLabel(tr("Last update of TrustBridge: %1").arg(""));
539 QLabel *updatesTip = 539 QLabel *updatesTip =
540 new QLabel("<h4>" + tr("The following certificate changes are recommended.") + "</h4>"); 540 new QLabel(tr("You should apply the following changes to your root certificates:"));
541 541
542 updatesHeaderTextLayout->addWidget(mUpdatesHeader); 542 updatesHeaderTextLayout->addWidget(mUpdatesHeader);
543 updatesHeaderTextLayout->addWidget(mLastCertUpdate); 543 updatesHeaderTextLayout->addWidget(mLastCertUpdate);
544 updatesHeaderTextLayout->addWidget(mLastSWupdate); 544 updatesHeaderTextLayout->addWidget(mLastSWupdate);
545 updatesHeaderTextLayout->addSpacing(10); 545 updatesHeaderTextLayout->addSpacing(10);
546 updatesHeaderTextLayout->addWidget(updatesTip); 546 updatesHeaderTextLayout->addWidget(updatesTip);
547 547
548 QPushButton *searchUpdates = new QPushButton(tr("Search for Updates")); 548 QPushButton *searchUpdates = new QPushButton(tr("Check for updates"));
549 searchUpdates->setIcon(QIcon(":/img/system-search.png")); 549 searchUpdates->setIcon(QIcon(":/img/system-search.png"));
550 QPushButton *quitButton = new QPushButton(tr("Quit without saving")); 550 QPushButton *quitButton = new QPushButton(tr("Quit without saving"));
551 quitButton->setIcon(QIcon(":/img/system-shutdown.png")); 551 quitButton->setIcon(QIcon(":/img/system-shutdown.png"));
552 QPushButton *installButton = new QPushButton(tr("Update")); 552 QPushButton *installButton = new QPushButton(tr("Install updates"));
553 #ifdef Q_OS_WIN 553 #ifdef Q_OS_WIN
554 if (is_admin()) { 554 if (is_admin()) {
555 QIcon uacShield = QApplication::style()->standardIcon(QStyle::SP_VistaShield); 555 QIcon uacShield = QApplication::style()->standardIcon(QStyle::SP_VistaShield);
556 installButton->setIcon(uacShield); 556 installButton->setIcon(uacShield);
557 } 557 }
579 QHBoxLayout *updatesNewLayout = new QHBoxLayout; 579 QHBoxLayout *updatesNewLayout = new QHBoxLayout;
580 QHBoxLayout *updatesRemoveLayout = new QHBoxLayout; 580 QHBoxLayout *updatesRemoveLayout = new QHBoxLayout;
581 QHBoxLayout *updatesManualLayout = new QHBoxLayout; 581 QHBoxLayout *updatesManualLayout = new QHBoxLayout;
582 mUpdatesNewCertificates = 582 mUpdatesNewCertificates =
583 new QLabel("<h3>" + 583 new QLabel("<h3>" +
584 tr("Install new Certificates (%1/%2)").arg(0).arg(0) + 584 tr("Install new trusted certificates (%1/%2)").arg(0).arg(0) +
585 "</h3>"); 585 "</h3>");
586 mUpdatesDetailsNew = new QPushButton(tr("Show Details")); 586 mUpdatesDetailsNew = new QPushButton(tr("Show details"));
587 connect(mUpdatesDetailsNew, 587 connect(mUpdatesDetailsNew,
588 SIGNAL(clicked()), 588 SIGNAL(clicked()),
589 this, 589 this,
590 SLOT(toggleUpdatesNew())); 590 SLOT(toggleUpdatesNew()));
591 updatesNewLayout->addWidget(mUpdatesNewCertificates); 591 updatesNewLayout->addWidget(mUpdatesNewCertificates);
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 Certificates (%1/%2)").arg(0).arg(0) + 601 tr("Remove insecure 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,
607 SLOT(toggleUpdatesRemove())); 607 SLOT(toggleUpdatesRemove()));
608 updatesRemoveLayout->addWidget(mUpdatesRemoveCertificates); 608 updatesRemoveLayout->addWidget(mUpdatesRemoveCertificates);
613 this, SLOT(listChanged(int))); 613 this, SLOT(listChanged(int)));
614 mUpdatesRemove->hide(); 614 mUpdatesRemove->hide();
615 615
616 mUpdatesManualCertificates = 616 mUpdatesManualCertificates =
617 new QLabel("<h3>" + 617 new QLabel("<h3>" +
618 tr("Manualy changed Certificates (%1)").arg(0) + 618 tr("Manually changed certificates (%1)").arg(0) +
619 "</h3>"); 619 "</h3>");
620 mUpdatesDetailsManual = new QPushButton(tr("Show Details")); 620 mUpdatesDetailsManual = new QPushButton(tr("Show details"));
621 connect(mUpdatesDetailsManual, 621 connect(mUpdatesDetailsManual,
622 SIGNAL(clicked()), 622 SIGNAL(clicked()),
623 this, 623 this,
624 SLOT(toggleUpdatesManual())); 624 SLOT(toggleUpdatesManual()));
625 updatesManualLayout->addWidget(mUpdatesManualCertificates); 625 updatesManualLayout->addWidget(mUpdatesManualCertificates);
657 QVBoxLayout *installPanelLayout = new QVBoxLayout; 657 QVBoxLayout *installPanelLayout = new QVBoxLayout;
658 QVBoxLayout *installHeaderLayout = new QVBoxLayout; 658 QVBoxLayout *installHeaderLayout = new QVBoxLayout;
659 QVBoxLayout *installCenterLayout = new QVBoxLayout; 659 QVBoxLayout *installCenterLayout = new QVBoxLayout;
660 660
661 QLabel *installHeaderLabel = 661 QLabel *installHeaderLabel =
662 new QLabel("<h2>" + tr("Trusted Certificates") + "</h2>"); 662 new QLabel("<h2>" + tr("Trusted certificates") + "</h2>");
663 QLabel *installHeaderText = new QLabel(tr("The following list of root" 663 QLabel *installHeaderText = new QLabel(tr("The following list of trusted root"
664 " certificates was created by the BSI. The BSI vaidates authenticity," 664 " certificates is managed by the BSI. The BSI validates independently the"
665 " security and actuality of these certificates")); 665 " authenticity, security and actuality of these certificates."));
666 installHeaderLayout->addWidget(installHeaderLabel); 666 installHeaderLayout->addWidget(installHeaderLabel);
667 installHeaderLayout->addWidget(installHeaderText); 667 installHeaderLayout->addWidget(installHeaderText);
668 668
669 QLabel *installCenterText = new QLabel(tr("Please choose the certificates" 669 QLabel *installCenterText = new QLabel(tr("Please choose the certificates"
670 " you want to trust. TrustBridge will install these certificates for" 670 " you want to trust or untrust. TrustBridge will install these certificates for your"
671 " secure communication via email or the internet (e.g. IE, Firefox," 671 " secure communication for email and internet."));
672 " Thunderbird)"));
673 installCenterLayout->addWidget(installCenterText); 672 installCenterLayout->addWidget(installCenterText);
674 mInstallList = new CertificateListWidget(this); 673 mInstallList = new CertificateListWidget(this);
675 connect(mInstallList, SIGNAL(certChanged(bool, const Certificate&)), 674 connect(mInstallList, SIGNAL(certChanged(bool, const Certificate&)),
676 this, SLOT(toggleInManual(bool, const Certificate&))); 675 this, SLOT(toggleInManual(bool, const Certificate&)));
677 676
687 QVBoxLayout *removePanelLayout = new QVBoxLayout; 686 QVBoxLayout *removePanelLayout = new QVBoxLayout;
688 QVBoxLayout *removeHeaderLayout = new QVBoxLayout; 687 QVBoxLayout *removeHeaderLayout = new QVBoxLayout;
689 QVBoxLayout *removeCenterLayout = new QVBoxLayout; 688 QVBoxLayout *removeCenterLayout = new QVBoxLayout;
690 689
691 QLabel *removeHeaderLabel = 690 QLabel *removeHeaderLabel =
692 new QLabel("<h2>" + tr("Certificates to remove") + "</h2>"); 691 new QLabel("<h2>" + tr("Insecure certificates") + "</h2>");
693 QLabel *removeHeaderText = new QLabel(tr("The following list of root" 692 QLabel *removeHeaderText = new QLabel(tr("The following list of insecure root"
694 " certificates was created by the BSI. The BSI validates authenticity," 693 " certificates is managed by the BSI. The BSI validates independently the"
695 " security and actuality of these certificates")); 694 " authenticity, security and actuality of these certificates."));
696 removeHeaderLayout->addWidget(removeHeaderLabel); 695 removeHeaderLayout->addWidget(removeHeaderLabel);
697 removeHeaderLayout->addWidget(removeHeaderText); 696 removeHeaderLayout->addWidget(removeHeaderText);
698 697
699 QLabel *removeCenterText = new QLabel(tr("Please choose the certificates" 698 QLabel *removeCenterText = new QLabel(tr("If you have kept an insecure certificate"
700 " you want to remove. TrustBridge will remove these certificates.")); 699 " you can selected it to uninstall."
700 " Already uninstalled certificates cannot be reinstalled."
701 " Unsecure certificates should be removed to keep your"
702 " email and internet communication secure."));
701 removeCenterLayout->addWidget(removeCenterText); 703 removeCenterLayout->addWidget(removeCenterText);
702 mRemoveList = new CertificateListWidget(this); 704 mRemoveList = new CertificateListWidget(this);
703 connect(mRemoveList, SIGNAL(certChanged(bool, const Certificate&)), 705 connect(mRemoveList, SIGNAL(certChanged(bool, const Certificate&)),
704 this, SLOT(toggleInManual(bool, const Certificate&))); 706 this, SLOT(toggleInManual(bool, const Certificate&)));
705 707
805 mUpdatesHeader->setText("<h2>" + tr("Updates (%1/%2)") 807 mUpdatesHeader->setText("<h2>" + tr("Updates (%1/%2)")
806 .arg(mUpdatesRemove->selectedCertCount() + mUpdatesNew->selectedCertCount()) 808 .arg(mUpdatesRemove->selectedCertCount() + mUpdatesNew->selectedCertCount())
807 .arg(mUpdatesRemove->certificates().size() + mUpdatesNew->certificates().size()) + 809 .arg(mUpdatesRemove->certificates().size() + mUpdatesNew->certificates().size()) +
808 "</h2>"); 810 "</h2>");
809 mUpdatesNewCertificates->setText("<h3>" + 811 mUpdatesNewCertificates->setText("<h3>" +
810 tr("Install new Certificates (%1/%2)") 812 tr("Install new trusted certificates (%1/%2)")
811 .arg(mUpdatesNew->selectedCertCount()) 813 .arg(mUpdatesNew->selectedCertCount())
812 .arg(mUpdatesNew->certificates().size()) + 814 .arg(mUpdatesNew->certificates().size()) +
813 "</h3>"); 815 "</h3>");
814 mUpdatesRemoveCertificates->setText("<h3>" + 816 mUpdatesRemoveCertificates->setText("<h3>" +
815 tr("Remove Certificates (%1/%2)") 817 tr("Remove insecure certificates (%1/%2)")
816 .arg(mUpdatesRemove->selectedCertCount()) 818 .arg(mUpdatesRemove->selectedCertCount())
817 .arg(mUpdatesRemove->certificates().size()) + 819 .arg(mUpdatesRemove->certificates().size()) +
818 "</h3>"); 820 "</h3>");
819 } 821 }
820 822
880 } 882 }
881 mUpdatesHeader->setText("<h2>" + 883 mUpdatesHeader->setText("<h2>" +
882 tr("Updates (%1/%2)") 884 tr("Updates (%1/%2)")
883 .arg(mUpdatesNew->selectedCertCount() + mUpdatesRemove->selectedCertCount()) 885 .arg(mUpdatesNew->selectedCertCount() + mUpdatesRemove->selectedCertCount())
884 .arg(newRemoveCerts.size() + newInstallCerts.size()) + "</h2>"); 886 .arg(newRemoveCerts.size() + newInstallCerts.size()) + "</h2>");
885 mLastCertUpdate->setText(tr("Last certificate update: %1") 887 mLastCertUpdate->setText(tr("Last update of certificates: %1")
886 .arg(mInstalledList.date().toString())); 888 .arg(mInstalledList.date().toString()));
887 } 889 }
888 mUpdatesNewCertificates->setText("<h3>" + 890 mUpdatesNewCertificates->setText("<h3>" +
889 tr("Install new Certificates (%1/%2)") 891 tr("Install new trusted certificates (%1/%2)")
890 .arg(mUpdatesNew->selectedCertCount()) 892 .arg(mUpdatesNew->selectedCertCount())
891 .arg(mUpdatesNew->certificates().size()) + 893 .arg(mUpdatesNew->certificates().size()) +
892 "</h3>"); 894 "</h3>");
893 895
894 mUpdatesRemoveCertificates->setText("<h3>" + 896 mUpdatesRemoveCertificates->setText("<h3>" +
895 tr("Remove Certificates (%1/%2)") 897 tr("Remove insecure certificates (%1/%2)")
896 .arg(mUpdatesRemove->selectedCertCount()) 898 .arg(mUpdatesRemove->selectedCertCount())
897 .arg(mUpdatesRemove->certificates().size()) + 899 .arg(mUpdatesRemove->certificates().size()) +
898 "</h3>"); 900 "</h3>");
899 mUpdatesManualCertificates->setText("<h3>" + 901 mUpdatesManualCertificates->setText("<h3>" +
900 tr("Manualy changed Certificates (%1)").arg(0) + 902 tr("Manually changed certificates (%1)").arg(0) +
901 "</h3>"); 903 "</h3>");
902 } 904 }
903 905
904 void MainWindow::installerError(const QString& errMsg) { 906 void MainWindow::installerError(const QString& errMsg) {
905 QMessageBox::warning(this, tr("Error executing update"), errMsg); 907 QMessageBox::warning(this, tr("Error executing update"), errMsg);
1083 return; 1085 return;
1084 } 1086 }
1085 1087
1086 void MainWindow::toggleUpdatesNew() { 1088 void MainWindow::toggleUpdatesNew() {
1087 if (!mUpdatesNew->isVisible()) { 1089 if (!mUpdatesNew->isVisible()) {
1088 mUpdatesDetailsNew->setText(tr("Hide Details")); 1090 mUpdatesDetailsNew->setText(tr("Hide details"));
1089 mUpdatesNew->show(); 1091 mUpdatesNew->show();
1090 mUpdatesNew->setSelected(0); 1092 mUpdatesNew->setSelected(0);
1091 } 1093 }
1092 else { 1094 else {
1093 mUpdatesNew->hide(); 1095 mUpdatesNew->hide();
1094 mUpdatesDetailsNew->setText(tr("Show Details")); 1096 mUpdatesDetailsNew->setText(tr("Show details"));
1095 QSize old = mUpdatesWidget->size(); 1097 QSize old = mUpdatesWidget->size();
1096 mUpdatesWidget->resize(old.width(), old.height() - mUpdatesNew->height()); 1098 mUpdatesWidget->resize(old.width(), old.height() - mUpdatesNew->height());
1097 } 1099 }
1098 } 1100 }
1099 1101
1100 void MainWindow::toggleUpdatesRemove() { 1102 void MainWindow::toggleUpdatesRemove() {
1101 if (!mUpdatesRemove->isVisible()) { 1103 if (!mUpdatesRemove->isVisible()) {
1102 mUpdatesDetailsRemove->setText(tr("Hide Details")); 1104 mUpdatesDetailsRemove->setText(tr("Hide details"));
1103 mUpdatesRemove->show(); 1105 mUpdatesRemove->show();
1104 mUpdatesRemove->setSelected(0); 1106 mUpdatesRemove->setSelected(0);
1105 } 1107 }
1106 else { 1108 else {
1107 mUpdatesRemove->hide(); 1109 mUpdatesRemove->hide();
1108 mUpdatesDetailsRemove->setText(tr("Show Details")); 1110 mUpdatesDetailsRemove->setText(tr("Show details"));
1109 QSize old = mUpdatesWidget->size(); 1111 QSize old = mUpdatesWidget->size();
1110 mUpdatesWidget->resize(old.width(), old.height() - mUpdatesRemove->height()); 1112 mUpdatesWidget->resize(old.width(), old.height() - mUpdatesRemove->height());
1111 } 1113 }
1112 } 1114 }
1113 1115
1114 void MainWindow::toggleUpdatesManual() { 1116 void MainWindow::toggleUpdatesManual() {
1115 if (!mUpdatesManual->isVisible()) { 1117 if (!mUpdatesManual->isVisible()) {
1116 mUpdatesDetailsManual->setText(tr("Hide Details")); 1118 mUpdatesDetailsManual->setText(tr("Hide details"));
1117 mUpdatesManual->show(); 1119 mUpdatesManual->show();
1118 mUpdatesManual->setSelected(0); 1120 mUpdatesManual->setSelected(0);
1119 } 1121 }
1120 else { 1122 else {
1121 mUpdatesDetailsManual->setText(tr("Show Details")); 1123 mUpdatesDetailsManual->setText(tr("Show details"));
1122 mUpdatesManual->hide(); 1124 mUpdatesManual->hide();
1123 QSize old = mUpdatesWidget->size(); 1125 QSize old = mUpdatesWidget->size();
1124 mUpdatesWidget->resize(old.width(), old.height() - mUpdatesManual->height()); 1126 mUpdatesWidget->resize(old.width(), old.height() - mUpdatesManual->height());
1125 } 1127 }
1126 } 1128 }
http://wald.intevation.org/projects/trustbridge/