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 diff --git a/interface/resources/qml/dialogs/PreferencesDialog.qml b/interface/resources/qml/dialogs/PreferencesDialog.qml index bb3ce43fcd..3b594153dc 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].collapsable = false + } + } } Flickable { diff --git a/interface/resources/qml/dialogs/preferences/Section.qml b/interface/resources/qml/dialogs/preferences/Section.qml index 4b2c92f867..b1e59430a9 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 collapsable: true property bool expanded: false property string name: "Header" property real spacing: 8 @@ -42,7 +43,10 @@ Preference { VrControls.FontAwesome { id: toggle + width: root.collapsable ? height : 0 anchors { left: parent.left; top: parent.top; margins: root.spacing } + visible: root.collapsable + enabled: root.collapsable 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 \