trustbridge: ui/mainwindow.cpp comparison

comparison ui/mainwindow.cpp @ 445:b3721ded6f5b

Sort and filter the certificate list, changed certificate item roles.

author	Raimund Renkert <rrenkert@intevation.de>
date	Wed, 23 Apr 2014 11:53:57 +0200
parents	4b486a14252f
children	43090637d6ae

comparison

equal deleted inserted replaced

-:20f539866fa8
+:b3721ded6f5b
 QVBoxLayout *settingsLayout = new QVBoxLayout;
 // The certificate list
 QGroupBox *certBox = new QGroupBox(tr("Managed Certificates"));
 mCertListWidget = new QListWidget;
-mCertListWidget->setItemDelegate(new CertificateItemDelegate);
 connect(mCertListWidget, SIGNAL(itemClicked(QListWidgetItem*)),
 this, SLOT(showDetails(QListWidgetItem*)));
 certLayout->addWidget(mCertListWidget);
 certBox->setLayout(certLayout);
 mCertListWidget->clear();
 int i = 0;
 /* TODO: if nothing is available (neither old nor new) add some progress
 * indication */
+QList<Certificate> newInstallCerts;
-foreach (const Certificate &cert, mListToInstall.isValid() ?
+QList<Certificate> newRemoveCerts;
-mListToInstall.getCertificates() :
+QList<Certificate> oldInstallCerts;
-mInstalledList.getCertificates()) {
+QList<Certificate> oldRemoveCerts;
-if (!cert.isValid()) {
-qWarning() << "Invalid certificate in list";
+if (mListToInstall.getCertificates().isEmpty()) {
-continue;
+// No new list available, add old certificates.
-}
+foreach (const Certificate &cert, mInstalledList.getCertificates()) {
-QListWidgetItem* item = new QListWidgetItem(cert.shortDescription());
+if (cert.isInstallCert()) {
-SeparatorItemDelegate *separator = new SeparatorItemDelegate();
+oldInstallCerts.append(cert);
-item->setData(CertificateItemDelegate::DetailsRole, QVariant::fromValue(cert));
-Qt::CheckState checkedState = mPreviouslyUnselected.contains(cert.base64Line()) ?
-Qt::Unchecked : Qt::Checked;
-bool isOld = mInstalledList.getCertificates().contains(cert);
-qDebug() << "Found old certificate.";
-/* TODO properly work with that information. */
-if (cert.isInstallCert()) {
-// This if statements is for testing! @TODO Remove this!
-if (isOld) {
-item->setData(CertificateItemDelegate::StatusRole, Certificate::InstallOld);
-item->setFlags(item->flags() | Qt::ItemIsUserCheckable);
 }
 else {
-item->setData(CertificateItemDelegate::StatusRole, Certificate::InstallNew);
+oldRemoveCerts.append(cert);
-item->setFlags(item->flags() | Qt::ItemIsUserCheckable);
 }
-if (i == 3) {
+}
-QListWidgetItem *sep = new QListWidgetItem("New certificates");
+}
-mCertListWidget->setItemDelegateForRow(i, separator);
+else {
-mCertListWidget->addItem(sep);
+// Sort and filter both lists.
-i++;
+foreach (const Certificate &cert, mListToInstall.getCertificates()) {
-}
+if (cert.isInstallCert()) {
-item->setCheckState(checkedState);
+// Certificate with status "install".
-}
+if (mInstalledList.getCertificates().contains(cert)) {
-else {
+// Was in the old list.
-// This if statements is for testing! @TODO Remove this!
+oldInstallCerts.append(cert);
-if (i > 35) {
+}
-item->setData(CertificateItemDelegate::StatusRole, Certificate::RemoveNew);
+else {
-item->setFlags(item->flags() | Qt::ItemIsUserCheckable);
+// Is a brand new certificate
-item->setCheckState(checkedState);
+newInstallCerts.append(cert);
+}
 }
 else {
-item->setData(CertificateItemDelegate::StatusRole, Certificate::RemoveOld);
+// Certificate with status "remove".
-item->setFlags(item->flags() | Qt::ItemIsUserCheckable);
+if (mInstalledList.getCertificates().contains(cert)) {
+// Was in the old list.
+oldRemoveCerts.append(cert);
+}
+else {
+// Was in the old list with status "install" and now has the
+// status "remove".
+newRemoveCerts.append(cert);
+}
 }
 }
-mCertListWidget->addItem(item);
+}
-i++;
-}
+// Add separators and certificates to list widget.
+mCertListWidget->addItem(createSeparator(tr("New certificates to install"), i++));
+foreach (const Certificate &cert, newInstallCerts) {
+mCertListWidget->addItem(createListItem(cert, Certificate::InstallNew, i++));
+}
+mCertListWidget->addItem(createSeparator(tr("New certificates to remove"), i++));
+foreach (const Certificate &cert, newRemoveCerts) {
+mCertListWidget->addItem(createListItem(cert, Certificate::RemoveNew, i++));
+}
+mCertListWidget->addItem(createSeparator(tr("Old certificates to install"), i++));
+foreach (const Certificate &cert, oldInstallCerts) {
+mCertListWidget->addItem(createListItem(cert, Certificate::InstallOld, i++));
+}
+mCertListWidget->addItem(createSeparator(tr("Old certificates to remove"), i++));
+foreach (const Certificate &cert, oldRemoveCerts) {
+mCertListWidget->addItem(createListItem(cert, Certificate::RemoveOld, i++));
+}
+}
+QListWidgetItem* MainWindow::createSeparator(const QString &text, int index)
+{
+SeparatorItemDelegate *separatorDelegate = new SeparatorItemDelegate();
+QListWidgetItem *separator = new QListWidgetItem(text);
+mCertListWidget->setItemDelegateForRow(index, separatorDelegate);
+separator->setFlags(separator->flags() ^ Qt::ItemIsUserCheckable);
+return separator;
+}
+QListWidgetItem* MainWindow::createListItem(const Certificate &certificate,
+Certificate::Status status, int index)
+{
+CertificateItemDelegate *certDelegate = new CertificateItemDelegate();
+QListWidgetItem* item = new QListWidgetItem(certificate.shortDescription());
+item->setData(CertificateItemDelegate::DataRole,
+QVariant::fromValue(certificate));
+item->setData(CertificateItemDelegate::StatusRole, status);
+if (!mPreviouslyUnselected.contains(certificate.base64Line()) &&
+status == Certificate::RemoveOld) {
+item->setFlags(item->flags() ^ Qt::ItemIsUserCheckable);
+}
+else {
+Qt::CheckState checkedState =
+mPreviouslyUnselected.contains(certificate.base64Line()) ?
+Qt::Unchecked : Qt::Checked;
+item->setFlags(item->flags() | Qt::ItemIsUserCheckable);
+item->setCheckState(checkedState);
+}
+mCertListWidget->setItemDelegateForRow(index, certDelegate);
+return item;
 }
 void MainWindow::showSettings()
 {
 qDebug() << "show settingsdialog";
 about->show();
 }
 void MainWindow::showDetails(QListWidgetItem *item)
 {
-Certificate cert = item->data(CertificateItemDelegate::DetailsRole).value<Certificate>();
+Certificate cert = item->data(CertificateItemDelegate::DataRole).value<Certificate>();
 mSubjectCN->setText(cert.subjectCN());
 mSubjectOU->setText(cert.subjectOU());
 mIssuerCN->setText(cert.issuerCN());
 mIssuerOU->setText(cert.issuerO());
 mValidFrom->setText(cert.validFrom().toString());
 QStringList choices;
 for (int i = 0; i < mCertListWidget->count(); i++) {
 QListWidgetItem *item = mCertListWidget->item(i);
 if (item->checkState() == Qt::Checked) {
-choices << item->data(CertificateItemDelegate::B64LineRole).toString();
+choices << item->data(CertificateItemDelegate::DataRole).value<Certificate>().base64Line();
 continue;
 }
-QString certLine = item->data(CertificateItemDelegate::B64LineRole).toString();
+QString certLine = item->data(CertificateItemDelegate::DataRole).value<Certificate>().base64Line();
 if (certLine.startsWith("I:")) {
 certLine[0] = 'R';
 choices << certLine;
 }
 }
 mSettings.remove(""); /* Clears old choices */
 for (int i = 0; i < mCertListWidget->count(); i++) {
 QListWidgetItem *item = mCertListWidget->item(i);
 if (item->checkState() != Qt::Checked) {
 mSettings.setValue(QString::fromLatin1("cert%1").arg(i),
-item->data(CertificateItemDelegate::B64LineRole).toString());
+item->data(CertificateItemDelegate::DataRole).value<Certificate>().base64Line());
 }
 }
 mSettings.endGroup();
 mSettings.sync();
 return mSettings.status() == QSettings::NoError;

Mercurial > trustbridge

comparison ui/mainwindow.cpp @ 445:b3721ded6f5b