falkTX
/
Cadence
mirror of https://github.com/falkTX/Cadence
1
0
Fork 0
Code Releases 3 Activity
Browse Source

Cadence: Update 'tools' tab, jackmeter replaces catarina

tags/v0.9.0
falkTX 12 years ago
parent
8c27be5945
commit
052fe87642
7 changed files with 109 additions and 39 deletions
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. +1
    -1
      resources/resources.qrc
  2. BIN
      resources/screens/cadence-jackmeter.png
  3. BIN
      resources/screens/catarina.png
  4. BIN
      resources/screens/catia.png
  5. BIN
      resources/screens/claudia.png
  6. +107
    -35
      resources/ui/cadence.ui
  7. +1
    -3
      src/cadence.py

+ 1
- 1
resources/resources.qrc View File

@@ -81,10 +81,10 @@
<file>bitmaps/canvas/frame_node_header.png</file>
<file>bitmaps/canvas/frame_port_bg.png</file>

<file>screens/cadence-jackmeter.png</file>
<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>


BIN
resources/screens/cadence-jackmeter.png View File

Before After
Width: 150  |  Height: 100  |  Size: 2.0KB

BIN
resources/screens/catarina.png View File

Before After
Width: 150  |  Height: 109  |  Size: 16KB

BIN
resources/screens/catia.png View File

Before After
Width: 150  |  Height: 97  |  Size: 10KB Width: 150  |  Height: 117  |  Size: 12KB

BIN
resources/screens/claudia.png View File

Before After
Width: 150  |  Height: 89  |  Size: 8.7KB Width: 150  |  Height: 105  |  Size: 11KB

+ 107
- 35
resources/ui/cadence.ui View File

