Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-08-09 12:08:54 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Style directory and navigation controls "as is"

Browse source
This commit is contained in:
David Rowe 2016-05-10 15:45:10 +12:00
parent b8c0ec86af
commit 88207b727b
2 changed files with 9 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
interface/resources/qml/controls-uit/GlyphButton.qml
View file

@ -17,7 +17,7 @@ import "../styles-uit"
Original.Button { Original.Button {
property int color: 0 property int color: 0
property int colorScheme: hifi.colorShemes.light property int colorScheme: hifi.colorSchemes.light
property string glyph: "" property string glyph: ""
width: 120 width: 120

19
interface/resources/qml/dialogs/FileDialog.qml
View file

@ -94,25 +94,26 @@ ModalWindow {
// MouseArea { anchors.fill: parent; onClicked: d.navigateBack() } // MouseArea { anchors.fill: parent; onClicked: d.navigateBack() }
//} //}
Button { GlyphButton {
id: upButton id: upButton
glyph: hifi.glyphs.levelUp
width: height
enabled: model.parentFolder && model.parentFolder !== "" enabled: model.parentFolder && model.parentFolder !== ""
text: "up"
onClicked: d.navigateUp(); onClicked: d.navigateUp();
} }
Button { GlyphButton {
id: homeButton id: homeButton
property var destination: helper.home(); property var destination: helper.home();
glyph: hifi.glyphs.home
width: height
enabled: d.homeDestination ? true : false enabled: d.homeDestination ? true : false
text: "home"
onClicked: d.navigateHome(); onClicked: d.navigateHome();
} }
ComboBox { ComboBox {
id: drivesSelector id: drivesSelector
width: 48 width: 62
height: homeButton.height
model: drives model: drives
visible: drives.length > 1 visible: drives.length > 1
currentIndex: 0 currentIndex: 0
@ -121,8 +122,8 @@ ModalWindow {
TextField { TextField {
id: currentDirectory id: currentDirectory
property var lastValidFolder: helper.urlToPath(model.folder)
height: homeButton.height height: homeButton.height
style: TextFieldStyle { renderType: Text.QtRendering }
anchors { anchors {
top: parent.top top: parent.top
topMargin: hifi.dimensions.contentMargin.y topMargin: hifi.dimensions.contentMargin.y
@ -130,11 +131,7 @@ ModalWindow {
leftMargin: hifi.dimensions.contentSpacing.x leftMargin: hifi.dimensions.contentSpacing.x
right: parent.right right: parent.right
} }
property var lastValidFolder: helper.urlToPath(model.folder)
onLastValidFolderChanged: text = lastValidFolder; onLastValidFolderChanged: text = lastValidFolder;
verticalAlignment: Text.AlignVCenter
font.pointSize: 14
font.bold: true
// FIXME add support auto-completion // FIXME add support auto-completion
onAccepted: { onAccepted: {