Mirrors/overte-AleziaKurdis
3
0
Fork 0
mirror of https://github.com/AleziaKurdis/overte.git synced 2025-04-08 18:32:34 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #6953 from jherico/qml

Browse source 
More small fixes
This commit is contained in:
Howard Stearns 2016-01-28 11:22:40 -08:00
commit bff3362f94
4 changed files with 19 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
interface/resources/qml/Browser.qml
View file

@ -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

7
interface/resources/qml/dialogs/PreferencesDialog.qml
View file

@ -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 {

4
interface/resources/qml/dialogs/preferences/Section.qml
View file

@ -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 {} }

1
tests/ui/qmlscratch.pro
View file

@ -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 \