Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-04-30 00:42:46 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Port Edit.qml to QQC2 as well as some tablet preferences compinents

Browse source
This commit is contained in:
vladest 2017-11-17 20:46:21 +01:00
parent cfacf3b47d
commit dbd6ec0dff
14 changed files with 351 additions and 37 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
interface/resources/qml/dialogs/CustomQueryDialog.qml
View file

@ -8,8 +8,7 @@
// See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
//
import QtQuick 2.5;
import QtQuick.Controls 1.4;
import QtQuick 2.7;
import QtQuick.Dialogs 1.2 as OriginalDialogs;
import "../controls-uit";

3
interface/resources/qml/dialogs/TabletCustomQueryDialog.qml
View file

@ -8,8 +8,7 @@
// See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
//
import QtQuick 2.5
import QtQuick.Controls 1.4
import QtQuick 2.7
import QtQuick.Dialogs 1.2 as OriginalDialogs
import "../controls-uit"

3
interface/resources/qml/dialogs/TabletQueryDialog.qml
View file

@ -8,8 +8,7 @@
// See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
//
import QtQuick 2.5
import QtQuick.Controls 1.4
import QtQuick 2.7
import QtQuick.Dialogs 1.2 as OriginalDialogs
import "../controls-uit"

2
interface/resources/qml/dialogs/assetDialog/AssetDialogContent.qml
View file

@ -8,7 +8,7 @@
// See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
//
import QtQuick 2.5
import QtQuick 2.7
import QtQuick.Controls 1.4
import "../../controls-uit"

6
interface/resources/qml/hifi/Desktop.qml
View file

