Browse Source

Update CarlaHost UI file to match Carla 1.x series

tags/1.9.4
falkTX 11 years ago
parent
commit
fa9e46afeb
3 changed files with 417 additions and 80 deletions
  1. +372
    -37
      resources/ui/carla_host.ui
  2. +39
    -40
      source/carla_host.py
  3. +6
    -3
      source/carla_settings.py

+ 372
- 37
resources/ui/carla_host.ui View File

@@ -6,33 +6,33 @@
<rect>
<x>0</x>
<y>0</y>
<width>590</width>
<width>679</width>
<height>191</height>
</rect>
</property>
<property name="windowTitle">
<string>MainWindow</string>
</property>
<widget class="QWidget" name="centralwidget">
<zorder>splitter</zorder>
<zorder>miniCanvasPreview</zorder>
<zorder>miniCanvasPreview</zorder>
</widget>
<widget class="QWidget" name="centralwidget"/>
<widget class="QMenuBar" name="menubar">
<property name="geometry">
<rect>
<x>0</x>
<y>0</y>
<width>590</width>
<width>679</width>
<height>19</height>
</rect>
</property>
<widget class="QMenu" name="menu_Help">
<widget class="QMenu" name="menu_File">
<property name="title">
<string>&amp;Help</string>
<string>&amp;File</string>
</property>
<addaction name="act_help_about"/>
<addaction name="act_help_about_qt"/>
<addaction name="act_file_new"/>
<addaction name="act_file_open"/>
<addaction name="act_file_save"/>
<addaction name="act_file_save_as"/>
<addaction name="separator"/>
<addaction name="act_file_quit"/>
</widget>
<widget class="QMenu" name="menu_Engine">
<property name="title">
@@ -41,6 +41,60 @@
<addaction name="act_engine_start"/>
<addaction name="act_engine_stop"/>
</widget>
<widget class="QMenu" name="menu_Plugin">
<property name="title">
<string>&amp;Plugin</string>
</property>
<widget class="QMenu" name="menu_PluginMacros">
<property name="title">
<string>Macros (all plugins)</string>
</property>
<addaction name="act_plugins_enable"/>
<addaction name="act_plugins_disable"/>
<addaction name="separator"/>
<addaction name="act_plugins_volume100"/>
<addaction name="act_plugins_mute"/>
<addaction name="separator"/>
<addaction name="act_plugins_wet100"/>
<addaction name="act_plugins_bypass"/>
<addaction name="separator"/>
<addaction name="act_plugins_center"/>
</widget>
<addaction name="act_plugin_add"/>
<addaction name="act_plugin_remove_all"/>
<addaction name="separator"/>
<addaction name="menu_PluginMacros"/>
</widget>
<widget class="QMenu" name="menu_Transport">
<property name="title">
<string>&amp;Transport</string>
</property>
<addaction name="act_transport_play"/>
<addaction name="act_transport_stop"/>
<addaction name="act_transport_backwards"/>
<addaction name="act_transport_forwards"/>
</widget>
<widget class="QMenu" name="menu_Canvas">
<property name="title">
<string>&amp;Canvas</string>
</property>
<widget class="QMenu" name="menu_Canvas_Zoom">
<property name="title">
<string>Zoom</string>
</property>
<addaction name="act_canvas_zoom_fit"/>
<addaction name="separator"/>
<addaction name="act_canvas_zoom_in"/>
<addaction name="act_canvas_zoom_out"/>
<addaction name="act_canvas_zoom_100"/>
</widget>
<addaction name="act_canvas_arrange"/>
<addaction name="act_canvas_refresh"/>
<addaction name="menu_Canvas_Zoom"/>
<addaction name="separator"/>
<addaction name="act_canvas_print"/>
<addaction name="act_canvas_save_image"/>
</widget>
<widget class="QMenu" name="menu_Settings">
<property name="title">
<string>&amp;Settings</string>
@@ -49,15 +103,18 @@
<addaction name="separator"/>
<addaction name="act_settings_configure"/>
</widget>
<widget class="QMenu" name="menu_Plugin">
<widget class="QMenu" name="menu_Help">
<property name="title">
<string>&amp;Plugin</string>
<string>&amp;Help</string>
</property>
<addaction name="act_plugin_add"/>
<addaction name="act_plugin_remove_all"/>
<addaction name="act_help_about"/>
<addaction name="act_help_about_qt"/>
</widget>
<addaction name="menu_File"/>
<addaction name="menu_Engine"/>
<addaction name="menu_Plugin"/>
<addaction name="menu_Transport"/>
<addaction name="menu_Canvas"/>
<addaction name="menu_Settings"/>
<addaction name="menu_Help"/>
</widget>
@@ -65,6 +122,12 @@
<property name="windowTitle">
<string>toolBar</string>
</property>
<property name="movable">
<bool>false</bool>
</property>
<property name="allowedAreas">
<set>Qt::NoToolBarArea</set>
</property>
<property name="toolButtonStyle">
<enum>Qt::ToolButtonTextBesideIcon</enum>
</property>
@@ -74,19 +137,75 @@
<attribute name="toolBarBreak">
<bool>false</bool>
</attribute>
<addaction name="act_file_new"/>
<addaction name="act_file_open"/>
<addaction name="act_file_save"/>
<addaction name="act_file_save_as"/>
<addaction name="separator"/>
<addaction name="act_plugin_add2"/>
<addaction name="act_plugin_remove_all"/>
<addaction name="act_plugins_panic"/>
<addaction name="separator"/>
<addaction name="act_settings_configure"/>
</widget>
<action name="act_help_about">
<action name="act_file_new">
<property name="icon">
<iconset resource="../resources.qrc">
<normaloff>:/16x16/document-new.png</normaloff>:/16x16/document-new.png</iconset>
</property>
<property name="text">
<string>&amp;About</string>
<string>&amp;New</string>
</property>
<property name="shortcut">
<string>Ctrl+N</string>
</property>
</action>
<action name="act_help_about_qt">
<action name="act_file_open">
<property name="icon">
<iconset resource="../resources.qrc">
<normaloff>:/16x16/document-open.png</normaloff>:/16x16/document-open.png</iconset>
</property>
<property name="text">
<string>About &amp;Qt</string>
<string>&amp;Open...</string>
</property>
<property name="shortcut">
<string>Ctrl+O</string>
</property>
</action>
<action name="act_file_save">
<property name="icon">
<iconset resource="../resources.qrc">
<normaloff>:/16x16/document-save.png</normaloff>:/16x16/document-save.png</iconset>
</property>
<property name="text">
<string>&amp;Save</string>
</property>
<property name="shortcut">
<string>Ctrl+S</string>
</property>
</action>
<action name="act_file_save_as">
<property name="icon">
<iconset resource="../resources.qrc">
<normaloff>:/16x16/document-save-as.png</normaloff>:/16x16/document-save-as.png</iconset>
</property>
<property name="text">
<string>Save &amp;As...</string>
</property>
<property name="shortcut">
<string>Ctrl+Shift+S</string>
</property>
</action>
<action name="act_file_quit">
<property name="icon">
<iconset resource="../resources.qrc">
<normaloff>:/16x16/application-exit.png</normaloff>:/16x16/application-exit.png</iconset>
</property>
<property name="text">
<string>&amp;Quit</string>
</property>
<property name="shortcut">
<string>Ctrl+Q</string>
</property>
</action>
<action name="act_engine_start">
@@ -97,6 +216,9 @@
<property name="text">
<string>&amp;Start</string>
</property>
<property name="shortcut">
<string>F5</string>
</property>
</action>
<action name="act_engine_stop">
<property name="icon">
@@ -106,52 +228,249 @@
<property name="text">
<string>St&amp;op</string>
</property>
<property name="shortcut">
<string>F6</string>
</property>
</action>
<action name="act_settings_show_toolbar">
<action name="act_plugin_add">
<property name="icon">
<iconset resource="../resources.qrc">
<normaloff>:/16x16/list-add.png</normaloff>:/16x16/list-add.png</iconset>
</property>
<property name="text">
<string>&amp;Add...</string>
</property>
<property name="shortcut">
<string>Ctrl+A</string>
</property>
</action>
<action name="act_plugin_add2">
<property name="icon">
<iconset resource="../resources.qrc">
<normaloff>:/16x16/list-add.png</normaloff>:/16x16/list-add.png</iconset>
</property>
<property name="text">
<string>Add Plugin...</string>
</property>
</action>
<action name="act_plugin_remove_all">
<property name="icon">
<iconset resource="../resources.qrc">
<normaloff>:/16x16/edit-delete.png</normaloff>:/16x16/edit-delete.png</iconset>
</property>
<property name="text">
<string>&amp;Remove All</string>
</property>
</action>
<action name="act_plugins_enable">
<property name="text">
<string>Enable</string>
</property>
</action>
<action name="act_plugins_disable">
<property name="text">
<string>Disable</string>
</property>
</action>
<action name="act_plugins_bypass">
<property name="text">
<string>0% Wet (Bypass)</string>
</property>
</action>
<action name="act_plugins_wet100">
<property name="text">
<string>100% Wet</string>
</property>
</action>
<action name="act_plugins_mute">
<property name="text">
<string>0% Volume (Mute)</string>
</property>
</action>
<action name="act_plugins_volume100">
<property name="text">
<string>100% Volume</string>
</property>
</action>
<action name="act_plugins_center">
<property name="text">
<string>Center Balance</string>
</property>
</action>
<action name="act_plugins_panic">
<property name="icon">
<iconset resource="../resources.qrc">
<normaloff>:/16x16/dialog-warning.png</normaloff>:/16x16/dialog-warning.png</iconset>
</property>
<property name="text">
<string>Panic</string>
</property>
</action>
<action name="act_transport_play">
<property name="checkable">
<bool>true</bool>
</property>
<property name="checked">
<bool>true</bool>
<property name="icon">
<iconset resource="../resources.qrc">
<normaloff>:/16x16/media-playback-start.png</normaloff>:/16x16/media-playback-start.png</iconset>
</property>
<property name="text">
<string>Show &amp;Toolbar</string>
<string>&amp;Play</string>
</property>
<property name="shortcut">
<string>Ctrl+Shift+P</string>
</property>
</action>
<action name="act_settings_configure">
<action name="act_transport_stop">
<property name="icon">
<iconset resource="../resources.qrc">
<normaloff>:/16x16/configure.png</normaloff>:/16x16/configure.png</iconset>
<normaloff>:/16x16/media-playback-stop.png</normaloff>:/16x16/media-playback-stop.png</iconset>
</property>
<property name="text">
<string>&amp;Configure Carla</string>
<string>&amp;Stop</string>
</property>
<property name="shortcut">
<string>Ctrl+Shift+X</string>
</property>
</action>
<action name="act_plugin_add">
<action name="act_transport_backwards">
<property name="icon">
<iconset resource="../resources.qrc">
<normaloff>:/16x16/list-add.png</normaloff>:/16x16/list-add.png</iconset>
<normaloff>:/16x16/media-seek-backward.png</normaloff>:/16x16/media-seek-backward.png</iconset>
</property>
<property name="text">
<string>&amp;Add...</string>
<string>&amp;Backwards</string>
</property>
<property name="shortcut">
<string>Ctrl+Shift+B</string>
</property>
</action>
<action name="act_plugin_remove_all">
<action name="act_transport_forwards">
<property name="icon">
<iconset resource="../resources.qrc">
<normaloff>:/16x16/edit-delete.png</normaloff>:/16x16/edit-delete.png</iconset>
<normaloff>:/16x16/media-seek-forward.png</normaloff>:/16x16/media-seek-forward.png</iconset>
</property>
<property name="text">
<string>&amp;Remove All</string>
<string>&amp;Forwards</string>
</property>
<property name="shortcut">
<string>Ctrl+Shift+F</string>
</property>
</action>
<action name="act_plugin_add2">
<action name="act_canvas_arrange">
<property name="icon">
<iconset resource="../resources.qrc">
<normaloff>:/16x16/list-add.png</normaloff>:/16x16/list-add.png</iconset>
<normaloff>:/16x16/view-sort-ascending.png</normaloff>:/16x16/view-sort-ascending.png</iconset>
</property>
<property name="text">
<string>Add Plugin...</string>
<string>&amp;Arrange</string>
</property>
<property name="shortcut">
<string>Ctrl+G</string>
</property>
</action>
<action name="act_canvas_refresh">
<property name="icon">
<iconset resource="../resources.qrc">
<normaloff>:/16x16/view-refresh.png</normaloff>:/16x16/view-refresh.png</iconset>
</property>
<property name="text">
<string>&amp;Refresh</string>
</property>
<property name="shortcut">
<string>Ctrl+R</string>
</property>
</action>
<action name="act_canvas_print">
<property name="icon">
<iconset resource="../resources.qrc">
<normaloff>:/16x16/document-print.png</normaloff>:/16x16/document-print.png</iconset>
</property>
<property name="text">
<string>&amp;Print...</string>
</property>
</action>
<action name="act_canvas_save_image">
<property name="text">
<string>Save &amp;Image...</string>
</property>
</action>
<action name="act_canvas_zoom_fit">
<property name="icon">
<iconset resource="../resources.qrc">
<normaloff>:/16x16/zoom-fit-best.png</normaloff>:/16x16/zoom-fit-best.png</iconset>
</property>
<property name="text">
<string>Auto-Fit</string>
</property>
<property name="shortcut">
<string>Home</string>
</property>
</action>
<action name="act_canvas_zoom_in">
<property name="icon">
<iconset resource="../resources.qrc">
<normaloff>:/16x16/zoom-in.png</normaloff>:/16x16/zoom-in.png</iconset>
</property>
<property name="text">
<string>Zoom In</string>
</property>
<property name="shortcut">
<string>Ctrl++</string>
</property>
</action>
<action name="act_canvas_zoom_out">
<property name="icon">
<iconset resource="../resources.qrc">
<normaloff>:/16x16/zoom-out.png</normaloff>:/16x16/zoom-out.png</iconset>
</property>
<property name="text">
<string>Zoom Out</string>
</property>
<property name="shortcut">
<string>Ctrl+-</string>
</property>
</action>
<action name="act_canvas_zoom_100">
<property name="icon">
<iconset resource="../resources.qrc">
<normaloff>:/16x16/zoom-original.png</normaloff>:/16x16/zoom-original.png</iconset>
</property>
<property name="text">
<string>Zoom 100%</string>
</property>
<property name="shortcut">
<string>Ctrl+1</string>
</property>
</action>
<action name="act_settings_show_toolbar">
<property name="checkable">
<bool>true</bool>
</property>
<property name="checked">
<bool>true</bool>
</property>
<property name="text">
<string>Show &amp;Toolbar</string>
</property>
</action>
<action name="act_settings_configure">
<property name="icon">
<iconset resource="../resources.qrc">
<normaloff>:/16x16/configure.png</normaloff>:/16x16/configure.png</iconset>
</property>
<property name="text">
<string>&amp;Configure Carla</string>
</property>
</action>
<action name="act_help_about">
<property name="text">
<string>&amp;About</string>
</property>
</action>
<action name="act_help_about_qt">
<property name="text">
<string>About &amp;Qt</string>
</property>
</action>
</widget>
@@ -159,6 +478,22 @@
<include location="../resources.qrc"/>
</resources>
<connections>
<connection>
<sender>act_file_quit</sender>
<signal>triggered()</signal>
<receiver>CarlaHostW</receiver>
<slot>close()</slot>
<hints>
<hint type="sourcelabel">
<x>-1</x>
<y>-1</y>
</hint>
<hint type="destinationlabel">
<x>189</x>
<y>34</y>
</hint>
</hints>
</connection>
<connection>
<sender>act_settings_show_toolbar</sender>
<signal>triggered(bool)</signal>
@@ -170,8 +505,8 @@
<y>-1</y>
</hint>
<hint type="destinationlabel">
<x>399</x>
<y>34</y>
<x>354</x>
<y>35</y>
</hint>
</hints>
</connection>


