Merge pull request #1094 from AleziaKurdis/createApp_Paste_Url_In_Create_ui

Create App: Revolutionary "Paste" Url buttons for the "Create Model", "Create Material" and "Create Voxels" UI
This commit is contained in:
ksuprynowicz 2024-08-18 16:12:27 +02:00 committed by GitHub
commit a97b892338
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
3 changed files with 88 additions and 15 deletions

View file

@ -2,9 +2,10 @@
// NewMaterialDialog.qml // NewMaterialDialog.qml
// qml/hifi // qml/hifi
// //
// Created by Sam Gondelman on 1/17/18 // Created by Sam Gondelman on January 17th, 2018
// Copyright 2018 High Fidelity, Inc. // Copyright 2018 High Fidelity, Inc.
// Copyright 2020 Vircadia contributors // Copyright 2020 Vircadia contributors
// Copyright 2024 Overte e.V.
// //
// Distributed under the Apache License, Version 2.0. // Distributed under the Apache License, Version 2.0.
// See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html // See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
@ -55,17 +56,32 @@ Rectangle {
Text { Text {
id: text1 id: text1
text: qsTr("Material URL <i>(Optional)</i>") text: qsTr("Material URL <i>(Optional)</i>&nbsp;&nbsp;&nbsp;")
color: "#ffffff" color: "#ffffff"
font.pixelSize: 12 font.pixelSize: 12
} }
Button {
id: pasteBtn
text: "Paste"
font.pixelSize: 11
height: 16
width: 40
radius: 4
anchors.top: text1.top
anchors.left: text1.right
anchors.bottom: text1.bottom
onClicked: {
materialURL.paste()
}
}
TextInput { TextInput {
id: materialURL id: materialURL
height: 20 height: 20
text: qsTr("") text: qsTr("")
color: "white" color: "white"
anchors.top: text1.bottom anchors.top: pasteBtn.bottom
anchors.topMargin: 5 anchors.topMargin: 5
anchors.left: parent.left anchors.left: parent.left
anchors.leftMargin: 0 anchors.leftMargin: 0

View file

@ -2,9 +2,10 @@
// NewModelDialog.qml // NewModelDialog.qml
// qml/hifi // qml/hifi
// //
// Created by Seth Alves on 2017-2-10 // Created by Seth Alves on February 10th, 2017
// Copyright 2017 High Fidelity, Inc. // Copyright 2017 High Fidelity, Inc.
// Copyright 2020 Vircadia contributors // Copyright 2020 Vircadia contributors
// Copyright 2024 Overte e.V.
// //
// Distributed under the Apache License, Version 2.0. // Distributed under the Apache License, Version 2.0.
// See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html // See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
@ -55,17 +56,30 @@ Rectangle {
Text { Text {
id: text1 id: text1
text: qsTr("Model URL <i>(.fbx, .fst, .glb, .gltf, .obj, .gz)</i>") text: qsTr("Model URL <i>(.fbx, .fst, .glb, .gltf, .obj, .gz)</i>&nbsp;&nbsp;&nbsp;")
color: "#ffffff" color: "#ffffff"
font.pixelSize: 12 font.pixelSize: 12
} }
Button {
id: pasteBtn
text: "Paste"
font.pixelSize: 11
height: 16
width: 40
radius: 4
anchors.top: text1.top + 10
anchors.left: text1.right
anchors.bottom: text1.bottom
onClicked: {
modelURL.paste()
}
}
TextInput { TextInput {
id: modelURL id: modelURL
height: 20 height: 20
text: qsTr("") text: qsTr("")
color: "white" color: "white"
anchors.top: text1.bottom anchors.top: pasteBtn.bottom
anchors.topMargin: 5 anchors.topMargin: 5
anchors.left: parent.left anchors.left: parent.left
anchors.leftMargin: 0 anchors.leftMargin: 0

View file

@ -1,12 +1,12 @@
// //
// NewPolyVoxDialog.qml // NewPolyVoxDialog.qml
// Created by dr Karol Suprynowicz on 2022.05.17. // Created by dr Karol Suprynowicz on May 17th, 2022
// based on NewModelDialog.qml // based on NewModelDialog.qml
// qml/hifi // qml/hifi
// //
// Copyright 2017 High Fidelity, Inc. // Copyright 2017 High Fidelity, Inc.
// Copyright 2020 Vircadia contributors // Copyright 2020 Vircadia contributors
// Copyright 2022 Overte e.V. // Copyright 2022-2024 Overte e.V.
// //
// Distributed under the Apache License, Version 2.0. // Distributed under the Apache License, Version 2.0.
// See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html // See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
@ -117,17 +117,32 @@ Rectangle {
id: text1 id: text1
anchors.top: texturePreset.bottom anchors.top: texturePreset.bottom
anchors.topMargin: 5 anchors.topMargin: 5
text: qsTr("X Texture URL") text: qsTr("X Texture URL <i>&nbsp;&nbsp;&nbsp;</i>")
color: "#ffffff" color: "#ffffff"
font.pixelSize: 12 font.pixelSize: 12
} }
Button {
id: pasteBtn1
text: "Paste"
font.pixelSize: 11
height: 16
width: 40
radius: 4
anchors.top: text1.top
anchors.left: text1.right
anchors.bottom: text1.bottom
onClicked: {
xTextureURL.paste()
}
}
TextInput { TextInput {
id: xTextureURL id: xTextureURL
height: 20 height: 20
text: qsTr("") text: qsTr("")
color: "white" color: "white"
anchors.top: text1.bottom anchors.top: pasteBtn1.bottom
anchors.topMargin: 5 anchors.topMargin: 5
anchors.left: parent.left anchors.left: parent.left
anchors.leftMargin: 0 anchors.leftMargin: 0
@ -167,19 +182,33 @@ Rectangle {
Text { Text {
id: text2 id: text2
text: qsTr("Y Texture URL") text: qsTr("Y Texture URL <i>&nbsp;&nbsp;&nbsp;</i>")
color: "#ffffff" color: "#ffffff"
font.pixelSize: 12 font.pixelSize: 12
anchors.top: textInputBox1.bottom anchors.top: textInputBox1.bottom
anchors.topMargin: 5 anchors.topMargin: 5
} }
Button {
id: pasteBtn2
text: "Paste"
font.pixelSize: 11
height: 16
width: 40
radius: 4
anchors.top: text2.top
anchors.left: text2.right
anchors.bottom: text2.bottom
onClicked: {
yTextureURL.paste()
}
}
TextInput { TextInput {
id: yTextureURL id: yTextureURL
height: 20 height: 20
text: qsTr("") text: qsTr("")
color: "white" color: "white"
anchors.top: text2.bottom anchors.top: pasteBtn2.bottom
anchors.topMargin: 5 anchors.topMargin: 5
anchors.left: parent.left anchors.left: parent.left
anchors.leftMargin: 0 anchors.leftMargin: 0
@ -219,19 +248,33 @@ Rectangle {
Text { Text {
id: text3 id: text3
text: qsTr("Z Texture URL") text: qsTr("Z Texture URL <i>&nbsp;&nbsp;&nbsp;</i>")
color: "#ffffff" color: "#ffffff"
font.pixelSize: 12 font.pixelSize: 12
anchors.top: textInputBox2.bottom anchors.top: textInputBox2.bottom
anchors.topMargin: 5 anchors.topMargin: 5
} }
Button {
id: pasteBtn3
text: "Paste"
font.pixelSize: 11
height: 16
width: 40
radius: 4
anchors.top: text3.top
anchors.left: text3.right
anchors.bottom: text3.bottom
onClicked: {
zTextureURL.paste()
}
}
TextInput { TextInput {
id: zTextureURL id: zTextureURL
height: 20 height: 20
text: qsTr("") text: qsTr("")
color: "white" color: "white"
anchors.top: text3.bottom anchors.top: pasteBtn3.bottom
anchors.topMargin: 5 anchors.topMargin: 5
anchors.left: parent.left anchors.left: parent.left
anchors.leftMargin: 0 anchors.leftMargin: 0