trustbridge/trustbridge: ui/mainwindow.cpp comparison

comparison ui/mainwindow.cpp @ 640:626507197360 trustbridge-refactor

Updated mainwindow and handle certificate lists.

author	Raimund Renkert <rrenkert@intevation.de>
date	Tue, 24 Jun 2014 17:07:49 +0200
parents	3a9c0f38bbad
children	a7c3ab273d41

comparison

equal deleted inserted replaced

-:c1b35edb097f
+:626507197360
 #include "logging.h"
 MainWindow::MainWindow(bool trayMode):
 mTrayMode(trayMode)
 {
+mUpdatesNewSize = 0;
+mUpdatesRemoveSize = 0;
+mUpdatesManualSize = 0;
 createActions();
 createTrayIcon();
 createContent();
 resize(950, 540);
 qRegisterMetaType<SSLConnection::ErrorCode>("SSLConnection::ErrorCode");
 updatesManualLayout->addWidget(mUpdatesManualCertificates);
 updatesManualLayout->addWidget(updatesDetailsManual);
 updatesManualLayout->insertStretch(2, 10);
 mUpdatesManual = new CertificateListWidget(this);
 mUpdatesManual->hide();
+connect(mUpdatesManual, SIGNAL(certChanged(bool, const Certificate&)),
-updatesCenterLayout->addWidget(updatesTip);
+this, SLOT(removeFromManual(bool, const Certificate&)));
-updatesCenterLayout->addLayout(updatesNewLayout);
-updatesCenterLayout->addWidget(mUpdatesNew);
-updatesCenterLayout->addLayout(updatesRemoveLayout);
-updatesCenterLayout->addWidget(mUpdatesRemove);
-updatesCenterLayout->addLayout(updatesManualLayout);
-updatesCenterLayout->addWidget(mUpdatesManual);
 QHBoxLayout *updatesBottomLayout = new QHBoxLayout;
 quitButton = new QPushButton(tr("Quit without saving"));
 QPushButton *saveButton = new QPushButton(tr("Update"));
 connect(quitButton, SIGNAL(clicked()), this, SLOT(closeApp()));
 connect(saveButton, SIGNAL(clicked()), this, SLOT(installCerts()));
 updatesBottomLayout->insertStretch(0, 10);
 updatesBottomLayout->addWidget(saveButton);
 updatesBottomLayout->addWidget(quitButton);
+updatesBottomLayout->setAlignment(Qt::AlignBottom);
+updatesNewLayout->setAlignment(Qt::AlignTop);
+updatesRemoveLayout->setAlignment(Qt::AlignTop);
+updatesManualLayout->setAlignment(Qt::AlignTop);
+updatesCenterLayout->addWidget(updatesTip, 0, Qt::AlignTop);
+updatesCenterLayout->addLayout(updatesNewLayout);
+//    updatesCenterLayout->setStretchFactor(updatesNewLayout, 100);
+updatesCenterLayout->addWidget(mUpdatesNew, 1, Qt::AlignTop);
+updatesCenterLayout->addLayout(updatesRemoveLayout);
+//    updatesCenterLayout->setStretchFactor(updatesRemoveLayout, 100);
+updatesCenterLayout->addWidget(mUpdatesRemove, 1, Qt::AlignTop);
+updatesCenterLayout->addLayout(updatesManualLayout);
+//    updatesCenterLayout->setStretchFactor(updatesManualLayout, 100);
+updatesCenterLayout->addWidget(mUpdatesManual, 1, Qt::AlignTop);
+updatesCenterLayout->insertStretch(7, 0);
+updatesCenterLayout->addLayout(updatesBottomLayout);
 QFrame *updatesPanelSeparator = new QFrame();
 updatesPanelSeparator->setFrameShape(QFrame::HLine);
 updatesPanelSeparator->setFrameShadow(QFrame::Sunken);
 updatesPanelLayout->addLayout(updatesHeaderLayout);
 updatesPanelLayout->addWidget(updatesPanelSeparator);
 updatesPanelLayout->addLayout(updatesCenterLayout);
-updatesPanelLayout->insertStretch(3, 10);
+updatesPanelLayout->setStretchFactor(updatesCenterLayout, 1);
-updatesPanelLayout->addLayout(updatesBottomLayout);
+//updatesPanelLayout->insertStretch(3, 2);
+//updatesPanelLayout->addLayout(updatesBottomLayout);
 mUpdatesWidget->setLayout(updatesPanelLayout);
 mUpdatesWidget->setMinimumSize(QSize(820, 440));
 mUpdatesPanel->setWidget(mUpdatesWidget);
 // Panel for trusted certificates.
 " you want to trust. TrustBridge will install these certificates for"
 " secure communication via email or the internet (e.g. IE, Firefox,"
 " Thunderbird)"));
 installCenterLayout->addWidget(installCenterText);
 mInstallList = new CertificateListWidget(this);
