@@ -1,7 +1,8 @@ | |||||
The pixmaps in this folder were made by falkTX and nieee, with the exception of: | 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 |
@@ -49,7 +49,8 @@ | |||||
<file>scalable/carla.svg</file> | <file>scalable/carla.svg</file> | ||||
<file>scalable/carla-control.svg</file> | <file>scalable/carla-control.svg</file> | ||||
<file>bitmaps/carla_about.png</file> | |||||
<file>bitmaps/carla_about_black.png</file> | |||||
<file>bitmaps/carla_about_white.png</file> | |||||
<file>bitmaps/background_3bandeq.png</file> | <file>bitmaps/background_3bandeq.png</file> | ||||
<file>bitmaps/background_calf_black.png</file> | <file>bitmaps/background_calf_black.png</file> | ||||
<file>bitmaps/background_calf_blue.png</file> | <file>bitmaps/background_calf_blue.png</file> | ||||
@@ -82,10 +83,6 @@ | |||||
<file>bitmaps/button_off.png</file> | <file>bitmaps/button_off.png</file> | ||||
<file>bitmaps/button_on.png</file> | <file>bitmaps/button_on.png</file> | ||||
<file>bitmaps/dial_01.png</file> | |||||
<file>bitmaps/dial_01d.png</file> | |||||
<file>bitmaps/dial_02.png</file> | |||||
<file>bitmaps/dial_02d.png</file> | |||||
<file>bitmaps/dial_03.png</file> | <file>bitmaps/dial_03.png</file> | ||||
<file>bitmaps/dial_03d.png</file> | <file>bitmaps/dial_03d.png</file> | ||||
<file>bitmaps/dial_04.png</file> | <file>bitmaps/dial_04.png</file> | ||||
@@ -103,6 +100,7 @@ | |||||
<file>bitmaps/dial_10d.png</file> | <file>bitmaps/dial_10d.png</file> | ||||
<file>bitmaps/dial_11.png</file> | <file>bitmaps/dial_11.png</file> | ||||
<file>bitmaps/dial_11d.png</file> | <file>bitmaps/dial_11d.png</file> | ||||
<file>bitmaps/dial_11e.png</file> | |||||
<file>bitmaps/dial_12.png</file> | <file>bitmaps/dial_12.png</file> | ||||
<file>bitmaps/dial_12d.png</file> | <file>bitmaps/dial_12d.png</file> | ||||
<file>bitmaps/dial_13.png</file> | <file>bitmaps/dial_13.png</file> | ||||
@@ -76,7 +76,7 @@ | |||||
<string/> | <string/> | ||||
</property> | </property> | ||||
<property name="pixmap"> | <property name="pixmap"> | ||||
<pixmap resource="../resources.qrc">:/bitmaps/carla_about.png</pixmap> | |||||
<pixmap resource="../resources.qrc">:/bitmaps/carla_about_white.png</pixmap> | |||||
</property> | </property> | ||||
<property name="alignment"> | <property name="alignment"> | ||||
<set>Qt::AlignCenter</set> | <set>Qt::AlignCenter</set> | ||||
@@ -198,21 +198,21 @@ | |||||
<widget class="QLabel" name="label_19"> | <widget class="QLabel" name="label_19"> | ||||
<property name="minimumSize"> | <property name="minimumSize"> | ||||
<size> | <size> | ||||
<width>37</width> | |||||
<height>37</height> | |||||
<width>32</width> | |||||
<height>32</height> | |||||
</size> | </size> | ||||
</property> | </property> | ||||
<property name="maximumSize"> | <property name="maximumSize"> | ||||
<size> | <size> | ||||
<width>37</width> | |||||
<height>37</height> | |||||
<width>32</width> | |||||
<height>32</height> | |||||
</size> | </size> | ||||
</property> | </property> | ||||
<property name="text"> | <property name="text"> | ||||
<string/> | <string/> | ||||
</property> | </property> | ||||
<property name="pixmap"> | <property name="pixmap"> | ||||
<pixmap resource="../resources.qrc">:/bitmaps/dial_01d.png</pixmap> | |||||
<pixmap resource="../resources.qrc">:/bitmaps/dial_11e.png</pixmap> | |||||
</property> | </property> | ||||
</widget> | </widget> | ||||
</item> | </item> | ||||
@@ -227,7 +227,7 @@ | |||||
</sizepolicy> | </sizepolicy> | ||||
</property> | </property> | ||||
<property name="text"> | <property name="text"> | ||||
<string>Contains some knobs, backgrounds and other small artwork from ArtyFX, Calf Studio Gear, OpenOctave and TAL-Plugins projects.</string> | |||||
<string>Contains some knobs, backgrounds and other small artwork from Calf Studio Gear, OpenAV and OpenOctave projects.</string> | |||||
</property> | </property> | ||||
<property name="wordWrap"> | <property name="wordWrap"> | ||||
<bool>true</bool> | <bool>true</bool> | ||||
@@ -26,11 +26,11 @@ from carla_config import * | |||||
if config_UseQt5: | if config_UseQt5: | ||||
from PyQt5.QtCore import pyqtSignal, pyqtSlot, Qt, QByteArray, QSettings, QTimer | 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 | from PyQt5.QtWidgets import QDialog, QInputDialog, QLineEdit, QMenu, QVBoxLayout, QWidget | ||||
else: | else: | ||||
from PyQt4.QtCore import pyqtSignal, pyqtSlot, Qt, QByteArray, QSettings, QTimer | 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 | from PyQt4.QtGui import QDialog, QInputDialog, QLineEdit, QMenu, QVBoxLayout, QWidget | ||||
# ------------------------------------------------------------------------------------------------------------ | # ------------------------------------------------------------------------------------------------------------ | ||||
@@ -79,6 +79,11 @@ class CarlaAboutW(QDialog): | |||||
"<br>Copyright (C) 2011-2018 falkTX<br>" | "<br>Copyright (C) 2011-2018 falkTX<br>" | ||||
"" % (VERSION, extraInfo))) | "" % (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: | if host.isControl: | ||||
self.ui.l_extended.hide() | self.ui.l_extended.hide() | ||||
self.ui.tabWidget.removeTab(3) | self.ui.tabWidget.removeTab(3) | ||||