Browse Source

Misc fixing to rack colors

tags/1.9.4
falkTX 10 years ago
parent
commit
1cff73d3ef
4 changed files with 23 additions and 6 deletions
  1. +1
    -1
      source/carla_rack.py
  2. +7
    -2
      source/carla_skin.py
  3. +7
    -2
      source/carla_style.py
  4. +8
    -1
      source/widgets/pixmapdial.py

+ 1
- 1
source/carla_rack.py View File

@@ -97,7 +97,7 @@ class CarlaRackW(QFrame):

self.fLayout = QHBoxLayout(self)
self.fLayout.setContentsMargins(0, 0, 0, 0)
self.fLayout.setSpacing(1)
self.fLayout.setSpacing(0)
self.setLayout(self.fLayout)

self.fPadLeft = QLabel(self)


+ 7
- 2
source/carla_skin.py View File

@@ -735,11 +735,13 @@ class PluginSlot_BasicFX(AbstractPluginSlot):

self.setStyleSheet("""
AbstractPluginSlot#PluginWidget {
color: white;
background-color: rgb(%i, %i, %i);
background-image: url(:/bitmaps/background_noise1.png);
background-repeat: repeat-xy;
}
QLabel#label_name {
color: white;
}
""" % (r, g, b))

self.ui.b_enable.setPixmaps(":/bitmaps/button_off.png", ":/bitmaps/button_on.png", ":/bitmaps/button_off.png")
@@ -807,10 +809,11 @@ class PluginSlot_BasicFX(AbstractPluginSlot):
widget.setLabel(paramName)
widget.setCustomColor(QColor(_r, _g, _b))
widget.setCustomPaint(PixmapDial.CUSTOM_PAINT_COLOR)
widget.setWhiteText()

widget.setSingleStep(paramRanges['step']*1000)
widget.setMinimum(paramRanges['min']*1000)
widget.setMaximum(paramRanges['max']*1000)
widget.setSingleStep(paramRanges['step']*1000)

if (paramData['hints'] & PARAMETER_IS_ENABLED) == 0:
widget.setEnabled(False)
@@ -824,11 +827,13 @@ class PluginSlot_BasicFX(AbstractPluginSlot):
self.ui.dial_drywet.setPixmap(3)
self.ui.dial_drywet.setLabel("Dry/Wet")
self.ui.dial_drywet.setCustomPaint(PixmapDial.CUSTOM_PAINT_CARLA_WET)
self.ui.dial_drywet.setWhiteText()

self.ui.dial_vol.setIndex(PARAMETER_VOLUME)
self.ui.dial_vol.setPixmap(3)
self.ui.dial_vol.setLabel("Volume")
self.ui.dial_vol.setCustomPaint(PixmapDial.CUSTOM_PAINT_CARLA_VOL)
self.ui.dial_vol.setWhiteText()

self.fParameterList.append([PARAMETER_DRYWET, self.ui.dial_drywet])
self.fParameterList.append([PARAMETER_VOLUME, self.ui.dial_vol])


+ 7
- 2
source/carla_style.py View File

@@ -20,7 +20,7 @@
# Imports (Global)

from PyQt4.QtCore import QSettings
from PyQt4.QtGui import QApplication, QColor, QPalette
from PyQt4.QtGui import QApplication, QColor, QFont, QPalette

# ------------------------------------------------------------------------------------------------------------
# Imports (Custom)
@@ -181,8 +181,13 @@ class CarlaApplication(object):

useProTheme = settings.value("Main/UseProTheme", True, type=bool)

if useProTheme:
if useProTheme or True:
#font = QFont("Sans Serif", 8, QFont.Normal, False)
#self.fApp.setFont(font)
#QApplication.setFont(font)

self.fApp.setStyle("carla")
#QApplication.setStyle("carla")

proThemeColor = settings.value("Main/ProThemeColor", "Black", type=str).lower()



+ 8
- 1
source/widgets/pixmapdial.py View File

@@ -66,7 +66,9 @@ class PixmapDial(QDial):

self.fLabel = ""
self.fLabelPos = QPointF(0.0, 0.0)
self.fLabelFont = QFont()
self.fLabelFont = QFont() #"DejaVu Sans [Book]", 6, QFont.Normal, False)
#self.fLabelFont.setPixelSize(8)
#self.fLabelFont.setWeight(100)
self.fLabelFont.setPointSize(6)
self.fLabelWidth = 0
self.fLabelHeight = 0
@@ -142,6 +144,11 @@ class PixmapDial(QDial):
self.updateSizes()
#self.update()

def setWhiteText(self):
self.fColor1 = QColor(0, 0, 0, 255)
self.fColor2 = QColor(0, 0, 0, 0)
self.fColorT = [Qt.white, Qt.darkGray]

def minimumSizeHint(self):
return QSize(self.fSize, self.fSize)



Loading…
Cancel
Save