diff --git a/src/Makefile.qt.include b/src/Makefile.qt.include
index efc149b0b..27ebd6ebb 100644
--- a/src/Makefile.qt.include
+++ b/src/Makefile.qt.include
@@ -304,6 +304,7 @@ RES_ICONS = \
qt/res/icons/history.png \
qt/res/icons/info.png \
qt/res/icons/key.png \
+ qt/res/icons/keva.png \
qt/res/icons/litecoin_splash.png \
qt/res/icons/lock_closed.png \
qt/res/icons/lock_open.png \
diff --git a/src/qt/bitcoin.qrc b/src/qt/bitcoin.qrc
index 5d4cee07c..6aae59014 100644
--- a/src/qt/bitcoin.qrc
+++ b/src/qt/bitcoin.qrc
@@ -39,6 +39,7 @@
res/icons/lock_closed.png
res/icons/lock_open.png
res/icons/key.png
+ res/icons/keva.png
res/icons/filesave.png
res/icons/debugwindow.png
res/icons/open.png
diff --git a/src/qt/bitcoingui.cpp b/src/qt/bitcoingui.cpp
index 2a07ab6d9..53b34cea7 100644
--- a/src/qt/bitcoingui.cpp
+++ b/src/qt/bitcoingui.cpp
@@ -313,7 +313,7 @@ void BitcoinGUI::createActions()
historyAction->setShortcut(QKeySequence(Qt::ALT + Qt::Key_4));
tabGroup->addAction(historyAction);
- kevaAction = new QAction(platformStyle->SingleColorIcon(":/icons/key"), tr("&Keva"), this);
+ kevaAction = new QAction(platformStyle->SingleColorIcon(":/icons/keva"), tr("&Keva"), this);
kevaAction->setStatusTip(tr("Keva related operations"));
kevaAction->setToolTip(kevaAction->statusTip());
kevaAction->setCheckable(true);
diff --git a/src/qt/forms/kevadialog.ui b/src/qt/forms/kevadialog.ui
index 8a986bc19..b172a9c7a 100644
--- a/src/qt/forms/kevadialog.ui
+++ b/src/qt/forms/kevadialog.ui
@@ -28,38 +28,6 @@
-
-
-
-
-
- An optional amount to request. Leave this empty or zero to not request a specific amount.
-
-
- &Amount:
-
-
- Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter
-
-
- reqAmount
-
-
-
- -
-
-
- An optional message to attach to the payment request, which will be displayed when the request is opened. Note: The message will not be sent with the payment over the Kevacoin network.
-
-
- &Message:
-
-
- Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter
-
-
- reqMessage
-
-
-
-
@@ -70,17 +38,17 @@
-
- Use this form to request payments. All fields are <b>optional</b>.
+ Use this form to perform Keva database operations.
-
- An optional label to associate with the new receiving address.
+ The namespace ID, which has a prefix "N".
- &Label:
+ &Namespace:
Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter
@@ -90,32 +58,8 @@
- -
-
-
- An optional message to attach to the payment request, which will be displayed when the request is opened. Note: The message will not be sent with the payment over the Kevacoin network.
-
-
-
-
-
-
-
-
-
- 150
- 0
-
-
-
- &Request payment
-
-
-
- :/icons/receiving_addresses:/icons/receiving_addresses
-
-
-
-
@@ -125,14 +69,14 @@
- Clear all fields of the form.
+ Show content of the namespace.
- Clear
+ Show content
- :/icons/remove:/icons/remove
+ :/icons/eye:/icons/eye
false
@@ -140,94 +84,44 @@
-
-
-
- Qt::Horizontal
-
-
-
- 40
- 20
-
-
-
-
-
-
- -
-
-
-
-
-
-
- -
-
-
-
-
-
-
- 0
- 0
-
-
+
- 80
+ 150
0
-
-
- 1000
- 100
-
-
-
- An optional amount to request. Leave this empty or zero to not request a specific amount.
-
-
-
- -
-
-
-
- 0
- 0
-
-
-
-
- 1000
- 16777215
-
-
-
- Qt::StrongFocus
-
-
- Native segwit addresses (aka Bech32 or BIP-173) reduce your transaction fees later on and offer better protection against typos, but old wallets don't support them. When unchecked, an address compatible with older wallets will be created instead.
-
- Generate native segwit (Bech32) address
+ &Previously used namespaces
+
+
+
+ :/icons/address-book:/icons/address-book
-
-
+
Qt::Horizontal
- 0
- 0
+ 40
+ 20
+ -
+
+
+
+
+
+
@@ -270,7 +164,7 @@
- Requested payments history
+ Content of namespace
diff --git a/src/qt/kevadialog.cpp b/src/qt/kevadialog.cpp
index c9ecaf0aa..0103d980d 100644
--- a/src/qt/kevadialog.cpp
+++ b/src/qt/kevadialog.cpp
@@ -37,8 +37,8 @@ KevaDialog::KevaDialog(const PlatformStyle *_platformStyle, QWidget *parent) :
ui->showRequestButton->setIcon(QIcon());
ui->removeRequestButton->setIcon(QIcon());
} else {
- ui->clearButton->setIcon(_platformStyle->SingleColorIcon(":/icons/remove"));
- ui->receiveButton->setIcon(_platformStyle->SingleColorIcon(":/icons/receiving_addresses"));
+ ui->clearButton->setIcon(_platformStyle->SingleColorIcon(":/icons/eye"));
+ ui->receiveButton->setIcon(_platformStyle->SingleColorIcon(":/icons/address-book"));
ui->showRequestButton->setIcon(_platformStyle->SingleColorIcon(":/icons/edit"));
ui->removeRequestButton->setIcon(_platformStyle->SingleColorIcon(":/icons/remove"));
}
@@ -93,12 +93,6 @@ void KevaDialog::setModel(WalletModel *_model)
SLOT(recentRequestsView_selectionChanged(QItemSelection, QItemSelection)));
// Last 2 columns are set by the columnResizingFixer, when the table geometry is ready.
columnResizingFixer = new GUIUtil::TableViewLastColumnResizingFixer(tableView, AMOUNT_MINIMUM_COLUMN_WIDTH, DATE_COLUMN_WIDTH, this);
-
- if (model->getDefaultAddressType() == OUTPUT_TYPE_BECH32) {
- ui->useBech32->setCheckState(Qt::Checked);
- } else {
- ui->useBech32->setCheckState(Qt::Unchecked);
- }
}
}
@@ -109,9 +103,7 @@ KevaDialog::~KevaDialog()
void KevaDialog::clear()
{
- ui->reqAmount->clear();
ui->reqLabel->setText("");
- ui->reqMessage->setText("");
updateDisplayUnit();
}
@@ -129,7 +121,6 @@ void KevaDialog::updateDisplayUnit()
{
if(model && model->getOptionsModel())
{
- ui->reqAmount->setDisplayUnit(model->getOptionsModel()->getDisplayUnit());
}
}
@@ -142,17 +133,14 @@ void KevaDialog::on_receiveButton_clicked()
QString label = ui->reqLabel->text();
/* Generate new receiving address */
OutputType address_type;
- if (ui->useBech32->isChecked()) {
- address_type = OUTPUT_TYPE_BECH32;
- } else {
- address_type = model->getDefaultAddressType();
- if (address_type == OUTPUT_TYPE_BECH32) {
- address_type = OUTPUT_TYPE_P2SH_SEGWIT;
- }
+ address_type = model->getDefaultAddressType();
+ if (address_type == OUTPUT_TYPE_BECH32) {
+ address_type = OUTPUT_TYPE_P2SH_SEGWIT;
}
+
address = model->getAddressTableModel()->addRow(AddressTableModel::Receive, label, "", address_type);
SendCoinsRecipient info(address, label,
- ui->reqAmount->value(), ui->reqMessage->text());
+ NULL, NULL);
ReceiveRequestDialog *dialog = new ReceiveRequestDialog(this);
dialog->setAttribute(Qt::WA_DeleteOnClose);
dialog->setModel(model->getOptionsModel());
@@ -218,7 +206,7 @@ void KevaDialog::keyPressEvent(QKeyEvent *event)
if (event->key() == Qt::Key_Return)
{
// press return -> submit form
- if (ui->reqLabel->hasFocus() || ui->reqAmount->hasFocus() || ui->reqMessage->hasFocus())
+ if (ui->reqLabel->hasFocus())
{
event->ignore();
on_receiveButton_clicked();
diff --git a/src/qt/res/icons/about.png b/src/qt/res/icons/about.png
index 473725b76..d034f477c 100644
Binary files a/src/qt/res/icons/about.png and b/src/qt/res/icons/about.png differ
diff --git a/src/qt/res/icons/keva.png b/src/qt/res/icons/keva.png
new file mode 100644
index 000000000..aa342e03c
Binary files /dev/null and b/src/qt/res/icons/keva.png differ