Merge branch 'vangelis' into oram

zynthian · Dec 27, 2024 · db4b868 · db4b868
2 parents 15d81fb + c37cd1c
commit db4b868
Show file tree

Hide file tree

Showing 96 changed files with 2,749 additions and 1,373 deletions.
diff --git a/help/audio_mixer.html b/help/audio_mixer.html
@@ -27,22 +27,23 @@
   </div>
  </div>
 
- <h1>Audio Mixer</h1>
-
- <p>The audio mixer is the zynthian UI's "home" view. You can always access
-  the mixer by pushing the MIX button.</p>
- <p>It's composed of vertical strips associated with chains. Initially it will be empty, showing the main strip alone.
-  For each chain you create, a new strip is added to the mixer. There can be more mixer strips than can be displayed.
-  They will scroll left / right if you select a strip that is off screen.</p>
- <p>Each strip is an interactive widget that can be manipulated in several ways and it shows status info about the
-  associated chain.<p>
-
- <p>From top to bottom:</p>
+ <div class="right_container">
+  <h1>Audio Mixer</h1>
+  <p>The audio mixer is the zynthian UI's "home" view. You can always access
+   the mixer by pushing the MIX button.</p>
+  <p>It's composed of vertical strips associated with chains. Initially it will be empty, showing the main strip alone.
+   For each chain you create, a new strip is added to the mixer. There can be more mixer strips than can be displayed.
+   They will scroll left / right if you select a strip that is off screen.</p>
+  <p>Each strip is an interactive widget that can be manipulated in several ways and it shows status info about the
+   associated chain.<p>
+  <p>From top to bottom:</p>
+ </div>
 
  <div class="left_float_container">
   <img src="img/mixer_strip_legend_bg_black.png" class="full">
  </div>
 
+ <div class="right_container">
  <ul>
   <li><b>Solo:</b> Solo flag. Push to toggle. This is a non-exclusive solo mode. When a chain has solo enabled, all
    other chains without solo enabled will be muted, allowing auditioning of one or more chains. The <i>main</i> solo
@@ -58,6 +59,7 @@ <h1>Audio Mixer</h1>
   <li><b>Legend:</b> It shows an icon for the chain's type and a number for the assigned MIDI channel. Tap it to access
    the chain's control view.</li>
  </ul>
+ </div>
 
  <div class="clear"></div>
 

diff --git a/help/icons/white_icon_action_knob_rotate.png b/help/icons/white_icon_action_knob_rotate.png
diff --git a/help/img/mixer_strip_legend_bg_black.png b/help/img/mixer_strip_legend_bg_black.png
diff --git a/help/style.css b/help/style.css
@@ -27,14 +27,17 @@ div.clear {
 	clear: both;
 }
 
+div.right_container {
+	width: 65%;
+}
+
 div.knobs_action_container,
 div.left_float_container {
 	clear: both;
 	float: right;
 	width: 30%;
 }
 div.knob_action {
-	margin-left: 1em;
 	margin-bottom: 2px;
 	padding-right: 4px;
 	font-size: 100%;

diff --git a/icons/audio.png b/icons/audio.png
diff --git a/icons/audio_generator.png b/icons/audio_generator.png
diff --git a/icons/audio_input.png b/icons/audio_input.png
diff --git a/icons/audio_options.png b/icons/audio_options.png
diff --git a/icons/audio_output.png b/icons/audio_output.png
diff --git a/icons/audio_processor.png b/icons/audio_processor.png
diff --git a/icons/audio_recorder.png b/icons/audio_recorder.png
diff --git a/icons/back.png b/icons/back.png
diff --git a/icons/bluetooth.png b/icons/bluetooth.png
diff --git a/icons/delete.png b/icons/delete.png
diff --git a/icons/delete_all.png b/icons/delete_all.png
diff --git a/icons/delete_chains.png b/icons/delete_chains.png
diff --git a/icons/delete_sequences.png b/icons/delete_sequences.png
diff --git a/icons/effects_loop.png b/icons/effects_loop.png
diff --git a/icons/folder.png b/icons/folder.png
diff --git a/icons/headphones.png b/icons/headphones.png
diff --git a/icons/meter.png b/icons/meter.png
diff --git a/icons/meters.png b/icons/meters.png
diff --git a/icons/metronome.png b/icons/metronome.png
diff --git a/icons/metronome.svg b/icons/metronome.svg
diff --git a/icons/midi_audio.png b/icons/midi_audio.png
diff --git a/icons/midi_input.png b/icons/midi_input.png
diff --git a/icons/midi_instrument.png b/icons/midi_instrument.png
diff --git a/icons/midi_logo.png b/icons/midi_logo.png
diff --git a/icons/midi_output.png b/icons/midi_output.png
diff --git a/icons/midi_processor.png b/icons/midi_processor.png
diff --git a/icons/midi_recorder.png b/icons/midi_recorder.png
diff --git a/icons/mixer.png b/icons/mixer.png
diff --git a/icons/note_range.png b/icons/note_range.png
diff --git a/icons/panic.png b/icons/panic.png
diff --git a/icons/sequencer.png b/icons/sequencer.png
diff --git a/icons/settings.png b/icons/settings.png
diff --git a/icons/snapshot.png b/icons/snapshot.png
diff --git a/icons/special_chain.png b/icons/special_chain.png
diff --git a/icons/stopped.png b/icons/stopped.png
diff --git a/icons/synth_processor.png b/icons/synth_processor.png
diff --git a/icons/zynpad_mode_loop.png b/icons/zynpad_mode_loop.png
diff --git a/icons/zynpad_mode_loopall.png b/icons/zynpad_mode_loopall.png
diff --git a/icons/zynpad_mode_loopsync.png b/icons/zynpad_mode_loopsync.png
diff --git a/icons/zynpad_mode_oneshot.png b/icons/zynpad_mode_oneshot.png
diff --git a/icons/zynpad_mode_oneshotall.png b/icons/zynpad_mode_oneshotall.png
diff --git a/icons/zynpad_mode_oneshotsync.png b/icons/zynpad_mode_oneshotsync.png