implemented OS independent progress bar style / moved one-time functions used on the bar to a better code location
This commit is contained in:
parent
5519660a0d
commit
c7c0c93172
@ -138,17 +138,21 @@ BitcoinGUI::BitcoinGUI(QWidget *parent):
|
|||||||
frameBlocksLayout->addWidget(labelBlocksIcon);
|
frameBlocksLayout->addWidget(labelBlocksIcon);
|
||||||
frameBlocksLayout->addStretch();
|
frameBlocksLayout->addStretch();
|
||||||
|
|
||||||
// Progress bar for blocks download
|
// Progress bar and label for blocks download
|
||||||
progressBarLabel = new QLabel(tr("Synchronizing with network..."));
|
progressBarLabel = new QLabel();
|
||||||
progressBarLabel->setVisible(false);
|
progressBarLabel->setVisible(false);
|
||||||
progressBar = new QProgressBar();
|
progressBar = new QProgressBar();
|
||||||
progressBar->setToolTip(tr("Block chain synchronization in progress"));
|
|
||||||
progressBar->setVisible(false);
|
progressBar->setVisible(false);
|
||||||
|
|
||||||
statusBar()->addWidget(progressBarLabel);
|
statusBar()->addWidget(progressBarLabel);
|
||||||
statusBar()->addWidget(progressBar);
|
statusBar()->addWidget(progressBar);
|
||||||
statusBar()->addPermanentWidget(frameBlocks);
|
statusBar()->addPermanentWidget(frameBlocks);
|
||||||
|
|
||||||
|
// define progress bar format
|
||||||
|
progressBar->setFormat(tr("~%m blocks remaining"));
|
||||||
|
// define OS independent progress bar style (has to be after addWidget(), otherwise we crash)
|
||||||
|
progressBar->setStyleSheet("QProgressBar { background-color: transparent; border: 1px solid grey; border-radius: 5px; text-align: center; } QProgressBar::chunk { background: QLinearGradient(x1: 0, y1: 0, x2: 1, y2: 0, stop: 0 transparent, stop: 1 orange); margin: 0px; }");
|
||||||
|
|
||||||
syncIconMovie = new QMovie(":/movies/update_spinner", "mng", this);
|
syncIconMovie = new QMovie(":/movies/update_spinner", "mng", this);
|
||||||
|
|
||||||
// Clicking on a transaction on the overview page simply sends you to transaction history page
|
// Clicking on a transaction on the overview page simply sends you to transaction history page
|
||||||
@ -471,13 +475,11 @@ void BitcoinGUI::setNumBlocks(int count)
|
|||||||
|
|
||||||
if (clientModel->getStatusBarWarnings() == "")
|
if (clientModel->getStatusBarWarnings() == "")
|
||||||
{
|
{
|
||||||
progressBarLabel->setVisible(true);
|
|
||||||
progressBarLabel->setText(tr("Synchronizing with network..."));
|
progressBarLabel->setText(tr("Synchronizing with network..."));
|
||||||
progressBar->setVisible(true);
|
progressBarLabel->setVisible(true);
|
||||||
progressBar->setFormat(tr("~%m blocks remaining"));
|
|
||||||
progressBar->setAlignment(Qt::AlignCenter);
|
|
||||||
progressBar->setMaximum(nCurMax);
|
progressBar->setMaximum(nCurMax);
|
||||||
progressBar->setValue(nOnePercentCurMax * nPercentageDone);
|
progressBar->setValue(nOnePercentCurMax * nPercentageDone);
|
||||||
|
progressBar->setVisible(true);
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
|
Loading…
Reference in New Issue
Block a user