@@ -6,7 +6,7 @@
<rect>
<x>0</x>
<y>0</y>
<width>739</width>
<width>740</width>
<height>564</height>
</rect>
</property>
@@ -493,7 +493,7 @@
<item row="1" column="0">
<widget class="QPushButton" name="b_jack_switchmaster">
<property name="text">
<string>Switch Master!</string>
<string>Switch Master</string>
</property>
</widget>
</item>
@@ -572,7 +572,7 @@
<rect>
<x>0</x>
<y>0</y>
<width>362</width>
<width>360</width>
<height>100</height>
</rect>
</property>
@@ -720,8 +720,8 @@
<rect>
<x>0</x>
<y>0</y>
<width>362</width>
<height>97</height>
<width>290</width>
<height>77</height>
</rect>
</property>
<attribute name="label">
@@ -861,8 +861,8 @@
<rect>
<x>0</x>
<y>0</y>
<width>362</width>
<height>97</height>
<width>204</width>
<height>77</height>
</rect>
</property>
<attribute name="label">
@@ -1053,28 +1053,40 @@
<item>
<layout class="QHBoxLayout" name="horizontalLayout_3">
<item>
<widget class="QGroupBox" name="groupBox_catarina">
<widget class="QGroupBox" name="groupBox_catia">
<property name="title">
<string>Catarina</string>
<string>Catia</string>
</property>
<layout class="QVBoxLayout" name="verticalLayout_4">
<layout class="QVBoxLayout" name="verticalLayout_2">
<item>
<widget class="ClickableLabel" name="pic_catarina">
<widget class="ClickableLabel" name="pic_catia">
<property name="minimumSize">
<size>
<width>0</width>
<height>117</height>
</size>
</property>
<property name="maximumSize">
<size>
<width>16777215</width>
<height>117</height>
</size>
</property>
<property name="text">
<string/>
</property>
<property name="pixmap">
<pixmap resource="../resources.qrc">:/screens/catarina.png</pixmap>
<pixmap resource="../resources.qrc">:/screens/catia.png</pixmap>
</property>
<property name="alignment">
<set>Qt::AlignCenter</set>
<set>Qt::AlignHCenter|Qt::AlignTop</set>
</property>
</widget>
</item>
<item>
<widget class="QLabel" name="label_tools_catarina">
<widget class="QLabel" name="label_tools_catia">
<property name="text">
<string>Patchbay test app</string>
<string>JACK Patchbay with A2J Bridge support and JACK Transport</string>
</property>
<property name="alignment">
<set>Qt::AlignCenter</set>
@@ -1088,28 +1100,40 @@
</widget>
</item>
<item>
<widget class="QGroupBox" name="groupBox_catia">
<widget class="QGroupBox" name="groupBox_claudia">
<property name="title">
<string>Catia</string>
<string>Claudia</string>
</property>
<layout class="QVBoxLayout" name="verticalLayout_2">
<layout class="QVBoxLayout" name="verticalLayout_3">
<item>
<widget class="ClickableLabel" name="pic_catia">
<widget class="ClickableLabel" name="pic_claudia">
<property name="minimumSize">
<size>
<width>0</width>
<height>117</height>
</size>
</property>
<property name="maximumSize">
<size>
<width>16777215</width>
<height>117</height>
</size>
</property>
<property name="text">
<string/>
</property>
<property name="pixmap">
<pixmap resource="../resources.qrc">:/screens/catia.png</pixmap>
<pixmap resource="../resources.qrc">:/screens/claudia.png</pixmap>
</property>
<property name="alignment">
<set>Qt::AlignCenter</set>
<set>Qt::AlignHCenter|Qt::AlignTop</set>
</property>
</widget>
</item>
<item>
<widget class="QLabel" name="label_tools_catia">
<widget class="QLabel" name="label_tools_claudia">
<property name="text">
<string>Catia is a nice JACK Patchbay with A2J Bridge integration</string>
<string>LADISH frontend; like Catia, but focused at session management</string>
</property>
<property name="alignment">
<set>Qt::AlignCenter</set>
@@ -1123,28 +1147,40 @@
</widget>
</item>
<item>
<widget class="QGroupBox" name="groupBox_claudia">
<widget class="QGroupBox" name="groupBox_meter">
<property name="title">
<string>Claudia</string>
<string>Meter</string>
</property>
<layout class="QVBoxLayout" name="verticalLayout_3">
<layout class="QVBoxLayout" name="verticalLayout_4">
<item>
<widget class="ClickableLabel" name="pic_claudia">
<widget class="ClickableLabel" name="pic_meter">
<property name="minimumSize">
<size>
<width>0</width>
<height>117</height>
</size>
</property>
<property name="maximumSize">
<size>
<width>16777215</width>
<height>117</height>
</size>
</property>
<property name="text">
<string/>
</property>
<property name="pixmap">
<pixmap resource="../resources.qrc">:/screens/claudia.png</pixmap>
<pixmap resource="../resources.qrc">:/screens/cadence-jackmeter.png</pixmap>
</property>
<property name="alignment">
<set>Qt::AlignCenter</set>
<set>Qt::AlignHCenter|Qt::AlignTop</set>
</property>
</widget>
</item>
<item>
<widget class="QLabel" name="label_tools_claudia">
<widget class="QLabel" name="label_tools_meter">
<property name="text">
<string>Claudia is a Graphical User Interface to LADISH</string>
<string>Digital peak meter, auto-connected to all system outputs</string>
</property>
<property name="alignment">
<set>Qt::AlignCenter</set>
@@ -1215,6 +1251,18 @@
<layout class="QVBoxLayout" name="verticalLayout_7">
<item>
<widget class="ClickableLabel" name="pic_logs">
<property name="minimumSize">
<size>
<width>0</width>
<height>128</height>
</size>
</property>
<property name="maximumSize">
<size>
<width>16777215</width>
<height>128</height>
</size>
</property>
<property name="text">
<string/>
</property>
@@ -1222,7 +1270,7 @@
<pixmap resource="../resources.qrc">:/screens/cadence-logs.png</pixmap>
</property>
<property name="alignment">
<set>Qt::AlignCenter</set>
<set>Qt::AlignHCenter|Qt::AlignTop</set>
</property>
</widget>
</item>
@@ -1250,6 +1298,18 @@
<layout class="QVBoxLayout" name="verticalLayout_6">
<item>
<widget class="ClickableLabel" name="pic_render">
<property name="minimumSize">
<size>
<width>0</width>
<height>128</height>
</size>
</property>
<property name="maximumSize">
<size>
<width>16777215</width>
<height>128</height>
</size>
</property>
<property name="text">
<string/>
</property>
@@ -1257,7 +1317,7 @@
<pixmap resource="../resources.qrc">:/screens/cadence-render.png</pixmap>
</property>
<property name="alignment">
<set>Qt::AlignCenter</set>
<set>Qt::AlignHCenter|Qt::AlignTop</set>
</property>
</widget>
</item>
@@ -1285,6 +1345,18 @@
<layout class="QVBoxLayout" name="verticalLayout_5">
<item>
<widget class="ClickableLabel" name="pic_xycontroller">
<property name="minimumSize">
<size>
<width>0</width>
<height>128</height>
</size>
</property>
<property name="maximumSize">
<size>
<width>16777215</width>
<height>128</height>
</size>
</property>
<property name="text">
<string/>
</property>
@@ -1292,7 +1364,7 @@
<pixmap resource="../resources.qrc">:/screens/cadence-xycontroller.png</pixmap>
</property>
<property name="alignment">
<set>Qt::AlignCenter</set>
<set>Qt::AlignHCenter|Qt::AlignTop</set>
</property>
</widget>
</item>
@@ -1689,7 +1761,7 @@
<rect>
<x>0</x>
<y>0</y>
<width>415</width>
<width>359</width>
<height>334</height>
</rect>
</property>


+ 1
- 3
src/cadence.py View File

@@ -1049,7 +1049,6 @@ class CadenceMainW(QMainWindow, ui_cadence.Ui_CadenceMainW):
self.systray.addMenuAction("tools", "app_catarina", "Catarina")
self.systray.addMenuAction("tools", "app_catia", "Catia")
self.systray.addMenuAction("tools", "app_claudia", "Claudia")
self.systray.addMenuAction("tools", "app_carla", "Carla")
self.systray.addMenuSeparator("tools", "tools_sep")
self.systray.addMenuAction("tools", "app_logs", "Logs")
self.systray.addMenuAction("tools", "app_meter", "Meter")
@@ -1060,7 +1059,6 @@ class CadenceMainW(QMainWindow, ui_cadence.Ui_CadenceMainW):
self.systray.connect("app_catarina", lambda tool="catarina": self.func_start_tool(tool))
self.systray.connect("app_catia", lambda tool="catia": self.func_start_tool(tool))
self.systray.connect("app_claudia", lambda tool="claudia": self.func_start_tool(tool))
self.systray.connect("app_carla", lambda tool="carla": self.func_start_tool(tool))
self.systray.connect("app_logs", lambda tool="cadence-logs": self.func_start_tool(tool))
self.systray.connect("app_meter", lambda tool="cadence-jackmeter": self.func_start_tool(tool))
self.systray.connect("app_render", lambda tool="cadence-render": self.func_start_tool(tool))
@@ -1093,9 +1091,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_meter, SIGNAL("clicked()"), lambda tool="cadence-jackmeter": 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))


Write Preview
Loading…
Cancel
Save