|
|
@ -143,16 +143,13 @@ BitcoinGUI::BitcoinGUI(QWidget *parent): |
|
|
|
progressBarLabel = new QLabel(); |
|
|
|
progressBarLabel = new QLabel(); |
|
|
|
progressBarLabel->setVisible(false); |
|
|
|
progressBarLabel->setVisible(false); |
|
|
|
progressBar = new QProgressBar(); |
|
|
|
progressBar = new QProgressBar(); |
|
|
|
|
|
|
|
progressBar->setAlignment(Qt::AlignCenter); |
|
|
|
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 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); |
|
|
|
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
|
|
|
@ -416,7 +413,7 @@ void BitcoinGUI::trayIconActivated(QSystemTrayIcon::ActivationReason reason) |
|
|
|
{ |
|
|
|
{ |
|
|
|
if(reason == QSystemTrayIcon::Trigger) |
|
|
|
if(reason == QSystemTrayIcon::Trigger) |
|
|
|
{ |
|
|
|
{ |
|
|
|
// Click on system tray icon triggers "open bitcoin"
|
|
|
|
// Click on system tray icon triggers "show/hide bitcoin"
|
|
|
|
toggleHideAction->trigger(); |
|
|
|
toggleHideAction->trigger(); |
|
|
|
} |
|
|
|
} |
|
|
|
} |
|
|
|
} |
|
|
@ -425,17 +422,17 @@ void BitcoinGUI::trayIconActivated(QSystemTrayIcon::ActivationReason reason) |
|
|
|
void BitcoinGUI::toggleHidden() |
|
|
|
void BitcoinGUI::toggleHidden() |
|
|
|
{ |
|
|
|
{ |
|
|
|
// activateWindow() (sometimes) helps with keyboard focus on Windows
|
|
|
|
// activateWindow() (sometimes) helps with keyboard focus on Windows
|
|
|
|
if(isHidden()) |
|
|
|
if (isHidden()) |
|
|
|
{ |
|
|
|
{ |
|
|
|
show(); |
|
|
|
show(); |
|
|
|
activateWindow(); |
|
|
|
activateWindow(); |
|
|
|
} |
|
|
|
} |
|
|
|
else if(isMinimized()) |
|
|
|
else if (isMinimized()) |
|
|
|
{ |
|
|
|
{ |
|
|
|
showNormal(); |
|
|
|
showNormal(); |
|
|
|
activateWindow(); |
|
|
|
activateWindow(); |
|
|
|
} |
|
|
|
} |
|
|
|
else if(GUIUtil::isObscured(this)) |
|
|
|
else if (GUIUtil::isObscured(this)) |
|
|
|
{ |
|
|
|
{ |
|
|
|
raise(); |
|
|
|
raise(); |
|
|
|
activateWindow(); |
|
|
|
activateWindow(); |
|
|
@ -555,7 +552,7 @@ void BitcoinGUI::setNumBlocks(int count) |
|
|
|
if(secs < 90*60) |
|
|
|
if(secs < 90*60) |
|
|
|
{ |
|
|
|
{ |
|
|
|
tooltip = tr("Up to date") + QString(".\n") + tooltip; |
|
|
|
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 |
|
|
|
else |
|
|
|
{ |
|
|
|
{ |
|
|
|