Cadence: Replace Carla pic for a Catarina one

resources/resources.qrc

@@ -84,6 +84,7 @@
         <file>screens/cadence-logs.png</file>
         <file>screens/cadence-render.png</file>
         <file>screens/cadence-xycontroller.png</file>
+        <file>screens/catarina.png</file>
         <file>screens/catia.png</file>
         <file>screens/claudia.png</file>
     </qresource>

resources/ui/cadence.ui

@@ -556,7 +556,7 @@
                 </sizepolicy>
                </property>
                <property name="frameShape">
-                <enum>QFrame::Panel</enum>
+                <enum>QFrame::StyledPanel</enum>
                </property>
                <property name="frameShadow">
                 <enum>QFrame::Sunken</enum>
@@ -572,8 +572,8 @@
                  <rect>
                   <x>0</x>
                   <y>0</y>
-                  <width>364</width>
-                  <height>98</height>
+                  <width>362</width>
+                  <height>100</height>
                  </rect>
                 </property>
                 <attribute name="label">
@@ -720,8 +720,8 @@
                  <rect>
                   <x>0</x>
                   <y>0</y>
-                  <width>364</width>
-                  <height>96</height>
+                  <width>362</width>
+                  <height>97</height>
                  </rect>
                 </property>
                 <attribute name="label">
@@ -861,8 +861,8 @@
                  <rect>
                   <x>0</x>
                   <y>0</y>
-                  <width>364</width>
-                  <height>96</height>
+                  <width>362</width>
+                  <height>97</height>
                  </rect>
                 </property>
                 <attribute name="label">
@@ -1053,18 +1053,18 @@
         <item>
          <layout class="QHBoxLayout" name="horizontalLayout_3">
           <item>
-           <widget class="QGroupBox" name="groupBox_catia">
+           <widget class="QGroupBox" name="groupBox_catarina">
             <property name="title">
-             <string>Catia</string>
+             <string>Catarina</string>
             </property>
-            <layout class="QVBoxLayout" name="verticalLayout_2">
+            <layout class="QVBoxLayout" name="verticalLayout_4">
              <item>
-              <widget class="ClickableLabel" name="pic_catia">
+              <widget class="ClickableLabel" name="pic_catarina">
                <property name="text">
                 <string/>
                </property>
                <property name="pixmap">
-                <pixmap resource="../resources.qrc">:/screens/catia.png</pixmap>
+                <pixmap resource="../resources.qrc">:/screens/catarina.png</pixmap>
                </property>
                <property name="alignment">
                 <set>Qt::AlignCenter</set>
@@ -1072,9 +1072,9 @@
               </widget>
              </item>
              <item>
-              <widget class="QLabel" name="label_tools_catia">
+              <widget class="QLabel" name="label_tools_catarina">
                <property name="text">
-                <string>Catia is a nice JACK Patchbay with A2J Bridge integration</string>
+                <string>Patchbay test app</string>
                </property>
                <property name="alignment">
                 <set>Qt::AlignCenter</set>
@@ -1088,18 +1088,18 @@
            </widget>
           </item>
           <item>
-           <widget class="QGroupBox" name="groupBox_claudia">
+           <widget class="QGroupBox" name="groupBox_catia">
             <property name="title">
-             <string>Claudia</string>
+             <string>Catia</string>
             </property>
-            <layout class="QVBoxLayout" name="verticalLayout_3">
+            <layout class="QVBoxLayout" name="verticalLayout_2">
              <item>
-              <widget class="ClickableLabel" name="pic_claudia">
+              <widget class="ClickableLabel" name="pic_catia">
                <property name="text">
                 <string/>
                </property>
                <property name="pixmap">
-                <pixmap resource="../resources.qrc">:/screens/claudia.png</pixmap>
+                <pixmap resource="../resources.qrc">:/screens/catia.png</pixmap>
                </property>
                <property name="alignment">
                 <set>Qt::AlignCenter</set>
@@ -1107,9 +1107,9 @@
               </widget>
              </item>
              <item>
-              <widget class="QLabel" name="label_tools_claudia">
+              <widget class="QLabel" name="label_tools_catia">
                <property name="text">
-                <string>Claudia is a Graphical User Interface to LADISH</string>
+                <string>Catia is a nice JACK Patchbay with A2J Bridge integration</string>
                </property>
                <property name="alignment">
                 <set>Qt::AlignCenter</set>
