diff --git a/resources/bitmaps/zita/ambsect.png b/resources/bitmaps/zita-rev/ambsect.png similarity index 100% rename from resources/bitmaps/zita/ambsect.png rename to resources/bitmaps/zita-rev/ambsect.png diff --git a/resources/bitmaps/zita/eq1sect.png b/resources/bitmaps/zita-rev/eq1sect.png similarity index 100% rename from resources/bitmaps/zita/eq1sect.png rename to resources/bitmaps/zita-rev/eq1sect.png diff --git a/resources/bitmaps/zita/eq2sect.png b/resources/bitmaps/zita-rev/eq2sect.png similarity index 100% rename from resources/bitmaps/zita/eq2sect.png rename to resources/bitmaps/zita-rev/eq2sect.png diff --git a/resources/bitmaps/zita/mixsect.png b/resources/bitmaps/zita-rev/mixsect.png similarity index 100% rename from resources/bitmaps/zita/mixsect.png rename to resources/bitmaps/zita-rev/mixsect.png diff --git a/resources/bitmaps/zita/redzita.png b/resources/bitmaps/zita-rev/redzita.png similarity index 100% rename from resources/bitmaps/zita/redzita.png rename to resources/bitmaps/zita-rev/redzita.png diff --git a/resources/bitmaps/zita/revsect.png b/resources/bitmaps/zita-rev/revsect.png similarity index 100% rename from resources/bitmaps/zita/revsect.png rename to resources/bitmaps/zita-rev/revsect.png diff --git a/resources/resources.qrc b/resources/resources.qrc index 4af5a2426..044c0d3fb 100644 --- a/resources/resources.qrc +++ b/resources/resources.qrc @@ -115,12 +115,12 @@ bitmaps/style/arrow.png bitmaps/style/groupbox.png - bitmaps/zita/ambsect.png - bitmaps/zita/eq1sect.png - bitmaps/zita/eq2sect.png - bitmaps/zita/mixsect.png - bitmaps/zita/redzita.png - bitmaps/zita/revsect.png + bitmaps/zita-rev/ambsect.png + bitmaps/zita-rev/eq1sect.png + bitmaps/zita-rev/eq2sect.png + bitmaps/zita-rev/mixsect.png + bitmaps/zita-rev/redzita.png + bitmaps/zita-rev/revsect.png scalable/pb_generic.svg scalable/pb_hardware.svg diff --git a/source/carla_skin.py b/source/carla_skin.py index 92e1423e5..7d0452504 100644 --- a/source/carla_skin.py +++ b/source/carla_skin.py @@ -667,8 +667,8 @@ class PluginSlot_Calf(AbstractPluginSlot): # Internal stuff self.fButtonFont = QFont() - self.fButtonFont.setBold(False) - self.fButtonFont.setPointSize(9) + #self.fButtonFont.setBold(False) + self.fButtonFont.setPointSize(8) self.fButtonColorOn = QColor( 18, 41, 87) self.fButtonColorOff = QColor(150, 150, 150) @@ -755,7 +755,7 @@ class PluginSlot_Calf(AbstractPluginSlot): # ------------------------------------------------------------------------------------------------------------ -class PluginSlot_Zita(AbstractPluginSlot): +class PluginSlot_ZitaRev(AbstractPluginSlot): def __init__(self, parent, pluginId): AbstractPluginSlot.__init__(self, parent, pluginId) self.ui = ui_carla_plugin_zita.Ui_PluginWidget() @@ -776,19 +776,19 @@ class PluginSlot_Zita(AbstractPluginSlot): background-color: #404040; } QWidget#w_revsect { - background-image: url(:/bitmaps/zita/revsect.png); + background-image: url(:/bitmaps/zita-rev/revsect.png); } QWidget#w_eq1sect { - background-image: url(:/bitmaps/zita/eq1sect.png); + background-image: url(:/bitmaps/zita-rev/eq1sect.png); } QWidget#w_eq2sect { - background-image: url(:/bitmaps/zita/eq2sect.png); + background-image: url(:/bitmaps/zita-rev/eq2sect.png); } QWidget#w_ambmixsect { - background-image: url(:/bitmaps/zita/%s.png); + background-image: url(:/bitmaps/zita-rev/%s.png); } QWidget#w_redzita { - background-image: url(:/bitmaps/zita/redzita.png); + background-image: url(:/bitmaps/zita-rev/redzita.png); } """ % ("mixsect" if audioCount['outs'] == 2 else "ambsect")) @@ -1083,7 +1083,7 @@ def createPluginSlot(parent, pluginId): if pluginInfo['type'] == PLUGIN_LADSPA: if (pluginLabel == "zita-reverb" and uniqueId == 3701) or (pluginLabel == "zita-reverb-amb" and uniqueId == 3702): - return PluginSlot_Zita(parent, pluginId) + return PluginSlot_ZitaRev(parent, pluginId) if pluginName.split(" ", 1)[0].lower() == "calf": return PluginSlot_Calf(parent, pluginId) @@ -1099,9 +1099,8 @@ if __name__ == '__main__': import resources_rc app = CarlaApplication("Carla-Skins") - gui = PluginSlot_Pixmap(None, 0) #gui = PluginSlot_Calf(None, 0) - #gui = PluginSlot_ZynFX(None, 0) + gui = PluginSlot_ZynFX(None, 0) gui.show() app.exec_()