[QT] don't colorize icons on win and mac

jonasschnelli · jonasschnelli · commit ca5f6885470a · 2015-05-13T20:27:26.000+02:00
diff --git 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)

Original file line number	Diff line number	Diff line change
`@@ -27,12 +27,17 @@ static void MakeSingleColorImage(QImage& img, const QColor& colorbase)`
`27`	`27`	`QImage SingleColorImage(const QString& filename, const QColor& colorbase)`
`28`	`28`	`{`
`29`	`29`	`QImage img(filename);`
	`30`	`+#if !defined(WIN32) && !defined(MAC_OSX)`
`30`	`31`	`MakeSingleColorImage(img, colorbase);`
	`32`	`+#endif`
`31`	`33`	`return img;`
`32`	`34`	`}`
`33`	`35`
`34`	`36`	`QIcon SingleColorIcon(const QIcon& ico, const QColor& colorbase)`
`35`	`37`	`{`
	`38`	`+#if defined(WIN32) \|\| defined(MAC_OSX)`
	`39`	`+ return ico;`
	`40`	`+#else`
`36`	`41`	`QIcon new_ico;`
`37`	`42`	`QSize sz;`
`38`	`43`	`Q_FOREACH(sz, ico.availableSizes())`
`@@ -42,6 +47,7 @@ QIcon SingleColorIcon(const QIcon& ico, const QColor& colorbase)`
`42`	`47`	`new_ico.addPixmap(QPixmap::fromImage(img));`
`43`	`48`	`}`
`44`	`49`	`return new_ico;`
	`50`	`+#endif`
`45`	`51`	`}`
`46`	`52`
`47`	`53`	`QIcon SingleColorIcon(const QString& filename, const QColor& colorbase)`
`@@ -51,6 +57,9 @@ QIcon SingleColorIcon(const QString& filename, const QColor& colorbase)`
`51`	`57`
`52`	`58`	`QColor SingleColor()`
`53`	`59`	`{`
	`60`	`+#if defined(WIN32) \|\| defined(MAC_OSX)`
	`61`	`+ return QColor(0,0,0);`
	`62`	`+#else`
`54`	`63`	`const QColor colorHighlightBg(QApplication::palette().color(QPalette::Highlight));`
`55`	`64`	`const QColor colorHighlightFg(QApplication::palette().color(QPalette::HighlightedText));`
`56`	`65`	`const QColor colorText(QApplication::palette().color(QPalette::WindowText));`
`@@ -61,6 +70,7 @@ QColor SingleColor()`
`61`	`70`	`else`
`62`	`71`	`colorbase = colorHighlightFg;`
`63`	`72`	`return colorbase;`
	`73`	`+#endif`
`64`	`74`	`}`
`65`	`75`
`66`	`76`	`QIcon SingleColorIcon(const QString& filename)`