Merge g757 via qt_addrbook_walletname-0.18

This commit is contained in:
Luke Dashjr 2023-11-15 23:49:11 +00:00
commit a81ccd2654
4 changed files with 19 additions and 0 deletions

View File

@ -164,6 +164,7 @@ void AddressBookPage::setModel(AddressTableModel *_model)
connect(_model, &AddressTableModel::rowsInserted, this, &AddressBookPage::selectNewAddress);
selectionChanged();
this->updateWindowsTitleWithWalletName();
}
void AddressBookPage::on_copyAddress_clicked()
@ -328,3 +329,16 @@ void AddressBookPage::selectNewAddress(const QModelIndex &parent, int begin, int
newAddressToSelect.clear();
}
}
void AddressBookPage::updateWindowsTitleWithWalletName()
{
const QString walletName = this->model->GetWalletDisplayName();
if (mode == ForEditing) {
switch(tab)
{
case SendingTab: setWindowTitle(tr("Sending addresses - %1").arg(walletName)); break;
case ReceivingTab: setWindowTitle(tr("Receiving addresses - %1").arg(walletName)); break;
}
}
}

View File

@ -56,6 +56,7 @@ private:
AddressBookSortFilterProxyModel *proxyModel;
QMenu *contextMenu;
QString newAddressToSelect;
void updateWindowsTitleWithWalletName();
private Q_SLOTS:
/** Delete currently selected address entry */

View File

@ -450,3 +450,5 @@ void AddressTableModel::emitDataChanged(int idx)
{
Q_EMIT dataChanged(index(idx, 0, QModelIndex()), index(idx, columns.length()-1, QModelIndex()));
}
QString AddressTableModel::GetWalletDisplayName() const { return walletModel->getDisplayName(); };

View File

@ -87,6 +87,8 @@ public:
OutputType GetDefaultAddressType() const;
QString GetWalletDisplayName() const;
private:
WalletModel* const walletModel;
AddressTablePriv *priv = nullptr;