GUI: Enable palette change adaptation on all platforms

luke-jr · luke-jr · commit c901d4d8ce79 · 2021-06-22T19:24:42.000Z
diff --git a/src/qt/bitcoingui.cpp b/src/qt/bitcoingui.cpp
@@ -1173,14 +1173,12 @@ void BitcoinGUI::message(const QString& title, QString message, unsigned int sty
 
 void BitcoinGUI::changeEvent(QEvent *e)
 {
-#ifdef Q_OS_MACOS
     if (e->type() == QEvent::PaletteChange) {
         overviewAction->setIcon(platformStyle->SingleColorIcon(QStringLiteral(":/icons/overview")));
         sendCoinsAction->setIcon(platformStyle->SingleColorIcon(QStringLiteral(":/icons/send")));
         receiveCoinsAction->setIcon(platformStyle->SingleColorIcon(QStringLiteral(":/icons/receiving_addresses")));
         historyAction->setIcon(platformStyle->SingleColorIcon(QStringLiteral(":/icons/history")));
     }
-#endif
 
     QMainWindow::changeEvent(e);
 
@@ -1511,14 +1509,12 @@ void UnitDisplayStatusBarControl::mousePressEvent(QMouseEvent *event)
 
 void UnitDisplayStatusBarControl::changeEvent(QEvent* e)
 {
-#ifdef Q_OS_MACOS
     if (e->type() == QEvent::PaletteChange) {
         QString style = QString("QLabel { color : %1 }").arg(m_platform_style->SingleColor().name());
         if (style != styleSheet()) {
             setStyleSheet(style);
         }
     }
-#endif
 }
 
 /** Creates context menu, its actions, and wires up all the relevant signals for mouse events. */
diff --git a/src/qt/coincontroldialog.cpp b/src/qt/coincontroldialog.cpp
@@ -564,11 +564,9 @@ void CoinControlDialog::updateLabels(CCoinControl& m_coin_control, WalletModel *
 
 void CoinControlDialog::changeEvent(QEvent* e)
 {
-#ifdef Q_OS_MACOS
     if (e->type() == QEvent::PaletteChange) {
         updateView();
     }
-#endif
 }
 
 void CoinControlDialog::updateView()
diff --git a/src/qt/guiutil.cpp b/src/qt/guiutil.cpp
@@ -809,11 +809,9 @@ void ThemedLabel::setThemedPixmap(const QString& image_filename, int width, int
 
 void ThemedLabel::changeEvent(QEvent* e)
 {
-#ifdef Q_OS_MACOS
     if (e->type() == QEvent::PaletteChange) {
         updateThemedPixmap();
     }
-#endif
     QLabel::changeEvent(e);
 }
 
diff --git a/src/qt/overviewpage.cpp b/src/qt/overviewpage.cpp
@@ -297,13 +297,11 @@ void OverviewPage::setWalletModel(WalletModel *model)
 
 void OverviewPage::changeEvent(QEvent* e)
 {
-#ifdef Q_OS_MACOS
     if (e->type() == QEvent::PaletteChange) {
         QIcon icon = m_platform_style->SingleColorIcon(QStringLiteral(":/icons/warning"));
         ui->labelTransactionsStatus->setIcon(icon);
         ui->labelWalletStatus->setIcon(icon);
     }
-#endif
 }
 
 void OverviewPage::updateDisplayUnit()
diff --git a/src/qt/rpcconsole.cpp b/src/qt/rpcconsole.cpp
@@ -882,7 +882,6 @@ void RPCConsole::keyPressEvent(QKeyEvent *event)
 
 void RPCConsole::changeEvent(QEvent* e)
 {
-#ifdef Q_OS_MACOS
     if (e->type() == QEvent::PaletteChange) {
         ui->clearButton->setIcon(platformStyle->SingleColorIcon(QStringLiteral(":/icons/remove")));
         ui->fontBiggerButton->setIcon(platformStyle->SingleColorIcon(QStringLiteral(":/icons/fontbigger")));
@@ -896,7 +895,6 @@ void RPCConsole::changeEvent(QEvent* e)
                 platformStyle->SingleColorImage(ICON_MAPPING[i].source).scaled(QSize(consoleFontSize * 2, consoleFontSize * 2), Qt::IgnoreAspectRatio, Qt::SmoothTransformation));
         }
     }
-#endif
 }
 
 void RPCConsole::message(int category, const QString &message, bool html)
diff --git a/src/qt/sendcoinsentry.cpp b/src/qt/sendcoinsentry.cpp
@@ -238,15 +238,13 @@ void SendCoinsEntry::updateDisplayUnit()
 
 void SendCoinsEntry::changeEvent(QEvent* e)
 {
-#ifdef Q_OS_MACOS
     if (e->type() == QEvent::PaletteChange) {
         ui->addressBookButton->setIcon(platformStyle->SingleColorIcon(QStringLiteral(":/icons/address-book")));
         ui->pasteButton->setIcon(platformStyle->SingleColorIcon(QStringLiteral(":/icons/editpaste")));
         ui->deleteButton->setIcon(platformStyle->SingleColorIcon(QStringLiteral(":/icons/remove")));
         ui->deleteButton_is->setIcon(platformStyle->SingleColorIcon(QStringLiteral(":/icons/remove")));
         ui->deleteButton_s->setIcon(platformStyle->SingleColorIcon(QStringLiteral(":/icons/remove")));
     }
-#endif
 }
 
 bool SendCoinsEntry::updateLabel(const QString &address)
diff --git a/src/qt/signverifymessagedialog.cpp b/src/qt/signverifymessagedialog.cpp
@@ -286,7 +286,6 @@ bool SignVerifyMessageDialog::eventFilter(QObject *object, QEvent *event)
 
 void SignVerifyMessageDialog::changeEvent(QEvent* e)
 {
-#ifdef Q_OS_MACOS
     if (e->type() == QEvent::PaletteChange) {
         ui->addressBookButton_SM->setIcon(platformStyle->SingleColorIcon(QStringLiteral(":/icons/address-book")));
         ui->pasteButton_SM->setIcon(platformStyle->SingleColorIcon(QStringLiteral(":/icons/editpaste")));
@@ -297,5 +296,4 @@ void SignVerifyMessageDialog::changeEvent(QEvent* e)
         ui->verifyMessageButton_VM->setIcon(platformStyle->SingleColorIcon(QStringLiteral(":/icons/transaction_0")));
         ui->clearButton_VM->setIcon(platformStyle->SingleColorIcon(QStringLiteral(":/icons/remove")));
     }
-#endif
 }
diff --git a/src/qt/transactionview.cpp b/src/qt/transactionview.cpp
@@ -245,7 +245,6 @@ void TransactionView::setModel(WalletModel *_model)
 
 void TransactionView::changeEvent(QEvent* e)
 {
-#ifdef Q_OS_MACOS
     if (e->type() == QEvent::PaletteChange) {
         watchOnlyWidget->setItemIcon(
             TransactionFilterProxy::WatchOnlyFilter_Yes,
@@ -254,7 +253,6 @@ void TransactionView::changeEvent(QEvent* e)
             TransactionFilterProxy::WatchOnlyFilter_No,
             m_platform_style->SingleColorIcon(QStringLiteral(":/icons/eye_minus")));
     }
-#endif
 }
 
 void TransactionView::chooseDate(int idx)

Original file line number	Diff line number	Diff line change
`@@ -1173,14 +1173,12 @@ void BitcoinGUI::message(const QString& title, QString message, unsigned int sty`
`1173`	`1173`
`1174`	`1174`	`void BitcoinGUI::changeEvent(QEvent *e)`
`1175`	`1175`	`{`
`1176`		`-#ifdef Q_OS_MACOS`
`1177`	`1176`	`if (e->type() == QEvent::PaletteChange) {`
`1178`	`1177`	`overviewAction->setIcon(platformStyle->SingleColorIcon(QStringLiteral(":/icons/overview")));`
`1179`	`1178`	`sendCoinsAction->setIcon(platformStyle->SingleColorIcon(QStringLiteral(":/icons/send")));`
`1180`	`1179`	`receiveCoinsAction->setIcon(platformStyle->SingleColorIcon(QStringLiteral(":/icons/receiving_addresses")));`
`1181`	`1180`	`historyAction->setIcon(platformStyle->SingleColorIcon(QStringLiteral(":/icons/history")));`
`1182`	`1181`	`}`
`1183`		`-#endif`
`1184`	`1182`
`1185`	`1183`	`QMainWindow::changeEvent(e);`
`1186`	`1184`
`@@ -1511,14 +1509,12 @@ void UnitDisplayStatusBarControl::mousePressEvent(QMouseEvent *event)`
`1511`	`1509`
`1512`	`1510`	`void UnitDisplayStatusBarControl::changeEvent(QEvent* e)`
`1513`	`1511`	`{`
`1514`		`-#ifdef Q_OS_MACOS`
`1515`	`1512`	`if (e->type() == QEvent::PaletteChange) {`
`1516`	`1513`	`QString style = QString("QLabel { color : %1 }").arg(m_platform_style->SingleColor().name());`
`1517`	`1514`	`if (style != styleSheet()) {`
`1518`	`1515`	`setStyleSheet(style);`
`1519`	`1516`	`}`
`1520`	`1517`	`}`
`1521`		`-#endif`
`1522`	`1518`	`}`
`1523`	`1519`
`1524`	`1520`	`/** Creates context menu, its actions, and wires up all the relevant signals for mouse events. */`
Original file line number	Diff line number	Diff line change
`@@ -564,11 +564,9 @@ void CoinControlDialog::updateLabels(CCoinControl& m_coin_control, WalletModel *`
`564`	`564`
`565`	`565`	`void CoinControlDialog::changeEvent(QEvent* e)`
`566`	`566`	`{`
`567`		`-#ifdef Q_OS_MACOS`
`568`	`567`	`if (e->type() == QEvent::PaletteChange) {`
`569`	`568`	`updateView();`
`570`	`569`	`}`
`571`		`-#endif`
`572`	`570`	`}`
`573`	`571`
`574`	`572`	`void CoinControlDialog::updateView()`
Original file line number	Diff line number	Diff line change
`@@ -809,11 +809,9 @@ void ThemedLabel::setThemedPixmap(const QString& image_filename, int width, int`
`809`	`809`
`810`	`810`	`void ThemedLabel::changeEvent(QEvent* e)`
`811`	`811`	`{`
`812`		`-#ifdef Q_OS_MACOS`
`813`	`812`	`if (e->type() == QEvent::PaletteChange) {`
`814`	`813`	`updateThemedPixmap();`
`815`	`814`	`}`
`816`		`-#endif`
`817`	`815`	`QLabel::changeEvent(e);`
`818`	`816`	`}`
`819`	`817`
Original file line number	Diff line number	Diff line change
`@@ -297,13 +297,11 @@ void OverviewPage::setWalletModel(WalletModel *model)`
`297`	`297`
`298`	`298`	`void OverviewPage::changeEvent(QEvent* e)`
`299`	`299`	`{`
`300`		`-#ifdef Q_OS_MACOS`
`301`	`300`	`if (e->type() == QEvent::PaletteChange) {`
`302`	`301`	`QIcon icon = m_platform_style->SingleColorIcon(QStringLiteral(":/icons/warning"));`
`303`	`302`	`ui->labelTransactionsStatus->setIcon(icon);`
`304`	`303`	`ui->labelWalletStatus->setIcon(icon);`
`305`	`304`	`}`
`306`		`-#endif`
`307`	`305`	`}`
`308`	`306`
`309`	`307`	`void OverviewPage::updateDisplayUnit()`
Original file line number	Diff line number	Diff line change
`@@ -882,7 +882,6 @@ void RPCConsole::keyPressEvent(QKeyEvent *event)`
`882`	`882`
`883`	`883`	`void RPCConsole::changeEvent(QEvent* e)`
`884`	`884`	`{`
`885`		`-#ifdef Q_OS_MACOS`
`886`	`885`	`if (e->type() == QEvent::PaletteChange) {`
`887`	`886`	`ui->clearButton->setIcon(platformStyle->SingleColorIcon(QStringLiteral(":/icons/remove")));`
`888`	`887`	`ui->fontBiggerButton->setIcon(platformStyle->SingleColorIcon(QStringLiteral(":/icons/fontbigger")));`
`@@ -896,7 +895,6 @@ void RPCConsole::changeEvent(QEvent* e)`
`896`	`895`	`platformStyle->SingleColorImage(ICON_MAPPING[i].source).scaled(QSize(consoleFontSize * 2, consoleFontSize * 2), Qt::IgnoreAspectRatio, Qt::SmoothTransformation));`
`897`	`896`	`}`
`898`	`897`	`}`
`899`		`-#endif`
`900`	`898`	`}`
`901`	`899`
`902`	`900`	`void RPCConsole::message(int category, const QString &message, bool html)`
Original file line number	Diff line number	Diff line change
`@@ -238,15 +238,13 @@ void SendCoinsEntry::updateDisplayUnit()`
`238`	`238`
`239`	`239`	`void SendCoinsEntry::changeEvent(QEvent* e)`
`240`	`240`	`{`
`241`		`-#ifdef Q_OS_MACOS`
`242`	`241`	`if (e->type() == QEvent::PaletteChange) {`
`243`	`242`	`ui->addressBookButton->setIcon(platformStyle->SingleColorIcon(QStringLiteral(":/icons/address-book")));`
`244`	`243`	`ui->pasteButton->setIcon(platformStyle->SingleColorIcon(QStringLiteral(":/icons/editpaste")));`
`245`	`244`	`ui->deleteButton->setIcon(platformStyle->SingleColorIcon(QStringLiteral(":/icons/remove")));`
`246`	`245`	`ui->deleteButton_is->setIcon(platformStyle->SingleColorIcon(QStringLiteral(":/icons/remove")));`
`247`	`246`	`ui->deleteButton_s->setIcon(platformStyle->SingleColorIcon(QStringLiteral(":/icons/remove")));`
`248`	`247`	`}`
`249`		`-#endif`
`250`	`248`	`}`
`251`	`249`
`252`	`250`	`bool SendCoinsEntry::updateLabel(const QString &address)`
Original file line number	Diff line number	Diff line change
`@@ -286,7 +286,6 @@ bool SignVerifyMessageDialog::eventFilter(QObject object, QEvent event)`
`286`	`286`
`287`	`287`	`void SignVerifyMessageDialog::changeEvent(QEvent* e)`
`288`	`288`	`{`
`289`		`-#ifdef Q_OS_MACOS`
`290`	`289`	`if (e->type() == QEvent::PaletteChange) {`
`291`	`290`	`ui->addressBookButton_SM->setIcon(platformStyle->SingleColorIcon(QStringLiteral(":/icons/address-book")));`
`292`	`291`	`ui->pasteButton_SM->setIcon(platformStyle->SingleColorIcon(QStringLiteral(":/icons/editpaste")));`
`@@ -297,5 +296,4 @@ void SignVerifyMessageDialog::changeEvent(QEvent* e)`
`297`	`296`	`ui->verifyMessageButton_VM->setIcon(platformStyle->SingleColorIcon(QStringLiteral(":/icons/transaction_0")));`
`298`	`297`	`ui->clearButton_VM->setIcon(platformStyle->SingleColorIcon(QStringLiteral(":/icons/remove")));`
`299`	`298`	`}`
`300`		`-#endif`
`301`	`299`	`}`
Original file line number	Diff line number	Diff line change
`@@ -245,7 +245,6 @@ void TransactionView::setModel(WalletModel *_model)`
`245`	`245`
`246`	`246`	`void TransactionView::changeEvent(QEvent* e)`
`247`	`247`	`{`
`248`		`-#ifdef Q_OS_MACOS`
`249`	`248`	`if (e->type() == QEvent::PaletteChange) {`
`250`	`249`	`watchOnlyWidget->setItemIcon(`
`251`	`250`	`TransactionFilterProxy::WatchOnlyFilter_Yes,`
`@@ -254,7 +253,6 @@ void TransactionView::changeEvent(QEvent* e)`
`254`	`253`	`TransactionFilterProxy::WatchOnlyFilter_No,`
`255`	`254`	`m_platform_style->SingleColorIcon(QStringLiteral(":/icons/eye_minus")));`
`256`	`255`	`}`
`257`		`-#endif`
`258`	`256`	`}`
`259`	`257`
`260`	`258`	`void TransactionView::chooseDate(int idx)`