Expand Key Details Dialog;

Expand and Improve GpgKey and GpgSubKey;
Change Interface getKeyDetails();
Code Modified;

Signed-off-by: Saturneric <[email protected]>

1 files changed, 7 insertions, 192 deletions

diff --git a/src/ui/KeyDetailsDialog.cpp b/src/ui/KeyDetailsDialog.cpp
index c124ef02..b181ff7b 100644
--- a/src/ui/KeyDetailsDialog.cpp
+++ b/src/ui/KeyDetailsDialog.cpp
@@ -24,205 +24,20 @@
 
 #include "ui/KeyDetailsDialog.h"
 
-KeyDetailsDialog::KeyDetailsDialog(GpgME::GpgContext *ctx, gpgme_key_t key, QWidget *parent)
+KeyDetailsDialog::KeyDetailsDialog(GpgME::GpgContext *ctx, const GpgKey& key, QWidget *parent)
         : QDialog(parent) {
-    mCtx = ctx;
-    keyid = new QString(key->subkeys->keyid);
 
-    ownerBox = new QGroupBox(tr("Owner details"));
-    keyBox = new QGroupBox(tr("Key details"));
-    fingerprintBox = new QGroupBox(tr("Fingerprint"));
-    additionalUidBox = new QGroupBox(tr("Additional Uids"));
-    buttonBox = new QDialogButtonBox(QDialogButtonBox::Close);
-    connect(buttonBox, SIGNAL(rejected()), this, SLOT(close()));
 
-    nameVarLabel = new QLabel(QString::fromUtf8(key->uids->name));
-    nameVarLabel->setTextInteractionFlags(Qt::TextSelectableByMouse);
-    emailVarLabel = new QLabel(QString::fromUtf8(key->uids->email));
-    emailVarLabel->setTextInteractionFlags(Qt::TextSelectableByMouse);
+    tabWidget = new QTabWidget(this);
+    tabWidget->addTab(new KeyPairDetailTab(ctx, key, this), tr("KeyPair Details"));
 
-    commentVarLabel = new QLabel(QString::fromUtf8(key->uids->comment));
-    commentVarLabel->setTextInteractionFlags(Qt::TextSelectableByMouse);
-    keyidVarLabel = new QLabel(key->subkeys->keyid);
-    keyidVarLabel->setTextInteractionFlags(Qt::TextSelectableByMouse);
+    auto *mainLayout = new QVBoxLayout;
+    mainLayout->addWidget(tabWidget);
 
-    QString keySizeVal, keyExpireVal, keyCreatedVal, keyAlgoVal;
-
-    if (key->subkeys->expires == 0) {
-        keyExpireVal = tr("Never");
-    } else {
-        keyExpireVal = QDateTime::fromTime_t(key->subkeys->expires).toString("dd. MMM. yyyy");
-    }
-
-    keyAlgoVal = gpgme_pubkey_algo_name(key->subkeys->pubkey_algo);
-    keyCreatedVal = QDateTime::fromTime_t(key->subkeys->timestamp).toString("dd. MMM. yyyy");
-
-    // have el-gamal key?
-    if (key->subkeys->next) {
-        keySizeVal.sprintf("%d / %d", int(key->subkeys->length), int(key->subkeys->next->length));
-        if (key->subkeys->next->expires == 0) {
-            keyExpireVal += tr(" / Never");
-        } else {
-            keyExpireVal += " / " + QDateTime::fromTime_t(key->subkeys->next->expires).toString("dd. MMM. yyyy");
-        }
-        keyAlgoVal.append(" / ").append(gpgme_pubkey_algo_name(key->subkeys->next->pubkey_algo));
-        keyCreatedVal += " / " + QDateTime::fromTime_t(key->subkeys->next->timestamp).toString("dd. MMM. yyyy");
-    } else {
-        keySizeVal.setNum(int(key->subkeys->length));
-    }
-
-    keySizeVarLabel = new QLabel(keySizeVal);
-    expireVarLabel = new QLabel(keyExpireVal);
-    createdVarLabel = new QLabel(keyCreatedVal);
-    algorithmVarLabel = new QLabel(keyAlgoVal);
-
-    auto *mvbox = new QVBoxLayout();
-    auto *vboxKD = new QGridLayout();
-    auto *vboxOD = new QGridLayout();
-
-    vboxOD->addWidget(new QLabel(tr("Name:")), 0, 0);
-    vboxOD->addWidget(new QLabel(tr("E-Mailaddress:")), 1, 0);
-    vboxOD->addWidget(new QLabel(tr("Comment:")), 2, 0);
-    vboxOD->addWidget(nameVarLabel, 0, 1);
-    vboxOD->addWidget(emailVarLabel, 1, 1);
-    vboxOD->addWidget(commentVarLabel, 2, 1);
-
-    vboxKD->addWidget(new QLabel(tr("Key size:")), 0, 0);
-    vboxKD->addWidget(new QLabel(tr("Expires on: ")), 1, 0);
-    vboxKD->addWidget(new QLabel(tr("Algorithm: ")), 3, 0);
-    vboxKD->addWidget(new QLabel(tr("Created on: ")), 4, 0);
-    vboxKD->addWidget(new QLabel(tr("Key ID: ")), 5, 0);
-    vboxKD->addWidget(keySizeVarLabel, 0, 1);
-    vboxKD->addWidget(expireVarLabel, 1, 1);
-    vboxKD->addWidget(algorithmVarLabel, 3, 1);
-    vboxKD->addWidget(createdVarLabel, 4, 1);
-    vboxKD->addWidget(keyidVarLabel, 5, 1);
-
-    ownerBox->setLayout(vboxOD);
-    mvbox->addWidget(ownerBox);
-
-    keyBox->setLayout(vboxKD);
-    mvbox->addWidget(keyBox);
-
-    fingerPrintVarLabel = new QLabel(beautifyFingerprint(key->subkeys->fpr));
-    fingerPrintVarLabel->setTextInteractionFlags(Qt::TextSelectableByMouse);
-    fingerPrintVarLabel->setStyleSheet("margin-left: 20; margin-right: 20;");
-    auto *hboxFP = new QHBoxLayout();
-
-    hboxFP->addWidget(fingerPrintVarLabel);
-    QIcon ico(":button_copy.png");
-
-    QPushButton copyFingerprintButton(QIcon(ico.pixmap(12, 12)), "");
-    //copyFingerprintButton.setStyleSheet("QPushButton {border: 0px; } QPushButton:Pressed {}  ");
-    copyFingerprintButton.setFlat(true);
-    copyFingerprintButton.setToolTip(tr("copy fingerprint to clipboard"));
-    connect(&copyFingerprintButton, SIGNAL(clicked()), this, SLOT(slotCopyFingerprint()));
-
-    hboxFP->addWidget(&copyFingerprintButton);
-
-    fingerprintBox->setLayout(hboxFP);
-    mvbox->addWidget(fingerprintBox);
-
-    // If key has more than primary uid, also show the other uids
-    gpgme_user_id_t addUserIds = key->uids->next;
-    if (addUserIds != nullptr) {
-        auto *vboxUID = new QVBoxLayout();
-        while (addUserIds != nullptr) {
-            addUserIdsVarLabel = new QLabel(
-                    QString::fromUtf8(addUserIds->name) + QString(" <") + addUserIds->email + ">");
-            addUserIdsVarLabel->setTextInteractionFlags(Qt::TextSelectableByMouse);
-            vboxUID->addWidget(addUserIdsVarLabel);
-            addUserIds = addUserIds->next;
-        }
-        additionalUidBox->setLayout(vboxUID);
-        mvbox->addWidget(additionalUidBox);
-    }
-
-    if (key->secret) {
-        auto *privKeyBox = new QGroupBox(tr("Private Key"));
-        auto *vboxPK = new QVBoxLayout();
-
-        auto *exportButton = new QPushButton(tr("Export Private Key"));
-        vboxPK->addWidget(exportButton);
-        connect(exportButton, SIGNAL(clicked()), this, SLOT(slotExportPrivateKey()));
-
-        privKeyBox->setLayout(vboxPK);
-        mvbox->addWidget(privKeyBox);
-    }
-
-    if ((key->expired) || (key->revoked)) {
-        auto *expBox = new QHBoxLayout();
-        QIcon icon = QIcon::fromTheme("dialog-warning");
-        QPixmap pixmap = icon.pixmap(QSize(32, 32), QIcon::Normal, QIcon::On);
-
-        auto *expLabel = new QLabel();
-        auto *iconLabel = new QLabel();
-        if (key->expired) {
-            expLabel->setText(tr("Warning: Key expired"));
-        }
-        if (key->revoked) {
-            expLabel->setText(tr("Warning: Key revoked"));
-        }
-
-        iconLabel->setPixmap(pixmap);
-        QFont font = expLabel->font();
-        font.setBold(true);
-        expLabel->setFont(font);
-        expBox->addWidget(iconLabel);
-        expBox->addWidget(expLabel);
-        mvbox->addLayout(expBox);
-    }
-
-    mvbox->addWidget(buttonBox);
-
-    this->setLayout(mvbox);
+    this->setLayout(mainLayout);
     this->setWindowTitle(tr("Keydetails"));
     this->setModal(true);
     this->show();
 
     exec();
-}
-
-void KeyDetailsDialog::slotExportPrivateKey() {
-    // Show a information box with explanation about private key
-    int ret = QMessageBox::information(this, tr("Exporting private Key"),
-                                       tr("You are about to export your private key.\n"
-                                          "This is NOT your public key, so don't give it away.\n"
-                                          "Make sure you keep it save."
-                                          "Do you really want to export your private key?"),
-                                       QMessageBox::Cancel | QMessageBox::Ok);
-
-    // export key, if ok was clicked
-    if (ret == QMessageBox::Ok) {
-        auto *keyArray = new QByteArray();
-        mCtx->exportSecretKey(*keyid, keyArray);
-        gpgme_key_t key = mCtx->getKeyDetails(*keyid);
-        QString fileString = QString::fromUtf8(key->uids->name) + " " + QString::fromUtf8(key->uids->email) + "(" +
-                             QString(key->subkeys->keyid) + ")_pub_sec.asc";
-        QString fileName = QFileDialog::getSaveFileName(this, tr("Export Key To File"), fileString,
-                                                        tr("Key Files") + " (*.asc *.txt);;All Files (*)");
-        QFile file(fileName);
-        if (!file.open(QIODevice::WriteOnly | QIODevice::Text)) {
-            QMessageBox::critical(nullptr, tr("Export error"), tr("Couldn't open %1 for writing").arg(fileName));
-            return;
-        }
-        QTextStream stream(&file);
-        stream << *keyArray;
-        file.close();
-        delete keyArray;
-    }
-}
-
-QString KeyDetailsDialog::beautifyFingerprint(QString fingerprint) {
-    uint len = fingerprint.length();
-    if ((len > 0) && (len % 4 == 0))
-        for (uint n = 0; 4 * (n + 1) < len; ++n)
-            fingerprint.insert(static_cast<int>(5u * n + 4u), ' ');
-    return fingerprint;
-}
-
-void KeyDetailsDialog::slotCopyFingerprint() {
-    QString fpr = fingerPrintVarLabel->text().trimmed().replace(" ", "");
-    QClipboard *cb = QApplication::clipboard();
-    cb->setText(fpr);
-}
+}
\ No newline at end of file