Browse Source

Add "Add JACK Application" to plugin menu

Closes #773

Signed-off-by: falkTX <falktx@gmail.com>
tags/v2.1-alpha2
falkTX 5 years ago
parent
commit
6544c4a883
Signed by: falkTX <falktx@gmail.com> GPG Key ID: 2D3445A829213837
2 changed files with 19 additions and 5 deletions
  1. +13
    -3
      resources/ui/carla_host.ui
  2. +6
    -2
      source/frontend/carla_host.py

+ 13
- 3
resources/ui/carla_host.ui View File

@@ -230,7 +230,7 @@
<x>0</x> <x>0</x>
<y>0</y> <y>0</y>
<width>1058</width> <width>1058</width>
<height>20</height>
<height>25</height>
</rect> </rect>
</property> </property>
<widget class="QMenu" name="menu_File"> <widget class="QMenu" name="menu_File">
@@ -276,6 +276,7 @@
<addaction name="act_plugins_expand"/> <addaction name="act_plugins_expand"/>
</widget> </widget>
<addaction name="act_plugin_add"/> <addaction name="act_plugin_add"/>
<addaction name="act_plugin_add_jack"/>
<addaction name="act_plugin_remove_all"/> <addaction name="act_plugin_remove_all"/>
<addaction name="separator"/> <addaction name="separator"/>
<addaction name="menu_PluginMacros"/> <addaction name="menu_PluginMacros"/>
@@ -878,7 +879,7 @@
<normaloff>:/16x16/list-add.png</normaloff>:/16x16/list-add.png</iconset> <normaloff>:/16x16/list-add.png</normaloff>:/16x16/list-add.png</iconset>
</property> </property>
<property name="text"> <property name="text">
<string>&amp;Add...</string>
<string>&amp;Add Plugin...</string>
</property> </property>
<property name="shortcut"> <property name="shortcut">
<string>Ctrl+A</string> <string>Ctrl+A</string>
@@ -1222,7 +1223,16 @@
<normaloff>:/16x16/list-add.png</normaloff>:/16x16/list-add.png</iconset> <normaloff>:/16x16/list-add.png</normaloff>:/16x16/list-add.png</iconset>
</property> </property>
<property name="text"> <property name="text">
<string>Add &amp;Jack Application</string>
<string>Add &amp;JACK Application</string>
</property>
</action>
<action name="act_plugin_add_jack">
<property name="icon">
<iconset resource="../resources.qrc">
<normaloff>:/16x16/list-add.png</normaloff>:/16x16/list-add.png</iconset>
</property>
<property name="text">
<string>Add &amp;JACK Application...</string>
</property> </property>
</action> </action>
</widget> </widget>


+ 6
- 2
source/frontend/carla_host.py View File

@@ -213,6 +213,7 @@ class HostWindow(QMainWindow):
self.ui.act_file_save_as.setVisible(False) self.ui.act_file_save_as.setVisible(False)
self.ui.act_plugin_add.setVisible(False) self.ui.act_plugin_add.setVisible(False)
self.ui.act_plugin_add2.setVisible(False) self.ui.act_plugin_add2.setVisible(False)
self.ui.act_plugin_add_jack.setVisible(False)
self.ui.act_plugin_remove_all.setVisible(False) self.ui.act_plugin_remove_all.setVisible(False)
self.ui.act_add_jack.setVisible(False) self.ui.act_add_jack.setVisible(False)
self.ui.menu_Plugin.setEnabled(False) self.ui.menu_Plugin.setEnabled(False)
@@ -426,6 +427,7 @@ class HostWindow(QMainWindow):
self.ui.act_plugin_remove_all.triggered.connect(self.slot_confirmRemoveAll) self.ui.act_plugin_remove_all.triggered.connect(self.slot_confirmRemoveAll)


self.ui.act_add_jack.triggered.connect(self.slot_jackAppAdd) self.ui.act_add_jack.triggered.connect(self.slot_jackAppAdd)
self.ui.act_plugin_add_jack.triggered.connect(self.slot_jackAppAdd)


self.ui.act_plugins_enable.triggered.connect(self.slot_pluginsEnable) self.ui.act_plugins_enable.triggered.connect(self.slot_pluginsEnable)
self.ui.act_plugins_disable.triggered.connect(self.slot_pluginsDisable) self.ui.act_plugins_disable.triggered.connect(self.slot_pluginsDisable)
@@ -1658,10 +1660,12 @@ class HostWindow(QMainWindow):
settings = QSettings("falkTX", "Carla2") settings = QSettings("falkTX", "Carla2")


if self.host.experimental and not self.host.isControl: if self.host.experimental and not self.host.isControl:
self.ui.act_add_jack.setVisible(settings.value(CARLA_KEY_EXPERIMENTAL_JACK_APPS,
CARLA_DEFAULT_EXPERIMENTAL_JACK_APPS, type=bool))
visible = settings.value(CARLA_KEY_EXPERIMENTAL_JACK_APPS, CARLA_DEFAULT_EXPERIMENTAL_JACK_APPS, type=bool)
self.ui.act_add_jack.setVisible(visible)
self.ui.act_plugin_add_jack.setVisible(visible)
else: else:
self.ui.act_add_jack.setVisible(False) self.ui.act_add_jack.setVisible(False)
self.ui.act_plugin_add_jack.setVisible(False)


self.fMiniCanvasUpdateTimeout = 1000 if self.fSavedSettings[CARLA_KEY_CANVAS_FANCY_EYE_CANDY] else 0 self.fMiniCanvasUpdateTimeout = 1000 if self.fSavedSettings[CARLA_KEY_CANVAS_FANCY_EYE_CANDY] else 0




Loading…
Cancel
Save