Merge branch 'feat/avatarTools/avatarPackager' of github.com:thoys/hifi into feat/avatarTools/avatarPackager

# Conflicts:
#	interface/resources/qml/hifi/avatarPackager/AvatarPackagerHeader.qml
#	interface/resources/qml/hifi/avatarPackager/InfoBox.qml

interface/resources/qml/hifi/avatarPackager/AvatarPackagerApp.qml

@@ -19,6 +19,7 @@ Item {
 
     MouseArea {
         anchors.fill: parent
+
         onClicked: {
             unfocusser.forceActiveFocus();
         }
@@ -352,8 +353,6 @@ Item {
 
                         color: 'white'
 
-                        visible: AvatarPackagerCore.currentAvatarProject !== null
-
                         anchors.top: parent.top
                         anchors.left: parent.left
                         anchors.topMargin: 16

interface/resources/qml/hifi/avatarPackager/AvatarPackagerHeader.qml

@@ -122,7 +122,6 @@ ShadowRectangle {
         anchors.verticalCenter: docs.verticalCenter
 
         text: qsTr("Docs")
-        color: "white"
 
         onClicked: {
             docsButtonClicked();

interface/resources/qml/hifi/avatarPackager/ClickableArea.qml

@@ -0,0 +1,63 @@
+import QtQuick 2.6
+
+import "../../controlsUit" 1.0 as HifiControls
+import "../../stylesUit" 1.0
+
+import TabletScriptingInterface 1.0
+
+Item {
+    id: root
+
+    readonly property bool pressed: mouseArea.state == "pressed"
+    readonly property bool hovered: mouseArea.state == "hovering"
+
+    signal clicked()
+
+    MouseArea {
+        id: mouseArea
+
+        anchors.fill: parent
+
+        hoverEnabled: true
+
+        onClicked: {
+            root.focus = true
+            Tablet.playSound(TabletEnums.ButtonClick);
+            root.clicked();
+        }
+
+        property string lastState: ""
+
+        states: [
+            State {
+                name: ""
+                StateChangeScript {
+                    script: {
+                        mouseArea.lastState = mouseArea.state;
+                    }
+                }
+            },
+            State {
+                name: "pressed"
+                when: mouseArea.containsMouse && mouseArea.pressed
+                StateChangeScript {
+                    script: {
+                        mouseArea.lastState = mouseArea.state;
+                    }
+                }
+            },
+            State {
+                name: "hovering"
+                when: mouseArea.containsMouse
+                StateChangeScript {
+                    script: {
+                        if (mouseArea.lastState == "") {
+                            Tablet.playSound(TabletEnums.ButtonHover);
+                        }
+                        mouseArea.lastState = mouseArea.state;
+                    }
+                }
+            }
+        ]
+    }
+}

interface/resources/qml/hifi/avatarPackager/CreateAvatarProject.qml

@@ -31,6 +31,7 @@ Item {
                     avatarPackager.displayErrorMessage(status);
                     return;
                 }
+                avatarProject.reset();
                 avatarPackager.state = AvatarPackagerState.project;
             }
         }

interface/resources/qml/hifi/avatarPackager/InfoBox.qml

@@ -20,6 +20,12 @@ Rectangle {
     property alias boxWidth: mainContainer.width
     property alias boxHeight: mainContainer.height
 
+    onVisibleChanged: {
+        if (visible) {
+            focus = true;
+        }
+    }
+
     function open() {
         visible = true;
     }

interface/resources/qml/hifi/avatarPackager/RalewayButton.qml

@@ -8,61 +8,21 @@ import TabletScriptingInterface 1.0
 RalewaySemiBold {
     id: root
 
-    text: "no text"
+    anchors.fill: textItem
-
-    signal clicked()
-
-    color: "white"
 
+    property var idleColor: "white"
     property var hoverColor: "#AFAFAF"
     property var pressedColor: "#575757"
 
-    MouseArea {
+    color: clickable.hovered ? root.hoverColor : (clickable.pressed ? root.pressedColor : root.idleColor);
-        id: mouseArea
 
-        anchors.fill: parent
+    signal clicked()
 
-        hoverEnabled: true
+    ClickableArea {
+        id: clickable
 
-        onClicked: {
+        anchors.fill: root
-            Tablet.playSound(TabletEnums.ButtonClick);
-            root.clicked()
-        }
 
-        property string lastState: ""
+        onClicked: root.clicked()
-
-        states: [
-            State {
-                name: ""
-                StateChangeScript {
-                    script: {
-                        mouseArea.lastState = mouseArea.state
-                    }
-                }
-            },
-            State {
-                name: "pressed"
-                when: mouseArea.containsMouse && mouseArea.pressed
-                PropertyChanges { target: root; color: pressedColor }
-                StateChangeScript {
-                    script: {
-                        mouseArea.lastState = mouseArea.state
-                    }
-                }
-            },
-            State {
-                name: "hovering"
-                when: mouseArea.containsMouse
-                PropertyChanges { target: root; color: hoverColor }
-                StateChangeScript {
-                    script: {
-                        if (mouseArea.lastState == "") {
-                            Tablet.playSound(TabletEnums.ButtonHover);
-                        }
-                        mouseArea.lastState = mouseArea.state
-                    }
-                }
-            }
-        ]
     }
 }