Skip to content

Fundamental transaction support UI #3

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wqking wants to merge 1 commit into
base: testnet-patch
Choose a base branch
from
Open

Fundamental transaction support UI #3

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 7 additions & 0 deletions src/qt/forms/sendcoinsdialog.ui
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1675,6 +1675,13 @@
</property>
</spacer>
</item>
<item>
<widget class="QCheckBox" name="checkBoxFnPayment">
<property name="text">
<string>FundamentalNode Payment</string>
</property>
</widget>
</item>
<item>
<layout class="QHBoxLayout" name="horizontalLayout_2">
<property name="spacing">
Expand Down
22 changes: 17 additions & 5 deletions src/qt/sendcoinsdialog.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,8 +59,12 @@ SendCoinsDialog::SendCoinsDialog(QWidget* parent) : QDialog(parent, Qt::WindowSy

// UTXO Splitter
connect(ui->splitBlockCheckBox, SIGNAL(stateChanged(int)), this, SLOT(splitBlockChecked(int)));
connect(ui->splitBlockCheckBox, SIGNAL(stateChanged(int)), this, SLOT(splitBlockChecked(int)));
connect(ui->splitBlockLineEdit, SIGNAL(textChanged(const QString&)), this, SLOT(splitBlockLineEditChanged(const QString&)));

// FN Create Toggle
connect(ui->checkBoxFnPayment, SIGNAL(stateChanged(int)), this, SLOT(ffnPaymentChecked(int)));

// VITAE specific
QSettings settings;
if (!settings.contains("bUseObfuScation"))
Expand Down Expand Up @@ -164,7 +168,7 @@ void SendCoinsDialog::setModel(WalletModel* model)
setBalance(model->getBalance(), model->getUnconfirmedBalance(), model->getImmatureBalance(),
model->getZerocoinBalance (), model->getUnconfirmedZerocoinBalance (), model->getImmatureZerocoinBalance (),
model->getWatchBalance(), model->getWatchUnconfirmedBalance(), model->getWatchImmatureBalance());
connect(model, SIGNAL(balanceChanged(CAmount, CAmount, CAmount, CAmount, CAmount, CAmount, CAmount, CAmount, CAmount)), this,
connect(model, SIGNAL(balanceChanged(CAmount, CAmount, CAmount, CAmount, CAmount, CAmount, CAmount, CAmount, CAmount)), this,
SLOT(setBalance(CAmount, CAmount, CAmount, CAmount, CAmount, CAmount, CAmount, CAmount, CAmount)));
connect(model->getOptionsModel(), SIGNAL(displayUnitChanged(int)), this, SLOT(updateDisplayUnit()));
updateDisplayUnit();
Expand Down Expand Up @@ -221,6 +225,8 @@ void SendCoinsDialog::on_sendButton_clicked()
if (!model || !model->getOptionsModel())
return;

IsFundamentalNodePayment = ui->checkBoxFnPayment->checkState() == Qt::Checked;

QList<SendCoinsRecipient> recipients;
bool valid = true;

Expand Down Expand Up @@ -251,7 +257,7 @@ void SendCoinsDialog::on_sendButton_clicked()
return;
}



//set split block in model
CoinControlDialog::coinControl->fSplitBlock = ui->splitBlockCheckBox->checkState() == Qt::Checked;
Expand Down Expand Up @@ -549,7 +555,7 @@ bool SendCoinsDialog::handlePaymentRequest(const SendCoinsRecipient& rv)
return true;
}

void SendCoinsDialog::setBalance(const CAmount& balance, const CAmount& unconfirmedBalance, const CAmount& immatureBalance,
void SendCoinsDialog::setBalance(const CAmount& balance, const CAmount& unconfirmedBalance, const CAmount& immatureBalance,
const CAmount& zerocoinBalance, const CAmount& unconfirmedZerocoinBalance, const CAmount& immatureZerocoinBalance,
const CAmount& watchBalance, const CAmount& watchUnconfirmedBalance, const CAmount& watchImmatureBalance)
{
Expand All @@ -574,7 +580,7 @@ void SendCoinsDialog::updateDisplayUnit()
TRY_LOCK(cs_main, lockMain);
if (!lockMain) return;

setBalance(model->getBalance(), model->getUnconfirmedBalance(), model->getImmatureBalance(),
setBalance(model->getBalance(), model->getUnconfirmedBalance(), model->getImmatureBalance(),
model->getZerocoinBalance (), model->getUnconfirmedZerocoinBalance (), model->getImmatureZerocoinBalance (),
model->getWatchBalance(), model->getWatchUnconfirmedBalance(), model->getWatchImmatureBalance());
coinControlUpdateLabels();
Expand All @@ -594,7 +600,7 @@ void SendCoinsDialog::updateSwiftTX()
void SendCoinsDialog::processSendCoinsReturn(const WalletModel::SendCoinsReturn& sendCoinsReturn, const QString& msgArg, bool fPrepare)
{
bool fAskForUnlock = false;

QPair<QString, CClientUIInterface::MessageBoxFlags> msgParams;
// Default to a warning message, override if error message is needed
msgParams.second = CClientUIInterface::MSG_WARNING;
Expand Down Expand Up @@ -755,6 +761,12 @@ void SendCoinsDialog::updateSmartFeeLabel()
updateFeeMinimizedLabel();
}

// FN checkbox
void SendCoinsDialog::ffnPaymentChecked(int state)
{
// TODO: display warning-disclaimer message about burn
}

// UTXO splitter
void SendCoinsDialog::splitBlockChecked(int state)
{
Expand Down
3 changes: 2 additions & 1 deletion src/qt/sendcoinsdialog.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ public slots:
void accept();
SendCoinsEntry* addEntry();
void updateTabsAndLabels();
void setBalance(const CAmount& balance, const CAmount& unconfirmedBalance, const CAmount& immatureBalance,
void setBalance(const CAmount& balance, const CAmount& unconfirmedBalance, const CAmount& immatureBalance,
const CAmount& zerocoinBalance, const CAmount& unconfirmedZerocoinBalance, const CAmount& immatureZerocoinBalance,
const CAmount& watchOnlyBalance, const CAmount& watchUnconfBalance, const CAmount& watchImmatureBalance);

Expand Down Expand Up @@ -100,6 +100,7 @@ private slots:
void updateMinFeeLabel();
void updateSmartFeeLabel();
void updateGlobalFeeVariables();
void ffnPaymentChecked(int state);

signals:
// Fired when a message should be reported to the user
Expand Down