diff --git a/resources/bitmaps/carla_about.png b/resources/bitmaps/carla_about.png
deleted file mode 100644
index aed5bc2e2..000000000
Binary files a/resources/bitmaps/carla_about.png and /dev/null differ
diff --git a/resources/bitmaps/carla_about.xcf b/resources/bitmaps/carla_about.xcf
index e6e1f13e8..f8059c6b0 100644
Binary files a/resources/bitmaps/carla_about.xcf and b/resources/bitmaps/carla_about.xcf differ
diff --git a/resources/bitmaps/carla_about_black.png b/resources/bitmaps/carla_about_black.png
new file mode 100644
index 000000000..18d4fe5a0
Binary files /dev/null and b/resources/bitmaps/carla_about_black.png differ
diff --git a/resources/bitmaps/carla_about_white.png b/resources/bitmaps/carla_about_white.png
new file mode 100644
index 000000000..45d9a946f
Binary files /dev/null and b/resources/bitmaps/carla_about_white.png differ
diff --git a/resources/bitmaps/credits.txt b/resources/bitmaps/credits.txt
index 48411c9c5..a04a155df 100644
--- a/resources/bitmaps/credits.txt
+++ b/resources/bitmaps/credits.txt
@@ -1,7 +1,8 @@
The pixmaps in this folder were made by falkTX and nieee, with the exception of:
-dial_01 - TAL Plugins
-dial_02 - TAL Plugins
-dial_05 - Guitarix
-kbd_* - Image-Line
-*calf* - Calf Studiogear
+canvas/* - OpenOctave
+style/* - Qt (from Fusion theme)
+*calf* - Calf Studio Gear
+dial_{11,12}* - OpenAV
+led_* - Image-Line (need to find a good replacement, suggestions welcome!)
+rack_interior_* - OpenOctave
diff --git a/resources/bitmaps/dial_01.png b/resources/bitmaps/dial_01.png
deleted file mode 100644
index 41444ad20..000000000
Binary files a/resources/bitmaps/dial_01.png and /dev/null differ
diff --git a/resources/bitmaps/dial_01d.png b/resources/bitmaps/dial_01d.png
deleted file mode 100644
index 652925e91..000000000
Binary files a/resources/bitmaps/dial_01d.png and /dev/null differ
diff --git a/resources/bitmaps/dial_02.png b/resources/bitmaps/dial_02.png
deleted file mode 100644
index 8c4e5dbb1..000000000
Binary files a/resources/bitmaps/dial_02.png and /dev/null differ
diff --git a/resources/bitmaps/dial_02d.png b/resources/bitmaps/dial_02d.png
deleted file mode 100644
index 144c3b790..000000000
Binary files a/resources/bitmaps/dial_02d.png and /dev/null differ
diff --git a/resources/bitmaps/dial_11e.png b/resources/bitmaps/dial_11e.png
new file mode 100644
index 000000000..d6afe5a54
Binary files /dev/null and b/resources/bitmaps/dial_11e.png differ
diff --git a/resources/resources.qrc b/resources/resources.qrc
index 8fd90b070..ee2469ea9 100644
--- a/resources/resources.qrc
+++ b/resources/resources.qrc
@@ -49,7 +49,8 @@
scalable/carla.svg
scalable/carla-control.svg
- bitmaps/carla_about.png
+ bitmaps/carla_about_black.png
+ bitmaps/carla_about_white.png
bitmaps/background_3bandeq.png
bitmaps/background_calf_black.png
bitmaps/background_calf_blue.png
@@ -82,10 +83,6 @@
bitmaps/button_off.png
bitmaps/button_on.png
- bitmaps/dial_01.png
- bitmaps/dial_01d.png
- bitmaps/dial_02.png
- bitmaps/dial_02d.png
bitmaps/dial_03.png
bitmaps/dial_03d.png
bitmaps/dial_04.png
@@ -103,6 +100,7 @@
bitmaps/dial_10d.png
bitmaps/dial_11.png
bitmaps/dial_11d.png
+ bitmaps/dial_11e.png
bitmaps/dial_12.png
bitmaps/dial_12d.png
bitmaps/dial_13.png
diff --git a/resources/ui/carla_about.ui b/resources/ui/carla_about.ui
index 5ca2d6b0c..485f25008 100644
--- a/resources/ui/carla_about.ui
+++ b/resources/ui/carla_about.ui
@@ -76,7 +76,7 @@
- :/bitmaps/carla_about.png
+ :/bitmaps/carla_about_white.png
Qt::AlignCenter
@@ -198,21 +198,21 @@
- 37
- 37
+ 32
+ 32
- 37
- 37
+ 32
+ 32
- :/bitmaps/dial_01d.png
+ :/bitmaps/dial_11e.png
@@ -227,7 +227,7 @@
- Contains some knobs, backgrounds and other small artwork from ArtyFX, Calf Studio Gear, OpenOctave and TAL-Plugins projects.
+ Contains some knobs, backgrounds and other small artwork from Calf Studio Gear, OpenAV and OpenOctave projects.
true
diff --git a/source/frontend/carla_widgets.py b/source/frontend/carla_widgets.py
index 45da84cc7..920b4e081 100755
--- a/source/frontend/carla_widgets.py
+++ b/source/frontend/carla_widgets.py
@@ -26,11 +26,11 @@ from carla_config import *
if config_UseQt5:
from PyQt5.QtCore import pyqtSignal, pyqtSlot, Qt, QByteArray, QSettings, QTimer
- from PyQt5.QtGui import QColor, QCursor, QFontMetrics, QPainter, QPainterPath
+ from PyQt5.QtGui import QColor, QCursor, QFontMetrics, QPainter, QPainterPath, QPalette, QPixmap
from PyQt5.QtWidgets import QDialog, QInputDialog, QLineEdit, QMenu, QVBoxLayout, QWidget
else:
from PyQt4.QtCore import pyqtSignal, pyqtSlot, Qt, QByteArray, QSettings, QTimer
- from PyQt4.QtGui import QColor, QCursor, QFontMetrics, QPainter, QPainterPath
+ from PyQt4.QtGui import QColor, QCursor, QFontMetrics, QPainter, QPainterPath, QPalette, QPixmap
from PyQt4.QtGui import QDialog, QInputDialog, QLineEdit, QMenu, QVBoxLayout, QWidget
# ------------------------------------------------------------------------------------------------------------
@@ -79,6 +79,11 @@ class CarlaAboutW(QDialog):
"
Copyright (C) 2011-2018 falkTX
"
"" % (VERSION, extraInfo)))
+ if self.ui.about.palette().color(QPalette.Background).blackF() > 0.5:
+ self.ui.l_icons.setPixmap(QPixmap(":/bitmaps/carla_about_white.png"))
+ else:
+ self.ui.l_icons.setPixmap(QPixmap(":/bitmaps/carla_about_black.png"))
+
if host.isControl:
self.ui.l_extended.hide()
self.ui.tabWidget.removeTab(3)