Browse Source

Misc

tags/1.9.5
falkTX 10 years ago
parent
commit
03b1e722fa
2 changed files with 17 additions and 15 deletions
  1. +7
    -5
      source/carla_skin.py
  2. +10
    -10
      source/carla_widgets.py

+ 7
- 5
source/carla_skin.py View File

@@ -126,7 +126,7 @@ class AbstractPluginSlot(QFrame, PluginEditParentMeta):
self.fLastGreenLedState = False self.fLastGreenLedState = False
self.fLastBlueLedState = False self.fLastBlueLedState = False


self.fParameterIconTimer = ICON_STATE_OFF
self.fParameterIconTimer = ICON_STATE_NULL
self.fParameterList = [] # index, widget self.fParameterList = [] # index, widget


if host.processMode == ENGINE_PROCESS_MODE_CONTINUOUS_RACK: if host.processMode == ENGINE_PROCESS_MODE_CONTINUOUS_RACK:
@@ -583,13 +583,15 @@ class AbstractPluginSlot(QFrame, PluginEditParentMeta):


def idleSlow(self): def idleSlow(self):
if self.fParameterIconTimer == ICON_STATE_ON: if self.fParameterIconTimer == ICON_STATE_ON:
self.fParameterIconTimer = ICON_STATE_WAIT1
self.parameterActivityChanged(True) self.parameterActivityChanged(True)
elif self.fParameterIconTimer == ICON_STATE_WAIT1:
self.fParameterIconTimer = ICON_STATE_WAIT2
elif self.fParameterIconTimer == ICON_STATE_WAIT2:
self.fParameterIconTimer = ICON_STATE_WAIT
elif self.fParameterIconTimer == ICON_STATE_WAIT:
self.fParameterIconTimer = ICON_STATE_OFF self.fParameterIconTimer = ICON_STATE_OFF

elif self.fParameterIconTimer == ICON_STATE_OFF:
self.parameterActivityChanged(False) self.parameterActivityChanged(False)
self.fParameterIconTimer = ICON_STATE_NULL


self.fEditDialog.idleSlow() self.fEditDialog.idleSlow()




+ 10
- 10
source/carla_widgets.py View File

@@ -48,10 +48,10 @@ from pixmapkeyboard import PixmapKeyboardHArea
# ------------------------------------------------------------------------------------------------------------ # ------------------------------------------------------------------------------------------------------------
# Carla GUI defines # Carla GUI defines


ICON_STATE_ON = 3 # turns on, sets as wait1
ICON_STATE_WAIT1 = 2 # sets as wait2
ICON_STATE_WAIT2 = 1 # turns off, sets as off
ICON_STATE_OFF = 0 # do nothing
ICON_STATE_ON = 3 # turns on, sets as wait
ICON_STATE_WAIT = 2 # nothing, sets as off
ICON_STATE_OFF = 1 # turns off, sets as null
ICON_STATE_NULL = 0 # nothing


# ------------------------------------------------------------------------------------------------------------ # ------------------------------------------------------------------------------------------------------------
# Carla About dialog # Carla About dialog
@@ -1056,11 +1056,11 @@ class PluginEdit(QDialog):
# Check Tab icons # Check Tab icons
for i in range(len(self.fTabIconTimers)): for i in range(len(self.fTabIconTimers)):
if self.fTabIconTimers[i] == ICON_STATE_ON: if self.fTabIconTimers[i] == ICON_STATE_ON:
self.fTabIconTimers[i] = ICON_STATE_WAIT1
elif self.fTabIconTimers[i] == ICON_STATE_WAIT1:
self.fTabIconTimers[i] = ICON_STATE_WAIT2
elif self.fTabIconTimers[i] == ICON_STATE_WAIT2:
self.fTabIconTimers[i] = ICON_STATE_WAIT
elif self.fTabIconTimers[i] == ICON_STATE_WAIT:
self.fTabIconTimers[i] = ICON_STATE_OFF self.fTabIconTimers[i] = ICON_STATE_OFF
elif self.fTabIconTimers[i] == ICON_STATE_OFF:
self.fTabIconTimers[i] = ICON_STATE_NULL
self.ui.tabWidget.setTabIcon(i+1, self.fTabIconOff) self.ui.tabWidget.setTabIcon(i+1, self.fTabIconOff)


# Check parameters needing update # Check parameters needing update
@@ -1108,7 +1108,7 @@ class PluginEdit(QDialog):
if paramType == PARAMETER_INPUT: if paramType == PARAMETER_INPUT:
tabIndex = paramWidget.getTabIndex() tabIndex = paramWidget.getTabIndex()


if self.fTabIconTimers[tabIndex-1] == ICON_STATE_OFF:
if self.fTabIconTimers[tabIndex-1] == ICON_STATE_NULL:
self.ui.tabWidget.setTabIcon(tabIndex, self.fTabIconOn) self.ui.tabWidget.setTabIcon(tabIndex, self.fTabIconOn)


self.fTabIconTimers[tabIndex-1] = ICON_STATE_ON self.fTabIconTimers[tabIndex-1] = ICON_STATE_ON
@@ -1483,7 +1483,7 @@ class PluginEdit(QDialog):
if paramType == PARAMETER_INPUT: if paramType == PARAMETER_INPUT:
self.ui.tabWidget.setTabIcon(tabIndex, self.fTabIconOff) self.ui.tabWidget.setTabIcon(tabIndex, self.fTabIconOff)


self.fTabIconTimers.append(ICON_STATE_OFF)
self.fTabIconTimers.append(ICON_STATE_NULL)


def _updateCtrlPrograms(self): def _updateCtrlPrograms(self):
self.ui.keyboard.setEnabled(self.fControlChannel >= 0) self.ui.keyboard.setEnabled(self.fControlChannel >= 0)


Loading…
Cancel
Save