|
|
|
@ -70,7 +70,7 @@ BitcoinGUI::BitcoinGUI(QWidget *parent):
@@ -70,7 +70,7 @@ BitcoinGUI::BitcoinGUI(QWidget *parent):
|
|
|
|
|
restoreWindowGeometry(); |
|
|
|
|
setWindowTitle(tr("Bitcoin") + " - " + tr("Wallet")); |
|
|
|
|
#ifndef Q_OS_MAC |
|
|
|
|
qApp->setWindowIcon(QIcon(":icons/bitcoin")); |
|
|
|
|
QApplication::setWindowIcon(QIcon(":icons/bitcoin")); |
|
|
|
|
setWindowIcon(QIcon(":icons/bitcoin")); |
|
|
|
|
#else |
|
|
|
|
setUnifiedTitleAndToolBarOnMac(true); |
|
|
|
@ -127,7 +127,7 @@ BitcoinGUI::BitcoinGUI(QWidget *parent):
@@ -127,7 +127,7 @@ BitcoinGUI::BitcoinGUI(QWidget *parent):
|
|
|
|
|
// Override style sheet for progress bar for styles that have a segmented progress bar,
|
|
|
|
|
// as they make the text unreadable (workaround for issue #1071)
|
|
|
|
|
// See https://qt-project.org/doc/qt-4.8/gallery.html
|
|
|
|
|
QString curStyle = qApp->style()->metaObject()->className(); |
|
|
|
|
QString curStyle = QApplication::style()->metaObject()->className(); |
|
|
|
|
if(curStyle == "QWindowsStyle" || curStyle == "QWindowsXPStyle") |
|
|
|
|
{ |
|
|
|
|
progressBar->setStyleSheet("QProgressBar { background-color: #e8e8e8; border: 1px solid grey; border-radius: 7px; padding: 1px; text-align: center; } QProgressBar::chunk { background: QLinearGradient(x1: 0, y1: 0, x2: 1, y2: 0, stop: 0 #FF8000, stop: 1 orange); border-radius: 7px; margin: 0px; }"); |
|
|
|
@ -308,7 +308,7 @@ void BitcoinGUI::setClientModel(ClientModel *clientModel)
@@ -308,7 +308,7 @@ void BitcoinGUI::setClientModel(ClientModel *clientModel)
|
|
|
|
|
{ |
|
|
|
|
setWindowTitle(windowTitle() + QString(" ") + tr("[testnet]")); |
|
|
|
|
#ifndef Q_OS_MAC |
|
|
|
|
qApp->setWindowIcon(QIcon(":icons/bitcoin_testnet")); |
|
|
|
|
QApplication::setWindowIcon(QIcon(":icons/bitcoin_testnet")); |
|
|
|
|
setWindowIcon(QIcon(":icons/bitcoin_testnet")); |
|
|
|
|
#else |
|
|
|
|
MacDockIconHandler::instance()->setIcon(QIcon(":icons/bitcoin_testnet")); |
|
|
|
@ -368,7 +368,7 @@ void BitcoinGUI::createTrayIcon()
@@ -368,7 +368,7 @@ void BitcoinGUI::createTrayIcon()
|
|
|
|
|
trayIcon->show(); |
|
|
|
|
#endif |
|
|
|
|
|
|
|
|
|
notificator = new Notificator(qApp->applicationName(), trayIcon); |
|
|
|
|
notificator = new Notificator(QApplication::applicationName(), trayIcon); |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
void BitcoinGUI::createTrayIconMenu() |
|
|
|
@ -432,7 +432,7 @@ void BitcoinGUI::restoreWindowGeometry()
@@ -432,7 +432,7 @@ void BitcoinGUI::restoreWindowGeometry()
|
|
|
|
|
QSize size = settings.value("nWindowSize", QSize(850, 550)).toSize(); |
|
|
|
|
if (!pos.x() && !pos.y()) |
|
|
|
|
{ |
|
|
|
|
QRect screen = qApp->desktop()->screenGeometry(); |
|
|
|
|
QRect screen = QApplication::desktop()->screenGeometry(); |
|
|
|
|
pos.setX((screen.width()-size.width())/2); |
|
|
|
|
pos.setY((screen.height()-size.height())/2); |
|
|
|
|
} |
|
|
|
@ -681,7 +681,7 @@ void BitcoinGUI::closeEvent(QCloseEvent *event)
@@ -681,7 +681,7 @@ void BitcoinGUI::closeEvent(QCloseEvent *event)
|
|
|
|
|
if(!clientModel->getOptionsModel()->getMinimizeToTray() && |
|
|
|
|
!clientModel->getOptionsModel()->getMinimizeOnClose()) |
|
|
|
|
{ |
|
|
|
|
qApp->quit(); |
|
|
|
|
QApplication::quit(); |
|
|
|
|
} |
|
|
|
|
#endif |
|
|
|
|
} |
|
|
|
|