From dac2ae19a427fc64450c129cd7481d145102d463 Mon Sep 17 00:00:00 2001
From: LaShonda Hopper <lashonda@1stplayable.com>
Date: Wed, 8 Nov 2017 12:24:16 -0500
Subject: [PATCH] [Case 6569] Add protection for dynamic vs static collision
 type (details below).

When creating a model, it was possible to elect Exact collision with the dynamic
property even though this combination is prohibited.  This combination would silently
fail rather than notifying the user of the error.

This commit implements safeguards against the invalid combination:
    * If the user elects the Exact collision type and the dynamic field is unchecked, then dynamic field is disabled.
    * If the user elects a different collision type and the dynamic filed is unchecked, then the dynamic field is enabled.
    * If the user has checked the dynamic field and subsequently elects the Exact collision type, then the selection is
      void and the previous collision selection is retained; however, an error dialog is presented informing the user of the error.

Changes Committed:
    modified:   interface/resources/qml/hifi/tablet/NewModelDialog.qml
---
 .../qml/hifi/tablet/NewModelDialog.qml        | 49 ++++++++++++++++---
 1 file changed, 42 insertions(+), 7 deletions(-)

diff --git a/interface/resources/qml/hifi/tablet/NewModelDialog.qml b/interface/resources/qml/hifi/tablet/NewModelDialog.qml
index 47d28486a9..e6459fe7bb 100644
--- a/interface/resources/qml/hifi/tablet/NewModelDialog.qml
+++ b/interface/resources/qml/hifi/tablet/NewModelDialog.qml
@@ -11,8 +11,11 @@
 
 import QtQuick 2.5
 import QtQuick.Controls 1.4
+import QtQuick.Dialogs 1.2 as OriginalDialogs
+
 import "../../styles-uit"
 import "../../controls-uit"
+import "../dialogs"
 
 Rectangle {
     id: newModelDialog
@@ -25,6 +28,15 @@ Rectangle {
     property bool punctuationMode: false
     property bool keyboardRasied: false
 
+    function errorMessageBox(message) {
+        return desktop.messageBox({
+            icon: hifi.icons.warning,
+            defaultButton: OriginalDialogs.StandardButton.Ok,
+            title: "Error",
+            text: message
+        });
+    }
+
     Item {
         id: column1
         anchors.rightMargin: 10
@@ -98,7 +110,6 @@ Rectangle {
                 CheckBox {
                     id: dynamic
                     text: qsTr("Dynamic")
-                    
                 }
 
                 Row {
@@ -139,15 +150,39 @@ Rectangle {
 
                 ComboBox {
                     id: collisionType
+
+                    property int priorIndex: 0
+                    property string staticMeshCollisionText: "Exact - All polygons"
+                    property var collisionArray: ["No Collision",
+                                                  "Basic - Whole model",
+                                                  "Good - Sub-meshes",
+                                                  staticMeshCollisionText, 
+                                                  "Box", 
+                                                  "Sphere"]
+
                     width: 200
                     z: 100
                     transformOrigin: Item.Center
-                    model: ["No Collision",
-                            "Basic - Whole model",
-                            "Good - Sub-meshes",
-                            "Exact - All polygons", 
-                            "Box", 
-                            "Sphere"]
+                    model: collisionArray
+
+                    onCurrentIndexChanged: {
+                        if (collisionArray[currentIndex] === staticMeshCollisionText) {
+                            
+                            if (dynamic.checked) {
+                                currentIndex = priorIndex;
+
+                                errorMessageBox("Models with Automatic Collisions set to \"" + staticMeshCollisionText + "\" cannot be dynamic.");
+                                //--EARLY EXIT--( Can't have a static mesh model that's dynamic )
+                                return;
+                            }
+
+                            dynamic.enabled = false;
+                        } else {
+                            dynamic.enabled = true;
+                        }
+
+                        priorIndex = currentIndex;
+                    }
                 }
 
                 Row {