Browse Source

More skin tweaks

tags/1.9.6
falkTX 9 years ago
parent
commit
0761d1a8fb
4 changed files with 163 additions and 122 deletions
  1. +1
    -1
      resources/ui/carla_plugin_basic_fx.ui
  2. +159
    -120
      resources/ui/carla_plugin_calf.ui
  3. +1
    -1
      resources/ui/carla_plugin_zynfx.ui
  4. +2
    -0
      source/carla_skin.py

+ 1
- 1
resources/ui/carla_plugin_basic_fx.ui View File

@@ -422,7 +422,7 @@
<number>4</number> <number>4</number>
</property> </property>
<property name="rightMargin"> <property name="rightMargin">
<number>10</number>
<number>12</number>
</property> </property>
<item> <item>
<widget class="QWidget" name="w_knobs_left" native="true"> <widget class="QWidget" name="w_knobs_left" native="true">


+ 159
- 120
resources/ui/carla_plugin_calf.ui View File

@@ -6,8 +6,8 @@
<rect> <rect>
<x>0</x> <x>0</x>
<y>0</y> <y>0</y>
<width>563</width>
<height>89</height>
<width>622</width>
<height>90</height>
</rect> </rect>
</property> </property>
<property name="contextMenuPolicy"> <property name="contextMenuPolicy">
@@ -24,57 +24,119 @@
</property> </property>
<layout class="QVBoxLayout" name="verticalLayout"> <layout class="QVBoxLayout" name="verticalLayout">
<property name="spacing"> <property name="spacing">
<number>2</number>
<number>0</number>
</property> </property>
<property name="leftMargin"> <property name="leftMargin">
<number>3</number>
<number>4</number>
</property> </property>
<property name="topMargin"> <property name="topMargin">
<number>0</number>
<number>3</number>
</property> </property>
<property name="rightMargin"> <property name="rightMargin">
<number>3</number>
<number>6</number>
</property> </property>
<property name="bottomMargin"> <property name="bottomMargin">
<number>2</number>
<number>3</number>
</property> </property>
<item> <item>
<layout class="QHBoxLayout" name="horizontalLayout_5">
<layout class="QHBoxLayout" name="layout_top">
<property name="spacing"> <property name="spacing">
<number>3</number>
</property>
<property name="leftMargin">
<number>10</number>
</property>
<property name="rightMargin">
<number>10</number>
<number>1</number>
</property> </property>
<item> <item>
<widget class="PixmapButton" name="b_enable">
<property name="text">
<string>Enable</string>
<widget class="QWidget" name="w_buttons" native="true">
<property name="minimumSize">
<size>
<width>72</width>
<height>0</height>
</size>
</property> </property>
<property name="checkable">
<bool>true</bool>
<property name="maximumSize">
<size>
<width>72</width>
<height>16777215</height>
</size>
</property> </property>
<layout class="QHBoxLayout" name="horizontalLayout_5">
<property name="spacing">
<number>2</number>
</property>
<property name="margin">
<number>0</number>
</property>
<item>
<widget class="PixmapButton" name="b_enable">
<property name="text">
<string>Enable</string>
</property>
<property name="checkable">
<bool>true</bool>
</property>
</widget>
</item>
<item>
<widget class="QLabel" name="label_active">
<property name="text">
<string>On/Off</string>
</property>
</widget>
</item>
</layout>
</widget> </widget>
</item> </item>
<item> <item>
<widget class="QLabel" name="label_active">
<property name="text">
<string>On/Off</string>
<spacer name="spacer_namesep1">
<property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
<property name="sizeType">
<enum>QSizePolicy::Fixed</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>6</width>
<height>1</height>
</size>
</property>
</spacer>
</item>
<item>
<widget class="Line" name="line_sep">
<property name="minimumSize">
<size>
<width>0</width>
<height>20</height>
</size>
</property>
<property name="maximumSize">
<size>
<width>16777215</width>
<height>20</height>
</size>
</property>
<property name="lineWidth">
<number>0</number>
</property>
<property name="midLineWidth">
<number>1</number>
</property>
<property name="orientation">
<enum>Qt::Vertical</enum>
</property> </property>
</widget> </widget>
</item> </item>
<item> <item>
<spacer name="horizontalSpacer_3">
<spacer name="spacer_namesep2">
<property name="orientation"> <property name="orientation">
<enum>Qt::Horizontal</enum> <enum>Qt::Horizontal</enum>
</property> </property>
<property name="sizeType">
<enum>QSizePolicy::Fixed</enum>
</property>
<property name="sizeHint" stdset="0"> <property name="sizeHint" stdset="0">
<size> <size>
<width>40</width>
<height>20</height>
<width>8</width>
<height>1</height>
</size> </size>
</property> </property>
</spacer> </spacer>
@@ -88,7 +150,7 @@
</font> </font>
</property> </property>
<property name="text"> <property name="text">
<string>TextLabel</string>
<string>PluginName</string>
</property> </property>
<property name="alignment"> <property name="alignment">
<set>Qt::AlignCenter</set> <set>Qt::AlignCenter</set>
@@ -96,20 +158,20 @@
</widget> </widget>
</item> </item>
<item> <item>
<spacer name="horizontalSpacer_2">
<spacer name="spacer_namesep3">
<property name="orientation"> <property name="orientation">
<enum>Qt::Horizontal</enum> <enum>Qt::Horizontal</enum>
</property> </property>
<property name="sizeHint" stdset="0"> <property name="sizeHint" stdset="0">
<size> <size>
<width>40</width>
<height>20</height>
<width>20</width>
<height>1</height>
</size> </size>
</property> </property>
</spacer> </spacer>
</item> </item>
<item> <item>
<layout class="QVBoxLayout" name="verticalLayout_4">
<layout class="QVBoxLayout" name="layout_midi">
<property name="spacing"> <property name="spacing">
<number>0</number> <number>0</number>
</property> </property>
@@ -157,7 +219,7 @@
</layout> </layout>
</item> </item>
<item> <item>
<layout class="QVBoxLayout" name="verticalLayout_2">
<layout class="QVBoxLayout" name="layout_peak_in">
<property name="spacing"> <property name="spacing">
<number>0</number> <number>0</number>
</property> </property>
@@ -184,7 +246,7 @@
</layout> </layout>
</item> </item>
<item> <item>
<layout class="QVBoxLayout" name="verticalLayout_3">
<layout class="QVBoxLayout" name="layout_peak_out">
<property name="spacing"> <property name="spacing">
<number>0</number> <number>0</number>
</property> </property>
@@ -226,24 +288,24 @@
</widget> </widget>
</item> </item>
<item> <item>
<layout class="QHBoxLayout" name="horizontalLayout_3">
<layout class="QHBoxLayout" name="layout_bottom">
<property name="spacing"> <property name="spacing">
<number>0</number>
<number>1</number>
</property> </property>
<property name="leftMargin"> <property name="leftMargin">
<number>10</number>
<number>6</number>
</property>
<property name="topMargin">
<number>4</number>
</property> </property>
<property name="rightMargin"> <property name="rightMargin">
<number>10</number>
<number>6</number>
</property> </property>
<item> <item>
<layout class="QHBoxLayout" name="horizontalLayout">
<layout class="QHBoxLayout" name="w_buttons2">
<property name="spacing"> <property name="spacing">
<number>3</number> <number>3</number>
</property> </property>
<property name="bottomMargin">
<number>0</number>
</property>
<item> <item>
<widget class="PixmapButton" name="b_gui"> <widget class="PixmapButton" name="b_gui">
<property name="text"> <property name="text">
@@ -274,86 +336,63 @@
</layout> </layout>
</item> </item>
<item> <item>
<layout class="QHBoxLayout" name="horizontalLayout_2">
<property name="spacing">
<number>0</number>
<spacer name="spacer_knobs">
<property name="orientation">
<enum>Qt::Horizontal</enum>
</property> </property>
<item>
<spacer name="horizontalSpacer">
<property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>40</width>
<height>20</height>
</size>
</property>
</spacer>
</item>
<item>
<widget class="QWidget" name="w_knobs" native="true">
<layout class="QHBoxLayout" name="horizontalLayout_4">
<property name="spacing">
<number>2</number>
</property>
<property name="leftMargin">
<number>4</number>
</property>
<property name="topMargin">
<number>0</number>
</property>
<property name="rightMargin">
<number>0</number>
</property>
<property name="bottomMargin">
<number>0</number>
</property>
</layout>
</widget>
</item>
<item>
<spacer name="horizontalSpacer_5">
<property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
<property name="sizeType">
<enum>QSizePolicy::Fixed</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>10</width>
<height>20</height>
</size>
</property>
</spacer>
</item>
<item>
<widget class="QLabel" name="label_logo">
<property name="minimumSize">
<size>
<width>71</width>
<height>30</height>
</size>
</property>
<property name="maximumSize">
<size>
<width>71</width>
<height>30</height>
</size>
</property>
<property name="text">
<string/>
</property>
<property name="pixmap">
<pixmap resource="../resources.qrc">:/bitmaps/logo_calf.png</pixmap>
</property>
<property name="alignment">
<set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
</property>
</widget>
</item>
</layout>
<property name="sizeHint" stdset="0">
<size>
<width>40</width>
<height>20</height>
</size>
</property>
</spacer>
</item>
<item>
<widget class="QWidget" name="w_knobs" native="true">
<layout class="QHBoxLayout" name="horizontalLayout_4">
<property name="spacing">
<number>2</number>
</property>
<property name="leftMargin">
<number>4</number>
</property>
<property name="topMargin">
<number>0</number>
</property>
<property name="rightMargin">
<number>0</number>
</property>
<property name="bottomMargin">
<number>0</number>
</property>
</layout>
</widget>
</item>
<item>
<widget class="QLabel" name="label_logo">
<property name="minimumSize">
<size>
<width>71</width>
<height>30</height>
</size>
</property>
<property name="maximumSize">
<size>
<width>71</width>
<height>30</height>
</size>
</property>
<property name="text">
<string/>
</property>
<property name="pixmap">
<pixmap resource="../resources.qrc">:/bitmaps/logo_calf.png</pixmap>
</property>
<property name="alignment">
<set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
</property>
</widget>
</item> </item>
</layout> </layout>
</item> </item>