+ 39
- 40
source/carla_host.py View File

@@ -220,61 +220,60 @@ class HostWindow(QMainWindow):
# -------------------------------------------------------------
# Connect actions to functions

#self.connect(self.ui.act_file_new, SIGNAL("triggered()"), SLOT("slot_fileNew()"))
#self.connect(self.ui.act_file_open, SIGNAL("triggered()"), SLOT("slot_fileOpen()"))
#self.connect(self.ui.act_file_save, SIGNAL("triggered()"), SLOT("slot_fileSave()"))
#self.connect(self.ui.act_file_save_as, SIGNAL("triggered()"), SLOT("slot_fileSaveAs()"))
##self.connect(self.ui.act_file_export_lv2, SIGNAL("triggered()"), SLOT("slot_fileExportLv2Preset()"))
#self.ui.act_file_new.triggered.connect(self.slot_fileNew)
#self.ui.act_file_open.triggered.connect(self.slot_fileOpen)
#self.ui.act_file_save.triggered.connect(self.slot_fileSave)
#self.ui.act_file_save_as.triggered.connect(self.slot_fileSaveAs)

#self.connect(self.ui.act_engine_start, SIGNAL("triggered()"), SLOT("slot_engineStart()"))
#self.connect(self.ui.act_engine_stop, SIGNAL("triggered()"), SLOT("slot_engineStop()"))
#self.ui.act_engine_start.triggered.connect(self.slot_engineStart)
#self.ui.act_engine_stop.triggered.connect(self.slot_engineStop)

