merge pull request 38.fixing conflicts

hdavid · Sep 24, 2016 · e67e37e · e67e37e
2 parents 6c48c37 + b2bae84
commit e67e37e
Show file tree

Hide file tree

Showing 16 changed files with 11 additions and 24 deletions.
diff --git a/DefChannelStripComponent.py b/DefChannelStripComponent.py
@@ -1,5 +1,3 @@
-# -*- coding: utf-8 -*-
-
 import Live
 from _Framework.ChannelStripComponent import ChannelStripComponent
 from ConfigurableButtonElement import ConfigurableButtonElement

diff --git a/DeviceComponent.py b/DeviceComponent.py
@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-
 from _Framework.DeviceComponent import DeviceComponent as LiveDeviceComponent
 from _Framework.ButtonElement import ButtonElement
 from DeviceControllerStrip import DeviceControllerStrip

diff --git a/DeviceControllerStrip.py b/DeviceControllerStrip.py
@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-
 
 from _Framework.ButtonSliderElement import ButtonSliderElement
 

diff --git a/InstrumentControllerComponent.py b/InstrumentControllerComponent.py
@@ -1,5 +1,3 @@
-# -*- coding: utf-8 -*-
-
 import Live
 from _Framework.CompoundComponent import CompoundComponent
 from _Framework.SubjectSlot import subject_slot

diff --git a/M4LInterface.py b/M4LInterface.py
@@ -1,8 +1,5 @@
-# -*- coding: utf-8 -*-
-
 from _Framework.ControlSurfaceComponent import ControlSurfaceComponent
 
-
 class M4LInterface(ControlSurfaceComponent):
 
 	def __init__(self):

diff --git a/MainSelectorComponent.py b/MainSelectorComponent.py
@@ -1,13 +1,11 @@
-# -*- coding: utf-8 -*-
-
 from _Framework.ModeSelectorComponent import ModeSelectorComponent
 from _Framework.ButtonElement import ButtonElement
 from _Framework.ButtonMatrixElement import ButtonMatrixElement
-from _Framework.SessionZoomingComponent import DeprecatedSessionZoomingComponent# noqa
+from _Framework.SessionZoomingComponent import *
 from DeviceComponent import DeviceComponent
 from SpecialSessionComponent import SpecialSessionComponent
 from InstrumentControllerComponent import InstrumentControllerComponent
-from SubSelectorComponent import SubSelectorComponent  # noqa
+from SubSelectorComponent import *
 from StepSequencerComponent import StepSequencerComponent
 from StepSequencerComponent2 import StepSequencerComponent2
 import Settings

diff --git a/NoteEditorComponent.py b/NoteEditorComponent.py
@@ -23,6 +23,7 @@ def __init__(self, stepsequencer = None, matrix = None, control_surface = None):
 		# Velocity color map. this must remain of length 3. WHY???
 		self.velocity_map = [20, 50, 80, 105, 127]
 		self.velocity_color_map = [	"StepSequencer.NoteEditor.Velocity0", "StepSequencer.NoteEditor.Velocity1", "StepSequencer.NoteEditor.Velocity2", "StepSequencer.NoteEditor.Velocity3", "StepSequencer.NoteEditor.Velocity4"]
+
 		# other colors
 		self.muted_note_color = "StepSequencer.NoteEditor.Muted"
 		self.playing_note_color = "StepSequencer.NoteEditor.Playing"

diff --git a/PreciseButtonSliderElement.py b/PreciseButtonSliderElement.py
@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-
 
 from _Framework.ButtonSliderElement import ButtonSliderElement
 SLIDER_MODE_SINGLE = 0

diff --git a/ScaleComponent.py b/ScaleComponent.py
@@ -1,5 +1,4 @@
 from _Framework.ControlSurfaceComponent import ControlSurfaceComponent
-#from _Framework.Control import PlayableControl, ButtonControl, ToggleButtonControl, control_matrix
 
 KEY_NAMES = ["C", "C#", "D", "D#", "E", "F", "F#", "G", "G#", "A", "A#", "B"]
 CIRCLE_OF_FIFTHS = [7 * k % 12 for k in range(12)]

diff --git a/SpecialMixerComponent.py b/SpecialMixerComponent.py
@@ -1,6 +1,3 @@
-# -*- coding: utf-8 -*-
-
-# import Live
 from _Framework.MixerComponent import MixerComponent
 from DefChannelStripComponent import DefChannelStripComponent
 from _Framework.ButtonElement import ButtonElement

diff --git a/StepSequencerComponent.py b/StepSequencerComponent.py
@@ -407,6 +407,7 @@ def should_scroll(self):
 
 #Used in Normal mode (Not Multinote) to delete/copy/mute/change loops regions
 #Scrolls the regions in Multinote Mode 
+
 class LoopSelectorComponent(ControlSurfaceComponent):
 
     def __init__(self, step_sequencer, buttons, control_surface):
@@ -926,6 +927,7 @@ def index_of(self, pad_list, pad):
                 return i
         return(-1)
 
+
 # enabled
     def set_enabled(self, enabled):
         if enabled:
@@ -1386,6 +1388,7 @@ def _mute_shift_button_value(self, value, sender):
             self._note_editor._is_mute_shifted = self._is_mute_shifted
             self._update_mute_shift_button()
 
+
 # MODE
     def _update_mode_button(self):
         if self.is_enabled():

diff --git a/SubSelectorComponent.py b/SubSelectorComponent.py
@@ -4,7 +4,6 @@
 from _Framework.SessionComponent import SessionComponent
 from SpecialMixerComponent import SpecialMixerComponent
 from PreciseButtonSliderElement import PreciseButtonSliderElement, SLIDER_MODE_VOLUME, SLIDER_MODE_PAN
-
 PAN_VALUE_MAP = (-1.0, -0.634921, -0.31746, 0.0, 0.0, 0.31746, 0.634921, 1.0)
 VOL_VALUE_MAP = (0.0, 0.142882, 0.302414, 0.4, 0.55, 0.7, 0.85, 1.0)
 SEND_VALUE_MAP = (0.0, 0.103536, 0.164219, 0.238439, 0.343664, 0.55, 0.774942, 1.0)

diff --git a/TrackControllerComponent.py b/TrackControllerComponent.py
@@ -1,4 +1,4 @@
-# -*- coding: utf-8 -*-
+
 from _Framework.MixerComponent import MixerComponent
 from _Framework.ButtonElement import ButtonElement
 import time

diff --git a/consts.py b/consts.py
@@ -1,4 +1 @@
-
-ACTION_BUTTON_COLORS = dict(color='DefaultButton.Off', pressed_color='DefaultButton.On', disabled_color='DefaultButton.Disabled')
-
-
+ACTION_BUTTON_COLORS = dict(color='DefaultButton.Off', pressed_color='DefaultButton.On', disabled_color='DefaultButton.Disabled')
diff --git a/web/Manual_ Launchpad95_FR.pdf b/web/Manual_ Launchpad95_FR.pdf
diff --git a/web/index.html b/web/index.html
@@ -90,6 +90,9 @@ <h2>User Manual</h2>
 		effect or device on any track of your arrangement, and
 		finally an <strong>Instrument Mode</strong> providing a tighter integration with Live.  
 	</p>
+	<p>
+		Note the manual is also available in <a href="Manual_ Launchpad95_FR.pdf">french as a PDF</a>, thanks to François Leh&eacute;rissier.
+	</p>
 	</section>
 
 	<section>