Add tempo spinner

Should be mostly functional (should at the very least not break current functionality)
Sammy1Am · Aug 23, 2020 · 09e7738 · 09e7738
1 parent 62dfdbd
commit 09e7738
Show file tree

Hide file tree

Showing 3 changed files with 155 additions and 76 deletions.
diff --git a/Java/MoppyControlGUI/src/main/java/com/moppy/control/gui/SequencerPanel.form b/Java/MoppyControlGUI/src/main/java/com/moppy/control/gui/SequencerPanel.form
@@ -58,7 +58,7 @@
       <Group type="103" groupAlignment="0" attributes="0">
           <Group type="102" alignment="0" attributes="0">
               <EmptySpace max="-2" attributes="0"/>
-              <Component id="jScrollPane1" pref="78" max="32767" attributes="0"/>
+              <Component id="jScrollPane1" pref="55" max="32767" attributes="0"/>
               <EmptySpace max="-2" attributes="0"/>
               <Group type="103" groupAlignment="3" attributes="0">
                   <Component id="loadFileButton" alignment="3" min="-2" max="-2" attributes="0"/>
@@ -119,21 +119,28 @@
                                   </Group>
                               </Group>
                               <Group type="102" alignment="1" attributes="0">
-                                  <EmptySpace min="0" pref="0" max="32767" attributes="0"/>
-                                  <Component id="volumeOverrideCB" min="-2" max="-2" attributes="0"/>
-                              </Group>
-                              <Group type="102" attributes="0">
                                   <Group type="103" groupAlignment="1" attributes="0">
                                       <Component id="midiInLabel" min="-2" max="-2" attributes="0"/>
                                       <Component id="midiOutLabel" min="-2" max="-2" attributes="0"/>
                                   </Group>
                                   <EmptySpace max="-2" attributes="0"/>
                                   <Group type="103" groupAlignment="0" attributes="0">
-                                      <Component id="midiOutCB" min="-2" pref="190" max="-2" attributes="0"/>
-                                      <Component id="midiInCB" min="-2" pref="190" max="-2" attributes="0"/>
+                                      <Component id="midiOutCB" alignment="0" min="-2" pref="190" max="-2" attributes="0"/>
+                                      <Component id="midiInCB" alignment="0" min="-2" pref="190" max="-2" attributes="0"/>
                                   </Group>
                                   <EmptySpace min="0" pref="0" max="32767" attributes="0"/>
                               </Group>
+                              <Group type="102" alignment="1" attributes="0">
+                                  <EmptySpace min="0" pref="0" max="32767" attributes="0"/>
+                                  <Group type="103" groupAlignment="0" attributes="0">
+                                      <Group type="102" alignment="1" attributes="0">
+                                          <Component id="tempoSpinner" min="-2" pref="45" max="-2" attributes="0"/>
+                                          <EmptySpace max="-2" attributes="0"/>
+                                          <Component id="jLabel1" min="-2" max="-2" attributes="0"/>
+                                      </Group>
+                                      <Component id="volumeOverrideCB" min="-2" max="-2" attributes="0"/>
+                                  </Group>
+                              </Group>
                           </Group>
                           <EmptySpace max="-2" attributes="0"/>
                       </Group>
@@ -166,7 +173,12 @@
                   </Group>
                   <EmptySpace max="-2" attributes="0"/>
                   <Component id="volumeOverrideCB" min="-2" max="-2" attributes="0"/>
-                  <EmptySpace pref="16" max="32767" attributes="0"/>
+                  <EmptySpace max="-2" attributes="0"/>
+                  <Group type="103" groupAlignment="3" attributes="0">
+                      <Component id="jLabel1" alignment="3" min="-2" max="-2" attributes="0"/>
+                      <Component id="tempoSpinner" alignment="3" min="-2" max="-2" attributes="0"/>
+                  </Group>
+                  <EmptySpace min="-2" pref="3" max="-2" attributes="0"/>
                   <Group type="103" groupAlignment="3" attributes="0">
                       <Component id="midiInLabel" alignment="3" min="-2" max="-2" attributes="0"/>
                       <Component id="midiInCB" alignment="3" min="-2" max="-2" attributes="0"/>
@@ -176,7 +188,7 @@
                       <Component id="midiOutLabel" alignment="3" min="-2" max="-2" attributes="0"/>
                       <Component id="midiOutCB" alignment="3" min="-2" max="-2" attributes="0"/>
                   </Group>
-                  <EmptySpace max="-2" attributes="0"/>
+                  <EmptySpace pref="25" max="32767" attributes="0"/>
               </Group>
           </Group>
         </DimensionLayout>
@@ -307,6 +319,23 @@
             <AuxValue name="JavaCodeGenerator_TypeParameters" type="java.lang.String" value="&lt;String&gt;"/>
           </AuxValues>
         </Component>
+        <Component class="javax.swing.JLabel" name="jLabel1">
+          <Properties>
+            <Property name="text" type="java.lang.String" value="BPM"/>
+          </Properties>
+        </Component>
+        <Component class="javax.swing.JSpinner" name="tempoSpinner">
+          <Properties>
+            <Property name="model" type="javax.swing.SpinnerModel" editor="org.netbeans.modules.form.editors2.SpinnerModelEditor">
+              <SpinnerModel initial="120.0" maximum="990.0" minimum="1.0" numberType="java.lang.Float" stepSize="1.0" type="number"/>
+            </Property>
+            <Property name="toolTipText" type="java.lang.String" value="Use scrollwheel to manually adjust tempo"/>
+          </Properties>
+          <Events>
+            <EventHandler event="stateChanged" listener="javax.swing.event.ChangeListener" parameters="javax.swing.event.ChangeEvent" handler="tempoSpinnerStateChanged"/>
+            <EventHandler event="mouseWheelMoved" listener="java.awt.event.MouseWheelListener" parameters="java.awt.event.MouseWheelEvent" handler="tempoSpinnerMouseWheelMoved"/>
+          </Events>
+        </Component>
       </SubComponents>
     </Container>
     <Container class="javax.swing.JScrollPane" name="jScrollPane1">