self.ui.act_plugin_add.triggered.connect(self.slot_pluginAdd)
self.ui.act_plugin_add2.triggered.connect(self.slot_pluginAdd)
self.ui.act_plugin_remove_all.triggered.connect(self.slot_pluginRemoveAll)

#self.connect(self.ui.act_plugins_enable, SIGNAL("triggered()"), SLOT("slot_pluginsEnable()"))
#self.connect(self.ui.act_plugins_disable, SIGNAL("triggered()"), SLOT("slot_pluginsDisable()"))
#self.connect(self.ui.act_plugins_panic, SIGNAL("triggered()"), SLOT("slot_pluginsDisable()"))
#self.connect(self.ui.act_plugins_volume100, SIGNAL("triggered()"), SLOT("slot_pluginsVolume100()"))
#self.connect(self.ui.act_plugins_mute, SIGNAL("triggered()"), SLOT("slot_pluginsMute()"))
#self.connect(self.ui.act_plugins_wet100, SIGNAL("triggered()"), SLOT("slot_pluginsWet100()"))
#self.connect(self.ui.act_plugins_bypass, SIGNAL("triggered()"), SLOT("slot_pluginsBypass()"))
#self.connect(self.ui.act_plugins_center, SIGNAL("triggered()"), SLOT("slot_pluginsCenter()"))
#self.ui.act_plugins_enable.triggered.connect(self.slot_pluginsEnable)
#self.ui.act_plugins_disable.triggered.connect(self.slot_pluginsDisable)
#self.ui.act_plugins_panic.triggered.connect(self.slot_pluginsDisable)
#self.ui.act_plugins_volume100.triggered.connect(self.slot_pluginsVolume100)
#self.ui.act_plugins_mute.triggered.connect(self.slot_pluginsMute)
#self.ui.act_plugins_wet100.triggered.connect(self.slot_pluginsWet100)
#self.ui.act_plugins_bypass.triggered.connect(self.slot_pluginsBypass)
#self.ui.act_plugins_center.triggered.connect(self.slot_pluginsCenter)

