From fc9bb897b5534a862327cc0b628856903f5fd2e8 Mon Sep 17 00:00:00 2001 From: falkTX Date: Fri, 14 Feb 2014 19:05:57 +0000 Subject: [PATCH] Replace the label_type with leds for the basics fx skin --- resources/resources.qrc | 3 + resources/ui/carla_plugin_basic_fx.ui | 98 ++++++++++++++++++++++++++- source/carla_skin.py | 7 +- 3 files changed, 104 insertions(+), 4 deletions(-) diff --git a/resources/resources.qrc b/resources/resources.qrc index 227a08079..ad0725795 100644 --- a/resources/resources.qrc +++ b/resources/resources.qrc @@ -110,6 +110,9 @@ bitmaps/logo_calf.png + bitmaps/padding_left.png + bitmaps/padding_right.png + bitmaps/canvas/frame_node_header.png bitmaps/canvas/frame_port_bg.png diff --git a/resources/ui/carla_plugin_basic_fx.ui b/resources/ui/carla_plugin_basic_fx.ui index db8d96361..6b4e59d4c 100644 --- a/resources/ui/carla_plugin_basic_fx.ui +++ b/resources/ui/carla_plugin_basic_fx.ui @@ -2,6 +2,14 @@ PluginWidget + + + 0 + 0 + 378 + 69 + + Qt::CustomContextMenu @@ -184,9 +192,90 @@ - + + + + 14 + 14 + + + + + 14 + 14 + + + + + + + true + + + + + + + + 14 + 14 + + + + + 14 + 14 + + - TYPE + + + + true + + + + + + + + 14 + 14 + + + + + 14 + 14 + + + + + + + true + + + + + + + + 14 + 14 + + + + + 14 + 14 + + + + + + + true @@ -397,6 +486,11 @@
digitalpeakmeter.h
1 + + LEDButton + QPushButton +
ledbutton.h
+
PixmapButton QPushButton diff --git a/source/carla_skin.py b/source/carla_skin.py index cb94d28d1..a24cee10a 100644 --- a/source/carla_skin.py +++ b/source/carla_skin.py @@ -709,7 +709,6 @@ class PluginSlot_BasicFX(AbstractPluginSlot): labelFont.setPointSize(9) self.ui.label_name.setFont(labelFont) - self.ui.label_type.setFont(labelFont) r = 40 g = 40 @@ -839,7 +838,11 @@ class PluginSlot_BasicFX(AbstractPluginSlot): self.b_edit = self.ui.b_edit self.label_name = self.ui.label_name - self.label_type = self.ui.label_type + + self.led_control = self.ui.led_control + self.led_midi = self.ui.led_midi + self.led_audio_in = self.ui.led_audio_in + self.led_audio_out = self.ui.led_audio_out self.peak_in = self.ui.peak_in self.peak_out = self.ui.peak_out