Merge pull request #6110

ca5f688 [QT] don't colorize icons on win and mac (Jonas Schnelli)
7247d10 [QT] use alert icon with tooltip insted of "(out of sync)" text (Jonas Schnelli)
51c7c70 [QT] remove frame to avoid double-frame situation in sendcoinsentry.ui (Jonas Schnelli)
2a6b844 [QT] change transaction amount and height in overview page (Jonas Schnelli)

1 files changed, 10 insertions, 0 deletions

diff --git a/src/qt/scicon.cpp b/src/qt/scicon.cpp
index a0ffcd82a..b2f2399b2 100644
--- a/src/qt/scicon.cpp
+++ b/src/qt/scicon.cpp
@@ -27,12 +27,17 @@ static void MakeSingleColorImage(QImage& img, const QColor& colorbase)
 QImage SingleColorImage(const QString& filename, const QColor& colorbase)
 {
     QImage img(filename);
+#if !defined(WIN32) && !defined(MAC_OSX)
     MakeSingleColorImage(img, colorbase);
+#endif
     return img;
 }
 
 QIcon SingleColorIcon(const QIcon& ico, const QColor& colorbase)
 {
+#if defined(WIN32) || defined(MAC_OSX)
+    return ico;
+#else
     QIcon new_ico;
     QSize sz;
     Q_FOREACH(sz, ico.availableSizes())
@@ -42,6 +47,7 @@ QIcon SingleColorIcon(const QIcon& ico, const QColor& colorbase)
         new_ico.addPixmap(QPixmap::fromImage(img));
     }
     return new_ico;
+#endif
 }
 
 QIcon SingleColorIcon(const QString& filename, const QColor& colorbase)
@@ -51,6 +57,9 @@ QIcon SingleColorIcon(const QString& filename, const QColor& colorbase)
 
 QColor SingleColor()
 {
+#if defined(WIN32) || defined(MAC_OSX)
+    return QColor(0,0,0);
+#else
     const QColor colorHighlightBg(QApplication::palette().color(QPalette::Highlight));
     const QColor colorHighlightFg(QApplication::palette().color(QPalette::HighlightedText));
     const QColor colorText(QApplication::palette().color(QPalette::WindowText));
@@ -61,6 +70,7 @@ QColor SingleColor()
     else
         colorbase = colorHighlightFg;
     return colorbase;
+#endif
 }
 
 QIcon SingleColorIcon(const QString& filename)