#self.connect(self.ui.act_transport_play, SIGNAL("triggered(bool)"), SLOT("slot_transportPlayPause(bool)"))
#self.connect(self.ui.act_transport_stop, SIGNAL("triggered()"), SLOT("slot_transportStop()"))
#self.connect(self.ui.act_transport_backwards, SIGNAL("triggered()"), SLOT("slot_transportBackwards()"))
#self.connect(self.ui.act_transport_forwards, SIGNAL("triggered()"), SLOT("slot_transportForwards()"))
#self.ui.act_transport_play-triggered(bool)"), SLOT("slot_transportPlayPause(bool)"))
#self.ui.act_transport_stop.triggered.connect(self.slot_transportStop)
#self.ui.act_transport_backwards.triggered.connect(self.slot_transportBackwards)
#self.ui.act_transport_forwards.triggered.connect(self.slot_transportForwards)

#self.ui.act_canvas_arrange.setEnabled(False) # TODO, later
#self.connect(self.ui.act_canvas_arrange, SIGNAL("triggered()"), SLOT("slot_canvasArrange()"))
#self.connect(self.ui.act_canvas_refresh, SIGNAL("triggered()"), SLOT("slot_canvasRefresh()"))
#self.connect(self.ui.act_canvas_zoom_fit, SIGNAL("triggered()"), SLOT("slot_canvasZoomFit()"))
#self.connect(self.ui.act_canvas_zoom_in, SIGNAL("triggered()"), SLOT("slot_canvasZoomIn()"))
#self.connect(self.ui.act_canvas_zoom_out, SIGNAL("triggered()"), SLOT("slot_canvasZoomOut()"))
#self.connect(self.ui.act_canvas_zoom_100, SIGNAL("triggered()"), SLOT("slot_canvasZoomReset()"))
#self.connect(self.ui.act_canvas_print, SIGNAL("triggered()"), SLOT("slot_canvasPrint()"))
#self.connect(self.ui.act_canvas_save_image, SIGNAL("triggered()"), SLOT("slot_canvasSaveImage()"))
#self.ui.act_canvas_arrange.triggered.connect(self.slot_canvasArrange)
#self.ui.act_canvas_refresh.triggered.connect(self.slot_canvasRefresh)
#self.ui.act_canvas_zoom_fit.triggered.connect(self.slot_canvasZoomFit)
#self.ui.act_canvas_zoom_in.triggered.connect(self.slot_canvasZoomIn)
#self.ui.act_canvas_zoom_out.triggered.connect(self.slot_canvasZoomOut)
#self.ui.act_canvas_zoom_100.triggered.connect(self.slot_canvasZoomReset)
#self.ui.act_canvas_print.triggered.connect(self.slot_canvasPrint)
#self.ui.act_canvas_save_image.triggered.connect(self.slot_canvasSaveImage)

