move tooltips, display string of highLightGate, color and speaker bug

1 files changed, 3 insertions, 186 deletions

diff --git a/Resources/tooltips_en.py b/Resources/tooltips_en.py
index a348b79..e59e88d 100644
--- a/Resources/tooltips_en.py
+++ b/Resources/tooltips_en.py
@@ -53,7 +53,7 @@ class Tooltips:
         self.Edit["2instrument3muteButton"] = _("Left click to mute, right click to solo")
         self.Edit["2instrument4muteButton"] = _("Left click to mute, right click to solo")
         self.Edit["2drumMuteButton"] = _("Left click to mute, right click to solo")
-        
+
         self.ALGO = {}
         self.ALGO["XYButton1"] = _('-- Rythm density, |  Rythm regularity' )
         self.ALGO["XYButton2"] = _('-- Pitch regularity, | Pitch maximum step' )
@@ -73,7 +73,7 @@ class Tooltips:
         self.ALGO["loadButton"] = _('Load preset')
         self.ALGO["checkButton"] = _('Generate')
         self.ALGO["cancelButton"] = _('Close')
- 
+
         self.PROP = {}
         self.PROP['pitchUp'] = _('Transpose up')
         self.PROP['pitchDown'] = _('Transpose down')
@@ -104,7 +104,7 @@ class Tooltips:
         self.PROP['paraSlider'] = _('Specific parameter')
         self.PROP['checkButton'] = _('Apply generator')
         self.PROP['cancelButton'] = _('Cancel')
-    
+
 
 
     #miniTamTam
@@ -126,186 +126,3 @@ class Tooltips:
     RECMIC = _('Record with the microphone')
     RECLAB = _('Open SynthLab to create noise')
     MT_RECORDBUTTONS = [_('Record mic into slot 1'), _('Record mic into slot 2'), _('Record mic into slot 3'), _('Record mic into slot 4')]
