From 88207b727b8cfa6628883a88dfc2256abb1117b7 Mon Sep 17 00:00:00 2001 From: David Rowe Date: Tue, 10 May 2016 15:45:10 +1200 Subject: [PATCH] Style directory and navigation controls "as is" --- .../qml/controls-uit/GlyphButton.qml | 2 +- .../resources/qml/dialogs/FileDialog.qml | 19 ++++++++----------- 2 files changed, 9 insertions(+), 12 deletions(-) diff --git a/interface/resources/qml/controls-uit/GlyphButton.qml b/interface/resources/qml/controls-uit/GlyphButton.qml index c4ee53c04f..2625dda723 100644 --- a/interface/resources/qml/controls-uit/GlyphButton.qml +++ b/interface/resources/qml/controls-uit/GlyphButton.qml @@ -17,7 +17,7 @@ import "../styles-uit" Original.Button { property int color: 0 - property int colorScheme: hifi.colorShemes.light + property int colorScheme: hifi.colorSchemes.light property string glyph: "" width: 120 diff --git a/interface/resources/qml/dialogs/FileDialog.qml b/interface/resources/qml/dialogs/FileDialog.qml index 3be7fbc667..1f710b4ef5 100644 --- a/interface/resources/qml/dialogs/FileDialog.qml +++ b/interface/resources/qml/dialogs/FileDialog.qml @@ -94,25 +94,26 @@ ModalWindow { // MouseArea { anchors.fill: parent; onClicked: d.navigateBack() } //} - Button { + GlyphButton { id: upButton + glyph: hifi.glyphs.levelUp + width: height enabled: model.parentFolder && model.parentFolder !== "" - text: "up" onClicked: d.navigateUp(); } - Button { + GlyphButton { id: homeButton property var destination: helper.home(); + glyph: hifi.glyphs.home + width: height enabled: d.homeDestination ? true : false - text: "home" onClicked: d.navigateHome(); } ComboBox { id: drivesSelector - width: 48 - height: homeButton.height + width: 62 model: drives visible: drives.length > 1 currentIndex: 0 @@ -121,8 +122,8 @@ ModalWindow { TextField { id: currentDirectory + property var lastValidFolder: helper.urlToPath(model.folder) height: homeButton.height - style: TextFieldStyle { renderType: Text.QtRendering } anchors { top: parent.top topMargin: hifi.dimensions.contentMargin.y @@ -130,11 +131,7 @@ ModalWindow { leftMargin: hifi.dimensions.contentSpacing.x right: parent.right } - property var lastValidFolder: helper.urlToPath(model.folder) onLastValidFolderChanged: text = lastValidFolder; - verticalAlignment: Text.AlignVCenter - font.pointSize: 14 - font.bold: true // FIXME add support auto-completion onAccepted: {