diff options
| author | Wladimir J. van der Laan <laanwj@gmail.com> | 2012-04-16 00:55:37 -0700 |
|---|---|---|
| committer | Wladimir J. van der Laan <laanwj@gmail.com> | 2012-04-16 00:55:37 -0700 |
| commit | 088a13331bd85a54a1cb39aeb8699a36c1e5de98 (patch) | |
| tree | e40e953d381ebf11ea9ee18e9a18919291bbdd6b /src/qt | |
| parent | 5a701eb7ea16b87b56263996ee8e98ec89e2a3d8 (diff) | |
| parent | e72c6a18305903a5d6660d710875aa6bd4f590ec (diff) | |
Merge pull request #1091 from Diapolo/GUI-BlockDL
revert to default OS theme for progressbar (fix #1071)
Diffstat (limited to 'src/qt')
| -rw-r--r-- | src/qt/bitcoingui.cpp | 15 |
1 files changed, 6 insertions, 9 deletions
diff --git a/src/qt/bitcoingui.cpp b/src/qt/bitcoingui.cpp index 10028b5809..bcf90917ed 100644 --- a/src/qt/bitcoingui.cpp +++ b/src/qt/bitcoingui.cpp @@ -143,16 +143,13 @@ BitcoinGUI::BitcoinGUI(QWidget *parent): progressBarLabel = new QLabel(); progressBarLabel->setVisible(false); progressBar = new QProgressBar(); + progressBar->setAlignment(Qt::AlignCenter); progressBar->setVisible(false); statusBar()->addWidget(progressBarLabel); statusBar()->addWidget(progressBar); statusBar()->addPermanentWidget(frameBlocks); - // define OS independent progress bar style (has to be placed after addWidget(), otherwise we crash) - // we did this, because with some OSes default style, text on the progress bar is unreadable - progressBar->setStyleSheet("QProgressBar { background-color: transparent; border: 1px solid grey; border-radius: 2px; padding: 1px; text-align: center; } QProgressBar::chunk { background: QLinearGradient(x1: 0, y1: 0, x2: 1, y2: 0, stop: 0 #FF8000, stop: 1 orange); margin: 0px; }"); - syncIconMovie = new QMovie(":/movies/update_spinner", "mng", this); // Clicking on a transaction on the overview page simply sends you to transaction history page @@ -416,7 +413,7 @@ void BitcoinGUI::trayIconActivated(QSystemTrayIcon::ActivationReason reason) { if(reason == QSystemTrayIcon::Trigger) { - // Click on system tray icon triggers "open bitcoin" + // Click on system tray icon triggers "show/hide bitcoin" toggleHideAction->trigger(); } } @@ -425,17 +422,17 @@ void BitcoinGUI::trayIconActivated(QSystemTrayIcon::ActivationReason reason) void BitcoinGUI::toggleHidden() { // activateWindow() (sometimes) helps with keyboard focus on Windows - if(isHidden()) + if (isHidden()) { show(); activateWindow(); } - else if(isMinimized()) + else if (isMinimized()) { showNormal(); activateWindow(); } - else if(GUIUtil::isObscured(this)) + else if (GUIUtil::isObscured(this)) { raise(); activateWindow(); @@ -555,7 +552,7 @@ void BitcoinGUI::setNumBlocks(int count) if(secs < 90*60 && count >= nTotalBlocks) { tooltip = tr("Up to date") + QString(".\n") + tooltip; - labelBlocksIcon->setPixmap(QIcon(":/icons/synced").pixmap(STATUSBAR_ICONSIZE,STATUSBAR_ICONSIZE)); + labelBlocksIcon->setPixmap(QIcon(":/icons/synced").pixmap(STATUSBAR_ICONSIZE, STATUSBAR_ICONSIZE)); } else { |