Merge pull request #292 from UdjinM6/fix_UI_masternode_litemode

Fix UI in masternode and lite modes
This commit is contained in:
evan82 2015-03-31 15:29:53 -07:00
commit 24cd4665ba
2 changed files with 11 additions and 4 deletions

View File

@ -135,15 +135,15 @@ OverviewPage::OverviewPage(QWidget *parent) :
if(fLiteMode){ if(fLiteMode){
ui->frameDarksend->setVisible(false); ui->frameDarksend->setVisible(false);
} else { } else if(!fMasterNode) {
timer = new QTimer(this); timer = new QTimer(this);
connect(timer, SIGNAL(timeout()), this, SLOT(darkSendStatus())); connect(timer, SIGNAL(timeout()), this, SLOT(darkSendStatus()));
timer->start(333); timer->start(333);
} }
if(fMasterNode || fLiteMode){ if(fMasterNode){
ui->toggleDarksend->setText("(" + tr("Disabled") + ")"); ui->toggleDarksend->setText("(" + tr("Disabled") + ")");
ui->toggleDarksend->setEnabled(false); ui->frameDarksend->setEnabled(false);
}else if(!fEnableDarksend){ }else if(!fEnableDarksend){
ui->toggleDarksend->setText(tr("Start Darksend Mixing")); ui->toggleDarksend->setText(tr("Start Darksend Mixing"));
} else { } else {
@ -162,7 +162,7 @@ void OverviewPage::handleTransactionClicked(const QModelIndex &index)
OverviewPage::~OverviewPage() OverviewPage::~OverviewPage()
{ {
if(!fLiteMode) disconnect(timer, SIGNAL(timeout()), this, SLOT(darkSendStatus())); if(!fLiteMode && !fMasterNode) disconnect(timer, SIGNAL(timeout()), this, SLOT(darkSendStatus()));
delete ui; delete ui;
} }

View File

@ -46,6 +46,13 @@ SendCoinsDialog::SendCoinsDialog(QWidget *parent) :
connect(ui->pushButtonCoinControl, SIGNAL(clicked()), this, SLOT(coinControlButtonClicked())); connect(ui->pushButtonCoinControl, SIGNAL(clicked()), this, SLOT(coinControlButtonClicked()));
connect(ui->checkBoxCoinControlChange, SIGNAL(stateChanged(int)), this, SLOT(coinControlChangeChecked(int))); connect(ui->checkBoxCoinControlChange, SIGNAL(stateChanged(int)), this, SLOT(coinControlChangeChecked(int)));
connect(ui->lineEditCoinControlChange, SIGNAL(textEdited(const QString &)), this, SLOT(coinControlChangeEdited(const QString &))); connect(ui->lineEditCoinControlChange, SIGNAL(textEdited(const QString &)), this, SLOT(coinControlChangeEdited(const QString &)));
// Dash specific
if(fLiteMode) {
ui->checkUseDarksend->setChecked(false);
ui->checkUseDarksend->setVisible(false);
ui->checkInstantX->setVisible(false);
}
connect(ui->checkUseDarksend, SIGNAL(stateChanged ( int )), this, SLOT(updateDisplayUnit())); connect(ui->checkUseDarksend, SIGNAL(stateChanged ( int )), this, SLOT(updateDisplayUnit()));
connect(ui->checkInstantX, SIGNAL(stateChanged ( int )), this, SLOT(updateInstantX())); connect(ui->checkInstantX, SIGNAL(stateChanged ( int )), this, SLOT(updateInstantX()));