neobytes-project/neobytes
neobytes-project/neobytes
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1 Wiki Activity

[Qt] small cleanup of coincontroldialog

Browse Source 
- use a little more Qt-style
- check for NULL pointers first and return in updateView()
- small space and formating changes
This commit is contained in:
Philip Kaufmann 2014-04-01 10:08:35 +02:00
parent d8dcfb9034
commit d34b958406
1 changed files with 16 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
src/qt/coincontroldialog.cpp
View File

@ -97,7 +97,7 @@ CoinControlDialog::CoinControlDialog(QWidget *parent) :
connect(ui->radioListMode, SIGNAL(toggled(bool)), this, SLOT(radioListMode(bool))); connect(ui->radioListMode, SIGNAL(toggled(bool)), this, SLOT(radioListMode(bool)));
// click on checkbox // click on checkbox
connect(ui->treeWidget, SIGNAL(itemChanged( QTreeWidgetItem*, int)), this, SLOT(viewItemChanged( QTreeWidgetItem*, int))); connect(ui->treeWidget, SIGNAL(itemChanged(QTreeWidgetItem*, int)), this, SLOT(viewItemChanged(QTreeWidgetItem*, int)));
// click on header // click on header
#if QT_VERSION < 0x050000 #if QT_VERSION < 0x050000
@ -434,7 +434,8 @@ void CoinControlDialog::updateLabelLocked()
void CoinControlDialog::updateLabels(WalletModel *model, QDialog* dialog) void CoinControlDialog::updateLabels(WalletModel *model, QDialog* dialog)
{ {
if (!model) return; if (!model)
return;
// nPayAmount // nPayAmount
qint64 nPayAmount = 0; qint64 nPayAmount = 0;
@ -640,17 +641,18 @@ void CoinControlDialog::updateLabels(WalletModel *model, QDialog* dialog)
void CoinControlDialog::updateView() void CoinControlDialog::updateView()
{ {
if (!model || !model->getOptionsModel() || !model->getAddressTableModel())
return;
bool treeMode = ui->radioTreeMode->isChecked(); bool treeMode = ui->radioTreeMode->isChecked();
ui->treeWidget->clear(); ui->treeWidget->clear();
ui->treeWidget->setEnabled(false); // performance, otherwise updateLabels would be called for every checked checkbox ui->treeWidget->setEnabled(false); // performance, otherwise updateLabels would be called for every checked checkbox
ui->treeWidget->setAlternatingRowColors(!treeMode); ui->treeWidget->setAlternatingRowColors(!treeMode);
QFlags<Qt::ItemFlag> flgCheckbox=Qt::ItemIsSelectable | Qt::ItemIsEnabled | Qt::ItemIsUserCheckable; QFlags<Qt::ItemFlag> flgCheckbox = Qt::ItemIsSelectable | Qt::ItemIsEnabled | Qt::ItemIsUserCheckable;
QFlags<Qt::ItemFlag> flgTristate=Qt::ItemIsSelectable | Qt::ItemIsEnabled | Qt::ItemIsUserCheckable | Qt::ItemIsTristate; QFlags<Qt::ItemFlag> flgTristate = Qt::ItemIsSelectable | Qt::ItemIsEnabled | Qt::ItemIsUserCheckable | Qt::ItemIsTristate;
int nDisplayUnit = BitcoinUnits::BTC; int nDisplayUnit = model->getOptionsModel()->getDisplayUnit();
if (model && model->getOptionsModel())
nDisplayUnit = model->getOptionsModel()->getDisplayUnit();
map<QString, vector<COutput> > mapCoins; map<QString, vector<COutput> > mapCoins;
model->listCoins(mapCoins); model->listCoins(mapCoins);
@ -658,11 +660,10 @@ void CoinControlDialog::updateView()
BOOST_FOREACH(PAIRTYPE(QString, vector<COutput>) coins, mapCoins) BOOST_FOREACH(PAIRTYPE(QString, vector<COutput>) coins, mapCoins)
{ {
QTreeWidgetItem *itemWalletAddress = new QTreeWidgetItem(); QTreeWidgetItem *itemWalletAddress = new QTreeWidgetItem();
itemWalletAddress->setCheckState(COLUMN_CHECKBOX, Qt::Unchecked);
QString sWalletAddress = coins.first; QString sWalletAddress = coins.first;
QString sWalletLabel = ""; QString sWalletLabel = model->getAddressTableModel()->labelForAddress(sWalletAddress);
if (model->getAddressTableModel()) if (sWalletLabel.isEmpty())
sWalletLabel = model->getAddressTableModel()->labelForAddress(sWalletAddress);
if (sWalletLabel.length() == 0)
sWalletLabel = tr("(no label)"); sWalletLabel = tr("(no label)");
if (treeMode) if (treeMode)
@ -671,7 +672,7 @@ void CoinControlDialog::updateView()
ui->treeWidget->addTopLevelItem(itemWalletAddress); ui->treeWidget->addTopLevelItem(itemWalletAddress);
itemWalletAddress->setFlags(flgTristate); itemWalletAddress->setFlags(flgTristate);
itemWalletAddress->setCheckState(COLUMN_CHECKBOX,Qt::Unchecked); itemWalletAddress->setCheckState(COLUMN_CHECKBOX, Qt::Unchecked);
// label // label
itemWalletAddress->setText(COLUMN_LABEL, sWalletLabel); itemWalletAddress->setText(COLUMN_LABEL, sWalletLabel);
@ -722,10 +723,8 @@ void CoinControlDialog::updateView()
} }
else if (!treeMode) else if (!treeMode)
{ {
QString sLabel = ""; QString sLabel = model->getAddressTableModel()->labelForAddress(sAddress);
if (model->getAddressTableModel()) if (sLabel.isEmpty())
sLabel = model->getAddressTableModel()->labelForAddress(sAddress);
if (sLabel.length() == 0)
sLabel = tr("(no label)"); sLabel = tr("(no label)");
itemOutput->setText(COLUMN_LABEL, sLabel); itemOutput->setText(COLUMN_LABEL, sLabel);
} }
@ -766,7 +765,7 @@ void CoinControlDialog::updateView()
// set checkbox // set checkbox
if (coinControl->IsSelected(txhash, out.i)) if (coinControl->IsSelected(txhash, out.i))
itemOutput->setCheckState(COLUMN_CHECKBOX,Qt::Checked); itemOutput->setCheckState(COLUMN_CHECKBOX, Qt::Checked);
} }
// amount // amount