From 07df1ed883288cc3470b84370d5a201bec74a9b4 Mon Sep 17 00:00:00 2001
From: mmcwilliams <hi@mmcwilliams.com>
Date: Wed, 14 Mar 2018 23:17:42 -0400
Subject: [PATCH] All UI update for new mscript features

---
 app/css/app.css    |  8 ++++++++
 app/index.html     | 42 +++++++++++++++++++++++++++---------------
 app/less/app.less  |  9 +++++++++
 app/less/core.less |  2 +-
 app/less/seq.less  |  2 +-
 5 files changed, 46 insertions(+), 17 deletions(-)

diff --git a/app/css/app.css b/app/css/app.css
index a43877c..23724e0 100644
--- a/app/css/app.css
+++ b/app/css/app.css
@@ -837,3 +837,11 @@ button:focus {
 .cp-app .cp-memo {
   bottom: 2px !important;
 }
+.progress {
+  width: 240px;
+  margin: 85px -120px;
+  display: block;
+  position: absolute;
+  left: 50%;
+  top: 50%;
+}
diff --git a/app/index.html b/app/index.html
index 50c9739..0d9e3c3 100644
--- a/app/index.html
+++ b/app/index.html
@@ -49,7 +49,7 @@
           <button id="seq_stop" onclick="seq.stop(true);">STOP</button>
           <button id="seq_clear" onclick="gui.grid.clear();">CLEAR</button>
           <button id="seq_plus24" onclick="gui.grid.plus_24();">+ 24</button>
-          <button id="seq_mscript" onclick="gui.mscript.generate(mcopy.state.sequence.arr);">TO SCRIPT</button>
+          <button id="seq_mscript" onclick="mse.mscript.fromSequence();">TO SCRIPT</button>
           <input id="seq_scroll_state" type="number" min="0" value="00000" />
         </div>
         <div id="seq_stats">
@@ -68,8 +68,9 @@
         <textarea id="editor"></textarea>
         <footer id="console">
         <div id="mscript_cmd">
-          <button id="mscript_compile" onclick="mse.mscript.eval()">EVAL</button>
-          <button id="mscript_seq" onclick="">TO SEQUENCE</button>
+          <button id="mscript_compile" onclick="mse.mscript.compile()">COMPILE</button>
+          <button id="mscript_compile" onclick="mse.mscript.run()">RUN</button>
+          <button id="mscript_seq" onclick="mse.mscript.toSequence();">TO SEQUENCE</button>
         </div>
           <textarea>> </textarea>
         </footer>
@@ -85,6 +86,22 @@
             <input type="number" id="seq_proj_count_2" class="count" value="00000" onchange="gui.counterFormat(this, mcopy.state.projector.pos);" onblur="gui.updateProj(this);" />
           </div>
         </div>
+        <div id="move_to">
+          <div class="cam">
+            <!--<label>MOVE TO</label>-->
+            <div>
+              <input type="number" id="move_cam_to" class="count" value="00000" onchange="gui.counterFormat(this, this.value);" />
+              <button id="move_cam_to_go" onclick="return cmd.cam_to();">GO TO</button>
+            </div>
+          </div>
+          <div class="proj">
+            <!--<label>MOVE TO</label>-->
+            <div>
+              <input type="number" id="move_proj_to" class="count" value="00000" onchange="gui.counterFormat(this, this.value);"/>
+              <button id="move_proj_to_go" onclick="return cmd.proj_to();">GO TO</button>
+            </div>
+          </div>
+        </div>
         <div id="buttons" class="clearfix">
           <div>
             <div>
@@ -104,14 +121,14 @@
             <div>
               <button id="cmd_black_forward" onclick="cmd.black_forward();" class="cmd fwd">
                 <i class="fa fa-times-circle"></i> 
-                BLACK FRAME +1
+                BLANK +1
                 <i class="fa fa-step-forward"></i>
               </button>
             </div>
             <div>
               <button id="cmd_black_backward" onclick="cmd.black_backward();" class="cmd bwd">
                 <i class="fa fa-times-circle"></i> 
-                BLACK FRAME -1
+                BLANK -1
                 <i class="fa fa-step-backward"></i>
               </button>
             </div>
@@ -133,16 +150,6 @@
             </div>
           </div>
         </div>
-        <div id="move_to">
-          <div class="cam">
-            <label>MOVE CAMERA TO</label>
-            <input type="number" id="move_cam_to" class="count" value="00000" onchange="gui.counterFormat(this, this.value);" onblur="cmd.cam_to(this)" />
-          </div>
-          <div class="proj">
-            <label>MOVE PROJECTOR TO</label>
-            <input type="number" id="move_cam_to" class="count" value="00000" onchange="gui.counterFormat(this, this.value);" onblur="cmd.proj_to(this);" />
-          </div>
-        </div>
         <footer>
           <div id="log"></div>
         </footer>
@@ -282,6 +289,11 @@
     <div id="overlay" onclick="gui.overlay(false);gui.spinner(false);"></div>
     <div id="spinner">
       <div id="spinnerMsg"></div>
+      <div id="spinnerProgress" class="progress">
+        <div class="progress-bar" role="progressbar" aria-valuenow="0" aria-valuemin="0" aria-valuemax="100" style="width: 0%;">
+          <span class="sr-only">0% Complete</span>
+        </div>
+      </div>
     </div>
     <script src="./js/app.js"></script>
   </body>
diff --git a/app/less/app.less b/app/less/app.less
index 7953512..fd02392 100644
--- a/app/less/app.less
+++ b/app/less/app.less
@@ -165,4 +165,13 @@
 	.cp-memo{
 		bottom: 2px !important;
 	}
+}
+
+.progress{
+	width: 240px;
+    margin: 85px -120px;
+    display: block;
+    position: absolute;
+    left: 50%;
+    top: 50%;
 }
\ No newline at end of file
diff --git a/app/less/core.less b/app/less/core.less
index 11d5741..7a6f2e3 100644
--- a/app/less/core.less
+++ b/app/less/core.less
@@ -37,4 +37,4 @@ button{
 	    clear: both;
 	    display: table;
 	}
-}
\ No newline at end of file
+}
diff --git a/app/less/seq.less b/app/less/seq.less
index 5ebd494..2b6907a 100644
--- a/app/less/seq.less
+++ b/app/less/seq.less
@@ -164,7 +164,7 @@
 	.monospace();
 	background-color: #272b30;
 	position: absolute;
-	top: 128px;
+	top: 115px;
 	padding-top: 2px;
 	padding-bottom: 15px;
 	width: 54px;