DragonX/SilentDragonXLite
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1 Wiki Activity

Labels (#59)

Browse Source 
* hacked up labels

* Custom widget for addresses with labels

* turnstile to use labels
This commit is contained in:
adityapk00
2018-11-21 16:30:15 -08:00
committed by GitHub
parent 79520f41c5
commit 44d26ddab7
16 changed files with 144 additions and 48 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
src/mainwindow.cpp
View File

@@ -219,13 +219,13 @@ void MainWindow::turnstileDoMigration(QString fromAddr) {
return bal;
};
//turnstile.migrateZaddList->addItem("All Sprout z-Addrs");
turnstile.fromBalance->setText(Settings::getZECUSDDisplayFormat(fnGetAllSproutBalance()));
for (auto addr : *rpc->getAllZAddresses()) {
auto bal = rpc->getAllBalances()->value(addr);
if (Settings::getInstance()->isSaplingAddress(addr)) {
turnstile.migrateTo->addItem(addr);
turnstile.migrateTo->addItem(addr, bal);
} else {
turnstile.migrateZaddList->addItem(addr);
turnstile.migrateZaddList->addItem(addr, bal);
}
}
@@ -458,7 +458,7 @@ void MainWindow::addressBook() {
void MainWindow::donate() {
// Set up a donation to me :)
ui->Address1->setText(Settings::getDonationAddr(
Settings::getInstance()->isSaplingAddress(ui->inputsCombo->currentText())));
Settings::getInstance()->isSaplingAddress(ui->inputsCombo->currentText())));
ui->Address1->setCursorPosition(0);
ui->Amount1->setText("0.01");
ui->MemoTxt1->setText("Thanks for supporting zec-qt-wallet!");
@@ -735,7 +735,8 @@ void MainWindow::setupBalancesTab() {
auto fnDoSendFrom = [=](const QString& addr, const QString& to = QString(), bool sendMax = false) {
// Find the inputs combo
for (int i = 0; i < ui->inputsCombo->count(); i++) {
if (ui->inputsCombo->itemText(i).startsWith(addr)) {
auto inputComboAddress = ui->inputsCombo->itemText(i);
if (inputComboAddress.startsWith(addr)) {
ui->inputsCombo->setCurrentIndex(i);
break;
}
@@ -772,7 +773,8 @@ void MainWindow::setupBalancesTab() {
if (index.row() < 0) return;
index = index.sibling(index.row(), 0);
auto addr = ui->balancesTable->model()->data(index).toString();
auto addr = AddressBook::addressFromAddressLabel(
ui->balancesTable->model()->data(index).toString());
QMenu menu(this);
@@ -910,7 +912,7 @@ void MainWindow::addNewZaddr(bool sapling) {
// Just double make sure the z-address is still checked
if (( sapling && ui->rdioZSAddr->isChecked()) ||
(!sapling && ui->rdioZAddr->isChecked())) {
ui->listRecieveAddresses->insertItem(0, addr);
ui->listRecieveAddresses->insertItem(0, addr);
ui->listRecieveAddresses->setCurrentIndex(0);
ui->statusBar->showMessage(QString::fromStdString("Created new zAddr") %
@@ -931,8 +933,10 @@ std::function<void(bool)> MainWindow::addZAddrsToComboList(bool sapling) {
std::for_each(addrs->begin(), addrs->end(), [=] (auto addr) {
if ( (sapling && Settings::getInstance()->isSaplingAddress(addr)) ||
(!sapling && !Settings::getInstance()->isSaplingAddress(addr)))
ui->listRecieveAddresses->addItem(addr);
(!sapling && !Settings::getInstance()->isSaplingAddress(addr))) {
auto bal = rpc->getAllBalances()->value(addr);
ui->listRecieveAddresses->addItem(addr, bal);
}
});
// If z-addrs are empty, then create a new one.
@@ -969,7 +973,8 @@ void MainWindow::setupRecieveTab() {
std::for_each(utxos->begin(), utxos->end(), [=] (auto& utxo) {
auto addr = utxo.address;
if (addr.startsWith("t") && ui->listRecieveAddresses->findText(addr) < 0) {
ui->listRecieveAddresses->addItem(addr);
auto bal = rpc->getAllBalances()->value(addr);
ui->listRecieveAddresses->addItem(addr, bal);
}
});
@@ -1026,7 +1031,8 @@ void MainWindow::setupRecieveTab() {
// Select item in address list
QObject::connect(ui->listRecieveAddresses,
QOverload<const QString &>::of(&QComboBox::currentIndexChanged), [=] (const QString& addr) {
QOverload<int>::of(&QComboBox::currentIndexChanged), [=] (int index) {
QString addr = ui->listRecieveAddresses->itemText(index);
if (addr.isEmpty()) {
// Draw empty stuff