Browse Source

Misc fixing

tags/1.9.4
falkTX 11 years ago
parent
commit
c15efe0b12
3 changed files with 19 additions and 10 deletions
  1. +1
    -1
      source/carla_rack.py
  2. +13
    -4
      source/carla_skin.py
  3. +5
    -5
      source/widgets/pixmapdial.py

+ 1
- 1
source/carla_rack.py View File

@@ -72,7 +72,7 @@ class CarlaRackW(QListWidget):
# ------------------------------------------------------------- # -------------------------------------------------------------
# Set-up GUI stuff # Set-up GUI stuff


self.setMinimumWidth(591)
self.setMinimumWidth(640) # required by zita, 591 was old value
self.setSortingEnabled(False) self.setSortingEnabled(False)


app = QApplication.instance() app = QApplication.instance()


+ 13
- 4
source/carla_skin.py View File

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


from PyQt4.QtGui import QFont, QFrame
from PyQt4.QtGui import QFont, QFrame, QPushButton


# ------------------------------------------------------------------------------------------------------------ # ------------------------------------------------------------------------------------------------------------
# Imports (Custom) # Imports (Custom)
@@ -116,8 +116,13 @@ class AbstractPluginSlot(QFrame):
self.b_gui.clicked.connect(self.slot_showCustomUi) self.b_gui.clicked.connect(self.slot_showCustomUi)
self.b_gui.setEnabled(bool(self.fPluginInfo['hints'] & PLUGIN_HAS_CUSTOM_UI)) self.b_gui.setEnabled(bool(self.fPluginInfo['hints'] & PLUGIN_HAS_CUSTOM_UI))


if self.b_edit is not None:
self.b_edit.clicked.connect(self.slot_showEditDialog)
if self.b_edit is None:
# Edit dialog *must* be available
self.b_edit = QPushButton(self)
self.b_edit.setCheckable(True)
self.b_edit.hide()

self.b_edit.clicked.connect(self.slot_showEditDialog)


if self.b_remove is not None: if self.b_remove is not None:
self.b_remove.clicked.connect(self.slot_removePlugin) self.b_remove.clicked.connect(self.slot_removePlugin)
@@ -762,6 +767,8 @@ class PluginSlot_Zita(AbstractPluginSlot):
# ------------------------------------------------------------- # -------------------------------------------------------------
# Set-up GUI # Set-up GUI


self.setMinimumWidth(640)

self.setStyleSheet(""" self.setStyleSheet("""
QFrame#PluginWidget { QFrame#PluginWidget {
background-color: #404040; background-color: #404040;
@@ -1063,6 +1070,8 @@ def createPluginSlot(parent, pluginId):
pluginInfo = Carla.host.get_plugin_info(pluginId) pluginInfo = Carla.host.get_plugin_info(pluginId)
pluginName = Carla.host.get_real_plugin_name(pluginId) pluginName = Carla.host.get_real_plugin_name(pluginId)
pluginLabel = charPtrToString(pluginInfo['label']) pluginLabel = charPtrToString(pluginInfo['label'])
uniqueId = int(pluginInfo['uniqueId'])

#pluginMaker = charPtrToString(pluginInfo['maker']) #pluginMaker = charPtrToString(pluginInfo['maker'])
#pluginIcon = charPtrToString(pluginInfo['iconName']) #pluginIcon = charPtrToString(pluginInfo['iconName'])


@@ -1071,7 +1080,7 @@ def createPluginSlot(parent, pluginId):
return PluginSlot_ZynFX(parent, pluginId) return PluginSlot_ZynFX(parent, pluginId)


if pluginInfo['type'] == PLUGIN_LADSPA: if pluginInfo['type'] == PLUGIN_LADSPA:
if pluginLabel == "zita-reverb" or pluginLabel == "zita-reverb-amb":
if (pluginLabel == "zita-reverb" and uniqueId == 3701) or (pluginLabel == "zita-reverb-amb" and uniqueId == 3702):
return PluginSlot_Zita(parent, pluginId) return PluginSlot_Zita(parent, pluginId)


if pluginName.split(" ", 1)[0].lower() == "calf": if pluginName.split(" ", 1)[0].lower() == "calf":


+ 5
- 5
source/widgets/pixmapdial.py View File

@@ -289,15 +289,15 @@ class PixmapDial(QDial):


# Custom knobs (Zita) # Custom knobs (Zita)
elif self.fCustomPaint == self.CUSTOM_PAINT_ZITA: elif self.fCustomPaint == self.CUSTOM_PAINT_ZITA:
a = value * pi * 3 / 2 + 4.0
r = 11.0
x = 11.5
y = 11.5
a = value * pi * 1.5 - 2.35
r = 10.0
x = 10.5
y = 10.5
x += r * sin(a) x += r * sin(a)
y -= r * cos(a) y -= r * cos(a)
painter.setBrush(Qt.black) painter.setBrush(Qt.black)
painter.setPen(QPen(Qt.black, 2)) painter.setPen(QPen(Qt.black, 2))
painter.drawLine(QPointF(r, r), QPointF(x, y))
painter.drawLine(QPointF(11.0, 11.0), QPointF(x, y))


# Custom knobs # Custom knobs
else: else:


Loading…
Cancel
Save