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

Fix bug where doubleclick was picking wrong address

Browse Source
This commit is contained in:
adityapk00
2018-11-21 18:15:08 -08:00
parent 3bb26ce9a9
commit e718dfcbef
1 changed files with 8 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
src/mainwindow.cpp
View File

@@ -761,7 +761,7 @@ void MainWindow::setupBalancesTab() {
// Double click opens up memo if one exists // Double click opens up memo if one exists
QObject::connect(ui->balancesTable, &QTableView::doubleClicked, [=](auto index) { QObject::connect(ui->balancesTable, &QTableView::doubleClicked, [=](auto index) {
index = index.sibling(index.row(), 0); index = index.sibling(index.row(), 0);
auto addr = ui->balancesTable->model()->data(index).toString(); auto addr = AddressBook::addressFromAddressLabel(ui->balancesTable->model()->data(index).toString());
fnDoSendFrom(addr); fnDoSendFrom(addr);
}); });
@@ -1069,26 +1069,23 @@ void MainWindow::setupRecieveTab() {
return; return;
auto curLabel = AddressBook::getInstance()->getLabelForAddress(addr); auto curLabel = AddressBook::getInstance()->getLabelForAddress(addr);
auto label = ui->rcvLabel->text(); auto label = ui->rcvLabel->text().trimmed();
QString info; QString info;
if (!curLabel.isEmpty() && label.isEmpty()) { if (!curLabel.isEmpty() && label.isEmpty()) {
info = "Removed Label"; info = "Removed Label '" % curLabel % "'";
AddressBook::getInstance()->removeAddressLabel(curLabel, addr); AddressBook::getInstance()->removeAddressLabel(curLabel, addr);
} }
else if (!curLabel.isEmpty() && !label.isEmpty()) { else if (!curLabel.isEmpty() && !label.isEmpty()) {
info = "Updated Label"; info = "Updated Label '" % curLabel % "' to '" % label % "'";
AddressBook::getInstance()->updateLabel(curLabel, addr, label); AddressBook::getInstance()->updateLabel(curLabel, addr, label);
} }
else if (curLabel.isEmpty() && !label.isEmpty()) { else if (curLabel.isEmpty() && !label.isEmpty()) {
info = "Added Label"; info = "Added Label '" % label % "'";
AddressBook::getInstance()->addAddressLabel(label, addr); AddressBook::getInstance()->addAddressLabel(label, addr);
} }
if (info.isEmpty())
return;
// Update the UI // Update the UI
if (ui->rdioTAddr->isChecked()) { if (ui->rdioTAddr->isChecked()) {
fnUpdateTAddrCombo(true); fnUpdateTAddrCombo(true);
@@ -1098,7 +1095,9 @@ void MainWindow::setupRecieveTab() {
} }
// Show the user feedback // Show the user feedback
QMessageBox::information(this, "Label", info, QMessageBox::Ok); if (!info.isEmpty()) {
QMessageBox::information(this, "Label", info, QMessageBox::Ok);
}
}); });
} }