self.ui.act_settings_configure.triggered.connect(self.slot_configureCarla)

self.ui.act_help_about.triggered.connect(self.slot_aboutCarla)
self.ui.act_help_about_qt.triggered.connect(self.slot_aboutQt)

#self.connect(self.ui.splitter, SIGNAL("splitterMoved.connect(self.slot_splitterMoved()"))
#self.ui.splitter-splitterMoved.connect(self.slot_splitterMoved)

#self.connect(self.ui.cb_disk, SIGNAL("currentIndexChanged.connect(self.slot_diskFolderChanged)
#self.connect(self.ui.b_disk_add, SIGNAL("clicked()"), SLOT("slot_diskFolderAdd()"))
#self.connect(self.ui.b_disk_remove, SIGNAL("clicked()"), SLOT("slot_diskFolderRemove()"))
#self.connect(self.ui.fileTreeView, SIGNAL("doubleClicked(QModelIndex)"), SLOT("slot_fileTreeDoubleClicked(QModelIndex)"))
#self.connect(self.ui.miniCanvasPreview, SIGNAL("miniCanvasMoved(double, double)"), SLOT("slot_miniCanvasMoved(double, double)"))
#self.ui.cb_disk-currentIndexChanged.connect(self.slot_diskFolderChanged)
#self.ui.b_disk_add-clicked.connect(self.slot_diskFolderAdd)
#self.ui.b_disk_remove-clicked.connect(self.slot_diskFolderRemove)
#self.ui.fileTreeView-doubleClicked(QModelIndex)"), SLOT("slot_fileTreeDoubleClicked(QModelIndex)"))
#self.ui.miniCanvasPreview-miniCanvasMoved(double, double)"), SLOT("slot_miniCanvasMoved(double, double)"))

