From b236632ce01aa6f60ee13e82d3c211a52e006f88 Mon Sep 17 00:00:00 2001
From: Cameron Gutman <aicommander@gmail.com>
Date: Mon, 9 May 2016 15:41:04 -0400
Subject: [PATCH] Add a progress message with the indeterminate loading bar

---
 connectionlistener.cpp | 2 +-
 index.html             | 4 +++-
 static/css/style.css   | 2 ++
 static/js/index.js     | 1 +
 static/js/messages.js  | 2 ++
 5 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/connectionlistener.cpp b/connectionlistener.cpp
index c003d15..d7f327f 100644
--- a/connectionlistener.cpp
+++ b/connectionlistener.cpp
@@ -6,7 +6,7 @@
 #include "ppapi/cpp/mouse_lock.h"
 
 void MoonlightInstance::ClStageStarting(int stage) {
-    pp::Var response(std::string("Starting ") + std::string(LiGetStageName(stage)) + std::string("..."));
+    pp::Var response(std::string("ProgressMsg: Starting ") + std::string(LiGetStageName(stage)) + std::string("..."));
     g_Instance->PostMessage(response);
 }
 
diff --git a/index.html b/index.html
index bee05ca..f786bd2 100644
--- a/index.html
+++ b/index.html
@@ -67,7 +67,9 @@
 
             <div id="listener"></div> <!-- NaCl module placeholder.  NaCl gets thrown into here -->
 
-            <div id="loadingSpinner" class="mdl-progress mdl-js-progress mdl-progress__indeterminate"></div>
+            <div id="loadingSpinner" class="mdl-progress mdl-js-progress mdl-progress__indeterminate">
+                <h5 id="loadingMessage"></h5>
+            </div>
         </main>
     </div>
     <script defer src="static/js/jquery-2.2.0.min.js"></script>
diff --git a/static/css/style.css b/static/css/style.css
index d2e75d7..fc81a09 100644
--- a/static/css/style.css
+++ b/static/css/style.css
@@ -26,6 +26,8 @@
     bottom: 50%;
     transform: translate(-50%, -50%);
     margin: 0 auto;
+    color: white;
+    text-align: center;
 }
 main {
     padding: 50px 100px;
diff --git a/static/js/index.js b/static/js/index.js
index c0318e9..38eefef 100644
--- a/static/js/index.js
+++ b/static/js/index.js
@@ -293,6 +293,7 @@ function startSelectedGame() {
         var rikey = '00000000000000000000000000000000';
         var rikeyid = 0;
 
+        $('#loadingMessage').text('Starting ' + $("#selectGame option:selected").text() + '...');
         playGameMode();
 
         if(api.currentGame == appID) // if user wants to launch the already-running app, then we resume it.
diff --git a/static/js/messages.js b/static/js/messages.js
index f928cff..b965f9f 100644
--- a/static/js/messages.js
+++ b/static/js/messages.js
@@ -28,6 +28,8 @@ function handleMessage(msg) {
             });
         } else if(msg.data === 'Connection Established') {
             $('#loadingSpinner').css('display', 'none');
+        } else if(msg.data.indexOf('ProgressMsg: ') === 0) {
+            $('#loadingMessage').text(msg.data.replace('ProgressMsg: ', ''));
         }
     }
 }
\ No newline at end of file