diff --git a/src/dialog/verifyproofdialog.cpp b/src/dialog/verifyproofdialog.cpp index 291b977..4d34f4e 100644 --- a/src/dialog/verifyproofdialog.cpp +++ b/src/dialog/verifyproofdialog.cpp @@ -16,26 +16,28 @@ VerifyProofDialog::VerifyProofDialog(Wallet *wallet, QWidget *parent) { ui->setupUi(this); - connect(ui->btn_verifySpendProof, &QPushButton::clicked, this, &VerifyProofDialog::checkSpendProof); - connect(ui->btn_verifyOutProof, &QPushButton::clicked, this, &VerifyProofDialog::checkOutProof); - connect(ui->btn_verifyInProof, &QPushButton::clicked, this, &VerifyProofDialog::checkInProof); - - connect(ui->btn_spendClear, &QPushButton::clicked, [this](){ - ui->lineEdit_spendTxID->clear(); - ui->lineEdit_spendMessage->clear(); - ui->input_SpendProof->clear(); - }); - connect(ui->btn_outClear, &QPushButton::clicked, [this](){ - ui->lineEdit_outTxID->clear(); - ui->lineEdit_outAddress->clear(); - ui->lineEdit_outMessage->clear(); - ui->input_OutProof->clear(); - }); - connect(ui->btn_inClear, &QPushButton::clicked, [this](){ - ui->lineEdit_inTxID->clear(); - ui->lineEdit_inAddress->clear(); - ui->lineEdit_inMessage->clear(); - ui->input_InProof->clear(); + connect(ui->btn_verify, &QPushButton::clicked, this, &VerifyProofDialog::checkProof); + + connect(ui->btn_clear, &QPushButton::clicked, [this]{ + switch (ui->tabWidget->currentIndex()) { + case 0: + ui->lineEdit_spendTxID->clear(); + ui->lineEdit_spendMessage->clear(); + ui->input_SpendProof->clear(); + break; + case 1: + ui->lineEdit_outTxID->clear(); + ui->lineEdit_outAddress->clear(); + ui->lineEdit_outMessage->clear(); + ui->input_OutProof->clear(); + break; + case 2: + ui->lineEdit_inTxID->clear(); + ui->lineEdit_inAddress->clear(); + ui->lineEdit_inMessage->clear(); + ui->input_InProof->clear(); + break; + } }); } @@ -44,6 +46,20 @@ VerifyProofDialog::~VerifyProofDialog() delete ui; } +void VerifyProofDialog::checkProof() { + switch (ui->tabWidget->currentIndex()) { + case 0: + this->checkSpendProof(); + break; + case 1: + this->checkOutProof(); + break; + case 2: + this->checkInProof(); + break; + } +} + void VerifyProofDialog::checkSpendProof() { auto r = m_wallet->checkSpendProof(ui->lineEdit_spendTxID->text(), ui->lineEdit_spendMessage->text(), ui->input_SpendProof->toPlainText()); diff --git a/src/dialog/verifyproofdialog.h b/src/dialog/verifyproofdialog.h index 28b22a7..4442923 100644 --- a/src/dialog/verifyproofdialog.h +++ b/src/dialog/verifyproofdialog.h @@ -20,12 +20,13 @@ public: ~VerifyProofDialog() override; private slots: - void checkSpendProof(); - void checkOutProof(); - void checkInProof(); + void checkProof(); private: void checkTxProof(const QString &txId, const QString &address, const QString &message, const QString &signature); + void checkSpendProof(); + void checkOutProof(); + void checkInProof(); Ui::VerifyProofDialog *ui; Wallet *m_wallet; diff --git a/src/dialog/verifyproofdialog.ui b/src/dialog/verifyproofdialog.ui index 6ff55bf..e161ac2 100644 --- a/src/dialog/verifyproofdialog.ui +++ b/src/dialog/verifyproofdialog.ui @@ -39,17 +39,7 @@ - - - - - Transaction ID: - - - - - - + @@ -57,10 +47,13 @@ - - + + + + + - SpendProof: + Transaction ID: @@ -71,6 +64,13 @@ + + + + SpendProof: + + + @@ -96,37 +96,6 @@ - - - - - - Qt::Horizontal - - - - 40 - 20 - - - - - - - - Clear - - - - - - - Verify - - - - - @@ -213,37 +182,6 @@ - - - - - - Qt::Horizontal - - - - 40 - 20 - - - - - - - - Clear - - - - - - - Verify - - - - - @@ -331,41 +269,44 @@ - - - - - - Qt::Horizontal - - - - 40 - 20 - - - - - - - - Clear - - - - - - - Verify - - - - - + + + + + + Qt::Horizontal + + + + 40 + 20 + + + + + + + + Clear + + + + + + + Verify + + + true + + + + +