From 7953507cb8dbb1b06abfd471557124dcfe3cd7ad Mon Sep 17 00:00:00 2001 From: Ryan Huffman Date: Thu, 3 Jan 2019 11:59:16 -0800 Subject: [PATCH] Update avatar project rename to have audio and highlighting --- .../hifi/avatarPackager/AvatarPackagerApp.qml | 7 ++--- .../avatarPackager/AvatarPackagerHeader.qml | 29 +++++++++++++++---- 2 files changed, 25 insertions(+), 11 deletions(-) diff --git a/interface/resources/qml/hifi/avatarPackager/AvatarPackagerApp.qml b/interface/resources/qml/hifi/avatarPackager/AvatarPackagerApp.qml index 6e2e352b51..ee78f4f934 100644 --- a/interface/resources/qml/hifi/avatarPackager/AvatarPackagerApp.qml +++ b/interface/resources/qml/hifi/avatarPackager/AvatarPackagerApp.qml @@ -11,15 +11,12 @@ import "../../dialogs" import "../avatarapp" 1.0 as AvatarApp Item { + id: windowContent + HifiConstants { id: hifi } property alias desktopObject: avatarPackager.desktopObject - id: windowContent - // height: pane ? pane.height : parent.width - // width: pane ? pane.width : parent.width - - MouseArea { anchors.fill: parent diff --git a/interface/resources/qml/hifi/avatarPackager/AvatarPackagerHeader.qml b/interface/resources/qml/hifi/avatarPackager/AvatarPackagerHeader.qml index b40e9cc264..845fdeb99f 100644 --- a/interface/resources/qml/hifi/avatarPackager/AvatarPackagerHeader.qml +++ b/interface/resources/qml/hifi/avatarPackager/AvatarPackagerHeader.qml @@ -11,7 +11,7 @@ ShadowRectangle { height: 74 color: "#252525" - property alias title: title.text + property string title: qsTr("Avatar Packager") property alias docsEnabled: docs.visible property bool backButtonVisible: true // If false, is not visible and does not take up space property bool backButtonEnabled: true // If false, is not visible but does not affect space @@ -43,6 +43,7 @@ ShadowRectangle { } Item { id: titleArea + anchors.top: parent.top anchors.bottom: parent.bottom anchors.left: root.backButtonVisible ? back.right : parent.left @@ -57,15 +58,31 @@ ShadowRectangle { } ] - RalewaySemiBold { + Item { id: title - size: 28 anchors.fill: parent - text: qsTr("Avatar Packager") - color: "white" - MouseArea { + RalewaySemiBold { + id: titleNotRenameable + + visible: !root.canRename + + size: 28 anchors.fill: parent + text: root.title + color: "white" + } + + RalewayButton { + id: titleRenameable + + visible: root.canRename + enabled: root.canRename + + size: 28 + anchors.fill: parent + text: root.title + onClicked: { if (!root.canRename || AvatarPackagerCore.currentAvatarProject === null) { return;