From 92fc08fa700683d3a10af0031a9e77fa60b1eb40 Mon Sep 17 00:00:00 2001
From: Ryan Huffman <ryanhuffman@gmail.com>
Date: Wed, 7 Jan 2015 12:14:47 -0800
Subject: [PATCH 1/4] Update property list window to only show after selection

---
 examples/editEntities.js | 13 ++++++++++---
 1 file changed, 10 insertions(+), 3 deletions(-)

diff --git a/examples/editEntities.js b/examples/editEntities.js
index 709014bdb8..b65756e9b4 100644
--- a/examples/editEntities.js
+++ b/examples/editEntities.js
@@ -42,7 +42,15 @@ gridTool = GridTool({ horizontalGrid: grid });
 Script.include("libraries/entityList.js");
 var entityListTool = EntityListTool();
 
-selectionManager.addEventListener(selectionDisplay.updateHandles);
+var hasShownPropertiesTool = false;
+
+selectionManager.addEventListener(function() {
+    selectionDisplay.updateHandles();
+    if (selectionManager.hasSelection() && !hasShownPropertiesTool) {
+        propertiesTool.setVisible(true);
+        hasShownPropertiesTool = true;
+    }
+});
 
 var windowDimensions = Controller.getViewportDimensions();
 var toolIconUrl = HIFI_PUBLIC_BUCKET + "images/tools/";
@@ -223,10 +231,9 @@ var toolBar = (function () {
                 selectionManager.clearSelections();
                 cameraManager.disable();
             } else {
+                hasShownPropertiesTool = false;
                 cameraManager.enable();
-                entityListTool.setVisible(true);
                 gridTool.setVisible(true);
-                propertiesTool.setVisible(true);
                 grid.setEnabled(true);
             }
         }

From fbdc50942815a7cae367e47c3c6b8eccd8e1f8b5 Mon Sep 17 00:00:00 2001
From: Ryan Huffman <ryanhuffman@gmail.com>
Date: Wed, 7 Jan 2015 12:15:14 -0800
Subject: [PATCH 2/4] Increase size of url input boxes

---
 examples/html/entityProperties.html | 6 +++---
 examples/html/style.css             | 6 +++++-
 2 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/examples/html/entityProperties.html b/examples/html/entityProperties.html
index 4e22637ad6..a3644d8c3d 100644
--- a/examples/html/entityProperties.html
+++ b/examples/html/entityProperties.html
@@ -618,7 +618,7 @@
         <tr>
             <td class="label">Script URL</td>
             <td>
-                <input id="property-script-url"></input>
+                <input id="property-script-url" class="url"></input>
             </td>
         </tr>
 
@@ -637,13 +637,13 @@
         <tr class="model-section">
             <td class="label">Model URL</td>
             <td>
-                <input type="text" id="property-model-url"></input>
+                <input type="text" id="property-model-url" class="url"></input>
             </td>
         </tr>
         <tr class="model-section">
             <td class="label">Animation URL</td>
             <td>
-                <input type="text" id="property-model-animation-url"></input>
+                <input type="text" id="property-model-animation-url" class="url"></input>
             </td>
         </tr>
         <tr class="model-section">
diff --git a/examples/html/style.css b/examples/html/style.css
index aa23cf97ab..2f43b1c356 100644
--- a/examples/html/style.css
+++ b/examples/html/style.css
@@ -96,6 +96,10 @@ input {
     background-color: #eee;
 }
 
+input.url {
+    width: 100%;
+}
+
 table#entity-table {
     border-collapse: collapse;
     font-family: Sans-Serif;
@@ -171,7 +175,7 @@ table#properties-table {
 }
 
 #properties-table td {
-    padding: 5px 0px 5px 10px;
+    padding: 5px;
 }
 
 col#col-label {

From eafe1ae951c7ad3439d7cd1cfec0820e4a3f27df Mon Sep 17 00:00:00 2001
From: Ryan Huffman <ryanhuffman@gmail.com>
Date: Wed, 7 Jan 2015 12:15:36 -0800
Subject: [PATCH 3/4] Update position of grid-to-avatar to be at the left foot

---
 examples/libraries/gridTool.js | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/examples/libraries/gridTool.js b/examples/libraries/gridTool.js
index f444a67ed1..87b7f907e2 100644
--- a/examples/libraries/gridTool.js
+++ b/examples/libraries/gridTool.js
@@ -439,7 +439,11 @@ GridTool = function(opts) {
             } else if (overlay == uiOverlays.snapToGridCheckbox.overlay) {
                 horizontalGrid.setSnapToGrid(!horizontalGrid.getSnapToGrid());
             } else if (overlay == uiOverlays.moveToAvatar.overlay) {
-                horizontalGrid.setPosition(MyAvatar.position);
+                var position = MyAvatar.getJointPosition("LeftFoot");
+                if (position.x == 0 && position.y == 0 && position.z == 0) {
+                    position = MyAvatar.position;
+                }
+                horizontalGrid.setPosition(position);
             } else if (overlay == uiOverlays.moveToSelection.overlay) {
                 var newPosition = selectionManager.worldPosition;
                 newPosition = Vec3.subtract(newPosition, { x: 0, y: selectionManager.worldDimensions.y * 0.5, z: 0 });

From b471c1fa71338f43376be169a3245aabbe67ed2a Mon Sep 17 00:00:00 2001
From: Ryan Huffman <ryanhuffman@gmail.com>
Date: Wed, 7 Jan 2015 12:15:53 -0800
Subject: [PATCH 4/4] Update hotkey for audio stats

---
 interface/src/Menu.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/interface/src/Menu.cpp b/interface/src/Menu.cpp
index 1399388a60..58c588fbd4 100644
--- a/interface/src/Menu.cpp
+++ b/interface/src/Menu.cpp
@@ -611,7 +611,7 @@ Menu::Menu() :
     
     AudioIOStatsRenderer::SharedPointer statsRenderer = DependencyManager::get<AudioIOStatsRenderer>();
     addCheckableActionToQMenuAndActionHash(audioDebugMenu, MenuOption::AudioStats,
-                                           Qt::CTRL | Qt::Key_A,
+                                           Qt::CTRL | Qt::SHIFT | Qt::Key_A,
                                            false,
                                            statsRenderer.data(),
                                            SLOT(toggle()));