+connect(mInstallList, SIGNAL(certChanged(bool, const Certificate&)),
+this, SLOT(toggleInManual(bool, const Certificate&)));
 installPanelLayout->addLayout(installHeaderLayout);
 installPanelLayout->addLayout(installCenterLayout);
 installPanelLayout->addWidget(mInstallList);
 mInstallPanel->setLayout(installPanelLayout);
 QLabel *removeCenterText = new QLabel(tr("Please choose the certificates"
 " you want to remove. TrustBridge will remove these certificates."));
 removeCenterLayout->addWidget(removeCenterText);
 mRemoveList = new CertificateListWidget(this);
+connect(mRemoveList, SIGNAL(certChanged(bool, const Certificate&)),
+this, SLOT(toggleInManual(bool, const Certificate&)));
 removePanelLayout->addLayout(removeHeaderLayout);
 removePanelLayout->addLayout(removeCenterLayout);
 removePanelLayout->addWidget(mRemoveList);
 mRemovePanel->setLayout(removePanelLayout);
 void MainWindow::loadCertificateList()
 {
 //mCertListWidget->clear();
 //int i = 0;
-qDebug() << "loading list";
 /* TODO: if nothing is available (neither old nor new) add some progress
 * indication */
 mInstallList->clear();
 mUpdatesNew->clear();
 mRemoveList->clear();
 QList<Certificate> oldInstallCerts;
 QList<Certificate> oldRemoveCerts;
 if (mListToInstall.getCertificates().isEmpty()) {
 // No new list available, add old certificates.
-qDebug() << "no new list...";
 foreach (const Certificate &cert, mInstalledList.getCertificates()) {
+bool state = !mPreviouslyUnselected.contains(cert.base64Line());
 if (cert.isInstallCert()) {
 oldInstallCerts.append(cert);
-mInstallList->addCertificate(cert);
+mInstallList->addCertificate(cert, state);
 }
 else {
 oldRemoveCerts.append(cert);
-mRemoveList->addCertificate(cert);
+mRemoveList->addCertificate(cert, state, !state);
 }
 }
-qDebug() << "old list date: " << mInstalledList.date().toString();
 // Set the date of the old list.
 //        mCurrentListDate->setText(tr("Current List Date: %1")
 //            .arg(mInstalledList.date().toString()));
 }
 else {
-qDebug() << "new list available";
 // Sort and filter both lists.
 foreach (const Certificate &cert, mListToInstall.getCertificates()) {
+bool state = !mPreviouslyUnselected.contains(cert.base64Line());
 if (cert.isInstallCert()) {
 // Certificate with status "install".
 if (mInstalledList.getCertificates().contains(cert)) {
 // Was in the old list.
 oldInstallCerts.append(cert);
-qDebug() << "add install";
+mInstallList->addCertificate(cert, state);
-mInstallList->addCertificate(cert);
 }
 else {
 // Is a brand new certificate
 newInstallCerts.append(cert);
-qDebug() << "add new install";
+mUpdatesNew->addCertificate(cert, state);
-mUpdatesNew->addCertificate(cert);
 }
 }
 else {
 // Certificate with status "remove".
 if (mInstalledList.getCertificates().contains(cert)) {
 // Was in the old list.
 oldRemoveCerts.append(cert);
-qDebug() << "add remove";
+// Is removed, so set editable to false.
-mRemoveList->addCertificate(cert);
+mRemoveList->addCertificate(cert, state, !state);
 }
 else {
 // Was in the old list with status "install" and now has the
 // status "remove".
 newRemoveCerts.append(cert);
-qDebug() << "add new remove";
+mUpdatesRemove->addCertificate(cert, state);
-mUpdatesRemove->addCertificate(cert);
 }
 }
 }
 mUpdatesHeader->setText("<h2>" +
 tr("Updates (%1/%2)")
-.arg(newRemoveCerts.size() + newInstallCerts.size())
+.arg(mUpdatesNew->selectedCertCount() + mUpdatesRemove->selectedCertCount())
 .arg(newRemoveCerts.size() + newInstallCerts.size()) + "</h2>");
 mLastCertUpdate->setText(tr("Last certificate update: %1")
 .arg(mInstalledList.date().toString()));
 /*        mCurrentListDate->setText(tr("Current List Date: %1")
 .arg(mInstalledList.date().toString()));
 loadCertificateList();
 }
 void MainWindow::installCerts() {
 QStringList choices;
+QStringList unselected;
-choices << mUpdatesNew->certificates();
-choices << mUpdatesRemove->certificates();
+choices << mUpdatesNew->selectedCertificates();
-choices << mUpdatesManual->certificates();
+choices << mUpdatesRemove->selectedCertificates();
+choices <<  mUpdatesManual->selectedCertificates();
+QStringList unselectedManuals = mUpdatesManual->unselectedCertificates();
+for(int i = 0; i < unselectedManuals.size(); i++) {
+if (unselectedManuals.at(i).startsWith("I:")) {
+QString certLine = unselectedManuals.at(i);
+certLine[0] = 'R';
+choices << certLine;
+}
+}
+unselected << mUpdatesNew->unselectedCertificates();
+unselected << mUpdatesRemove->unselectedCertificates();
+unselected << mInstallList->unselectedCertificates();
+unselected << mRemoveList->unselectedCertificates();
 /*    for (int i = 0; i < mCertListWidget->count(); i++) {
 QListWidgetItem *item = mCertListWidget->item(i);
 if (item->checkState() == Qt::Checked) {
 choices << item->data(CertificateItemDelegate::DataRole).value<Certificate>().base64Line();
 connect(instWrap, SIGNAL(installationSuccessful()),
 this, SLOT(installerSuccess()));
 connect(instWrap, SIGNAL(error(const QString &)),
 this, SLOT(installerError(const QString &)));
 instWrap->start();
-/*
-if (!saveUnselectedCertificates()) {
+if (!saveUnselectedCertificates(unselected)) {
 qWarning() << "Failed to save previosly unselected certificates.";
 }
-*/
 }
 void MainWindow::loadUnselectedCertificates()
 {
 mPreviouslyUnselected.clear();
 mPreviouslyUnselected << mSettings.value(key, QString()).toString();
 }
 mSettings.endGroup();
 }
