Claudia is now fired !

LADI · Jan 17, 2022 · 8b39876 · 8b39876
1 parent 2f6d2b5
commit 8b39876
Show file tree

Hide file tree

Showing 11 changed files with 49 additions and 455 deletions.
diff --git a/INSTALL.md b/INSTALL.md
@@ -38,7 +38,6 @@ Optional but recommended:
  - pulseaudio[-module-jack]
 
 The 'Cadence' app relies on jackdbus to work properly (either JACK2 or JACK1+DBus patch). <br/>
-Claudia is a LADISH frontend, so it will obviously require LADISH to run.
 
 The python version used and tested is python3.2. Older versions won't work! <br/>
 After install, the app/tools will still work on distributions with python2 as default, without any additional work.
@@ -76,7 +75,3 @@ No special requirements <br/>
 ### Catia
 Requires jack <br/>
 Recommends a2jmidid (>= 7) and jackdbus <br/>
-
-### Claudia [Linux only] <br/>
-Requires jackdbus and ladish <br/>
-Recommends a2jmidid <br/>
diff --git a/Makefile b/Makefile
@@ -61,7 +61,7 @@ locale/%.qm: locale/%.ts
 UI: cadence catarina catia tools
 
 cadence: src/ui_cadence.py \
-	src/ui_cadence_tb_jack.py src/ui_cadence_tb_alsa.py src/ui_cadence_tb_a2j.py src/ui_cadence_tb_pa.py \
+	src/ui_cadence_tb_alsa.py src/ui_cadence_tb_a2j.py src/ui_cadence_tb_pa.py \
 	src/ui_cadence_rwait.py
 
 catarina: src/ui_catarina.py \

diff --git a/README.md b/README.md
@@ -21,10 +21,10 @@ It automatically connects itself to all application JACK output ports that are a
 
 ### [Cadence-JackSettings](http://kxstudio.sourceforge.net/KXStudio:Applications:Cadence-JackSettings)
 Simple and easy-to-use configure dialog for jackdbus. <br/>
-It can configure JACK's driver and engine parameters, and it also supports LADISH studios.
+It can configure JACK's driver and engine parameters.
 
 ### [Cadence-Logs](http://kxstudio.sourceforge.net/KXStudio:Applications:Cadence-Logs)
-Small tool that shows JACK, A2J, LASH and LADISH logs in a multi-tab window. <br/>
+Small tool that shows JACK and A2J logs in a multi-tab window. <br/>
 The logs are viewed in a text box, making it easy to browse and extract status messages using copy and paste commands.
 
 ### [Cadence-Render](http://kxstudio.sourceforge.net/KXStudio:Applications:Cadence-Render)
@@ -37,21 +37,10 @@ It can send data through specific channels and has a MIDI Keyboard too.
 
 ### [Catarina](http://kxstudio.sourceforge.net/KXStudio:Applications:Catarina)
 A Patchbay test app, created while the patchcanvas module was being developed. <br/>
-It allows the user to experiment with the patchbay, without using ALSA, JACK or LADISH. <br/>
+It allows the user to experiment with the patchbay, without using ALSA or JACK. <br/>
 You can save & load patchbay configurations too.
 
 ### [Catia](http://kxstudio.sourceforge.net/KXStudio:Applications:Catia)
 JACK Patchbay, with some neat features like A2J bridge support and JACK Transport. <br/>
-It's supposed to be as simple as possible (there's Claudia for advanced things), so it can work nicely on Windows and Mac too. <br/>
+It's supposed to be as simple as possible, so it can work nicely on Windows and Mac too. <br/>
 Currently has ALSA-MIDI support in experimental stage (it doesn't automatically refresh the canvas when changes happen externally).
-
-### [Claudia](http://kxstudio.sourceforge.net/KXStudio:Applications:Claudia)
-LADISH frontend; just like Catia, but focused at session management through LADISH. <br/>
-It has a bit more features than the official LADISH GUI, with a nice preview of the main canvas in the bottom-left. <br/>
-It also implements the 'Claudia-Launcher' add-application style for LADISH.
-
-### [Claudia-Launcher](http://kxstudio.sourceforge.net/KXStudio:Applications:Claudia-Launcher)
-A multimedia application launcher with LADISH support. <br/>
-It searches for installed packages (not binaries), and displays the respective content as a launcher. <br/>
-The content is got through an hardcoded database, created and/or modified to suit the target distribution. <br/>
-Currently supports Debian and ArchLinux based distros.
diff --git a/resources/ui/cadence.ui b/resources/ui/cadence.ui
@@ -18,7 +18,7 @@
     <item>
      <widget class="QTabWidget" name="tabWidget">
       <property name="currentIndex">
-       <number>0</number>
+       <number>1</number>
       </property>
       <widget class="QWidget" name="tab_system">
        <attribute name="title">
@@ -689,8 +689,8 @@
                  <rect>
                   <x>0</x>
                   <y>0</y>
-                  <width>392</width>
-                  <height>118</height>
+                  <width>299</width>
+                  <height>98</height>
                  </rect>
                 </property>
                 <attribute name="label">
@@ -823,8 +823,8 @@
                  <rect>
                   <x>0</x>
                   <y>0</y>
-                  <width>392</width>
-                  <height>118</height>
+                  <width>302</width>
+                  <height>98</height>
                  </rect>
                 </property>
                 <attribute name="label">
@@ -1192,7 +1192,7 @@
              <item>
               <widget class="QLabel" name="label_tools_logs">
                <property name="text">
-                <string>View JACK, A2J and LADISH logs</string>
+                <string>View JACK and A2J logs</string>
                </property>
                <property name="alignment">
                 <set>Qt::AlignCenter</set>
@@ -1612,8 +1612,8 @@
                  <rect>
                   <x>0</x>
                   <y>0</y>
-                  <width>396</width>
-                  <height>401</height>
+                  <width>96</width>
+                  <height>89</height>
                  </rect>
                 </property>
                 <attribute name="label">
@@ -1642,7 +1642,7 @@
                  <rect>
                   <x>0</x>
                   <y>0</y>
-                  <width>91</width>
+                  <width>96</width>
                   <height>89</height>
                  </rect>
                 </property>
@@ -1672,7 +1672,7 @@
                  <rect>
                   <x>0</x>
                   <y>0</y>
-                  <width>91</width>
+                  <width>96</width>
                   <height>89</height>
                  </rect>
                 </property>
@@ -1702,7 +1702,7 @@
                  <rect>
                   <x>0</x>
                   <y>0</y>
-                  <width>91</width>
+                  <width>96</width>
                   <height>89</height>
                  </rect>
                 </property>

diff --git a/resources/ui/cadence_tb_jack.ui b/resources/ui/cadence_tb_jack.ui