Skip to content

Commit

Permalink
Cleanup/Remove experimental ALSA integration
Browse files Browse the repository at this point in the history 
Signed-off-by: falkTX <[email protected]>
  • Loading branch information
@falkTX
falkTX committed Aug 5, 2020
1 parent 2f7ca9b commit c5cf8b6
Show file tree
Hide file tree
Showing 5 changed files with 119 additions and 788 deletions.
176 changes: 5 additions & 171 deletions resources/ui/catia.ui
View file
Original file line number Diff line number Diff line change
Expand Up @@ -394,8 +394,10 @@
</property>
<widget class="QMenu" name="menu_File">
<property name="title">
<string>&amp;File</string>
<string>&amp;Catia</string>
</property>
<addaction name="act_jack_clear_xruns"/>
<addaction name="separator"/>
<addaction name="act_quit"/>
</widget>
<widget class="QMenu" name="menu_Help">
Expand Down Expand Up @@ -434,27 +436,10 @@
<addaction name="separator"/>
<addaction name="act_canvas_save_image"/>
</widget>
<widget class="QMenu" name="menu_Tools">
<property name="title">
<string>&amp;Tools</string>
</property>
<widget class="QMenu" name="menu_A2J_Bridge">
<property name="title">
<string>&amp;ALSA-MIDI Bridge</string>
</property>
<addaction name="act_tools_a2j_start"/>
<addaction name="act_tools_a2j_stop"/>
<addaction name="act_tools_a2j_export_hw"/>
</widget>
<addaction name="menu_A2J_Bridge"/>
<addaction name="separator"/>
<addaction name="act_jack_clear_xruns"/>
</widget>
<widget class="QMenu" name="menu_Settings">
<property name="title">
<string>S&amp;ettings</string>
</property>
<addaction name="act_settings_show_alsa"/>
<addaction name="act_settings_show_toolbar"/>
<addaction name="act_settings_show_statusbar"/>
<addaction name="separator"/>
Expand All @@ -463,7 +448,6 @@
<addaction name="menu_File"/>
<addaction name="menu_Transport"/>
<addaction name="menu_Canvas"/>
<addaction name="menu_Tools"/>
<addaction name="menu_Settings"/>
<addaction name="menu_Help"/>
</widget>
Expand Down Expand Up @@ -609,22 +593,13 @@
</action>
<action name="act_jack_clear_xruns">
<property name="icon">
<iconset>
<normaloff>:/16x16/edit-clear.png</normaloff>:/16x16/edit-clear.png</iconset>
<iconset resource="../resources.qrc">
<normaloff>:/16x16/edit-clear.svgz</normaloff>:/16x16/edit-clear.svgz</iconset>
</property>
<property name="text">
<string>Clear &amp;Xruns</string>
</property>
</action>
<action name="act_jack_configure">
<property name="icon">
<iconset>
<normaloff>:/16x16/configure.png</normaloff>:/16x16/configure.png</iconset>
</property>
<property name="text">
<string>Configure JACK</string>
</property>
</action>
<action name="act_settings_show_toolbar">
<property name="checkable">
<bool>true</bool>
Expand Down Expand Up @@ -653,131 +628,6 @@
<string>Ctrl+P</string>
</property>
</action>
<action name="act_tools_jack_start">
<property name="icon">
<iconset>
<normaloff>:/16x16/media-playback-start.png</normaloff>:/16x16/media-playback-start.png</iconset>
</property>
<property name="text">
<string>Start JACK Server</string>
</property>
<property name="shortcut">
<string>F5</string>
</property>
</action>
<action name="act_tools_jack_stop">
<property name="icon">
<iconset>
<normaloff>:/16x16/media-playback-stop.png</normaloff>:/16x16/media-playback-stop.png</iconset>
</property>
<property name="text">
<string>Stop JACK Server</string>
</property>
<property name="shortcut">
<string>F6</string>
</property>
</action>
<action name="act_jack_bf_32">
<property name="checkable">
<bool>true</bool>
</property>
<property name="text">
<string>32</string>
</property>
</action>
<action name="act_jack_bf_64">
<property name="checkable">
<bool>true</bool>
</property>
<property name="text">
<string>64</string>
</property>
</action>
<action name="act_jack_bf_128">
<property name="checkable">
<bool>true</bool>
</property>
<property name="text">
<string>128</string>
</property>
</action>
<action name="act_jack_bf_256">
<property name="checkable">
<bool>true</bool>
</property>
<property name="text">
<string>256</string>
</property>
</action>
<action name="act_jack_bf_512">
<property name="checkable">
<bool>true</bool>
</property>
<property name="text">
<string>512</string>
</property>
</action>
<action name="act_jack_bf_1024">
<property name="checkable">
<bool>true</bool>
</property>
<property name="text">
<string>1024</string>
</property>
</action>
<action name="act_jack_bf_2048">
<property name="checkable">
<bool>true</bool>
</property>
<property name="text">
<string>2048</string>
</property>
</action>
<action name="act_jack_bf_4096">
<property name="checkable">
<bool>true</bool>
</property>
<property name="text">
<string>4096</string>
</property>
</action>
<action name="act_jack_bf_8192">
<property name="checkable">
<bool>true</bool>
</property>
<property name="text">
<string>8192</string>
</property>
</action>
<action name="act_tools_a2j_start">
<property name="icon">
<iconset>
<normaloff>:/16x16/media-playback-start.png</normaloff>:/16x16/media-playback-start.png</iconset>
</property>
<property name="text">
<string>Start Bridge</string>
</property>
<property name="shortcut">
<string>F7</string>
</property>
</action>
<action name="act_tools_a2j_stop">
<property name="icon">
<iconset>
<normaloff>:/16x16/media-playback-stop.png</normaloff>:/16x16/media-playback-stop.png</iconset>
</property>
<property name="text">
<string>Stop Bridge</string>
</property>
<property name="shortcut">
<string>F8</string>
</property>
</action>
<action name="act_tools_a2j_export_hw">
<property name="text">
<string>Export Hardware Ports...</string>
</property>
</action>
<action name="act_canvas_save_image">
<property name="text">
<string>Save &amp;Image...</string>
Expand All @@ -788,22 +638,6 @@
<string>About Qt</string>
</property>
</action>
<action name="act_jack_bf_16">
<property name="checkable">
<bool>true</bool>
</property>
<property name="text">
<string>16</string>
</property>
</action>
<action name="act_settings_show_alsa">
<property name="checkable">
<bool>true</bool>
</property>
<property name="text">
<string>Show ALSA-MIDI (EXPERIMENTAL)</string>
</property>
</action>
</widget>
<resources>
<include location="../resources.qrc"/>
Expand Down
34 changes: 32 additions & 2 deletions resources/ui/settings_app.ui
View file
Original file line number Diff line number Diff line change
Expand Up @@ -168,11 +168,26 @@
</item>
<item>
<widget class="QLabel" name="label_icon_main">
<property name="minimumSize">
<size>
<width>48</width>
<height>48</height>
</size>
</property>
<property name="maximumSize">
<size>
<width>48</width>
<height>48</height>
</size>
</property>
<property name="text">
<string notr="true"/>
</property>
<property name="pixmap">
<pixmap>:/48x48/exec.png</pixmap>
<pixmap resource="../resources.qrc">:/scalable/catia.svg</pixmap>
</property>
<property name="scaledContents">
<bool>true</bool>
</property>
<property name="alignment">
<set>Qt::AlignHCenter|Qt::AlignTop</set>
Expand Down Expand Up @@ -308,11 +323,26 @@
</item>
<item>
<widget class="QLabel" name="label_10">
<property name="minimumSize">
<size>
<width>48</width>
<height>48</height>
</size>
</property>
<property name="maximumSize">
<size>
<width>48</width>
<height>48</height>
</size>
</property>
<property name="text">
<string notr="true"/>
</property>
<property name="pixmap">
<pixmap>:/48x48/canvas.png</pixmap>
<pixmap resource="../resources.qrc">:/scalable/canvas.svg</pixmap>
</property>
<property name="scaledContents">
<bool>true</bool>
</property>
<property name="alignment">
<set>Qt::AlignHCenter|Qt::AlignTop</set>
Expand Down
Loading

0 comments on commit c5cf8b6

Please sign in to comment.