From 630922dd95d39a3c6feeb6bf442f917ad847f92e Mon Sep 17 00:00:00 2001
From: Cain Kilgore <cain+git@cainkilgore.com>
Date: Mon, 24 Jul 2017 05:25:52 +0100
Subject: [PATCH 01/12] Dominant Hands Branch Initial Commit

Adds a new option in the Avatar Basics section of the Avatar Settings.

API Accessible Functions:
MyAvatar.getUseAlternativeHand()
MyAvatar.setUseAlternativeHand()

Defaults to false (Right Hand). Will return True if set to Left Hand.
---
 .../qml/controls-uit/RadioButton.qml          |  71 ++++++++++++
 .../preferences/PrimaryHandPreference.qml     | 102 ++++++++++++++++++
 .../qml/dialogs/preferences/Section.qml       |   5 +
 interface/src/avatar/MyAvatar.cpp             |   3 +-
 interface/src/avatar/MyAvatar.h               |   5 +-
 interface/src/ui/PreferencesDialog.cpp        |   6 ++
 libraries/shared/src/Preferences.h            |   9 ++
 7 files changed, 199 insertions(+), 2 deletions(-)
 create mode 100644 interface/resources/qml/controls-uit/RadioButton.qml
 create mode 100644 interface/resources/qml/dialogs/preferences/PrimaryHandPreference.qml