-bool MainWindow::saveUnselectedCertificates()
+bool MainWindow::saveUnselectedCertificates(QStringList unselected)
 {
 mPreviouslyUnselected.clear();
 mSettings.beginGroup("unselected");
 mSettings.remove(""); /* Clears old choices */
-for (int i = 0; i < mCertListWidget->count(); i++) {
+for (int i = 0; i < unselected.size(); i++) {
-QListWidgetItem *item = mCertListWidget->item(i);
+QString key = QString::fromLatin1("cert%1").arg(i);
-if (item->checkState() != Qt::Checked &&
+QString value = unselected.at(i);
-(item->flags() & Qt::ItemIsUserCheckable)) {
+mSettings.setValue(key, value);
-QString key = QString::fromLatin1("cert%1").arg(i);
+mPreviouslyUnselected << value;
-QString value =
-item->data(CertificateItemDelegate::DataRole).value<Certificate>().base64Line();
-mSettings.setValue(key, value);
-mPreviouslyUnselected << value;
-}
 }
 mSettings.endGroup();
 mSettings.sync();
 return mSettings.status() == QSettings::NoError;
 }
 mSettings.beginGroup("settings");
 mSettings.setValue("autostart", state != Qt::Unchecked);
 mSettings.endGroup();
 }
+void MainWindow::toggleInManual(bool state, const Certificate &cert)
+{
+if (!mUpdatesManual->contains(cert)) {
+mUpdatesManual->addCertificate(cert, state);
+}
+else {
+mUpdatesManual->removeCertificate(cert);
+}
+mUpdatesManualCertificates->setText("<h3>" +
+tr("Manualy changed Certificates (%1)")
+.arg(mUpdatesManual->certificates().size()) +
+"</h3>");
+}
+void MainWindow::removeFromManual(bool state, const Certificate &cert)
+{
+mUpdatesManual->removeCertificate(cert);
+mUpdatesManualCertificates->setText("<h3>" +
+tr("Manualy changed Certificates (%1)")
+.arg(mUpdatesManual->certificates().size()) +
+"</h3>");
+if (cert.isInstallCert()) {
+mInstallList->setCertState(state, cert);
+}
+else {
+mRemoveList->setCertState(state, cert);
+}
+}
 void MainWindow::closeApp()
 {
-//saveUnselectedCertificates();
 qApp->quit();
 }
 void MainWindow::togglePages(int button)
 {
 }
 void MainWindow::toggleUpdatesNew() {
 QSize old = mUpdatesWidget->size();
 if (!mUpdatesNew->isVisible()) {
-mUpdatesWidget->resize(old.width(), old.height() + mUpdatesNew->height());
 mUpdatesNew->show();
+if (mUpdatesNewSize == 0) {
+mUpdatesNewSize = mUpdatesNew->height();
+}
+mUpdatesWidget->resize(old.width(), old.height() + mUpdatesNewSize);
 }
 else {
 mUpdatesWidget->resize(old.width(), old.height() - mUpdatesNew->height());
 mUpdatesNew->hide();
 }
 }
 void MainWindow::toggleUpdatesRemove() {
 QSize old = mUpdatesWidget->size();
 if (!mUpdatesRemove->isVisible()) {
-mUpdatesWidget->resize(old.width(), old.height() + mUpdatesRemove->height());
 mUpdatesRemove->show();
+if (mUpdatesRemoveSize == 0) {
+mUpdatesRemoveSize = mUpdatesRemove->height();
+}
+mUpdatesWidget->resize(old.width(), old.height() + mUpdatesRemoveSize);
 }
 else {
 mUpdatesWidget->resize(old.width(), old.height() - mUpdatesRemove->height());
 mUpdatesRemove->hide();
 }
 }
 void MainWindow::toggleUpdatesManual() {
 QSize old = mUpdatesWidget->size();
 if (!mUpdatesManual->isVisible()) {
-mUpdatesWidget->resize(old.width(), old.height() + mUpdatesManual->height());
 mUpdatesManual->show();
+if (mUpdatesManualSize == 0) {
+mUpdatesManualSize = mUpdatesManual->height();
+}
+mUpdatesWidget->resize(old.width(), old.height() + mUpdatesManualSize);
 }
 else {
+mUpdatesWidget->resize(old.width(), old.height() - mUpdatesManual->height());
 mUpdatesManual->hide();
-mUpdatesWidget->resize(old.width(), old.height() - mUpdatesManual->height());
+}
 }
-}

Mercurial > trustbridge > trustbridge

comparison ui/mainwindow.cpp @ 640:626507197360 trustbridge-refactor