-
-    
-    #Synthlab
-    SOURCE = _('Source')
-    EFFECT = _('Effect')
-    CONTROL = _('Control')
-    SOUNDOUT = _('Sound Output')
-    SOUNDDUR = _('Sound Duration')
-    SL_RECORDBUTTONS = [_('Record into slot 1'), _('Record into slot 2'), _('Record into slot 3'), _('Record into slot 4'), _('Record into slot 5'), _('Record into slot 6')]
-    SAVE = _('Save')
-    LOAD = _('Load')
-    SAVEMINI = _('Save to miniTamTam')
-    CLOSE = _('Save to journal and quit')
-    RESET = _('Reset')
-    
-    #Controls
-    LFO = _('LFO')
-    AMP = _('Amplitude')
-    FREQ = _('Frequency')
-    WAVEFORM = _('Waveform')
-    LFO_WAVEFORMS = [_('Sine'), _('Triangle'), _('Bi-Square'), _('Uni-Square'), _('Sawtooth'), _('Sawtooth-down')]
-    OFFSET = _('Offset')
-    
-    RANDOM = _('Random')
-    MIN = _('Minimum')
-    MAX = _('Maximum')
-    FREQ = FREQ
-    SEED = _('Seed')
-    
-    ADSR = _('Envelope')
-    ATTACK = _('Attack')
-    DECAY = _('Decay')
-    SUSTAIN = _('Sustain')
-    RELEASE = _('Release')
-
-    TRACKPADX = _('Trackpad X')
-    MIN = MIN
-    MAX = MAX
-    SCALING = _('Scaling')
-    SCALING_TYPES =    [_('Lin'), _('Log')] 
-    POLL = _('Poll time')
-    
-    TRACKPADY = _('Trackpad Y')
-    MIN = MIN
-    MAX = MAX
-    SCALING = SCALING
-    SCALING_TYPES = SCALING_TYPES
-    POLL = POLL
-    
-    #Source
-    FM = _('FM')
-    CAR = _('Carrier Frequency')
-    MOD = _('Modulator Frequency')
-    INDEX = _('Index')
-    GAIN = _('Gain')
-    
-    BUZZ = _('Buzz')
-    FREQ = FREQ
-    NHARM = _('Number of harmonics')
-    FSLOPE = _('Filter Slope')
-    GAIN = GAIN
-    
-    VCO = _('VCO')
-    FREQ = FREQ
-    WAVEFORM = WAVEFORM
-    VCO_WAVEFORMS = [_('Sawtooth'), _('Square'), _('Triangle')]
-    FSLOPE = FSLOPE
-    GAIN = GAIN
-    
-    PLUCK = _('Pluck')
-    FREQ = FREQ
-    LFILTER = _('Lowpass Filter')
-    VIBRATO = _('Vibrato')
-    GAIN = GAIN
-    
-    NOISE = _('Noise')
-    NOISETYPE = _('Type')
-    NOISE_TYPES = [_('White'), _('Pink'), _('Gauss')]
-    FREQ = FREQ
-    BANDWITH = _('Bandwith')
-    GAIN = GAIN
-    
-    SAMPLE = _('Sound Sample')
-    FREQ = FREQ
-    SAMPLEN = _('Sample Number')
-    SAMPLE_NAMES = _('Sample name')
-    LFILTER = LFILTER
-    GAIN = GAIN
-    
-    VOICE = _('Voice')
-    FREQ = FREQ
-    VOWEL = _('Vowel')
-    VOWEL_TYPES = ['i', 'e', 'ee', 'a', 'u', 'o1', 'o2', 'oa', 'oe']
-    VIBRATO = VIBRATO
-    GAIN = GAIN
-
-    GRAIN = _('Grain')
-    FREQ = FREQ
-    SAMPLEN = SAMPLEN
-    INDEX = _('Index')
-    GAIN = GAIN
-
-    ADDSYNTH = _('Additive Synthesis')
-    FREQ = FREQ
-    SPREAD = _('Spread')
-    WAVE = _('Waveform')
-    GAIN = GAIN
-    
-    #Effects
-    DELAY = _('Delay')
-    FREQ = FREQ
-    LFILTER = LFILTER
-    FEEDBACK = _('Feedback')
-    GAIN = GAIN
-    
-    DIST = _('Distortion')
-    FREQ = FREQ
-    RESON = _('Resonance')
-    DISTL = _('Distotion Level')
-    GAIN = GAIN
-    
-    FILTER = _('Filter')
-    FREQ = FREQ
-    FSLOPE = FSLOPE
-    FTYPE = _('Type')
-    FILTER_TYPES = [_('Lowpass'), _('Highpass'), _('Bandpass')]
-    GAIN = GAIN
-    
-    RINGMOD = _('Ring Modulator')
-    FREQ = FREQ
-    MIX = _('Mix')
-    WAVEFORM = WAVEFORM
-    LFO_WAVEFORMS = LFO_WAVEFORMS
-    GAIN = GAIN
-    
-    REVERB = _('Reverb')
-    REVERBD = _('Length')
-    REVERBF = _('Lowpass Filter')
-    REVERBL = _('Reverb Level')
-    GAIN = GAIN
-    
-    HARMON = _('Harmonizer')
-    FREQ = FREQ
-    DRYDELAY = _('Dry delay')
-    MIX = MIX
-    GAIN = GAIN
-
-    EQ4BAND = _('Equalizer 4 bands')
-    FREQ1 = _('Band one gain')
-    FREQ2 = _('Band two gain')
-    FREQ3 = _('Band three gain')
-    FREQ4 = _('Band four gain')
-
-    CHORUS = _('Chorus')
-    LFODEPTH = _('LFO Depth')
-    LFOFREQ = _('LFO Frequency')
-    DELAY = _('Delay')
-    FEEDBACK = FEEDBACK
-
-    SYNTHTYPES = [[LFO, RANDOM, ADSR, TRACKPADX, TRACKPADY], [FM, BUZZ, VCO, PLUCK, NOISE, SAMPLE, VOICE, GRAIN, ADDSYNTH], [DELAY, DIST, FILTER, RINGMOD, REVERB, HARMON, EQ4BAND, CHORUS], [ADSR]]
-    SYNTHPARA = {	_('lfo'): [AMP, FREQ, WAVEFORM, OFFSET],
-                        _('rand'): [MIN, MAX, FREQ, SEED],
-                        _('adsr'): [ATTACK, DECAY, SUSTAIN, RELEASE],
-                        _('trackpadX'): [MIN, MAX, SCALING, POLL],
-                        _('trackpadY'): [MIN, MAX, SCALING, POLL],
-                        _('fm'): [CAR, MOD, INDEX, GAIN],
-                        _('buzz'): [FREQ, NHARM, FSLOPE, GAIN],
-                        _('vco'): [FREQ, WAVEFORM, FSLOPE, GAIN],
-                        _('pluck'): [FREQ, LFILTER, VIBRATO, GAIN],
-                        _('noise'): [NOISETYPE, FREQ, BANDWITH, GAIN],
-                        _('sample'): [FREQ, SAMPLEN, LFILTER, GAIN],
-                        _('voice'): [FREQ, VOWEL, VIBRATO, GAIN],
-                        _('grain'): [FREQ, SAMPLEN, INDEX, GAIN],
-                        _('addSynth'): [FREQ, SPREAD, WAVE, GAIN],
-                        _('wguide'): [FREQ, LFILTER, FEEDBACK, GAIN],
-                        _('distort'): [FREQ, RESON, DISTL, GAIN],
-                        _('filter'): [FREQ, FSLOPE, FTYPE, GAIN],
-                        _('ring'): [FREQ, MIX, WAVEFORM, GAIN],
-                        _('reverb'): [REVERBD, REVERBF, REVERBL, GAIN],
-                        _('harmon'): [FREQ, DRYDELAY, MIX, GAIN],
-                        _('eq4band'): [FREQ1, FREQ2, FREQ3, FREQ4], 
-                        _('chorus'): [LFODEPTH, LFOFREQ, DELAY, FEEDBACK]} 
-