diff --git a/interface/resources/qml/controls-uit/RadioButton.qml b/interface/resources/qml/controls-uit/RadioButton.qml
new file mode 100644
index 0000000000..76b7902435
--- /dev/null
+++ b/interface/resources/qml/controls-uit/RadioButton.qml
@@ -0,0 +1,71 @@
+//
+//  RadioButton.qml
+//
+//  Created by Cain Kilgore on 20th July 2017
+//  Copyright 2017 High Fidelity, Inc.
+//
+//  Distributed under the Apache License, Version 2.0.
+//  See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
+//
+
+import QtQuick 2.5
+import QtQuick.Controls 1.4 as Original
+import QtQuick.Controls.Styles 1.4
+
+import "../styles-uit"
+import "../controls-uit" as HifiControls
+
+Original.RadioButton {
+    id: radioButton
+    HifiConstants { id: hifi }
+
+    property int colorScheme: hifi.colorSchemes.light
+    readonly property bool isLightColorScheme: colorScheme == hifi.colorSchemes.light
+
+    readonly property int boxSize: 14
+    readonly property int boxRadius: 3
+    readonly property int checkSize: 10
+    readonly property int checkRadius: 2
+
+    style: RadioButtonStyle {
+        indicator: Rectangle {
+            id: box
+            width: boxSize
+            height: boxSize
+            radius: boxRadius
+            gradient: Gradient {
+                GradientStop {
+                    position: 0.2
+                    color: pressed || hovered
+                           ? (radioButton.isLightColorScheme ? hifi.colors.checkboxDarkStart : hifi.colors.checkboxLightStart)
+                           : (radioButton.isLightColorScheme ? hifi.colors.checkboxLightStart : hifi.colors.checkboxDarkStart)
+                }
+                GradientStop {
+                    position: 1.0
+                    color: pressed || hovered
+                           ? (radioButton.isLightColorScheme ? hifi.colors.checkboxDarkFinish : hifi.colors.checkboxLightFinish)
+                           : (radioButton.isLightColorScheme ? hifi.colors.checkboxLightFinish : hifi.colors.checkboxDarkFinish)
+                }
+            }
+
+            Rectangle {
+                id: check
+                width: checkSize
+                height: checkSize
+                radius: checkRadius
+                anchors.centerIn: parent
+                color: hifi.colors.checkBoxChecked
+                border.width: 1
+                border.color: hifi.colors.checkBoxCheckedBorder
+                visible: checked && !pressed || !checked && pressed
+            }
+        }
+
+        label: RalewaySemiBold {
+            text: control.text
+            size: hifi.fontSizes.inputLabel
+            color: isLightColorScheme ? hifi.colors.lightGray : hifi.colors.lightGrayText
+            x: radioButton.boxSize / 2
+        }
+    }
+}
diff --git a/interface/resources/qml/dialogs/preferences/PrimaryHandPreference.qml b/interface/resources/qml/dialogs/preferences/PrimaryHandPreference.qml
new file mode 100644
index 0000000000..74044ea27d
--- /dev/null
+++ b/interface/resources/qml/dialogs/preferences/PrimaryHandPreference.qml
@@ -0,0 +1,102 @@
+//
+//  PrimaryHandPreference.qml
+//
+//  Created by Cain Kilgore on 20th July 2017
+//  Copyright 2017 High Fidelity, Inc.
+//
+//  Distributed under the Apache License, Version 2.0.
+//  See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
+//
+
+import QtQuick 2.5
+
+import "../../controls-uit"
+
+Preference {
+    id: root
+    property alias box1: box1
+    property alias box2: box2
+    
+    height: control.height + hifi.dimensions.controlInterlineHeight
+
+    Component.onCompleted: {
+        if(preference.value) {
+            box1.checked = true;
+        } else {
+            box2.checked = true;
+        }
+    }
+
+    function save() {
+		// Box1 = True, Box2 = False (Right Hand for Default)
+		if(box1.checked && !box2.checked) {
+			preference.value = true;
+		}
+		if(!box1.checked && box2.checked) {
+			preference.value = false;
+		}
+        preference.save();
+    }
+
+    Item {
+        id: control
+        anchors {
+            left: parent.left
+            right: parent.right
+            bottom: parent.bottom
+        }
+        height: Math.max(labelName.height, box1.height, box2.height)
+
+        Label {
+            id: labelName
+            text: root.label + ":"
+            colorScheme: hifi.colorSchemes.dark
+            anchors {
+                left: parent.left
+                right: box1.left
+                rightMargin: hifi.dimensions.labelPadding
+                verticalCenter: parent.verticalCenter
+            }
+            horizontalAlignment: Text.AlignRight
+            wrapMode: Text.Wrap
+        }
+
+        RadioButton {
+            id: box1
+            text: "Left"
+            width: 60
+            anchors {
+                right: box2.left
+                verticalCenter: parent.verticalCenter
+            }
+            onClicked: {
+                if(box2.checked) {
+                    box2.checked = false;
+                }
+                if(!box1.checked && !box2.checked) {
+                    box2.checked = true;
+                }
+            }
+            colorScheme: hifi.colorSchemes.dark
+        }
+        
+        RadioButton {
+            id: box2
+            text: "Right"
+            width: 60
+            anchors {
+                right: parent.right
+                verticalCenter: parent.verticalCenter
+            }
+            onClicked: {
+                if(box1.checked) {
+                    box1.checked = false;
+                }
+                if(!box1.checked && !box2.checked) {
+                    box2.checked = true;
+                }
+            }
+            colorScheme: hifi.colorSchemes.dark
+        }
+    }
+}
diff --git a/interface/resources/qml/dialogs/preferences/Section.qml b/interface/resources/qml/dialogs/preferences/Section.qml
index 3985c7d6f6..af2e58c875 100644
--- a/interface/resources/qml/dialogs/preferences/Section.qml
+++ b/interface/resources/qml/dialogs/preferences/Section.qml
@@ -73,6 +73,7 @@ Preference {
         property var buttonBuilder: Component { ButtonPreference { } }
         property var comboBoxBuilder: Component { ComboBoxPreference { } }
         property var spinnerSliderBuilder: Component { SpinnerSliderPreference { } }
+		property var primaryHandBuilder: Component { PrimaryHandPreference { } }
         property var preferences: []
         property int checkBoxCount: 0
 
@@ -134,6 +135,10 @@ Preference {
                     checkBoxCount = 0;
                     builder = spinnerSliderBuilder;
                     break;
+                case Preference.PrimaryHand:
+                    checkBoxCount++;
+                    builder = primaryHandBuilder;
+                    break;
             };
 
             if (builder) {
diff --git a/interface/src/avatar/MyAvatar.cpp b/interface/src/avatar/MyAvatar.cpp
index f9a4d491c8..0a3d9f4c74 100755
--- a/interface/src/avatar/MyAvatar.cpp
+++ b/interface/src/avatar/MyAvatar.cpp
@@ -926,6 +926,7 @@ void MyAvatar::saveData() {
     Settings settings;
     settings.beginGroup("Avatar");
 
+    settings.setValue("useAlternativeHand", _useAlternativeHand);
     settings.setValue("headPitch", getHead()->getBasePitch());
 
     settings.setValue("scale", _targetScale);
@@ -1122,7 +1123,7 @@ void MyAvatar::loadData() {
     setCollisionSoundURL(settings.value("collisionSoundURL", DEFAULT_AVATAR_COLLISION_SOUND_URL).toString());
     setSnapTurn(settings.value("useSnapTurn", _useSnapTurn).toBool());
     setClearOverlayWhenMoving(settings.value("clearOverlayWhenMoving", _clearOverlayWhenMoving).toBool());
-
+    setUseAlternativeHand(settings.value("useAlternativeHand", _useAlternativeHand).toBool());
     settings.endGroup();
 
     setEnableMeshVisible(Menu::getInstance()->isOptionChecked(MenuOption::MeshVisible));
diff --git a/interface/src/avatar/MyAvatar.h b/interface/src/avatar/MyAvatar.h
index 648a5b5f29..8ff616b36b 100644
--- a/interface/src/avatar/MyAvatar.h
+++ b/interface/src/avatar/MyAvatar.h
@@ -339,6 +339,9 @@ public:
     Q_INVOKABLE bool getClearOverlayWhenMoving() const { return _clearOverlayWhenMoving; }
     Q_INVOKABLE void setClearOverlayWhenMoving(bool on) { _clearOverlayWhenMoving = on; }
 
+    Q_INVOKABLE void setUseAlternativeHand(bool hand) { _useAlternativeHand = hand; }
+    Q_INVOKABLE bool getUseAlternativeHand() const { return _useAlternativeHand; }
+
     Q_INVOKABLE void setHMDLeanRecenterEnabled(bool value) { _hmdLeanRecenterEnabled = value; }
     Q_INVOKABLE bool getHMDLeanRecenterEnabled() const { return _hmdLeanRecenterEnabled; }
 
@@ -424,7 +427,6 @@ public:
     Q_INVOKABLE QString getFullAvatarModelName() const { return _fullAvatarModelName; }
     void resetFullAvatarURL();
 
-
     virtual void setAttachmentData(const QVector<AttachmentData>& attachmentData) override;
 
     MyCharacterController* getCharacterController() { return &_characterController; }
@@ -720,6 +722,7 @@ private:
     QUrl _fstAnimGraphOverrideUrl;
     bool _useSnapTurn { true };
     bool _clearOverlayWhenMoving { true };
+    bool _useAlternativeHand{ false }; // False defaults to right hand, true to left
 
     const float ROLL_CONTROL_DEAD_ZONE_DEFAULT = 8.0f; // deg
     const float ROLL_CONTROL_RATE_DEFAULT = 2.5f; // deg/sec/deg
diff --git a/interface/src/ui/PreferencesDialog.cpp b/interface/src/ui/PreferencesDialog.cpp
index 87131e4f5c..b962b456af 100644
--- a/interface/src/ui/PreferencesDialog.cpp
+++ b/interface/src/ui/PreferencesDialog.cpp
@@ -67,6 +67,12 @@ void setupPreferences() {
         auto setter = [=](bool value) { myAvatar->setClearOverlayWhenMoving(value); };
         preferences->addPreference(new CheckPreference(AVATAR_BASICS, "Clear overlays when moving", getter, setter));
     }
+    {
+        auto getter = [=]()->bool { return myAvatar->getUseAlternativeHand(); };
+        auto setter = [=](bool value) { myAvatar->setUseAlternativeHand(value); };
+        preferences->addPreference(new PrimaryHandPreference(AVATAR_BASICS, "Dominant Hand", getter, setter));
+        
+    }
 
     // UI
     static const QString UI_CATEGORY { "UI" };
diff --git a/libraries/shared/src/Preferences.h b/libraries/shared/src/Preferences.h
index 6093cd3c8a..73cce1e909 100644
--- a/libraries/shared/src/Preferences.h
+++ b/libraries/shared/src/Preferences.h
@@ -56,6 +56,7 @@ public:
         Checkbox,
         Button,
         ComboBox,
+        PrimaryHand,
         // Special casing for an unusual preference
         Avatar
     };
@@ -339,6 +340,14 @@ public:
     Type getType() override { return Checkbox; }
 };
 
+class PrimaryHandPreference : public BoolPreference {
+    Q_OBJECT
+public:
+    PrimaryHandPreference(const QString& category, const QString& name, Getter getter, Setter setter)
+        : BoolPreference(category, name, getter, setter) { }
+    Type getType() override { return PrimaryHand; }
+};
+
 #endif
 
 

From a4cf27402dcf541374c1b13d3e938517b3740b75 Mon Sep 17 00:00:00 2001
From: Cain Kilgore <cain+git@cainkilgore.com>
Date: Mon, 24 Jul 2017 06:27:14 +0100
Subject: [PATCH 02/12] Tabs and Cleanup of Code

---
 .../preferences/PrimaryHandPreference.qml     | 20 +++++++++----------
 .../qml/dialogs/preferences/Section.qml       |  3 ++-
 interface/src/ui/PreferencesDialog.cpp        |  1 -
 3 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/interface/resources/qml/dialogs/preferences/PrimaryHandPreference.qml b/interface/resources/qml/dialogs/preferences/PrimaryHandPreference.qml
index 74044ea27d..af9999ae7a 100644
--- a/interface/resources/qml/dialogs/preferences/PrimaryHandPreference.qml
+++ b/interface/resources/qml/dialogs/preferences/PrimaryHandPreference.qml
@@ -20,7 +20,7 @@ Preference {
     height: control.height + hifi.dimensions.controlInterlineHeight
 
     Component.onCompleted: {
-        if(preference.value) {
+        if (preference.value) {
             box1.checked = true;
         } else {
             box2.checked = true;
@@ -28,13 +28,13 @@ Preference {
     }
 
     function save() {
-		// Box1 = True, Box2 = False (Right Hand for Default)
-		if(box1.checked && !box2.checked) {
-			preference.value = true;
-		}
-		if(!box1.checked && box2.checked) {
-			preference.value = false;
-		}
+        // Box1 = True, Box2 = False (Right Hand for Default)
+        if (box1.checked && !box2.checked) {
+            preference.value = true;
+        }
+        if (!box1.checked && box2.checked) {
+            preference.value = false;
+        }
         preference.save();
     }
 
@@ -70,10 +70,10 @@ Preference {
                 verticalCenter: parent.verticalCenter
             }
             onClicked: {
-                if(box2.checked) {
+                if (box2.checked) {
                     box2.checked = false;
                 }
-                if(!box1.checked && !box2.checked) {
+                if (!box1.checked && !box2.checked) {
                     box2.checked = true;
                 }
             }
diff --git a/interface/resources/qml/dialogs/preferences/Section.qml b/interface/resources/qml/dialogs/preferences/Section.qml
index af2e58c875..4a16036a69 100644
--- a/interface/resources/qml/dialogs/preferences/Section.qml
+++ b/interface/resources/qml/dialogs/preferences/Section.qml
@@ -73,7 +73,7 @@ Preference {
         property var buttonBuilder: Component { ButtonPreference { } }
         property var comboBoxBuilder: Component { ComboBoxPreference { } }
         property var spinnerSliderBuilder: Component { SpinnerSliderPreference { } }
-		property var primaryHandBuilder: Component { PrimaryHandPreference { } }
+        property var primaryHandBuilder: Component { PrimaryHandPreference { } }
         property var preferences: []
         property int checkBoxCount: 0
 
@@ -135,6 +135,7 @@ Preference {
                     checkBoxCount = 0;
                     builder = spinnerSliderBuilder;
                     break;
+                    
                 case Preference.PrimaryHand:
                     checkBoxCount++;
                     builder = primaryHandBuilder;
diff --git a/interface/src/ui/PreferencesDialog.cpp b/interface/src/ui/PreferencesDialog.cpp
index b962b456af..fe1663b98d 100644
--- a/interface/src/ui/PreferencesDialog.cpp
+++ b/interface/src/ui/PreferencesDialog.cpp
@@ -71,7 +71,6 @@ void setupPreferences() {
         auto getter = [=]()->bool { return myAvatar->getUseAlternativeHand(); };
         auto setter = [=](bool value) { myAvatar->setUseAlternativeHand(value); };
         preferences->addPreference(new PrimaryHandPreference(AVATAR_BASICS, "Dominant Hand", getter, setter));
-        
     }
 
     // UI

From 42742ba1f9fda98db0fd11281a5b68b5a471fa09 Mon Sep 17 00:00:00 2001
From: Cain Kilgore <cain+git@cainkilgore.com>
Date: Mon, 24 Jul 2017 18:31:16 +0100
Subject: [PATCH 03/12] Changed the Return to a String "left/right" instead.

---
 .../qml/dialogs/preferences/PrimaryHandPreference.qml |  6 +++---
 interface/src/avatar/MyAvatar.cpp                     |  4 ++--
 interface/src/avatar/MyAvatar.h                       | 11 ++++++++---
 interface/src/ui/PreferencesDialog.cpp                |  4 ++--
 libraries/shared/src/Preferences.h                    |  4 ++--
 5 files changed, 17 insertions(+), 12 deletions(-)

diff --git a/interface/resources/qml/dialogs/preferences/PrimaryHandPreference.qml b/interface/resources/qml/dialogs/preferences/PrimaryHandPreference.qml
index af9999ae7a..c89756f678 100644
--- a/interface/resources/qml/dialogs/preferences/PrimaryHandPreference.qml
+++ b/interface/resources/qml/dialogs/preferences/PrimaryHandPreference.qml
@@ -20,7 +20,7 @@ Preference {
     height: control.height + hifi.dimensions.controlInterlineHeight
 
     Component.onCompleted: {
-        if (preference.value) {
+        if (preference.value == "left") {
             box1.checked = true;
         } else {
             box2.checked = true;
@@ -30,10 +30,10 @@ Preference {
     function save() {
         // Box1 = True, Box2 = False (Right Hand for Default)
         if (box1.checked && !box2.checked) {
-            preference.value = true;
+            preference.value = "left";
         }
         if (!box1.checked && box2.checked) {
-            preference.value = false;
+            preference.value = "right";
         }
         preference.save();
     }
diff --git a/interface/src/avatar/MyAvatar.cpp b/interface/src/avatar/MyAvatar.cpp
index 0a3d9f4c74..9b42310c3c 100755
--- a/interface/src/avatar/MyAvatar.cpp
+++ b/interface/src/avatar/MyAvatar.cpp
@@ -926,7 +926,7 @@ void MyAvatar::saveData() {
     Settings settings;
     settings.beginGroup("Avatar");
 
-    settings.setValue("useAlternativeHand", _useAlternativeHand);
+    settings.setValue("dominantHand", _dominantHand);
     settings.setValue("headPitch", getHead()->getBasePitch());
 
     settings.setValue("scale", _targetScale);
@@ -1123,7 +1123,7 @@ void MyAvatar::loadData() {
     setCollisionSoundURL(settings.value("collisionSoundURL", DEFAULT_AVATAR_COLLISION_SOUND_URL).toString());
     setSnapTurn(settings.value("useSnapTurn", _useSnapTurn).toBool());
     setClearOverlayWhenMoving(settings.value("clearOverlayWhenMoving", _clearOverlayWhenMoving).toBool());
-    setUseAlternativeHand(settings.value("useAlternativeHand", _useAlternativeHand).toBool());
+    setDominantHand(settings.value("dominantHand", _dominantHand).toString().toLower());
     settings.endGroup();
 
     setEnableMeshVisible(Menu::getInstance()->isOptionChecked(MenuOption::MeshVisible));
diff --git a/interface/src/avatar/MyAvatar.h b/interface/src/avatar/MyAvatar.h
index 8ff616b36b..05af26416c 100644
--- a/interface/src/avatar/MyAvatar.h
+++ b/interface/src/avatar/MyAvatar.h
@@ -339,8 +339,13 @@ public:
     Q_INVOKABLE bool getClearOverlayWhenMoving() const { return _clearOverlayWhenMoving; }
     Q_INVOKABLE void setClearOverlayWhenMoving(bool on) { _clearOverlayWhenMoving = on; }
 
-    Q_INVOKABLE void setUseAlternativeHand(bool hand) { _useAlternativeHand = hand; }
-    Q_INVOKABLE bool getUseAlternativeHand() const { return _useAlternativeHand; }
+    Q_INVOKABLE void setDominantHand(const QString& hand) {
+        if (hand == "left" || hand == "right") {
+            _dominantHand = hand;
+        }
+    }
+
+    Q_INVOKABLE QString getDominantHand() const { return _dominantHand; }
 
     Q_INVOKABLE void setHMDLeanRecenterEnabled(bool value) { _hmdLeanRecenterEnabled = value; }
     Q_INVOKABLE bool getHMDLeanRecenterEnabled() const { return _hmdLeanRecenterEnabled; }
@@ -722,7 +727,7 @@ private:
     QUrl _fstAnimGraphOverrideUrl;
     bool _useSnapTurn { true };
     bool _clearOverlayWhenMoving { true };
-    bool _useAlternativeHand{ false }; // False defaults to right hand, true to left
+    QString _dominantHand{ "right" };
 
     const float ROLL_CONTROL_DEAD_ZONE_DEFAULT = 8.0f; // deg
     const float ROLL_CONTROL_RATE_DEFAULT = 2.5f; // deg/sec/deg
diff --git a/interface/src/ui/PreferencesDialog.cpp b/interface/src/ui/PreferencesDialog.cpp
index fe1663b98d..fd0847c945 100644
--- a/interface/src/ui/PreferencesDialog.cpp
+++ b/interface/src/ui/PreferencesDialog.cpp
@@ -68,8 +68,8 @@ void setupPreferences() {
         preferences->addPreference(new CheckPreference(AVATAR_BASICS, "Clear overlays when moving", getter, setter));
     }
     {
-        auto getter = [=]()->bool { return myAvatar->getUseAlternativeHand(); };
-        auto setter = [=](bool value) { myAvatar->setUseAlternativeHand(value); };
+        auto getter = [=]()->QString { return myAvatar->getDominantHand(); };
+        auto setter = [=](const QString& value) { myAvatar->setDominantHand(value); };
         preferences->addPreference(new PrimaryHandPreference(AVATAR_BASICS, "Dominant Hand", getter, setter));
     }
 
diff --git a/libraries/shared/src/Preferences.h b/libraries/shared/src/Preferences.h
index 73cce1e909..6fa2cb9b1f 100644
--- a/libraries/shared/src/Preferences.h
+++ b/libraries/shared/src/Preferences.h
@@ -340,11 +340,11 @@ public:
     Type getType() override { return Checkbox; }
 };
 
-class PrimaryHandPreference : public BoolPreference {
+class PrimaryHandPreference : public StringPreference {
     Q_OBJECT
 public:
     PrimaryHandPreference(const QString& category, const QString& name, Getter getter, Setter setter)
-        : BoolPreference(category, name, getter, setter) { }
+        : StringPreference(category, name, getter, setter) { }
     Type getType() override { return PrimaryHand; }
 };
 

From e6fd85f45ac4e748d54af6dbf749668e4c9b3a21 Mon Sep 17 00:00:00 2001
From: Cain Kilgore <cain+git@cainkilgore.com>
Date: Mon, 24 Jul 2017 19:02:40 +0100
Subject: [PATCH 04/12] Some code cleanup

---
 .../dialogs/preferences/PrimaryHandPreference.qml    |  4 ++--
 interface/src/avatar/MyAvatar.cpp                    | 12 ++++++++++++
 interface/src/avatar/MyAvatar.h                      | 12 +++++++-----
 3 files changed, 21 insertions(+), 7 deletions(-)

diff --git a/interface/resources/qml/dialogs/preferences/PrimaryHandPreference.qml b/interface/resources/qml/dialogs/preferences/PrimaryHandPreference.qml
index c89756f678..d230f7e0da 100644
--- a/interface/resources/qml/dialogs/preferences/PrimaryHandPreference.qml
+++ b/interface/resources/qml/dialogs/preferences/PrimaryHandPreference.qml
@@ -89,10 +89,10 @@ Preference {
                 verticalCenter: parent.verticalCenter
             }
             onClicked: {
-                if(box1.checked) {
+                if (box1.checked) {
                     box1.checked = false;
                 }
-                if(!box1.checked && !box2.checked) {
+                if (!box1.checked && !box2.checked) {
                     box2.checked = true;
                 }
             }
diff --git a/interface/src/avatar/MyAvatar.cpp b/interface/src/avatar/MyAvatar.cpp
index 9b42310c3c..90870f83c2 100755
--- a/interface/src/avatar/MyAvatar.cpp
+++ b/interface/src/avatar/MyAvatar.cpp
@@ -72,6 +72,9 @@ const float MIN_AVATAR_SPEED_SQUARED = MIN_AVATAR_SPEED * MIN_AVATAR_SPEED; // s
 const float YAW_SPEED_DEFAULT = 120.0f;   // degrees/sec
 const float PITCH_SPEED_DEFAULT = 90.0f; // degrees/sec
 
+const QString DOMINANT_HAND_LEFT = "left";
+const QString DOMINANT_HAND_RIGHT = "right";
+
 // TODO: normalize avatar speed for standard avatar size, then scale all motion logic
 // to properly follow avatar size.
 float MAX_AVATAR_SPEED = 30.0f;
@@ -87,6 +90,9 @@ const float MyAvatar::ZOOM_MIN = 0.5f;
 const float MyAvatar::ZOOM_MAX = 25.0f;
 const float MyAvatar::ZOOM_DEFAULT = 1.5f;
 
+const QString& DOMINANT_LEFT_HAND = "left";
+const QString& DOMINANT_RIGHT_HAND = "right";
+
 // default values, used when avatar is missing joints... (avatar space)
 static const glm::quat DEFAULT_AVATAR_MIDDLE_EYE_ROT { Quaternions::Y_180 };
 static const glm::vec3 DEFAULT_AVATAR_MIDDLE_EYE_POS { 0.0f, 0.6f, 0.0f };
@@ -255,6 +261,12 @@ MyAvatar::~MyAvatar() {
     _lookAtTargetAvatar.reset();
 }
 
+void MyAvatar::setDominantHand(const QString& hand) {
+    if (hand == DOMINANT_HAND_LEFT || hand == DOMINANT_HAND_RIGHT) {
+        _dominantHand = hand;
+    }
+}
+
 void MyAvatar::registerMetaTypes(QScriptEngine* engine) {
     QScriptValue value = engine->newQObject(this, QScriptEngine::QtOwnership, QScriptEngine::ExcludeDeleteLater | QScriptEngine::ExcludeChildObjects);
     engine->globalObject().setProperty("MyAvatar", value);
diff --git a/interface/src/avatar/MyAvatar.h b/interface/src/avatar/MyAvatar.h
index 05af26416c..0f4d2c7464 100644
--- a/interface/src/avatar/MyAvatar.h
+++ b/interface/src/avatar/MyAvatar.h
@@ -43,6 +43,12 @@ enum AudioListenerMode {
     FROM_CAMERA,
     CUSTOM
 };
+
+enum DominantHand {
+    LEFT_HAND,
+    RIGHT_HAND
+};
+
 Q_DECLARE_METATYPE(AudioListenerMode);
 
 class MyAvatar : public Avatar {
@@ -339,11 +345,7 @@ public:
     Q_INVOKABLE bool getClearOverlayWhenMoving() const { return _clearOverlayWhenMoving; }
     Q_INVOKABLE void setClearOverlayWhenMoving(bool on) { _clearOverlayWhenMoving = on; }
 
-    Q_INVOKABLE void setDominantHand(const QString& hand) {
-        if (hand == "left" || hand == "right") {
-            _dominantHand = hand;
-        }
-    }
+    Q_INVOKABLE void setDominantHand(const QString& hand);
 
     Q_INVOKABLE QString getDominantHand() const { return _dominantHand; }
 

From fd2264f7c92d170b4ce34714e01e2d922e3f629a Mon Sep 17 00:00:00 2001
From: Cain Kilgore <cain+git@cainkilgore.com>
Date: Mon, 24 Jul 2017 19:05:49 +0100
Subject: [PATCH 05/12] removed duplicate

---
 interface/src/avatar/MyAvatar.cpp | 3 ---
 interface/src/avatar/MyAvatar.h   | 5 -----
 2 files changed, 8 deletions(-)

diff --git a/interface/src/avatar/MyAvatar.cpp b/interface/src/avatar/MyAvatar.cpp
index 90870f83c2..a0086723ae 100755
--- a/interface/src/avatar/MyAvatar.cpp
+++ b/interface/src/avatar/MyAvatar.cpp
@@ -72,9 +72,6 @@ const float MIN_AVATAR_SPEED_SQUARED = MIN_AVATAR_SPEED * MIN_AVATAR_SPEED; // s
 const float YAW_SPEED_DEFAULT = 120.0f;   // degrees/sec
 const float PITCH_SPEED_DEFAULT = 90.0f; // degrees/sec
 
-const QString DOMINANT_HAND_LEFT = "left";
-const QString DOMINANT_HAND_RIGHT = "right";
-
 // TODO: normalize avatar speed for standard avatar size, then scale all motion logic
 // to properly follow avatar size.
 float MAX_AVATAR_SPEED = 30.0f;
diff --git a/interface/src/avatar/MyAvatar.h b/interface/src/avatar/MyAvatar.h
index 0f4d2c7464..1239989c05 100644
--- a/interface/src/avatar/MyAvatar.h
+++ b/interface/src/avatar/MyAvatar.h
@@ -44,11 +44,6 @@ enum AudioListenerMode {
     CUSTOM
 };
 
-enum DominantHand {
-    LEFT_HAND,
-    RIGHT_HAND
-};
-
 Q_DECLARE_METATYPE(AudioListenerMode);
 
 class MyAvatar : public Avatar {

From 64ba159adf325f5a00fc71b7e87d97242a34ce7a Mon Sep 17 00:00:00 2001
From: Cain Kilgore <cain+git@cainkilgore.com>
Date: Mon, 24 Jul 2017 19:12:14 +0100
Subject: [PATCH 06/12] Updating Small Reference

---
 interface/src/avatar/MyAvatar.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/interface/src/avatar/MyAvatar.h b/interface/src/avatar/MyAvatar.h
index 1239989c05..dc306bd09a 100644
--- a/interface/src/avatar/MyAvatar.h
+++ b/interface/src/avatar/MyAvatar.h
@@ -724,7 +724,7 @@ private:
     QUrl _fstAnimGraphOverrideUrl;
     bool _useSnapTurn { true };
     bool _clearOverlayWhenMoving { true };
-    QString _dominantHand{ "right" };
+    QString _dominantHand{ DOMINANT_RIGHT_HAND };
 
     const float ROLL_CONTROL_DEAD_ZONE_DEFAULT = 8.0f; // deg
     const float ROLL_CONTROL_RATE_DEFAULT = 2.5f; // deg/sec/deg

From 9ff7891c880e94f593eba9db9d468c68fe188928 Mon Sep 17 00:00:00 2001
From: Cain Kilgore <cain+git@cainkilgore.com>
Date: Mon, 24 Jul 2017 19:56:02 +0100
Subject: [PATCH 07/12] Fixed reference error, Gustavo should build now.

---
 interface/src/avatar/MyAvatar.cpp | 5 +----
 interface/src/avatar/MyAvatar.h   | 6 ++++--
 2 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/interface/src/avatar/MyAvatar.cpp b/interface/src/avatar/MyAvatar.cpp
index a0086723ae..081ab8e8f1 100755
--- a/interface/src/avatar/MyAvatar.cpp
+++ b/interface/src/avatar/MyAvatar.cpp
@@ -87,9 +87,6 @@ const float MyAvatar::ZOOM_MIN = 0.5f;
 const float MyAvatar::ZOOM_MAX = 25.0f;
 const float MyAvatar::ZOOM_DEFAULT = 1.5f;
 
-const QString& DOMINANT_LEFT_HAND = "left";
-const QString& DOMINANT_RIGHT_HAND = "right";
-
 // default values, used when avatar is missing joints... (avatar space)
 static const glm::quat DEFAULT_AVATAR_MIDDLE_EYE_ROT { Quaternions::Y_180 };
 static const glm::vec3 DEFAULT_AVATAR_MIDDLE_EYE_POS { 0.0f, 0.6f, 0.0f };
@@ -259,7 +256,7 @@ MyAvatar::~MyAvatar() {
 }
 
 void MyAvatar::setDominantHand(const QString& hand) {
-    if (hand == DOMINANT_HAND_LEFT || hand == DOMINANT_HAND_RIGHT) {
+    if (hand == DOMINANT_LEFT_HAND || hand == DOMINANT_RIGHT_HAND) {
         _dominantHand = hand;
     }
 }
diff --git a/interface/src/avatar/MyAvatar.h b/interface/src/avatar/MyAvatar.h
index dc306bd09a..1657f78b26 100644
--- a/interface/src/avatar/MyAvatar.h
+++ b/interface/src/avatar/MyAvatar.h
@@ -142,6 +142,9 @@ class MyAvatar : public Avatar {
     Q_PROPERTY(float hmdRollControlDeadZone READ getHMDRollControlDeadZone WRITE setHMDRollControlDeadZone)
     Q_PROPERTY(float hmdRollControlRate READ getHMDRollControlRate WRITE setHMDRollControlRate)
 
+    const QString DOMINANT_LEFT_HAND = "left";
+    const QString DOMINANT_RIGHT_HAND = "right";
+
 public:
     enum DriveKeys {
         TRANSLATE_X = 0,
@@ -341,7 +344,6 @@ public:
     Q_INVOKABLE void setClearOverlayWhenMoving(bool on) { _clearOverlayWhenMoving = on; }
 
     Q_INVOKABLE void setDominantHand(const QString& hand);
-
     Q_INVOKABLE QString getDominantHand() const { return _dominantHand; }
 
     Q_INVOKABLE void setHMDLeanRecenterEnabled(bool value) { _hmdLeanRecenterEnabled = value; }
@@ -724,7 +726,7 @@ private:
     QUrl _fstAnimGraphOverrideUrl;
     bool _useSnapTurn { true };
     bool _clearOverlayWhenMoving { true };
-    QString _dominantHand{ DOMINANT_RIGHT_HAND };
+    QString _dominantHand { DOMINANT_RIGHT_HAND };
 
     const float ROLL_CONTROL_DEAD_ZONE_DEFAULT = 8.0f; // deg
     const float ROLL_CONTROL_RATE_DEFAULT = 2.5f; // deg/sec/deg

From 9c152ddc6f7d0c86c88b8423a8ee64f295351a29 Mon Sep 17 00:00:00 2001
From: Cain Kilgore <cain+git@cainkilgore.com>
Date: Mon, 24 Jul 2017 22:30:43 +0100
Subject: [PATCH 08/12] Ticking left will keep it on left, not right

---
 .../resources/qml/dialogs/preferences/PrimaryHandPreference.qml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/interface/resources/qml/dialogs/preferences/PrimaryHandPreference.qml b/interface/resources/qml/dialogs/preferences/PrimaryHandPreference.qml
index d230f7e0da..07b9c958dd 100644
--- a/interface/resources/qml/dialogs/preferences/PrimaryHandPreference.qml
+++ b/interface/resources/qml/dialogs/preferences/PrimaryHandPreference.qml
@@ -74,7 +74,7 @@ Preference {
                     box2.checked = false;
                 }
                 if (!box1.checked && !box2.checked) {
-                    box2.checked = true;
+                    box1.checked = true;
                 }
             }
             colorScheme: hifi.colorSchemes.dark

From 84609f27e36e161d4fb36039823396ec659e5fdf Mon Sep 17 00:00:00 2001
From: Cain Kilgore <cain+git@cainkilgore.com>
Date: Mon, 24 Jul 2017 23:53:03 +0100
Subject: [PATCH 09/12] Final Change - They're now Radio Boxes.

---
 interface/resources/qml/controls-uit/RadioButton.qml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/interface/resources/qml/controls-uit/RadioButton.qml b/interface/resources/qml/controls-uit/RadioButton.qml
index 76b7902435..3cc3db4e46 100644
--- a/interface/resources/qml/controls-uit/RadioButton.qml
+++ b/interface/resources/qml/controls-uit/RadioButton.qml
@@ -32,7 +32,7 @@ Original.RadioButton {
             id: box
             width: boxSize
             height: boxSize
-            radius: boxRadius
+            radius: 7
             gradient: Gradient {
                 GradientStop {
                     position: 0.2
@@ -52,7 +52,7 @@ Original.RadioButton {
                 id: check
                 width: checkSize
                 height: checkSize
-                radius: checkRadius
+                radius: 7
                 anchors.centerIn: parent
                 color: hifi.colors.checkBoxChecked
                 border.width: 1

From 280a7a7e42e5dabf8c6b284bcce4595c660ccd5d Mon Sep 17 00:00:00 2001
From: Cain Kilgore <cain+git@cainkilgore.com>
Date: Tue, 25 Jul 2017 01:48:55 +0100
Subject: [PATCH 10/12] Fixing Styling, added Preference to Tablet, Moved
 Location to Avatar Tuning

---
 interface/resources/qml/controls-uit/RadioButton.qml   |  4 ++--
 .../qml/dialogs/preferences/PrimaryHandPreference.qml  |  1 -
 interface/src/ui/PreferencesDialog.cpp                 | 10 +++++-----
 3 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/interface/resources/qml/controls-uit/RadioButton.qml b/interface/resources/qml/controls-uit/RadioButton.qml
index 3cc3db4e46..ab11ec68b1 100644
--- a/interface/resources/qml/controls-uit/RadioButton.qml
+++ b/interface/resources/qml/controls-uit/RadioButton.qml
@@ -54,9 +54,9 @@ Original.RadioButton {
                 height: checkSize
                 radius: 7
                 anchors.centerIn: parent
-                color: hifi.colors.checkBoxChecked
+                color: "#00B4EF"
                 border.width: 1
-                border.color: hifi.colors.checkBoxCheckedBorder
+                border.color: "#36CDFF"
                 visible: checked && !pressed || !checked && pressed
             }
         }
diff --git a/interface/resources/qml/dialogs/preferences/PrimaryHandPreference.qml b/interface/resources/qml/dialogs/preferences/PrimaryHandPreference.qml
index 07b9c958dd..cfc2e94ed9 100644
--- a/interface/resources/qml/dialogs/preferences/PrimaryHandPreference.qml
+++ b/interface/resources/qml/dialogs/preferences/PrimaryHandPreference.qml
@@ -28,7 +28,6 @@ Preference {
     }
 
     function save() {
-        // Box1 = True, Box2 = False (Right Hand for Default)
         if (box1.checked && !box2.checked) {
             preference.value = "left";
         }
diff --git a/interface/src/ui/PreferencesDialog.cpp b/interface/src/ui/PreferencesDialog.cpp
index fd0847c945..bf99daab67 100644
--- a/interface/src/ui/PreferencesDialog.cpp
+++ b/interface/src/ui/PreferencesDialog.cpp
@@ -67,11 +67,6 @@ void setupPreferences() {
         auto setter = [=](bool value) { myAvatar->setClearOverlayWhenMoving(value); };
         preferences->addPreference(new CheckPreference(AVATAR_BASICS, "Clear overlays when moving", getter, setter));
     }
-    {
-        auto getter = [=]()->QString { return myAvatar->getDominantHand(); };
-        auto setter = [=](const QString& value) { myAvatar->setDominantHand(value); };
-        preferences->addPreference(new PrimaryHandPreference(AVATAR_BASICS, "Dominant Hand", getter, setter));
-    }
 
     // UI
     static const QString UI_CATEGORY { "UI" };
@@ -186,6 +181,11 @@ void setupPreferences() {
         preference->setStep(1);
         preferences->addPreference(preference);
     }
+    {
+        auto getter = [=]()->QString { return myAvatar->getDominantHand(); };
+        auto setter = [=](const QString& value) { myAvatar->setDominantHand(value); };
+        preferences->addPreference(new PrimaryHandPreference(AVATAR_TUNING, "Dominant Hand", getter, setter));
+    }
     {
         auto getter = [=]()->float { return myAvatar->getUniformScale(); };
         auto setter = [=](float value) { myAvatar->setTargetScale(value); };

From 2f857a6d1a8b58332eabc4e4329e30753abd17a3 Mon Sep 17 00:00:00 2001
From: Cain Kilgore <cain+git@cainkilgore.com>
Date: Tue, 25 Jul 2017 06:05:06 +0100
Subject: [PATCH 11/12] Forgot a file

---
 .../resources/qml/controls/RadioButton.qml      | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)
 create mode 100644 interface/resources/qml/controls/RadioButton.qml

diff --git a/interface/resources/qml/controls/RadioButton.qml b/interface/resources/qml/controls/RadioButton.qml
new file mode 100644
index 0000000000..6bd9c860d2
--- /dev/null
+++ b/interface/resources/qml/controls/RadioButton.qml
@@ -0,0 +1,17 @@
+import QtQuick.Controls 1.3 as Original
+import QtQuick.Controls.Styles 1.3
+import "../styles"
+import "."
+Original.RadioButton {
+    text: "Radio Button"
+    style: RadioButtonStyle {
+        indicator: FontAwesome {
+            text: control.checked ? "\uf046" : "\uf096"
+        }
+        label: Text {
+            text: control.text
+            renderType: Text.QtRendering
+        }
+    }
+
+}

From f9204a7034d06a25391a74caf79cfb4ab272ab62 Mon Sep 17 00:00:00 2001
From: Cain Kilgore <cain+git@cainkilgore.com>
Date: Tue, 25 Jul 2017 09:03:47 +0100
Subject: [PATCH 12/12] Now it should appear..

---
 .../qml/hifi/tablet/tabletWindows/preferences/Section.qml  | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/interface/resources/qml/hifi/tablet/tabletWindows/preferences/Section.qml b/interface/resources/qml/hifi/tablet/tabletWindows/preferences/Section.qml
index af1fbd0070..8cf254809d 100644
--- a/interface/resources/qml/hifi/tablet/tabletWindows/preferences/Section.qml
+++ b/interface/resources/qml/hifi/tablet/tabletWindows/preferences/Section.qml
@@ -82,6 +82,7 @@ Preference {
         property var buttonBuilder: Component { ButtonPreference { } }
         property var comboBoxBuilder: Component { ComboBoxPreference { } }
         property var spinnerSliderBuilder: Component { SpinnerSliderPreference { } }
+        property var primaryHandBuilder: Component { PrimaryHandPreference { } }
         property var preferences: []
         property int checkBoxCount: 0
 
@@ -144,10 +145,16 @@ Preference {
                     //to be not overlapped when drop down is active
                     zpos = root.z + 1000 - itemNum
                     break;
+
                 case Preference.SpinnerSlider:
                     checkBoxCount = 0;
                     builder = spinnerSliderBuilder;
                     break;
+
+                case Preference.PrimaryHand:
+                    checkBoxCount++;
+                    builder = primaryHandBuilder;
+                    break;
             };
 
             if (builder) {