+ 1
- 1
resources/ui/carla_plugin_zynfx.ui View File

@@ -410,7 +410,7 @@
<number>4</number> <number>4</number>
</property> </property>
<property name="rightMargin"> <property name="rightMargin">
<number>10</number>
<number>12</number>
</property> </property>
<item> <item>
<widget class="QWidget" name="w_knobs_left" native="true"> <widget class="QWidget" name="w_knobs_left" native="true">


+ 2
- 0
source/carla_skin.py View File

@@ -1391,6 +1391,8 @@ class PluginSlot_Calf(AbstractPluginSlot):
# ------------------------------------------------------------- # -------------------------------------------------------------
# Set-up GUI # Set-up GUI


self.ui.label_active.setFont(self.fButtonFont)

self.ui.b_remove.setPixmaps(":/bitmaps/button_calf1.png", ":/bitmaps/button_calf1_down.png", ":/bitmaps/button_calf1_hover.png") self.ui.b_remove.setPixmaps(":/bitmaps/button_calf1.png", ":/bitmaps/button_calf1_down.png", ":/bitmaps/button_calf1_hover.png")


self.ui.b_edit.setTopText(self.tr("Edit"), self.fButtonColorOn, self.fButtonFont) self.ui.b_edit.setTopText(self.tr("Edit"), self.fButtonColorOn, self.fButtonFont)


Loading…
Cancel
Save