@ -1,12 +1,12 @@
import QtQuick 2.5
import QtQuick.Controls 1.4
import QtWebEngine 1.1;
import QtQuick 2.7
import QtWebEngine 1.5;
import Qt.labs.settings 1.0
import "../desktop" as OriginalDesktop
import ".."
import "."
import "./toolbars"
import "../controls-uit"
OriginalDesktop.Desktop {
id: desktop

3
interface/resources/qml/hifi/SpectatorCamera.qml
View file

@ -12,8 +12,7 @@
//
import Hifi 1.0 as Hifi
import QtQuick 2.5
import QtQuick.Controls 1.4
import QtQuick 2.7
import "../styles-uit"
import "../controls-uit" as HifiControlsUit
import "../controls" as HifiControls

292
interface/resources/qml/hifi/tablet/Edit.qml
View file

@ -1,29 +1,295 @@
import QtQuick 2.5
import QtQuick.Controls 1.4
import QtQuick 2.7
import QtQuick.Controls 2.2
import QtQuick.Layouts 1.3
import "../../styles-uit"
import "../../controls-uit" as HifiControls
import "../../controls"
import "../toolbars"
StackView {
ColumnLayout {
id: editRoot
objectName: "stack"
initialItem: Qt.resolvedUrl('EditTabView.qml')
anchors.fill: parent
readonly property var webTabsLinks: [
"",
"/system/html/entityList.html",
"/system/html/entityProperties.html",
"/system/html/gridControls.html",
"/system/particle_explorer/particleExplorer.html"
]
signal sendToScript(var message);
HifiConstants { id: hifi }
function pushSource(path) {
editRoot.push(Qt.resolvedUrl(path));
editRoot.currentItem.sendToScript.connect(editRoot.sendToScript);
console.error("Edit. push source", path, Qt.resolvedUrl(path))
editStack.push(Qt.resolvedUrl(path));
editStack.currentItem.sendToScript.connect(editRoot.sendToScript);
}
function popSource() {
editRoot.pop();
editStack.pop();
}
// Passes script messages to the item on the top of the stack
function fromScript(message) {
var currentItem = editRoot.currentItem;
if (currentItem && currentItem.fromScript)
currentItem.fromScript(message);
console.error("from script", JSON.stringify(message))
switch (message.method) {
case 'selectTab':
selectTab(message.params.id);
break;
default:
var currentItem = editStack.currentItem;
if (currentItem && currentItem.fromScript) {
currentItem.fromScript(message);
} else {
console.warn('Unrecognized message:', JSON.stringify(message));
}
}
}
// Changes the current tab based on tab index or title as input
function selectTab(id) {
console.error("selecting tab", id)
if (typeof id === 'number') {
if (id >= 0 && id <= 4) {
editTabView.currentIndex = id;
} else {
console.warn('Attempt to switch to invalid tab:', id);
}
} else if (typeof id === 'string'){
switch (id.toLowerCase()) {
case 'create':
editTabView.currentIndex = 0;
break;
case 'list':
editTabView.currentIndex = 1;
break;
case 'properties':
editTabView.currentIndex = 2;
break;
case 'grid':
editTabView.currentIndex = 3;
break;
case 'particle':
editTabView.currentIndex = 4;
break;
default:
console.warn('Attempt to switch to invalid tab:', id);
}
} else {
console.warn('Attempt to switch tabs with invalid input:', JSON.stringify(id));
}
}
spacing: 0
HifiConstants { id: hifi }
TabBar {
id: editTabView
height: 60
width: parent.width
contentWidth: parent.width
currentIndex: 0
padding: 0
spacing: 0
onCurrentIndexChanged: {
if (currentIndex === 0) {
editStack.replace(null, mainTab, {}, StackView.Immediate)
} else {
editStack.replace(null, webViewTab,
{url: Paths.defaultScripts + webTabsLinks[currentIndex]},
StackView.Immediate)
}
}
EditTabButton {
text: "CREATE"
}
EditTabButton {
text: "LIST"
}
EditTabButton {
text: "PROPERTIES"
}
EditTabButton {
text: "GRID"
}
EditTabButton {
text: "P"
}
}
StackView {
id: editStack
Layout.fillHeight: true
Layout.fillWidth: true
initialItem: mainTab//Qt.resolvedUrl('EditTabView.qml')
}
Component {
id: mainTab
Rectangle { //1st tab
color: "#404040"
Text {
color: "#ffffff"
text: "Choose an Entity Type to Create:"
font.pixelSize: 14
font.bold: true
anchors.top: parent.top
anchors.topMargin: 28
anchors.left: parent.left
anchors.leftMargin: 28
}
Flow {
id: createEntitiesFlow
spacing: 35
anchors.right: parent.right
anchors.rightMargin: 55
anchors.left: parent.left
anchors.leftMargin: 55
anchors.top: parent.top
anchors.topMargin: 70
NewEntityButton {
icon: "icons/create-icons/94-model-01.svg"
text: "MODEL"
onClicked: {
editRoot.sendToScript({
method: "newEntityButtonClicked", params: { buttonName: "newModelButton" }
});
editTabView.currentIndex = 2
}
}
NewEntityButton {
icon: "icons/create-icons/21-cube-01.svg"
text: "CUBE"
onClicked: {
editRoot.sendToScript({
method: "newEntityButtonClicked", params: { buttonName: "newCubeButton" }
});
editTabView.currentIndex = 2
}
}
NewEntityButton {
icon: "icons/create-icons/22-sphere-01.svg"
text: "SPHERE"
onClicked: {
editRoot.sendToScript({
method: "newEntityButtonClicked", params: { buttonName: "newSphereButton" }
});
editTabView.currentIndex = 2
}
}
NewEntityButton {
icon: "icons/create-icons/24-light-01.svg"
text: "LIGHT"
onClicked: {
editRoot.sendToScript({
method: "newEntityButtonClicked", params: { buttonName: "newLightButton" }
});
editTabView.currentIndex = 2
}
}
NewEntityButton {
icon: "icons/create-icons/20-text-01.svg"
text: "TEXT"
onClicked: {
editRoot.sendToScript({
method: "newEntityButtonClicked", params: { buttonName: "newTextButton" }
});
editTabView.currentIndex = 2
}
}
NewEntityButton {
icon: "icons/create-icons/25-web-1-01.svg"
text: "WEB"
onClicked: {
editRoot.sendToScript({
method: "newEntityButtonClicked", params: { buttonName: "newWebButton" }
});
editTabView.currentIndex = 2
}
}
NewEntityButton {
icon: "icons/create-icons/23-zone-01.svg"
text: "ZONE"
onClicked: {
editRoot.sendToScript({
method: "newEntityButtonClicked", params: { buttonName: "newZoneButton" }
});
editTabView.currentIndex = 2
}
}
NewEntityButton {
icon: "icons/create-icons/90-particles-01.svg"
text: "PARTICLE"
onClicked: {
editRoot.sendToScript({
method: "newEntityButtonClicked", params: { buttonName: "newParticleButton" }
});
editTabView.currentIndex = 4
}
}
}
HifiControls.Button {
id: assetServerButton
text: "Open This Domain's Asset Server"
color: hifi.buttons.black
colorScheme: hifi.colorSchemes.dark
anchors.right: parent.right
anchors.rightMargin: 55
anchors.left: parent.left
anchors.leftMargin: 55
anchors.top: createEntitiesFlow.bottom
anchors.topMargin: 35
onClicked: {
editRoot.sendToScript({
method: "newEntityButtonClicked", params: { buttonName: "openAssetBrowserButton" }
});
}
}
HifiControls.Button {
text: "Import Entities (.json)"
color: hifi.buttons.black
colorScheme: hifi.colorSchemes.dark
anchors.right: parent.right
anchors.rightMargin: 55
anchors.left: parent.left
anchors.leftMargin: 55
anchors.top: assetServerButton.bottom
anchors.topMargin: 20
onClicked: {
editRoot.sendToScript({
method: "newEntityButtonClicked", params: { buttonName: "importEntitiesButton" }
});
}
}
}
}
Component {
id: webViewTab
WebView {}
}
}

52
interface/resources/qml/hifi/tablet/EditTabButton.qml Normal file
View file

@ -0,0 +1,52 @@
//
// AudioTabButton.qml
// qml/hifi/audio
//
// Created by Vlad Stelmahovsky on 8/16/2017
// Copyright 2017 High Fidelity, Inc.
//
// Distributed under the Apache License, Version 2.0.
// See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
//
import QtQuick 2.7
import QtQuick.Controls 2.2
import "../../controls-uit" as HifiControls
import "../../styles-uit"
TabButton {
id: control
font.pixelSize: height / 2
padding: 0
spacing: 0
HifiConstants { id: hifi; }
contentItem: Text {
id: text
text: control.text
font.pixelSize: 16
font.bold: true
color: control.checked ? "white" : "white"
horizontalAlignment: Text.AlignHCenter
verticalAlignment: Text.AlignVCenter
property string glyphtext: ""
HiFiGlyphs {
anchors.centerIn: parent
size: 30
color: "#ffffff"
text: text.glyphtext
}
Component.onCompleted: {
if (control.text === "P") {
text.text = " ";
text.glyphtext = "\ue004";
}
}
}
background: Rectangle {
color: control.checked ? "#404040" :"black"
implicitWidth: control.contentItem.width + 42
implicitHeight: 40
}
}

4
interface/resources/qml/hifi/tablet/TabletAddressDialog.qml
View file

@ -9,8 +9,8 @@
//
import Hifi 1.0
import QtQuick 2.5
import QtQuick.Controls 1.4
import QtQuick 2.7
import QtQuick.Controls 2.2
import QtGraphicalEffects 1.0
import "../../controls"
import "../../styles"

4
interface/resources/qml/hifi/tablet/TabletAudioBuffers.qml
View file

@ -8,8 +8,8 @@
// See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
//
import QtQuick 2.5
import QtQuick.Controls 1.4
import QtQuick 2.7
import QtQuick.Controls 2.2
import "tabletWindows"
import "../../dialogs"

4
interface/resources/qml/hifi/tablet/TabletGeneralPreferences.qml
View file

@ -8,8 +8,8 @@
// See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
//
import QtQuick 2.5
import QtQuick.Controls 1.4
import QtQuick 2.7
import QtQuick.Controls 2.2
import "tabletWindows"
import "../../dialogs"

4
interface/resources/qml/hifi/tablet/TabletGraphicsPreferences.qml
View file

@ -8,8 +8,8 @@
// See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
//
import QtQuick 2.5
import QtQuick.Controls 1.4
import QtQuick 2.7
import QtQuick.Controls 2.2
import "tabletWindows"
import "../../dialogs"

4
interface/resources/qml/hifi/tablet/TabletLodPreferences.qml
View file

@ -8,8 +8,8 @@
// See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
//
import QtQuick 2.5
import QtQuick.Controls 1.4
import QtQuick 2.7
import QtQuick.Controls 2.2
import "tabletWindows"
import "../../dialogs"

4
interface/resources/qml/hifi/tablet/TabletNetworkingPreferences.qml
View file

@ -8,8 +8,8 @@
// See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
//
import QtQuick 2.5
import QtQuick.Controls 1.4
import QtQuick 2.7
import QtQuick.Controls 2.2
import "tabletWindows"
import "../../dialogs"