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

show project page

Browse source
This commit is contained in:
Thijs Wenker 2018-12-12 21:15:44 +01:00
parent c0bd9121fb
commit 96673bb5b9
3 changed files with 70 additions and 64 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
interface/resources/qml/hifi/AvatarPackager.qml
View file

@ -22,10 +22,15 @@ Windows.ScrollingWindow {
minSize: Qt.vector2d(200, 300) minSize: Qt.vector2d(200, 300)
//HifiConstants { id: hifi } //HifiConstants { id: hifi }
Rectangle {
anchors.left: parent.left
anchors.right: parent.right
anchors.top: parent.top
anchors.bottom: parent.bottom
AvatarProject { AvatarProject {
id: avatarProject id: avatarProject
colorScheme: root.colorScheme colorScheme: root.colorScheme
visible: false
} }
Rectangle { Rectangle {
@ -84,15 +89,17 @@ Windows.ScrollingWindow {
browser.selectedFile.connect(function(fileUrl) { browser.selectedFile.connect(function(fileUrl) {
console.log("FOUND PATH " + fileUrl); console.log("FOUND PATH " + fileUrl);
let fstFilePath = fileDialogHelper.urlToPath(fileUrl); let fstFilePath = fileDialogHelper.urlToPath(fileUrl);
let avatarProject = AvatarPackagerCore.openAvatarProject(fstFilePath); let currentAvatarProject = AvatarPackagerCore.openAvatarProject(fstFilePath);
if (avatarProject) { if (currentAvatarProject) {
console.log("LOAD COMPLETE"); console.log("LOAD COMPLETE");
console.log("file dir = " + AvatarPackagerCore.currentAvatarProject.projectFolderPath); console.log("file dir = " + AvatarPackagerCore.currentAvatarProject.projectFolderPath);
avatarProject.visible = true;
avatarPackagerMain.visible = false; avatarPackagerMain.visible = false;
avatarProject.visible = true;
} }
}); });
} }
} }
} }
}
} }

10
interface/resources/qml/hifi/avatarPackager/AvatarProject.qml
View file

@ -7,15 +7,13 @@ import "../../controlsUit" 1.0 as HifiControls
import "../../stylesUit" 1.0 import "../../stylesUit" 1.0
Rectangle { Rectangle {
id: avatarProject id: root
HifiConstants { id: hifi } HifiConstants { id: hifi }
z: 3
property int colorScheme; property int colorScheme;
visible: false visible: true
anchors.left: parent.left anchors.left: parent.left
anchors.right: parent.right anchors.right: parent.right
@ -37,7 +35,7 @@ Rectangle {
anchors.right: parent.right anchors.right: parent.right
anchors.top: avatarProjectLabel.bottom anchors.top: avatarProjectLabel.bottom
text: qsTr("Open Project Folder") text: qsTr("Open Project Folder")
colorScheme: avatarProject.colorScheme colorScheme: root.colorScheme
height: 30 height: 30
onClicked: function() { onClicked: function() {
fileDialogHelper.openDirectory(AvatarPackagerCore.currentAvatarProject.projectFolderPath); fileDialogHelper.openDirectory(AvatarPackagerCore.currentAvatarProject.projectFolderPath);
@ -50,7 +48,7 @@ Rectangle {
anchors.top: openFolderButton.bottom anchors.top: openFolderButton.bottom
text: qsTr("Upload") text: qsTr("Upload")
color: hifi.buttons.blue color: hifi.buttons.blue
colorScheme: avatarProject.colorScheme colorScheme: root.colorScheme
height: 30 height: 30
onClicked: function() { onClicked: function() {

3
interface/src/avatar/AvatarPackager.cpp
View file

@ -28,7 +28,8 @@ bool AvatarPackager::open() {
QObject* AvatarPackager::openAvatarProject(QString avatarProjectFSTPath) { QObject* AvatarPackager::openAvatarProject(QString avatarProjectFSTPath) {
if (_currentAvatarProject) { if (_currentAvatarProject) {
_currentAvatarProject->deleteLater(); //_currentAvatarProject->deleteLater();
//_currentAvatarProject = nullptr;
} }
_currentAvatarProject = AvatarProject::openAvatarProject(avatarProjectFSTPath); _currentAvatarProject = AvatarProject::openAvatarProject(avatarProjectFSTPath);
return _currentAvatarProject; return _currentAvatarProject;