#self.connect(self.ui.graphicsView.horizontalScrollBar(), SIGNAL("valueChanged.connect(self.slot_horizontalScrollBarChanged)
#self.connect(self.ui.graphicsView.verticalScrollBar(), SIGNAL("valueChanged.connect(self.slot_verticalScrollBarChanged)
#self.ui.graphicsView.horizontalScrollBar()-valueChanged.connect(self.slot_horizontalScrollBarChanged)
#self.ui.graphicsView.verticalScrollBar()-valueChanged.connect(self.slot_verticalScrollBarChanged)

#self.connect(self.scene, SIGNAL("sceneGroupMoved(int, int, QPointF)"), SLOT("slot_canvasItemMoved(int, int, QPointF)"))
#self.connect(self.scene, SIGNAL("scaleChanged(double)"), SLOT("slot_canvasScaleChanged(double)"))
#self.scene-sceneGroupMoved(int, int, QPointF)"), SLOT("slot_canvasItemMoved(int, int, QPointF)"))
#self.scene-scaleChanged(double)"), SLOT("slot_canvasScaleChanged(double)"))

self.DebugCallback.connect(self.slot_handleDebugCallback)
self.PluginAddedCallback.connect(self.slot_handlePluginAddedCallback)
@@ -307,9 +306,9 @@ class HostWindow(QMainWindow):
#self.SampleRateChangedCallback(double)"), SLOT("slot_handleSampleRateChangedCallback(double)"))
#self.NSM_AnnounceCallback(QString)"), SLOT("slot_handleNSM_AnnounceCallback(QString)"))
#self.NSM_OpenCallback(QString)"), SLOT("slot_handleNSM_OpenCallback(QString)"))
#self.NSM_SaveCallback()"), SLOT("slot_handleNSM_SaveCallback()"))
#self.NSM_SaveCallback.connect(self.slot_handleNSM_SaveCallback)
#self.ErrorCallback(QString)"), SLOT("slot_handleErrorCallback(QString)"))
#self.QuitCallback()"), SLOT("slot_handleQuitCallback()"))
#self.QuitCallback.connect(self.slot_handleQuitCallback)

self.SIGUSR1.connect(self.slot_handleSIGUSR1)
self.SIGTERM.connect(self.slot_handleSIGTERM)
@@ -558,7 +557,7 @@ class HostWindow(QMainWindow):
@pyqtSlot()
def slot_handleSIGUSR1(self):
print("Got SIGUSR1 -> Saving project now")
#QTimer.singleShot(0, self, SLOT("slot_fileSave()"))
#QTimer.singleShot(0, self, SLOT("slot_fileSave)

@pyqtSlot()
def slot_handleSIGTERM(self):


+ 6
- 3
source/carla_settings.py View File

@@ -202,9 +202,12 @@ class CarlaSettingsW(QDialog):

self.loadSettings()

if not hasGL:
self.ui.cb_canvas_use_opengl.setChecked(False)
self.ui.cb_canvas_use_opengl.setEnabled(False)
if not hasCanvas:
# TODO - hide canvas section

if not hasGL:
self.ui.cb_canvas_use_opengl.setChecked(False)
self.ui.cb_canvas_use_opengl.setEnabled(False)

if WINDOWS:
self.ui.group_theme.setEnabled(False)


Loading…
Cancel
Save