From 934311b54a426fdaef62adc2697ae562cdc284e8 Mon Sep 17 00:00:00 2001 From: David Rowe Date: Sun, 5 Jan 2020 16:15:04 +1300 Subject: [PATCH 1/6] Change default Avatar Packager project directory --- interface/src/avatar/AvatarProject.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/interface/src/avatar/AvatarProject.h b/interface/src/avatar/AvatarProject.h index 0a63290051..4c1e55fa1c 100644 --- a/interface/src/avatar/AvatarProject.h +++ b/interface/src/avatar/AvatarProject.h @@ -95,7 +95,7 @@ public: static bool isValidNewProjectName(const QString& projectPath, const QString& projectName); static QString getDefaultProjectsPath() { - return QStandardPaths::writableLocation(QStandardPaths::DocumentsLocation) + "/High Fidelity Projects"; + return QStandardPaths::writableLocation(QStandardPaths::DocumentsLocation) + "/Project Athena Projects"; } signals: From d79c87b2d49939b5d9a5b2df788773ca34caf5bb Mon Sep 17 00:00:00 2001 From: David Rowe Date: Sun, 5 Jan 2020 16:59:51 +1300 Subject: [PATCH 2/6] Change Avatar Package docs links --- .../resources/qml/hifi/avatarPackager/AvatarPackagerApp.qml | 2 +- interface/resources/qml/hifi/avatarPackager/AvatarProject.qml | 2 +- interface/src/avatar/AvatarDoctor.cpp | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/interface/resources/qml/hifi/avatarPackager/AvatarPackagerApp.qml b/interface/resources/qml/hifi/avatarPackager/AvatarPackagerApp.qml index 278ce36362..9158e25f75 100644 --- a/interface/resources/qml/hifi/avatarPackager/AvatarPackagerApp.qml +++ b/interface/resources/qml/hifi/avatarPackager/AvatarPackagerApp.qml @@ -229,7 +229,7 @@ Item { } function openDocs() { - Qt.openUrlExternally("https://docs.highfidelity.com/create/avatars/package-avatar.html"); + Qt.openUrlExternally("https://docs.projectathena.dev/create/avatars/package-avatar.html"); } function openVideo() { diff --git a/interface/resources/qml/hifi/avatarPackager/AvatarProject.qml b/interface/resources/qml/hifi/avatarPackager/AvatarProject.qml index e5bffa7829..5dd2dd0bd6 100644 --- a/interface/resources/qml/hifi/avatarPackager/AvatarProject.qml +++ b/interface/resources/qml/hifi/avatarPackager/AvatarProject.qml @@ -326,7 +326,7 @@ Item { text: "This item is not for sale yet, learn more." onLinkActivated: { - Qt.openUrlExternally("https://docs.highfidelity.com/sell/add-item/upload-avatar.html"); + Qt.openUrlExternally("https://docs.projectathena.dev/sell/add-item/upload-avatar.html"); } } diff --git a/interface/src/avatar/AvatarDoctor.cpp b/interface/src/avatar/AvatarDoctor.cpp index 01a40e89fd..b0c82f1afc 100644 --- a/interface/src/avatar/AvatarDoctor.cpp +++ b/interface/src/avatar/AvatarDoctor.cpp @@ -55,7 +55,7 @@ static QStringList HAND_MAPPING_SUFFIXES = { "HandThumb1", }; -const QUrl PACKAGE_AVATAR_DOCS_BASE_URL = QUrl("https://docs.highfidelity.com/create/avatars/package-avatar.html"); +const QUrl PACKAGE_AVATAR_DOCS_BASE_URL = QUrl("https://docs.projectathena.dev/create/avatars/package-avatar.html"); AvatarDoctor::AvatarDoctor(const QUrl& avatarFSTFileUrl) : _avatarFSTFileUrl(avatarFSTFileUrl) { From cd6669ec8ba80a83c8d69ee0dc6e34c9db3a5028 Mon Sep 17 00:00:00 2001 From: David Rowe Date: Sun, 5 Jan 2020 17:00:40 +1300 Subject: [PATCH 3/6] Comment out the "Video" button --- .../qml/hifi/avatarPackager/AvatarPackagerHeader.qml | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/interface/resources/qml/hifi/avatarPackager/AvatarPackagerHeader.qml b/interface/resources/qml/hifi/avatarPackager/AvatarPackagerHeader.qml index 31528a8557..edb862b023 100644 --- a/interface/resources/qml/hifi/avatarPackager/AvatarPackagerHeader.qml +++ b/interface/resources/qml/hifi/avatarPackager/AvatarPackagerHeader.qml @@ -128,6 +128,8 @@ ShadowRectangle { } } + // FIXME: Link to a Project Athena version of the video. + /* RalewayButton { id: video visible: false @@ -141,6 +143,12 @@ ShadowRectangle { onClicked: videoButtonClicked() } + */ + // Temporary placeholder for video button. + Rectangle { + id: video + visible: false + } RalewayButton { id: docs From 30c63fc30530af3895b64bff178ac8c72b8438d6 Mon Sep 17 00:00:00 2001 From: David Rowe Date: Sun, 5 Jan 2020 17:11:23 +1300 Subject: [PATCH 4/6] Remove "Upload" button and associated items --- .../qml/hifi/avatarPackager/AvatarProject.qml | 22 ++++++++++++++++++- 1 file changed, 21 insertions(+), 1 deletion(-) diff --git a/interface/resources/qml/hifi/avatarPackager/AvatarProject.qml b/interface/resources/qml/hifi/avatarPackager/AvatarProject.qml index 5dd2dd0bd6..3b1cb764b9 100644 --- a/interface/resources/qml/hifi/avatarPackager/AvatarProject.qml +++ b/interface/resources/qml/hifi/avatarPackager/AvatarProject.qml @@ -44,7 +44,11 @@ Item { HifiControls.Button { id: uploadButton + // FIXME: Re-enable if ability to upload to hosted location is added. + /* visible: AvatarPackagerCore.currentAvatarProject && !AvatarPackagerCore.currentAvatarProject.fst.hasMarketplaceID && !root.hasSuccessfullyUploaded + */ + visible: false enabled: Account.loggedIn anchors.verticalCenter: parent.verticalCenter @@ -62,7 +66,11 @@ Item { HifiControls.Button { id: updateButton + // FIXME: Re-enable if ability to upload to hosted location is added. + /* visible: AvatarPackagerCore.currentAvatarProject && AvatarPackagerCore.currentAvatarProject.fst.hasMarketplaceID && !root.hasSuccessfullyUploaded + */ + visible: false enabled: Account.loggedIn anchors.verticalCenter: parent.verticalCenter @@ -79,7 +87,12 @@ Item { } Item { anchors.fill: parent + + // FIXME: Re-enable if ability to upload to hosted location is added. + /* visible: root.hasSuccessfullyUploaded + */ + visible: false; HifiControls.Button { enabled: Account.loggedIn @@ -303,7 +316,9 @@ Item { wrapMode: Text.Wrap - text: "You can upload your files to our servers to always access them, and to make your avatar visible to other users." + // FIXME: Restore original text if ability to upload to hosted location is added. + //text: "You can upload your files to our servers to always access them, and to make your avatar visible to other users." + text: "Your files are ready to be uploaded to a server to make your avatar visible to other users." } RalewayRegular { @@ -389,8 +404,13 @@ Item { Rectangle { id: loginRequiredMessage + // FIXME: Re-enable if ability to upload to hosted location is added. + /* visible: !Account.loggedIn height: !Account.loggedIn ? loginRequiredTextRow.height + 20 : 0 + */ + visible: false + height: 0 anchors { bottom: parent.bottom From 977d49800400e6e389fa0ac3513fd6e8dc334dc3 Mon Sep 17 00:00:00 2001 From: David Rowe Date: Sun, 5 Jan 2020 17:53:36 +1300 Subject: [PATCH 5/6] Add an "Open Project Folder" button --- .../qml/hifi/avatarPackager/AvatarProject.qml | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/interface/resources/qml/hifi/avatarPackager/AvatarProject.qml b/interface/resources/qml/hifi/avatarPackager/AvatarProject.qml index 3b1cb764b9..5420651847 100644 --- a/interface/resources/qml/hifi/avatarPackager/AvatarProject.qml +++ b/interface/resources/qml/hifi/avatarPackager/AvatarProject.qml @@ -128,6 +128,22 @@ Item { onClicked: AvatarPackagerCore.currentAvatarProject.openInInventory() } } + // FIXME: Remove if "Upload" button is reinstated. + HifiControls.Button { + id: openDirectoryButton + visible: AvatarPackagerCore.currentAvatarProject + enabled: true + anchors.verticalCenter: parent.verticalCenter + anchors.right: parent.right + text: qsTr("Open Project Folder") + color: hifi.buttons.blue + colorScheme: root.colorScheme + width: 200 + height: 40 + onClicked: { + fileDialogHelper.openDirectory(fileDialogHelper.pathToUrl(AvatarPackagerCore.currentAvatarProject.projectFolderPath)); + } + } } Rectangle { From 1d9aec6fec4d40831040761abdef60fbb66ce2e4 Mon Sep 17 00:00:00 2001 From: David Rowe Date: Sun, 5 Jan 2020 18:24:56 +1300 Subject: [PATCH 6/6] Improve order of dialog contents --- .../qml/hifi/avatarPackager/AvatarProject.qml | 99 +++++++++---------- 1 file changed, 48 insertions(+), 51 deletions(-) diff --git a/interface/resources/qml/hifi/avatarPackager/AvatarProject.qml b/interface/resources/qml/hifi/avatarPackager/AvatarProject.qml index 5420651847..a0c98b0821 100644 --- a/interface/resources/qml/hifi/avatarPackager/AvatarProject.qml +++ b/interface/resources/qml/hifi/avatarPackager/AvatarProject.qml @@ -292,13 +292,58 @@ Item { color: 'white' size: 20 - anchors.left: parent.left - anchors.right: parent.right + anchors.horizontalCenter: parent.horizontalCenter anchors.top: errorsGlyph.bottom wrapMode: Text.Wrap } + RalewayRegular { + id: notForSaleMessage + + visible: root.hasSuccessfullyUploaded + + color: 'white' + linkColor: '#00B4EF' + size: 20 + + anchors.left: parent.left + anchors.right: parent.right + anchors.top: doctorStatusMessage.bottom + anchors.topMargin: 10 + + anchors.bottomMargin: 24 + + wrapMode: Text.Wrap + text: "This item is not for sale yet, learn more." + + onLinkActivated: { + Qt.openUrlExternally("https://docs.projectathena.dev/sell/add-item/upload-avatar.html"); + } + } + + RalewayRegular { + id: showErrorsLink + + color: 'white' + linkColor: '#00B4EF' + + visible: AvatarPackagerCore.currentAvatarProject && AvatarPackagerCore.currentAvatarProject.hasErrors + + anchors { + top: notForSaleMessage.bottom + horizontalCenter: parent.horizontalCenter + } + + size: 28 + + text: "View all errors" + + onLinkActivated: { + avatarPackager.state = AvatarPackagerState.avatarDoctorErrorReport; + } + } + RalewayRegular { id: infoMessage @@ -326,8 +371,7 @@ Item { anchors.left: parent.left anchors.right: parent.right - anchors.top: doctorStatusMessage.bottom - + anchors.bottom: showFilesText.top anchors.bottomMargin: 24 wrapMode: Text.Wrap @@ -337,53 +381,6 @@ Item { text: "Your files are ready to be uploaded to a server to make your avatar visible to other users." } - RalewayRegular { - id: notForSaleMessage - - visible: root.hasSuccessfullyUploaded - - color: 'white' - linkColor: '#00B4EF' - size: 20 - - anchors.left: parent.left - anchors.right: parent.right - anchors.top: infoMessage.bottom - anchors.topMargin: 10 - - anchors.bottomMargin: 24 - - wrapMode: Text.Wrap - text: "This item is not for sale yet, learn more." - - onLinkActivated: { - Qt.openUrlExternally("https://docs.projectathena.dev/sell/add-item/upload-avatar.html"); - } - } - - RalewayRegular { - id: showErrorsLink - - color: 'white' - linkColor: '#00B4EF' - - visible: AvatarPackagerCore.currentAvatarProject && AvatarPackagerCore.currentAvatarProject.hasErrors - - anchors { - top: notForSaleMessage.visible ? notForSaleMessage.bottom : infoMessage .bottom - bottom: showFilesText.top - horizontalCenter: parent.horizontalCenter - } - - size: 28 - - text: "View all errors" - - onLinkActivated: { - avatarPackager.state = AvatarPackagerState.avatarDoctorErrorReport; - } - } - HifiControls.Button { id: openFolderButton