@@ -1123,18 +1123,18 @@
            </widget>
           </item>
           <item>
-           <widget class="QGroupBox" name="groupBox_carla">
+           <widget class="QGroupBox" name="groupBox_claudia">
             <property name="title">
-             <string>Carla</string>
+             <string>Claudia</string>
             </property>
-            <layout class="QVBoxLayout" name="verticalLayout_4">
+            <layout class="QVBoxLayout" name="verticalLayout_3">
              <item>
-              <widget class="ClickableLabel" name="pic_carla">
+              <widget class="ClickableLabel" name="pic_claudia">
                <property name="text">
                 <string/>
                </property>
                <property name="pixmap">
-                <pixmap resource="../resources.qrc">:/screens/carla.png</pixmap>
+                <pixmap resource="../resources.qrc">:/screens/claudia.png</pixmap>
                </property>
                <property name="alignment">
                 <set>Qt::AlignCenter</set>
@@ -1142,9 +1142,9 @@
               </widget>
              </item>
              <item>
-              <widget class="QLabel" name="label_tools_carla">
+              <widget class="QLabel" name="label_tools_claudia">
                <property name="text">
-                <string>Carla is a multi-plugin host for JACK.</string>
+                <string>Claudia is a Graphical User Interface to LADISH</string>
                </property>
                <property name="alignment">
                 <set>Qt::AlignCenter</set>
@@ -1580,7 +1580,7 @@
              <item row="0" column="0" rowspan="8">
               <widget class="QToolBox" name="tb_tweak_plugins">
                <property name="frameShape">
-                <enum>QFrame::Panel</enum>
+                <enum>QFrame::StyledPanel</enum>
                </property>
                <property name="frameShadow">
                 <enum>QFrame::Sunken</enum>
@@ -1599,8 +1599,8 @@
                  <rect>
                   <x>0</x>
                   <y>0</y>
-                  <width>409</width>
-                  <height>322</height>
+                  <width>89</width>
+                  <height>66</height>
                  </rect>
                 </property>
                 <attribute name="label">
@@ -1629,8 +1629,8 @@
                  <rect>
                   <x>0</x>
                   <y>0</y>
-                  <width>409</width>
-                  <height>322</height>
+                  <width>89</width>
+                  <height>66</height>
                  </rect>
                 </property>
                 <attribute name="label">
@@ -1659,8 +1659,8 @@
                  <rect>
                   <x>0</x>
                   <y>0</y>
-                  <width>409</width>
-                  <height>322</height>
+                  <width>89</width>
+                  <height>66</height>
                  </rect>
                 </property>
                 <attribute name="label">
@@ -1689,8 +1689,8 @@
                  <rect>
                   <x>0</x>
                   <y>0</y>
-                  <width>409</width>
-                  <height>322</height>
+                  <width>415</width>
+                  <height>334</height>
                  </rect>
                 </property>
                 <attribute name="label">

src/cadence.py

@@ -1072,9 +1072,9 @@ class CadenceMainW(QMainWindow, ui_cadence.Ui_CadenceMainW):
         self.connect(self.b_pulse_stop, SIGNAL("clicked()"), SLOT("slot_PulseAudioBridgeStop()"))
         self.connect(self.tb_pulse_options, SIGNAL("clicked()"), SLOT("slot_PulseAudioBridgeOptions()"))
 
+        self.connect(self.pic_catarina, SIGNAL("clicked()"), lambda tool="catarina": self.func_start_tool(tool))
         self.connect(self.pic_catia, SIGNAL("clicked()"), lambda tool="catia": self.func_start_tool(tool))
         self.connect(self.pic_claudia, SIGNAL("clicked()"), lambda tool="claudia": self.func_start_tool(tool))
-        self.connect(self.pic_carla, SIGNAL("clicked()"), lambda tool="carla": self.func_start_tool(tool))
         self.connect(self.pic_logs, SIGNAL("clicked()"), lambda tool="cadence-logs": self.func_start_tool(tool))
         self.connect(self.pic_render, SIGNAL("clicked()"), lambda tool="cadence-render": self.func_start_tool(tool))
         self.connect(self.pic_xycontroller, SIGNAL("clicked()"), lambda tool="cadence-xycontroller": self.func_start_tool(tool))