From d9651c6d4b5c824c243cf092475da1550a7851d9 Mon Sep 17 00:00:00 2001
From: Brad Davis <bdavis@saintandreas.org>
Date: Tue, 26 Jan 2016 23:04:59 -0800
Subject: [PATCH 1/3] Allow user browser to work with marketplace

---
 interface/resources/qml/Browser.qml | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/interface/resources/qml/Browser.qml b/interface/resources/qml/Browser.qml
index 32515d82b7..382acc237c 100644
--- a/interface/resources/qml/Browser.qml
+++ b/interface/resources/qml/Browser.qml
@@ -108,7 +108,7 @@ Window {
             }
         }
 
-        WebEngineView {
+        WebView {
             id: webview
             url: "http://highfidelity.com"
             anchors.top: buttons.bottom
@@ -124,6 +124,12 @@ Window {
             onIconChanged: {
                 console.log("New icon: " + icon)
             }
+            
+            profile: WebEngineProfile {
+                id: webviewProfile
+                storageName: "qmlUserBrowser"
+            }
+
         }
     } // item
     

From 18d6a09dc9c3cf20ed5f15390bc336ed9aafc1be Mon Sep 17 00:00:00 2001
From: Brad Davis <bdavis@saintandreas.org>
Date: Tue, 26 Jan 2016 23:16:22 -0800
Subject: [PATCH 2/3] Better preferences dialog initial state

---
 interface/resources/qml/dialogs/PreferencesDialog.qml   | 7 +++++++
 interface/resources/qml/dialogs/preferences/Section.qml | 4 ++++
 tests/ui/qmlscratch.pro                                 | 1 +
 3 files changed, 12 insertions(+)

diff --git a/interface/resources/qml/dialogs/PreferencesDialog.qml b/interface/resources/qml/dialogs/PreferencesDialog.qml
index bb3ce43fcd..8eee78719b 100644
--- a/interface/resources/qml/dialogs/PreferencesDialog.qml
+++ b/interface/resources/qml/dialogs/PreferencesDialog.qml
@@ -62,6 +62,13 @@ Window {
 
                 sections.push(sectionBuilder.createObject(prefControls, { name: category }));
             }
+
+            if (sections.length) {
+                sections[0].expanded = true;
+                if (sections.length === 1) {
+                    sections[0].expandable = false
+                }
+            }
         }
 
         Flickable  {
diff --git a/interface/resources/qml/dialogs/preferences/Section.qml b/interface/resources/qml/dialogs/preferences/Section.qml
index 4b2c92f867..2cf232864d 100644
--- a/interface/resources/qml/dialogs/preferences/Section.qml
+++ b/interface/resources/qml/dialogs/preferences/Section.qml
@@ -7,6 +7,7 @@ import "."
 
 Preference {
     id: root
+    property bool expandable: true
     property bool expanded: false
     property string name: "Header"
     property real spacing: 8
@@ -42,7 +43,10 @@ Preference {
 
     VrControls.FontAwesome {
         id: toggle
+        width: root.expandable ? height : 0
         anchors { left: parent.left; top: parent.top; margins: root.spacing }
+        visible: root.expandable
+        enabled: root.expandable
         rotation: root.expanded ? 0 : -90
         text: "\uf078"
         Behavior on rotation { PropertyAnimation {} }
diff --git a/tests/ui/qmlscratch.pro b/tests/ui/qmlscratch.pro
index 7a1b5ab652..a4e4b33957 100644
--- a/tests/ui/qmlscratch.pro
+++ b/tests/ui/qmlscratch.pro
@@ -20,6 +20,7 @@ DISTFILES += \
     ../../interface/resources/qml/controls/*.qml \
     ../../interface/resources/qml/dialogs/*.qml \
     ../../interface/resources/qml/dialogs/fileDialog/*.qml \
+    ../../interface/resources/qml/dialogs/preferences/*.qml \
     ../../interface/resources/qml/desktop/*.qml \
     ../../interface/resources/qml/menus/*.qml \
     ../../interface/resources/qml/styles/*.qml \

From 04e6a5360a03d3ede5dbd39d32bae109839a315a Mon Sep 17 00:00:00 2001
From: Brad Davis <bdavis@saintandreas.org>
Date: Thu, 28 Jan 2016 10:29:21 -0800
Subject: [PATCH 3/3] Renaming preference dialog variable

---
 interface/resources/qml/dialogs/PreferencesDialog.qml   | 2 +-
 interface/resources/qml/dialogs/preferences/Section.qml | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/interface/resources/qml/dialogs/PreferencesDialog.qml b/interface/resources/qml/dialogs/PreferencesDialog.qml
index 8eee78719b..3b594153dc 100644
--- a/interface/resources/qml/dialogs/PreferencesDialog.qml
+++ b/interface/resources/qml/dialogs/PreferencesDialog.qml
@@ -66,7 +66,7 @@ Window {
             if (sections.length) {
                 sections[0].expanded = true;
                 if (sections.length === 1) {
-                    sections[0].expandable = false
+                    sections[0].collapsable = false
                 }
             }
         }
diff --git a/interface/resources/qml/dialogs/preferences/Section.qml b/interface/resources/qml/dialogs/preferences/Section.qml
index 2cf232864d..b1e59430a9 100644
--- a/interface/resources/qml/dialogs/preferences/Section.qml
+++ b/interface/resources/qml/dialogs/preferences/Section.qml
@@ -7,7 +7,7 @@ import "."
 
 Preference {
     id: root
-    property bool expandable: true
+    property bool collapsable: true
     property bool expanded: false
     property string name: "Header"
     property real spacing: 8
@@ -43,10 +43,10 @@ Preference {
 
     VrControls.FontAwesome {
         id: toggle
-        width: root.expandable ? height : 0
+        width: root.collapsable ? height : 0
         anchors { left: parent.left; top: parent.top; margins: root.spacing }
-        visible: root.expandable
-        enabled: root.expandable
+        visible: root.collapsable
+        enabled: root.collapsable
         rotation: root.expanded ? 0 : -90
         text: "\uf078"
         Behavior on rotation { PropertyAnimation {} }