mirror of
https://github.com/AleziaKurdis/overte.git
synced 2025-04-05 14:29:56 +02:00
repurpose qmlscratch into 'controls gallery' launcher
This commit is contained in:
Alexander Ivash
parent
27bb8a0de7
commit
d0ac5128b0
16 changed files with 40 additions and 2725 deletions
14
tests-manual/ui/qml/ControlsGalleryWindow.qml
Normal file
14
tests-manual/ui/qml/ControlsGalleryWindow.qml
Normal file
|
|
@ -0,0 +1,14 @@
|
|||
import QtQuick 2.0
|
||||
import QtQuick.Window 2.3
|
||||
import QtQuick.Controls 1.4
|
||||
import '../../../scripts/developer/tests' as Tests
|
||||
|
||||
ApplicationWindow {
|
||||
width: 640
|
||||
height: 480
|
||||
visible: true
|
||||
|
||||
Tests.ControlsGallery {
|
||||
anchors.fill: parent
|
||||
}
|
||||
}
|
||||
|
|
@ -1,150 +0,0 @@
|
|||
import QtQuick 2.3
|
||||
import QtQuick.Controls 1.2
|
||||
|
||||
Rectangle {
|
||||
color: "teal"
|
||||
height: 512
|
||||
width: 192
|
||||
SystemPalette { id: sp; colorGroup: SystemPalette.Active }
|
||||
SystemPalette { id: spi; colorGroup: SystemPalette.Inactive }
|
||||
SystemPalette { id: spd; colorGroup: SystemPalette.Disabled }
|
||||
|
||||
Column {
|
||||
anchors.margins: 8
|
||||
anchors.fill: parent
|
||||
spacing: 8
|
||||
Row {
|
||||
width: parent.width
|
||||
height: 16
|
||||
Text { height: parent.height; width: 128; text: "base" }
|
||||
Rectangle { height: parent.height; width: 16; color: sp.base }
|
||||
Rectangle { height: parent.height; width: 16; color: spi.base }
|
||||
Rectangle { height: parent.height; width: 16; color: spd.base }
|
||||
}
|
||||
Row {
|
||||
width: parent.width
|
||||
height: 16
|
||||
Text { height: parent.height; width: 128; text: "alternateBase" }
|
||||
Rectangle { height: parent.height; width: 16; color: sp.alternateBase }
|
||||
Rectangle { height: parent.height; width: 16; color: spi.alternateBase }
|
||||
Rectangle { height: parent.height; width: 16; color: spd.alternateBase }
|
||||
}
|
||||
Item {
|
||||
height: 16
|
||||
width:parent.width
|
||||
}
|
||||
Row {
|
||||
width: parent.width
|
||||
height: 16
|
||||
Text { height: parent.height; width: 128; text: "dark" }
|
||||
Rectangle { height: parent.height; width: 16; color: sp.dark }
|
||||
Rectangle { height: parent.height; width: 16; color: spi.dark }
|
||||
Rectangle { height: parent.height; width: 16; color: spd.dark }
|
||||
}
|
||||
Row {
|
||||
width: parent.width
|
||||
height: 16
|
||||
Text { height: parent.height; width: 128; text: "mid" }
|
||||
Rectangle { height: parent.height; width: 16; color: sp.mid }
|
||||
Rectangle { height: parent.height; width: 16; color: spi.mid }
|
||||
Rectangle { height: parent.height; width: 16; color: spd.mid }
|
||||
}
|
||||
Row {
|
||||
width: parent.width
|
||||
height: 16
|
||||
Text { height: parent.height; width: 128; text: "mid light" }
|
||||
Rectangle { height: parent.height; width: 16; color: sp.midlight }
|
||||
Rectangle { height: parent.height; width: 16; color: spi.midlight }
|
||||
Rectangle { height: parent.height; width: 16; color: spd.midlight }
|
||||
}
|
||||
Row {
|
||||
width: parent.width
|
||||
height: 16
|
||||
Text { height: parent.height; width: 128; text: "light" }
|
||||
Rectangle { height: parent.height; width: 16; color: sp.light}
|
||||
Rectangle { height: parent.height; width: 16; color: spi.light}
|
||||
Rectangle { height: parent.height; width: 16; color: spd.light}
|
||||
}
|
||||
Row {
|
||||
width: parent.width
|
||||
height: 16
|
||||
Text { height: parent.height; width: 128; text: "shadow" }
|
||||
Rectangle { height: parent.height; width: 16; color: sp.shadow}
|
||||
Rectangle { height: parent.height; width: 16; color: spi.shadow}
|
||||
Rectangle { height: parent.height; width: 16; color: spd.shadow}
|
||||
}
|
||||
Item {
|
||||
height: 16
|
||||
width:parent.width
|
||||
}
|
||||
|
||||
Row {
|
||||
width: parent.width
|
||||
height: 16
|
||||
Text { height: parent.height; width: 128; text: "text" }
|
||||
Rectangle { height: parent.height; width: 16; color: sp.text }
|
||||
Rectangle { height: parent.height; width: 16; color: spi.text }
|
||||
Rectangle { height: parent.height; width: 16; color: spd.text }
|
||||
}
|
||||
Item {
|
||||
height: 16
|
||||
width:parent.width
|
||||
}
|
||||
Row {
|
||||
width: parent.width
|
||||
height: 16
|
||||
Text { height: parent.height; width: 128; text: "window" }
|
||||
Rectangle { height: parent.height; width: 16; color: sp.window }
|
||||
Rectangle { height: parent.height; width: 16; color: spi.window }
|
||||
Rectangle { height: parent.height; width: 16; color: spd.window }
|
||||
}
|
||||
Row {
|
||||
width: parent.width
|
||||
height: 16
|
||||
Text { height: parent.height; width: 128; text: "window text" }
|
||||
Rectangle { height: parent.height; width: 16; color: sp.windowText }
|
||||
Rectangle { height: parent.height; width: 16; color: spi.windowText }
|
||||
Rectangle { height: parent.height; width: 16; color: spd.windowText }
|
||||
}
|
||||
Item {
|
||||
height: 16
|
||||
width:parent.width
|
||||
}
|
||||
Row {
|
||||
width: parent.width
|
||||
height: 16
|
||||
Text { height: parent.height; width: 128; text: "button" }
|
||||
Rectangle { height: parent.height; width: 16; color: sp.button }
|
||||
Rectangle { height: parent.height; width: 16; color: spi.button }
|
||||
Rectangle { height: parent.height; width: 16; color: spd.button }
|
||||
}
|
||||
Row {
|
||||
width: parent.width
|
||||
height: 16
|
||||
Text { height: parent.height; width: 128; text: "buttonText" }
|
||||
Rectangle { height: parent.height; width: 16; color: sp.buttonText }
|
||||
Rectangle { height: parent.height; width: 16; color: spi.buttonText }
|
||||
Rectangle { height: parent.height; width: 16; color: spd.buttonText }
|
||||
}
|
||||
Item {
|
||||
height: 16
|
||||
width:parent.width
|
||||
}
|
||||
Row {
|
||||
width: parent.width
|
||||
height: 16
|
||||
Text { height: parent.height; width: 128; text: "highlight" }
|
||||
Rectangle { height: parent.height; width: 16; color: sp.highlight }
|
||||
Rectangle { height: parent.height; width: 16; color: spi.highlight }
|
||||
Rectangle { height: parent.height; width: 16; color: spd.highlight }
|
||||
}
|
||||
Row {
|
||||
width: parent.width
|
||||
height: 16
|
||||
Text { height: parent.height; width: 128; text: "highlighted text" }
|
||||
Rectangle { height: parent.height; width: 16; color: sp.highlightedText}
|
||||
Rectangle { height: parent.height; width: 16; color: spi.highlightedText}
|
||||
Rectangle { height: parent.height; width: 16; color: spd.highlightedText}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
@ -1,111 +0,0 @@
|
|||
import QtQuick 2.1
|
||||
import QtQuick.Controls 1.0
|
||||
import QtQuick.Layouts 1.0
|
||||
import QtQuick.Dialogs 1.0
|
||||
|
||||
Rectangle {
|
||||
id: root
|
||||
property int size: 64
|
||||
width: size
|
||||
height: size
|
||||
color: 'black'
|
||||
property int controlId: 0
|
||||
property real value: 0.5
|
||||
property int scrollWidth: 1
|
||||
property real min: 0.0
|
||||
property real max: 1.0
|
||||
property bool log: false
|
||||
property real range: max - min
|
||||
property color lineColor: 'yellow'
|
||||
property bool bar: false
|
||||
property real lastHeight: -1
|
||||
property string label: ""
|
||||
|
||||
function update() {
|
||||
value = Controller.getValue(controlId);
|
||||
if (log) {
|
||||
var log = Math.log(10) / Math.log(Math.abs(value));
|
||||
var sign = Math.sign(value);
|
||||
value = log * sign;
|
||||
}
|
||||
canvas.requestPaint();
|
||||
}
|
||||
|
||||
function drawHeight() {
|
||||
if (value < min) {
|
||||
return 0;
|
||||
}
|
||||
if (value > max) {
|
||||
return height;
|
||||
}
|
||||
return ((value - min) / range) * height;
|
||||
}
|
||||
|
||||
Timer {
|
||||
interval: 50; running: true; repeat: true
|
||||
onTriggered: root.update()
|
||||
}
|
||||
|
||||
Canvas {
|
||||
id: canvas
|
||||
anchors.fill: parent
|
||||
antialiasing: false
|
||||
|
||||
Text {
|
||||
anchors.top: parent.top
|
||||
text: root.label
|
||||
color: 'white'
|
||||
}
|
||||
|
||||
Text {
|
||||
anchors.right: parent.right
|
||||
anchors.top: parent.top
|
||||
text: root.max
|
||||
color: 'white'
|
||||
}
|
||||
|
||||
Text {
|
||||
anchors.right: parent.right
|
||||
anchors.bottom: parent.bottom
|
||||
text: root.min
|
||||
color: 'white'
|
||||
}
|
||||
|
||||
function scroll() {
|
||||
var ctx = canvas.getContext('2d');
|
||||
var image = ctx.getImageData(0, 0, canvas.width, canvas.height);
|
||||
ctx.beginPath();
|
||||
ctx.clearRect(0, 0, canvas.width, canvas.height);
|
||||
ctx.drawImage(image, -root.scrollWidth, 0, canvas.width, canvas.height)
|
||||
ctx.restore()
|
||||
}
|
||||
|
||||
onPaint: {
|
||||
scroll();
|
||||
var ctx = canvas.getContext('2d');
|
||||
ctx.save();
|
||||
var currentHeight = root.drawHeight();
|
||||
if (root.lastHeight == -1) {
|
||||
root.lastHeight = currentHeight
|
||||
}
|
||||
|
||||
// var x = canvas.width - root.drawWidth;
|
||||
// var y = canvas.height - drawHeight;
|
||||
// ctx.fillStyle = root.color
|
||||
// ctx.fillRect(x, y, root.drawWidth, root.bar ? drawHeight : 1)
|
||||
// ctx.fill();
|
||||
// ctx.restore()
|
||||
|
||||
|
||||
ctx.beginPath();
|
||||
ctx.lineWidth = 1
|
||||
ctx.strokeStyle = root.lineColor
|
||||
ctx.moveTo(canvas.width - root.scrollWidth, root.lastHeight).lineTo(canvas.width, currentHeight)
|
||||
ctx.stroke()
|
||||
ctx.restore()
|
||||
root.lastHeight = currentHeight
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
|
|
@ -1,730 +0,0 @@
|
|||
import QtQuick 2.5
|
||||
import QtQuick.Controls 1.4
|
||||
|
||||
import "../../../interface/resources/qml/hifi"
|
||||
|
||||
Menu {
|
||||
property var menuOption: MenuOption {}
|
||||
Item {
|
||||
Action {
|
||||
id: login;
|
||||
text: menuOption.login
|
||||
}
|
||||
Action {
|
||||
id: update;
|
||||
text: "Update";
|
||||
enabled: false
|
||||
}
|
||||
Action {
|
||||
id: crashReporter;
|
||||
text: "Crash Reporter...";
|
||||
enabled: false
|
||||
}
|
||||
Action {
|
||||
id: help;
|
||||
text: menuOption.help
|
||||
onTriggered: Application.showHelp()
|
||||
}
|
||||
Action {
|
||||
id: aboutApp;
|
||||
text: menuOption.aboutApp
|
||||
}
|
||||
Action {
|
||||
id: quit;
|
||||
text: menuOption.quit
|
||||
}
|
||||
|
||||
ExclusiveGroup { id: renderResolutionGroup }
|
||||
Action {
|
||||
id: renderResolutionOne;
|
||||
exclusiveGroup: renderResolutionGroup;
|
||||
text: menuOption.renderResolutionOne;
|
||||
checkable: true;
|
||||
checked: true
|
||||
}
|
||||
Action {
|
||||
id: renderResolutionTwoThird;
|
||||
exclusiveGroup: renderResolutionGroup;
|
||||
text: menuOption.renderResolutionTwoThird;
|
||||
checkable: true
|
||||
}
|
||||
Action {
|
||||
id: renderResolutionHalf;
|
||||
exclusiveGroup: renderResolutionGroup;
|
||||
text: menuOption.renderResolutionHalf;
|
||||
checkable: true
|
||||
}
|
||||
Action {
|
||||
id: renderResolutionThird;
|
||||
exclusiveGroup: renderResolutionGroup;
|
||||
text: menuOption.renderResolutionThird;
|
||||
checkable: true
|
||||
}
|
||||
Action {
|
||||
id: renderResolutionQuarter;
|
||||
exclusiveGroup: renderResolutionGroup;
|
||||
text: menuOption.renderResolutionQuarter;
|
||||
checkable: true
|
||||
}
|
||||
|
||||
ExclusiveGroup { id: ambientLightGroup }
|
||||
Action {
|
||||
id: renderAmbientLightGlobal;
|
||||
exclusiveGroup: ambientLightGroup;
|
||||
text: menuOption.renderAmbientLightGlobal;
|
||||
checkable: true;
|
||||
checked: true
|
||||
}
|
||||
Action {
|
||||
id: renderAmbientLight0;
|
||||
exclusiveGroup: ambientLightGroup;
|
||||
text: menuOption.renderAmbientLight0;
|
||||
checkable: true;
|
||||
checked: true
|
||||
}
|
||||
Action {
|
||||
id: renderAmbientLight1;
|
||||
exclusiveGroup: ambientLightGroup;
|
||||
text: menuOption.renderAmbientLight1;
|
||||
checkable: true;
|
||||
checked: true
|
||||
}
|
||||
Action {
|
||||
id: renderAmbientLight2;
|
||||
exclusiveGroup: ambientLightGroup;
|
||||
text: menuOption.renderAmbientLight2;
|
||||
checkable: true;
|
||||
checked: true
|
||||
}
|
||||
Action {
|
||||
id: renderAmbientLight3;
|
||||
exclusiveGroup: ambientLightGroup;
|
||||
text: menuOption.renderAmbientLight3;
|
||||
checkable: true;
|
||||
checked: true
|
||||
}
|
||||
Action {
|
||||
id: renderAmbientLight4;
|
||||
exclusiveGroup: ambientLightGroup;
|
||||
text: menuOption.renderAmbientLight4;
|
||||
checkable: true;
|
||||
checked: true
|
||||
}
|
||||
Action {
|
||||
id: renderAmbientLight5;
|
||||
exclusiveGroup: ambientLightGroup;
|
||||
text: menuOption.renderAmbientLight5;
|
||||
checkable: true;
|
||||
checked: true
|
||||
}
|
||||
Action {
|
||||
id: renderAmbientLight6;
|
||||
exclusiveGroup: ambientLightGroup;
|
||||
text: menuOption.renderAmbientLight6;
|
||||
checkable: true;
|
||||
checked: true
|
||||
}
|
||||
Action {
|
||||
id: renderAmbientLight7;
|
||||
exclusiveGroup: ambientLightGroup;
|
||||
text: menuOption.renderAmbientLight7;
|
||||
checkable: true;
|
||||
checked: true
|
||||
}
|
||||
Action {
|
||||
id: renderAmbientLight8;
|
||||
exclusiveGroup: ambientLightGroup;
|
||||
text: menuOption.renderAmbientLight8;
|
||||
checkable: true;
|
||||
checked: true
|
||||
}
|
||||
Action {
|
||||
id: renderAmbientLight9;
|
||||
exclusiveGroup: ambientLightGroup;
|
||||
text: menuOption.renderAmbientLight9;
|
||||
checkable: true;
|
||||
checked: true
|
||||
}
|
||||
Action {
|
||||
id: preferences
|
||||
shortcut: StandardKey.Preferences
|
||||
text: menuOption.preferences
|
||||
onTriggered: dialogsManager.editPreferences()
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
Menu {
|
||||
title: "File"
|
||||
MenuItem {
|
||||
action: login
|
||||
}
|
||||
MenuItem {
|
||||
action: update
|
||||
}
|
||||
MenuItem {
|
||||
action: help
|
||||
}
|
||||
MenuItem {
|
||||
action: crashReporter
|
||||
}
|
||||
MenuItem {
|
||||
action: aboutApp
|
||||
}
|
||||
MenuItem {
|
||||
action: quit
|
||||
}
|
||||
}
|
||||
|
||||
Menu {
|
||||
title: "Edit"
|
||||
MenuItem {
|
||||
text: "Undo" }
|
||||
MenuItem {
|
||||
text: "Redo" }
|
||||
MenuItem {
|
||||
text: menuOption.runningScripts
|
||||
}
|
||||
MenuItem {
|
||||
text: menuOption.loadScript
|
||||
}
|
||||
MenuItem {
|
||||
text: menuOption.loadScriptURL
|
||||
}
|
||||
MenuItem {
|
||||
text: menuOption.stopAllScripts
|
||||
}
|
||||
MenuItem {
|
||||
text: menuOption.reloadAllScripts
|
||||
}
|
||||
MenuItem {
|
||||
text: menuOption.scriptEditor
|
||||
}
|
||||
MenuItem {
|
||||
text: menuOption.console_
|
||||
}
|
||||
MenuItem {
|
||||
text: menuOption.reloadContent
|
||||
}
|
||||
MenuItem {
|
||||
text: menuOption.packageModel
|
||||
}
|
||||
}
|
||||
|
||||
Menu {
|
||||
title: "Audio"
|
||||
MenuItem {
|
||||
text: menuOption.muteAudio;
|
||||
checkable: true
|
||||
}
|
||||
MenuItem {
|
||||
text: menuOption.audioTools;
|
||||
checkable: true
|
||||
}
|
||||
}
|
||||
Menu {
|
||||
title: "Avatar"
|
||||
// Avatar > Attachments...
|
||||
MenuItem {
|
||||
text: menuOption.attachments
|
||||
}
|
||||
Menu {
|
||||
title: "Size"
|
||||
// Avatar > Size > Increase
|
||||
MenuItem {
|
||||
text: menuOption.increaseAvatarSize
|
||||
}
|
||||
// Avatar > Size > Decrease
|
||||
MenuItem {
|
||||
text: menuOption.decreaseAvatarSize
|
||||
}
|
||||
// Avatar > Size > Reset
|
||||
MenuItem {
|
||||
text: menuOption.resetAvatarSize
|
||||
}
|
||||
}
|
||||
// Avatar > Reset Sensors
|
||||
MenuItem {
|
||||
text: menuOption.resetSensors
|
||||
}
|
||||
}
|
||||
Menu {
|
||||
title: "Display"
|
||||
}
|
||||
Menu {
|
||||
title: "View"
|
||||
ExclusiveGroup {
|
||||
id: cameraModeGroup
|
||||
}
|
||||
|
||||
MenuItem {
|
||||
text: menuOption.firstPerson;
|
||||
checkable: true;
|
||||
exclusiveGroup: cameraModeGroup
|
||||
}
|
||||
MenuItem {
|
||||
text: menuOption.thirdPerson;
|
||||
checkable: true;
|
||||
exclusiveGroup: cameraModeGroup
|
||||
}
|
||||
MenuItem {
|
||||
text: menuOption.fullscreenMirror;
|
||||
checkable: true;
|
||||
exclusiveGroup: cameraModeGroup
|
||||
}
|
||||
MenuItem {
|
||||
text: menuOption.independentMode;
|
||||
checkable: true;
|
||||
exclusiveGroup: cameraModeGroup
|
||||
}
|
||||
MenuItem {
|
||||
text: menuOption.cameraEntityMode;
|
||||
checkable: true;
|
||||
exclusiveGroup: cameraModeGroup
|
||||
}
|
||||
MenuSeparator{}
|
||||
MenuItem {
|
||||
text: menuOption.miniMirror;
|
||||
checkable: true
|
||||
}
|
||||
}
|
||||
Menu {
|
||||
title: "Navigate"
|
||||
MenuItem {
|
||||
text: "Home" }
|
||||
MenuItem {
|
||||
text: menuOption.addressBar
|
||||
}
|
||||
MenuItem {
|
||||
text: "Directory" }
|
||||
MenuItem {
|
||||
text: menuOption.copyAddress
|
||||
}
|
||||
MenuItem {
|
||||
text: menuOption.copyPath
|
||||
}
|
||||
}
|
||||
Menu {
|
||||
title: "Settings"
|
||||
MenuItem {
|
||||
text: "Advanced Menus" }
|
||||
MenuItem {
|
||||
text: "Developer Menus" }
|
||||
MenuItem {
|
||||
text: menuOption.preferences
|
||||
}
|
||||
MenuItem {
|
||||
text: "Avatar..." }
|
||||
MenuItem {
|
||||
text: "Audio..." }
|
||||
MenuItem {
|
||||
text: "LOD..." }
|
||||
MenuItem {
|
||||
text: menuOption.inputMenu
|
||||
}
|
||||
}
|
||||
Menu {
|
||||
title: "Developer"
|
||||
Menu {
|
||||
title: "Render"
|
||||
MenuItem {
|
||||
text: menuOption.atmosphere;
|
||||
checkable: true
|
||||
}
|
||||
MenuItem {
|
||||
text: menuOption.worldAxes;
|
||||
checkable: true
|
||||
}
|
||||
MenuItem {
|
||||
text: menuOption.debugAmbientOcclusion;
|
||||
checkable: true
|
||||
}
|
||||
MenuItem {
|
||||
text: menuOption.antialiasing;
|
||||
checkable: true
|
||||
}
|
||||
MenuItem {
|
||||
text: menuOption.stars;
|
||||
checkable: true
|
||||
}
|
||||
Menu {
|
||||
title: menuOption.renderAmbientLight
|
||||
MenuItem {
|
||||
action: renderAmbientLightGlobal; }
|
||||
MenuItem {
|
||||
action: renderAmbientLight0; }
|
||||
MenuItem {
|
||||
action: renderAmbientLight1; }
|
||||
MenuItem {
|
||||
action: renderAmbientLight2; }
|
||||
MenuItem {
|
||||
action: renderAmbientLight3; }
|
||||
MenuItem {
|
||||
action: renderAmbientLight4; }
|
||||
MenuItem {
|
||||
action: renderAmbientLight5; }
|
||||
MenuItem {
|
||||
action: renderAmbientLight6; }
|
||||
MenuItem {
|
||||
action: renderAmbientLight7; }
|
||||
MenuItem {
|
||||
action: renderAmbientLight8; }
|
||||
MenuItem {
|
||||
action: renderAmbientLight9; }
|
||||
}
|
||||
MenuItem {
|
||||
text: menuOption.throttleFPSIfNotFocus;
|
||||
checkable: true
|
||||
}
|
||||
Menu {
|
||||
title: menuOption.renderResolution
|
||||
MenuItem {
|
||||
action: renderResolutionOne
|
||||
}
|
||||
MenuItem {
|
||||
action: renderResolutionTwoThird
|
||||
}
|
||||
MenuItem {
|
||||
action: renderResolutionHalf
|
||||
}
|
||||
MenuItem {
|
||||
action: renderResolutionThird
|
||||
}
|
||||
MenuItem {
|
||||
action: renderResolutionQuarter
|
||||
}
|
||||
}
|
||||
MenuItem {
|
||||
text: menuOption.lodTools
|
||||
}
|
||||
}
|
||||
Menu {
|
||||
title: "Assets"
|
||||
MenuItem {
|
||||
text: menuOption.uploadAsset
|
||||
}
|
||||
MenuItem {
|
||||
text: menuOption.assetMigration
|
||||
}
|
||||
}
|
||||
Menu {
|
||||
title: "Avatar"
|
||||
Menu {
|
||||
title: "Face Tracking"
|
||||
MenuItem {
|
||||
text: menuOption.noFaceTracking;
|
||||
checkable: true
|
||||
}
|
||||
MenuItem {
|
||||
text: menuOption.faceshift;
|
||||
checkable: true
|
||||
}
|
||||
MenuItem {
|
||||
text: menuOption.useCamera;
|
||||
checkable: true
|
||||
}
|
||||
MenuSeparator{}
|
||||
MenuItem {
|
||||
text: menuOption.binaryEyelidControl;
|
||||
checkable: true
|
||||
}
|
||||
MenuItem {
|
||||
text: menuOption.coupleEyelids;
|
||||
checkable: true
|
||||
}
|
||||
MenuItem {
|
||||
text: menuOption.useAudioForMouth;
|
||||
checkable: true
|
||||
}
|
||||
MenuItem {
|
||||
text: menuOption.velocityFilter;
|
||||
checkable: true
|
||||
}
|
||||
MenuItem {
|
||||
text: menuOption.calibrateCamera
|
||||
}
|
||||
MenuSeparator{}
|
||||
MenuItem {
|
||||
text: menuOption.muteFaceTracking;
|
||||
checkable: true
|
||||
}
|
||||
MenuItem {
|
||||
text: menuOption.autoMuteAudio;
|
||||
checkable: true
|
||||
}
|
||||
}
|
||||
Menu {
|
||||
title: "Eye Tracking"
|
||||
MenuItem {
|
||||
text: menuOption.sMIEyeTracking;
|
||||
checkable: true
|
||||
}
|
||||
Menu {
|
||||
title: "Calibrate"
|
||||
MenuItem {
|
||||
text: menuOption.onePointCalibration
|
||||
}
|
||||
MenuItem {
|
||||
text: menuOption.threePointCalibration
|
||||
}
|
||||
MenuItem {
|
||||
text: menuOption.fivePointCalibration
|
||||
}
|
||||
}
|
||||
MenuItem {
|
||||
text: menuOption.simulateEyeTracking;
|
||||
checkable: true
|
||||
}
|
||||
}
|
||||
MenuItem {
|
||||
text: menuOption.avatarReceiveStats;
|
||||
checkable: true
|
||||
}
|
||||
MenuItem {
|
||||
text: menuOption.renderBoundingCollisionShapes;
|
||||
checkable: true
|
||||
}
|
||||
MenuItem {
|
||||
text: menuOption.renderLookAtVectors;
|
||||
checkable: true
|
||||
}
|
||||
MenuItem {
|
||||
text: menuOption.renderLookAtTargets;
|
||||
checkable: true
|
||||
}
|
||||
MenuItem {
|
||||
text: menuOption.renderFocusIndicator;
|
||||
checkable: true
|
||||
}
|
||||
MenuItem {
|
||||
text: menuOption.showWhosLookingAtMe;
|
||||
checkable: true
|
||||
}
|
||||
MenuItem {
|
||||
text: menuOption.fixGaze;
|
||||
checkable: true
|
||||
}
|
||||
MenuItem {
|
||||
text: menuOption.animDebugDrawDefaultPose;
|
||||
checkable: true
|
||||
}
|
||||
MenuItem {
|
||||
text: menuOption.animDebugDrawAnimPose;
|
||||
checkable: true
|
||||
}
|
||||
MenuItem {
|
||||
text: menuOption.animDebugDrawPosition;
|
||||
checkable: true
|
||||
}
|
||||
MenuItem {
|
||||
text: menuOption.meshVisible;
|
||||
checkable: true
|
||||
}
|
||||
MenuItem {
|
||||
text: menuOption.disableEyelidAdjustment;
|
||||
checkable: true
|
||||
}
|
||||
MenuItem {
|
||||
text: menuOption.turnWithHead;
|
||||
checkable: true
|
||||
}
|
||||
MenuItem {
|
||||
text: menuOption.keyboardMotorControl;
|
||||
checkable: true
|
||||
}
|
||||
MenuItem {
|
||||
text: menuOption.scriptedMotorControl;
|
||||
checkable: true
|
||||
}
|
||||
MenuItem {
|
||||
text: menuOption.enableCharacterController;
|
||||
checkable: true
|
||||
}
|
||||
}
|
||||
Menu {
|
||||
title: "Hands"
|
||||
MenuItem {
|
||||
text: menuOption.displayHandTargets;
|
||||
checkable: true
|
||||
}
|
||||
MenuItem {
|
||||
text: menuOption.lowVelocityFilter;
|
||||
checkable: true
|
||||
}
|
||||
Menu {
|
||||
title: "Leap Motion"
|
||||
MenuItem {
|
||||
text: menuOption.leapMotionOnHMD;
|
||||
checkable: true
|
||||
}
|
||||
}
|
||||
}
|
||||
Menu {
|
||||
title: "Entities"
|
||||
MenuItem {
|
||||
text: menuOption.octreeStats
|
||||
}
|
||||
MenuItem {
|
||||
text: menuOption.showRealtimeEntityStats;
|
||||
checkable: true
|
||||
}
|
||||
}
|
||||
Menu {
|
||||
title: "Network"
|
||||
MenuItem {
|
||||
text: menuOption.reloadContent
|
||||
}
|
||||
MenuItem {
|
||||
text: menuOption.disableNackPackets;
|
||||
checkable: true
|
||||
}
|
||||
MenuItem {
|
||||
text: menuOption.disableActivityLogger;
|
||||
checkable: true
|
||||
}
|
||||
MenuItem {
|
||||
text: menuOption.cachesSize
|
||||
}
|
||||
MenuItem {
|
||||
text: menuOption.diskCacheEditor
|
||||
}
|
||||
MenuItem {
|
||||
text: menuOption.showDSConnectTable
|
||||
}
|
||||
MenuItem {
|
||||
text: menuOption.bandwidthDetails
|
||||
}
|
||||
}
|
||||
Menu {
|
||||
title: "Timing"
|
||||
Menu {
|
||||
title: "Performance Timer"
|
||||
MenuItem {
|
||||
text: menuOption.displayDebugTimingDetails;
|
||||
checkable: true
|
||||
}
|
||||
MenuItem {
|
||||
text: menuOption.onlyDisplayTopTen;
|
||||
checkable: true
|
||||
}
|
||||
MenuItem {
|
||||
text: menuOption.expandUpdateTiming;
|
||||
checkable: true
|
||||
}
|
||||
MenuItem {
|
||||
text: menuOption.expandMyAvatarTiming;
|
||||
checkable: true
|
||||
}
|
||||
MenuItem {
|
||||
text: menuOption.expandMyAvatarSimulateTiming;
|
||||
checkable: true
|
||||
}
|
||||
MenuItem {
|
||||
text: menuOption.expandOtherAvatarTiming;
|
||||
checkable: true
|
||||
}
|
||||
MenuItem {
|
||||
text: menuOption.expandPaintGLTiming;
|
||||
checkable: true
|
||||
}
|
||||
}
|
||||
MenuItem {
|
||||
text: menuOption.frameTimer;
|
||||
checkable: true
|
||||
}
|
||||
MenuItem {
|
||||
text: menuOption.runTimingTests
|
||||
}
|
||||
MenuItem {
|
||||
text: menuOption.pipelineWarnings;
|
||||
checkable: true
|
||||
}
|
||||
MenuItem {
|
||||
text: menuOption.logExtraTimings;
|
||||
checkable: true
|
||||
}
|
||||
MenuItem {
|
||||
text: menuOption.suppressShortTimings;
|
||||
checkable: true
|
||||
}
|
||||
}
|
||||
Menu {
|
||||
title: "Audio"
|
||||
MenuItem {
|
||||
text: menuOption.audioNoiseReduction;
|
||||
checkable: true
|
||||
}
|
||||
MenuItem {
|
||||
text: menuOption.echoServerAudio;
|
||||
checkable: true
|
||||
}
|
||||
MenuItem {
|
||||
text: menuOption.echoLocalAudio;
|
||||
checkable: true
|
||||
}
|
||||
MenuItem {
|
||||
text: menuOption.muteEnvironment
|
||||
}
|
||||
Menu {
|
||||
title: "Audio"
|
||||
MenuItem {
|
||||
text: menuOption.audioScope;
|
||||
checkable: true
|
||||
}
|
||||
MenuItem {
|
||||
text: menuOption.audioScopePause;
|
||||
checkable: true
|
||||
}
|
||||
Menu {
|
||||
title: "Display Frames"
|
||||
ExclusiveGroup {
|
||||
id: audioScopeFramesGroup
|
||||
}
|
||||
MenuItem {
|
||||
exclusiveGroup: audioScopeFramesGroup;
|
||||
text: menuOption.audioScopeFiveFrames;
|
||||
checkable: true
|
||||
}
|
||||
MenuItem {
|
||||
exclusiveGroup: audioScopeFramesGroup;
|
||||
text: menuOption.audioScopeTwentyFrames;
|
||||
checkable: true
|
||||
}
|
||||
MenuItem {
|
||||
exclusiveGroup: audioScopeFramesGroup;
|
||||
text: menuOption.audioScopeFiftyFrames;
|
||||
checkable: true
|
||||
}
|
||||
}
|
||||
MenuItem {
|
||||
text: menuOption.audioNetworkStats
|
||||
}
|
||||
}
|
||||
}
|
||||
Menu {
|
||||
title: "Physics"
|
||||
MenuItem {
|
||||
text: menuOption.physicsShowOwned;
|
||||
checkable: true
|
||||
}
|
||||
MenuItem {
|
||||
text: menuOption.physicsShowHulls;
|
||||
checkable: true
|
||||
}
|
||||
}
|
||||
MenuItem {
|
||||
text: menuOption.displayCrashOptions;
|
||||
checkable: true
|
||||
}
|
||||
MenuItem {
|
||||
text: menuOption.crashInterface
|
||||
}
|
||||
MenuItem {
|
||||
text: menuOption.log
|
||||
}
|
||||
MenuItem {
|
||||
text: menuOption.stats;
|
||||
checkable: true
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
@ -1,346 +0,0 @@
|
|||
import QtQuick 2.5
|
||||
import QtQuick.Controls 1.4
|
||||
|
||||
// Stubs for the global service objects set by Interface.cpp when creating the UI
|
||||
// This is useful for testing inside Qt creator where these services don't actually exist.
|
||||
Item {
|
||||
|
||||
Item {
|
||||
objectName: "offscreenFlags"
|
||||
property bool navigationFocused: false
|
||||
}
|
||||
|
||||
Item {
|
||||
objectName: "urlHandler"
|
||||
function fixupUrl(url) { return url; }
|
||||
function canHandleUrl(url) { return false; }
|
||||
function handleUrl(url) { return true; }
|
||||
}
|
||||
|
||||
Item {
|
||||
objectName: "Account"
|
||||
function isLoggedIn() { return true; }
|
||||
function getUsername() { return "Jherico"; }
|
||||
}
|
||||
|
||||
Item {
|
||||
objectName: "GL"
|
||||
property string vendor: ""
|
||||
}
|
||||
|
||||
Item {
|
||||
objectName: "ApplicationCompositor"
|
||||
property bool reticleOverDesktop: true
|
||||
}
|
||||
|
||||
Item {
|
||||
objectName: "Controller"
|
||||
function getRecommendedOverlayRect() {
|
||||
return Qt.rect(0, 0, 1920, 1080);
|
||||
}
|
||||
}
|
||||
|
||||
Item {
|
||||
objectName: "Preferences"
|
||||
// List of categories obtained by logging categories as they are added in Interface in Preferences::addPreference().
|
||||
property var categories: [
|
||||
"Avatar Basics", "Snapshots", "Scripts", "Privacy", "Level of Detail Tuning", "Avatar Tuning", "Avatar Camera",
|
||||
"Audio", "Octree", "HMD", "Sixense Controllers", "Graphics"
|
||||
]
|
||||
}
|
||||
|
||||
Item {
|
||||
objectName: "ScriptDiscoveryService"
|
||||
//property var scriptsModelFilter: scriptsModel
|
||||
signal scriptCountChanged()
|
||||
property var _runningScripts:[
|
||||
{ name: "wireFrameTest.js", url: "foo/wireframetest.js", path: "foo/wireframetest.js", local: true },
|
||||
{ name: "edit.js", url: "foo/edit.js", path: "foo/edit.js", local: false },
|
||||
{ name: "listAllScripts.js", url: "foo/listAllScripts.js", path: "foo/listAllScripts.js", local: false },
|
||||
{ name: "users.js", url: "foo/users.js", path: "foo/users.js", local: false },
|
||||
]
|
||||
|
||||
function getRunning() {
|
||||
return _runningScripts;
|
||||
}
|
||||
}
|
||||
|
||||
Item {
|
||||
objectName: "HMD"
|
||||
property bool active: false
|
||||
}
|
||||
|
||||
Item {
|
||||
id: menuHelper
|
||||
objectName: "MenuHelper"
|
||||
|
||||
Component {
|
||||
id: modelMaker
|
||||
ListModel { }
|
||||
}
|
||||
|
||||
function toModel(menu, parent) {
|
||||
if (!parent) { parent = menuHelper }
|
||||
var result = modelMaker.createObject(parent);
|
||||
if (menu.type !== MenuItemType.Menu) {
|
||||
console.warn("Not a menu: " + menu);
|
||||
return result;
|
||||
}
|
||||
|
||||
var items = menu.items;
|
||||
for (var i = 0; i < items.length; ++i) {
|
||||
var item = items[i];
|
||||
switch (item.type) {
|
||||
case 2:
|
||||
result.append({"name": item.title, "item": item})
|
||||
break;
|
||||
case 1:
|
||||
result.append({"name": item.text, "item": item})
|
||||
break;
|
||||
case 0:
|
||||
result.append({"name": "", "item": item})
|
||||
break;
|
||||
}
|
||||
}
|
||||
return result;
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
Item {
|
||||
objectName: "Desktop"
|
||||
|
||||
property string _OFFSCREEN_ROOT_OBJECT_NAME: "desktopRoot";
|
||||
property string _OFFSCREEN_DIALOG_OBJECT_NAME: "topLevelWindow";
|
||||
|
||||
|
||||
function findChild(item, name) {
|
||||
for (var i = 0; i < item.children.length; ++i) {
|
||||
if (item.children[i].objectName === name) {
|
||||
return item.children[i];
|
||||
}
|
||||
}
|
||||
return null;
|
||||
}
|
||||
|
||||
function findParent(item, name) {
|
||||
while (item) {
|
||||
if (item.objectName === name) {
|
||||
return item;
|
||||
}
|
||||
item = item.parent;
|
||||
}
|
||||
return null;
|
||||
}
|
||||
|
||||
function findDialog(item) {
|
||||
item = findParent(item, _OFFSCREEN_DIALOG_OBJECT_NAME);
|
||||
return item;
|
||||
}
|
||||
|
||||
function closeDialog(item) {
|
||||
item = findDialog(item);
|
||||
if (item) {
|
||||
item.visible = false
|
||||
} else {
|
||||
console.warn("Could not find top level dialog")
|
||||
}
|
||||
}
|
||||
|
||||
function getDesktop(item) {
|
||||
while (item) {
|
||||
if (item.desktopRoot) {
|
||||
break;
|
||||
}
|
||||
item = item.parent;
|
||||
}
|
||||
return item
|
||||
}
|
||||
|
||||
function raise(item) {
|
||||
var desktop = getDesktop(item);
|
||||
if (desktop) {
|
||||
desktop.raise(item);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
Menu {
|
||||
id: root
|
||||
objectName: "rootMenu"
|
||||
|
||||
Menu {
|
||||
title: "Audio"
|
||||
}
|
||||
|
||||
Menu {
|
||||
title: "Avatar"
|
||||
}
|
||||
|
||||
Menu {
|
||||
title: "Display"
|
||||
ExclusiveGroup { id: displayMode }
|
||||
Menu {
|
||||
title: "More Stuff"
|
||||
|
||||
Menu { title: "Empty" }
|
||||
|
||||
MenuItem {
|
||||
text: "Do Nothing"
|
||||
onTriggered: console.log("Nothing")
|
||||
}
|
||||
}
|
||||
MenuItem {
|
||||
text: "Oculus"
|
||||
exclusiveGroup: displayMode
|
||||
checkable: true
|
||||
}
|
||||
MenuItem {
|
||||
text: "OpenVR"
|
||||
exclusiveGroup: displayMode
|
||||
checkable: true
|
||||
}
|
||||
MenuItem {
|
||||
text: "OSVR"
|
||||
exclusiveGroup: displayMode
|
||||
checkable: true
|
||||
}
|
||||
MenuItem {
|
||||
text: "2D Screen"
|
||||
exclusiveGroup: displayMode
|
||||
checkable: true
|
||||
checked: true
|
||||
}
|
||||
MenuItem {
|
||||
text: "3D Screen (Active)"
|
||||
exclusiveGroup: displayMode
|
||||
checkable: true
|
||||
}
|
||||
MenuItem {
|
||||
text: "3D Screen (Passive)"
|
||||
exclusiveGroup: displayMode
|
||||
checkable: true
|
||||
}
|
||||
}
|
||||
|
||||
Menu {
|
||||
title: "View"
|
||||
Menu {
|
||||
title: "Camera Mode"
|
||||
ExclusiveGroup { id: cameraMode }
|
||||
MenuItem {
|
||||
exclusiveGroup: cameraMode
|
||||
text: "First Person";
|
||||
onTriggered: console.log(text + " checked " + checked)
|
||||
checkable: true
|
||||
checked: true
|
||||
}
|
||||
MenuItem {
|
||||
exclusiveGroup: cameraMode
|
||||
text: "Third Person";
|
||||
onTriggered: console.log(text)
|
||||
checkable: true
|
||||
}
|
||||
MenuItem {
|
||||
exclusiveGroup: cameraMode
|
||||
text: "Independent Mode";
|
||||
onTriggered: console.log(text)
|
||||
checkable: true
|
||||
}
|
||||
MenuItem {
|
||||
exclusiveGroup: cameraMode
|
||||
text: "Entity Mode";
|
||||
onTriggered: console.log(text)
|
||||
enabled: false
|
||||
checkable: true
|
||||
}
|
||||
MenuItem {
|
||||
exclusiveGroup: cameraMode
|
||||
text: "Fullscreen Mirror";
|
||||
onTriggered: console.log(text)
|
||||
checkable: true
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
Menu {
|
||||
title: "Edit"
|
||||
|
||||
MenuItem {
|
||||
text: "Undo"
|
||||
shortcut: "Ctrl+Z"
|
||||
enabled: false
|
||||
onTriggered: console.log(text)
|
||||
}
|
||||
|
||||
MenuItem {
|
||||
text: "Redo"
|
||||
shortcut: "Ctrl+Shift+Z"
|
||||
enabled: false
|
||||
onTriggered: console.log(text)
|
||||
}
|
||||
|
||||
MenuSeparator { }
|
||||
|
||||
MenuItem {
|
||||
text: "Cut"
|
||||
shortcut: "Ctrl+X"
|
||||
onTriggered: console.log(text)
|
||||
}
|
||||
|
||||
MenuItem {
|
||||
text: "Copy"
|
||||
shortcut: "Ctrl+C"
|
||||
onTriggered: console.log(text)
|
||||
}
|
||||
|
||||
MenuItem {
|
||||
text: "Paste"
|
||||
shortcut: "Ctrl+V"
|
||||
visible: false
|
||||
onTriggered: console.log("Paste")
|
||||
}
|
||||
}
|
||||
|
||||
Menu {
|
||||
title: "Navigate"
|
||||
}
|
||||
|
||||
Menu {
|
||||
title: "Market"
|
||||
}
|
||||
|
||||
Menu {
|
||||
title: "Settings"
|
||||
}
|
||||
|
||||
Menu {
|
||||
title: "Developer"
|
||||
}
|
||||
|
||||
Menu {
|
||||
title: "Quit"
|
||||
}
|
||||
|
||||
Menu {
|
||||
title: "File"
|
||||
|
||||
Action {
|
||||
id: login
|
||||
text: "Login"
|
||||
}
|
||||
|
||||
Action {
|
||||
id: quit
|
||||
text: "Quit"
|
||||
shortcut: "Ctrl+Q"
|
||||
onTriggered: Qt.quit();
|
||||
}
|
||||
|
||||
MenuItem { action: quit }
|
||||
MenuItem { action: login }
|
||||
}
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
|
|
@ -1,160 +0,0 @@
|
|||
import QtQuick 2.3
|
||||
import QtQuick.Controls 1.2
|
||||
import QtQuick.Layouts 1.0
|
||||
import QtQuick.Dialogs 1.0
|
||||
|
||||
import "controller"
|
||||
import "controls" as HifiControls
|
||||
import "styles"
|
||||
|
||||
HifiControls.VrDialog {
|
||||
id: root
|
||||
HifiConstants { id: hifi }
|
||||
title: "Controller Test"
|
||||
resizable: true
|
||||
contentImplicitWidth: clientArea.implicitWidth
|
||||
contentImplicitHeight: clientArea.implicitHeight
|
||||
backgroundColor: "beige"
|
||||
|
||||
property var actions: Controller.Actions
|
||||
property var standard: Controller.Standard
|
||||
property var hydra: null
|
||||
property var testMapping: null
|
||||
property bool testMappingEnabled: false
|
||||
property var xbox: null
|
||||
|
||||
function buildMapping() {
|
||||
testMapping = Controller.newMapping();
|
||||
testMapping.fromQml(standard.RY).invert().toQml(actions.Pitch);
|
||||
testMapping.fromQml(function(){
|
||||
return Math.sin(Date.now() / 250);
|
||||
}).toQml(actions.Yaw);
|
||||
//testMapping.makeAxis(standard.LB, standard.RB).to(actions.Yaw);
|
||||
// Step yaw takes a number of degrees
|
||||
testMapping.fromQml(standard.LB).pulse(0.10).invert().scale(40.0).toQml(actions.StepYaw);
|
||||
testMapping.fromQml(standard.RB).pulse(0.10).scale(15.0).toQml(actions.StepYaw);
|
||||
testMapping.fromQml(standard.RX).scale(15.0).toQml(actions.StepYaw);
|
||||
}
|
||||
|
||||
function toggleMapping() {
|
||||
testMapping.enable(!testMappingEnabled);
|
||||
testMappingEnabled = !testMappingEnabled;
|
||||
}
|
||||
|
||||
Component.onCompleted: {
|
||||
var xboxRegex = /^GamePad/;
|
||||
var hydraRegex = /^Hydra/;
|
||||
for (var prop in Controller.Hardware) {
|
||||
if(xboxRegex.test(prop)) {
|
||||
root.xbox = Controller.Hardware[prop]
|
||||
print("found xbox")
|
||||
continue
|
||||
}
|
||||
if (hydraRegex.test(prop)) {
|
||||
root.hydra = Controller.Hardware[prop]
|
||||
print("found hydra")
|
||||
continue
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
Column {
|
||||
id: clientArea
|
||||
spacing: 12
|
||||
x: root.clientX
|
||||
y: root.clientY
|
||||
|
||||
Row {
|
||||
spacing: 8
|
||||
|
||||
Button {
|
||||
text: !root.testMapping ? "Build Mapping" : (root.testMappingEnabled ? "Disable Mapping" : "Enable Mapping")
|
||||
onClicked: {
|
||||
|
||||
if (!root.testMapping) {
|
||||
root.buildMapping()
|
||||
} else {
|
||||
root.toggleMapping();
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
Row {
|
||||
Standard { device: root.standard; label: "Standard"; width: 180 }
|
||||
}
|
||||
|
||||
Row {
|
||||
spacing: 8
|
||||
Xbox { device: root.xbox; label: "XBox"; width: 180 }
|
||||
Hydra { device: root.hydra; width: 180 }
|
||||
}
|
||||
|
||||
Row {
|
||||
spacing: 4
|
||||
ScrollingGraph {
|
||||
controlId: Controller.Actions.Yaw
|
||||
label: "Yaw"
|
||||
min: -2.0
|
||||
max: 2.0
|
||||
size: 64
|
||||
}
|
||||
|
||||
ScrollingGraph {
|
||||
controlId: Controller.Actions.YawLeft
|
||||
label: "Yaw Left"
|
||||
min: -2.0
|
||||
max: 2.0
|
||||
size: 64
|
||||
}
|
||||
|
||||
ScrollingGraph {
|
||||
controlId: Controller.Actions.YawRight
|
||||
label: "Yaw Right"
|
||||
min: -2.0
|
||||
max: 2.0
|
||||
size: 64
|
||||
}
|
||||
|
||||
ScrollingGraph {
|
||||
controlId: Controller.Actions.StepYaw
|
||||
label: "StepYaw"
|
||||
min: -20.0
|
||||
max: 20.0
|
||||
size: 64
|
||||
}
|
||||
}
|
||||
|
||||
Row {
|
||||
ScrollingGraph {
|
||||
controlId: Controller.Actions.TranslateZ
|
||||
label: "TranslateZ"
|
||||
min: -2.0
|
||||
max: 2.0
|
||||
size: 64
|
||||
}
|
||||
|
||||
ScrollingGraph {
|
||||
controlId: Controller.Actions.Forward
|
||||
label: "Forward"
|
||||
min: -2.0
|
||||
max: 2.0
|
||||
size: 64
|
||||
}
|
||||
|
||||
ScrollingGraph {
|
||||
controlId: Controller.Actions.Backward
|
||||
label: "Backward"
|
||||
min: -2.0
|
||||
max: 2.0
|
||||
size: 64
|
||||
}
|
||||
|
||||
}
|
||||
}
|
||||
} // dialog
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
|
@ -1,94 +0,0 @@
|
|||
import QtQuick 2.3
|
||||
import QtQuick.Controls 1.2
|
||||
import QtQuick.Controls.Styles 1.3
|
||||
import "controls"
|
||||
|
||||
VrDialog {
|
||||
title: "Test Dialog"
|
||||
id: testDialog
|
||||
objectName: "TestDialog"
|
||||
width: 512
|
||||
height: 512
|
||||
animationDuration: 200
|
||||
|
||||
onEnabledChanged: {
|
||||
if (enabled) {
|
||||
edit.forceActiveFocus();
|
||||
}
|
||||
}
|
||||
|
||||
Item {
|
||||
id: clientArea
|
||||
// The client area
|
||||
anchors.fill: parent
|
||||
anchors.margins: parent.margins
|
||||
anchors.topMargin: parent.topMargin
|
||||
|
||||
Rectangle {
|
||||
property int d: 100
|
||||
id: square
|
||||
objectName: "testRect"
|
||||
width: d
|
||||
height: d
|
||||
anchors.centerIn: parent
|
||||
color: "red"
|
||||
NumberAnimation on rotation { from: 0; to: 360; duration: 2000; loops: Animation.Infinite; }
|
||||
}
|
||||
|
||||
|
||||
TextEdit {
|
||||
id: edit
|
||||
anchors.left: parent.left
|
||||
anchors.leftMargin: 12
|
||||
anchors.right: parent.right
|
||||
anchors.rightMargin: 12
|
||||
clip: true
|
||||
text: "test edit"
|
||||
anchors.top: parent.top
|
||||
anchors.topMargin: 12
|
||||
}
|
||||
|
||||
Button {
|
||||
x: 128
|
||||
y: 192
|
||||
text: "Test"
|
||||
anchors.bottom: parent.bottom
|
||||
anchors.bottomMargin: 12
|
||||
anchors.right: parent.right
|
||||
anchors.rightMargin: 12
|
||||
onClicked: {
|
||||
console.log("Click");
|
||||
|
||||
if (square.visible) {
|
||||
square.visible = false
|
||||
} else {
|
||||
square.visible = true
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
Button {
|
||||
id: customButton2
|
||||
y: 192
|
||||
text: "Move"
|
||||
anchors.left: parent.left
|
||||
anchors.leftMargin: 12
|
||||
anchors.bottom: parent.bottom
|
||||
anchors.bottomMargin: 12
|
||||
onClicked: {
|
||||
onClicked: testDialog.x == 0 ? testDialog.x = 200 : testDialog.x = 0
|
||||
}
|
||||
}
|
||||
|
||||
Keys.onPressed: {
|
||||
console.log("Key " + event.key);
|
||||
switch (event.key) {
|
||||
case Qt.Key_Q:
|
||||
if (Qt.ControlModifier == event.modifiers) {
|
||||
event.accepted = true;
|
||||
break;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
@ -1,10 +0,0 @@
|
|||
import QtQuick 2.4
|
||||
import QtQuick.Controls 1.3
|
||||
import Hifi 1.0
|
||||
|
||||
// Currently for testing a pure QML replacement menu
|
||||
Item {
|
||||
Menu {
|
||||
objectName: "rootMenu";
|
||||
}
|
||||
}
|
||||
|
|
@ -1,43 +0,0 @@
|
|||
import Hifi 1.0
|
||||
import QtQuick 2.3
|
||||
import QtQuick.Controls 1.3
|
||||
// Import local folder last so that our own control customizations override
|
||||
// the built in ones
|
||||
import "controls"
|
||||
|
||||
Root {
|
||||
id: root
|
||||
anchors.fill: parent
|
||||
onParentChanged: {
|
||||
forceActiveFocus();
|
||||
}
|
||||
Button {
|
||||
id: messageBox
|
||||
anchors.right: createDialog.left
|
||||
anchors.rightMargin: 24
|
||||
anchors.bottom: parent.bottom
|
||||
anchors.bottomMargin: 24
|
||||
text: "Message"
|
||||
onClicked: {
|
||||
console.log("Foo")
|
||||
root.information("a")
|
||||
console.log("Bar")
|
||||
}
|
||||
}
|
||||
Button {
|
||||
id: createDialog
|
||||
anchors.right: parent.right
|
||||
anchors.rightMargin: 24
|
||||
anchors.bottom: parent.bottom
|
||||
anchors.bottomMargin: 24
|
||||
text: "Create"
|
||||
onClicked: {
|
||||
root.loadChild("MenuTest.qml");
|
||||
}
|
||||
}
|
||||
|
||||
Keys.onPressed: {
|
||||
console.log("Key press root")
|
||||
}
|
||||
}
|
||||
|
||||
|
|
@ -1,128 +0,0 @@
|
|||
/****************************************************************************
|
||||
**
|
||||
** Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies).
|
||||
** Contact: http://www.qt-project.org/legal
|
||||
**
|
||||
** This file is part of the Qt Quick Controls module of the Qt Toolkit.
|
||||
**
|
||||
** $QT_BEGIN_LICENSE:BSD$
|
||||
** You may use this file under the terms of the BSD license as follows:
|
||||
**
|
||||
** "Redistribution and use in source and binary forms, with or without
|
||||
** modification, are permitted provided that the following conditions are
|
||||
** met:
|
||||
** * Redistributions of source code must retain the above copyright
|
||||
** notice, this list of conditions and the following disclaimer.
|
||||
** * Redistributions in binary form must reproduce the above copyright
|
||||
** notice, this list of conditions and the following disclaimer in
|
||||
** the documentation and/or other materials provided with the
|
||||
** distribution.
|
||||
** * Neither the name of Digia Plc and its Subsidiary(-ies) nor the names
|
||||
** of its contributors may be used to endorse or promote products derived
|
||||
** from this software without specific prior written permission.
|
||||
**
|
||||
**
|
||||
** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
|
||||
** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
|
||||
** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
|
||||
** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
|
||||
** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
|
||||
** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
|
||||
** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
|
||||
** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
|
||||
** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
|
||||
** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
|
||||
** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
|
||||
**
|
||||
** $QT_END_LICENSE$
|
||||
**
|
||||
****************************************************************************/
|
||||
|
||||
import QtQuick 2.2
|
||||
import QtQuick.Layouts 1.1
|
||||
import QtQuick.Controls 1.2
|
||||
|
||||
ScrollView {
|
||||
id: page
|
||||
|
||||
horizontalScrollBarPolicy: Qt.ScrollBarAlwaysOff
|
||||
|
||||
Item {
|
||||
id: content
|
||||
|
||||
width: Math.max(page.viewport.width, grid.implicitWidth + 2 * grid.rowSpacing)
|
||||
height: Math.max(page.viewport.height, grid.implicitHeight + 2 * grid.columnSpacing)
|
||||
|
||||
GridLayout {
|
||||
id: grid
|
||||
|
||||
anchors.top: parent.top
|
||||
anchors.left: parent.left
|
||||
anchors.right: parent.right
|
||||
anchors.leftMargin: grid.rowSpacing
|
||||
anchors.rightMargin: grid.rowSpacing
|
||||
anchors.topMargin: grid.columnSpacing
|
||||
|
||||
columns: page.width < page.height ? 1 : 2
|
||||
|
||||
GroupBox {
|
||||
title: "Button"
|
||||
Layout.fillWidth: true
|
||||
Layout.columnSpan: grid.columns
|
||||
RowLayout {
|
||||
anchors.fill: parent
|
||||
Button { text: "OK"; isDefault: true }
|
||||
Button { text: "Cancel" }
|
||||
Item { Layout.fillWidth: true }
|
||||
Button {
|
||||
text: "Attach"
|
||||
menu: Menu {
|
||||
MenuItem { text: "Image" }
|
||||
MenuItem { text: "Document" }
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
GroupBox {
|
||||
title: "CheckBox"
|
||||
Layout.fillWidth: true
|
||||
ColumnLayout {
|
||||
anchors.fill: parent
|
||||
CheckBox { text: "E-mail"; checked: true }
|
||||
CheckBox { text: "Calendar"; checked: true }
|
||||
CheckBox { text: "Contacts" }
|
||||
}
|
||||
}
|
||||
|
||||
GroupBox {
|
||||
title: "RadioButton"
|
||||
Layout.fillWidth: true
|
||||
ColumnLayout {
|
||||
anchors.fill: parent
|
||||
ExclusiveGroup { id: radioGroup }
|
||||
RadioButton { text: "Portrait"; exclusiveGroup: radioGroup }
|
||||
RadioButton { text: "Landscape"; exclusiveGroup: radioGroup }
|
||||
RadioButton { text: "Automatic"; exclusiveGroup: radioGroup; checked: true }
|
||||
}
|
||||
}
|
||||
|
||||
GroupBox {
|
||||
title: "Switch"
|
||||
Layout.fillWidth: true
|
||||
Layout.columnSpan: grid.columns
|
||||
ColumnLayout {
|
||||
anchors.fill: parent
|
||||
RowLayout {
|
||||
Label { text: "Wi-Fi"; Layout.fillWidth: true }
|
||||
Switch { checked: true }
|
||||
}
|
||||
RowLayout {
|
||||
Label { text: "Bluetooth"; Layout.fillWidth: true }
|
||||
Switch { checked: false }
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
@ -1,114 +0,0 @@
|
|||
/****************************************************************************
|
||||
**
|
||||
** Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies).
|
||||
** Contact: http://www.qt-project.org/legal
|
||||
**
|
||||
** This file is part of the Qt Quick Controls module of the Qt Toolkit.
|
||||
**
|
||||
** $QT_BEGIN_LICENSE:BSD$
|
||||
** You may use this file under the terms of the BSD license as follows:
|
||||
**
|
||||
** "Redistribution and use in source and binary forms, with or without
|
||||
** modification, are permitted provided that the following conditions are
|
||||
** met:
|
||||
** * Redistributions of source code must retain the above copyright
|
||||
** notice, this list of conditions and the following disclaimer.
|
||||
** * Redistributions in binary form must reproduce the above copyright
|
||||
** notice, this list of conditions and the following disclaimer in
|
||||
** the documentation and/or other materials provided with the
|
||||
** distribution.
|
||||
** * Neither the name of Digia Plc and its Subsidiary(-ies) nor the names
|
||||
** of its contributors may be used to endorse or promote products derived
|
||||
** from this software without specific prior written permission.
|
||||
**
|
||||
**
|
||||
** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
|
||||
** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
|
||||
** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
|
||||
** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
|
||||
** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
|
||||
** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
|
||||
** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
|
||||
** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
|
||||
** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
|
||||
** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
|
||||
** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
|
||||
**
|
||||
** $QT_END_LICENSE$
|
||||
**
|
||||
****************************************************************************/
|
||||
|
||||
import QtQuick 2.2
|
||||
import QtQuick.Layouts 1.1
|
||||
import QtQuick.Controls 1.2
|
||||
|
||||
ScrollView {
|
||||
id: page
|
||||
|
||||
horizontalScrollBarPolicy: Qt.ScrollBarAlwaysOff
|
||||
|
||||
Item {
|
||||
id: content
|
||||
|
||||
width: Math.max(page.viewport.width, column.implicitWidth + 2 * column.spacing)
|
||||
height: Math.max(page.viewport.height, column.implicitHeight + 2 * column.spacing)
|
||||
|
||||
ColumnLayout {
|
||||
id: column
|
||||
|
||||
anchors.top: parent.top
|
||||
anchors.left: parent.left
|
||||
anchors.right: parent.right
|
||||
anchors.margins: column.spacing
|
||||
|
||||
GroupBox {
|
||||
title: "TextField"
|
||||
Layout.fillWidth: true
|
||||
ColumnLayout {
|
||||
anchors.fill: parent
|
||||
TextField { placeholderText: "..."; Layout.fillWidth: true; z: 1 }
|
||||
TextField { placeholderText: "Password"; echoMode: TextInput.Password; Layout.fillWidth: true }
|
||||
}
|
||||
}
|
||||
|
||||
GroupBox {
|
||||
title: "ComboBox"
|
||||
Layout.fillWidth: true
|
||||
ColumnLayout {
|
||||
anchors.fill: parent
|
||||
ComboBox {
|
||||
model: Qt.fontFamilies()
|
||||
Layout.fillWidth: true
|
||||
}
|
||||
ComboBox {
|
||||
editable: true
|
||||
model: ListModel {
|
||||
id: listModel
|
||||
ListElement { text: "Apple" }
|
||||
ListElement { text: "Banana" }
|
||||
ListElement { text: "Coconut" }
|
||||
ListElement { text: "Orange" }
|
||||
}
|
||||
onAccepted: {
|
||||
if (find(currentText) === -1) {
|
||||
listModel.append({text: editText})
|
||||
currentIndex = find(editText)
|
||||
}
|
||||
}
|
||||
Layout.fillWidth: true
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
GroupBox {
|
||||
title: "SpinBox"
|
||||
Layout.fillWidth: true
|
||||
ColumnLayout {
|
||||
anchors.fill: parent
|
||||
SpinBox { value: 99; Layout.fillWidth: true; z: 1 }
|
||||
SpinBox { decimals: 2; Layout.fillWidth: true }
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
@ -1,90 +0,0 @@
|
|||
/****************************************************************************
|
||||
**
|
||||
** Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies).
|
||||
** Contact: http://www.qt-project.org/legal
|
||||
**
|
||||
** This file is part of the Qt Quick Controls module of the Qt Toolkit.
|
||||
**
|
||||
** $QT_BEGIN_LICENSE:BSD$
|
||||
** You may use this file under the terms of the BSD license as follows:
|
||||
**
|
||||
** "Redistribution and use in source and binary forms, with or without
|
||||
** modification, are permitted provided that the following conditions are
|
||||
** met:
|
||||
** * Redistributions of source code must retain the above copyright
|
||||
** notice, this list of conditions and the following disclaimer.
|
||||
** * Redistributions in binary form must reproduce the above copyright
|
||||
** notice, this list of conditions and the following disclaimer in
|
||||
** the documentation and/or other materials provided with the
|
||||
** distribution.
|
||||
** * Neither the name of Digia Plc and its Subsidiary(-ies) nor the names
|
||||
** of its contributors may be used to endorse or promote products derived
|
||||
** from this software without specific prior written permission.
|
||||
**
|
||||
**
|
||||
** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
|
||||
** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
|
||||
** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
|
||||
** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
|
||||
** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
|
||||
** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
|
||||
** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
|
||||
** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
|
||||
** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
|
||||
** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
|
||||
** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
|
||||
**
|
||||
** $QT_END_LICENSE$
|
||||
**
|
||||
****************************************************************************/
|
||||
|
||||
import QtQuick 2.2
|
||||
import QtQuick.Layouts 1.1
|
||||
import QtQuick.Controls 1.2
|
||||
|
||||
ScrollView {
|
||||
id: page
|
||||
|
||||
horizontalScrollBarPolicy: Qt.ScrollBarAlwaysOff
|
||||
|
||||
Item {
|
||||
id: content
|
||||
|
||||
width: Math.max(page.viewport.width, column.implicitWidth + 2 * column.spacing)
|
||||
height: Math.max(page.viewport.height, column.implicitHeight + 2 * column.spacing)
|
||||
|
||||
ColumnLayout {
|
||||
id: column
|
||||
|
||||
anchors.top: parent.top
|
||||
anchors.left: parent.left
|
||||
anchors.right: parent.right
|
||||
anchors.margins: column.spacing
|
||||
|
||||
GroupBox {
|
||||
title: "ProgressBar"
|
||||
Layout.fillWidth: true
|
||||
ColumnLayout {
|
||||
anchors.fill: parent
|
||||
ProgressBar { indeterminate: true; Layout.fillWidth: true }
|
||||
ProgressBar { value: slider.value; Layout.fillWidth: true }
|
||||
}
|
||||
}
|
||||
|
||||
GroupBox {
|
||||
title: "Slider"
|
||||
Layout.fillWidth: true
|
||||
ColumnLayout {
|
||||
anchors.fill: parent
|
||||
Slider { id: slider; value: 0.5; Layout.fillWidth: true }
|
||||
}
|
||||
}
|
||||
|
||||
GroupBox {
|
||||
title: "BusyIndicator"
|
||||
Layout.fillWidth: true
|
||||
BusyIndicator { running: true }
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
@ -1,161 +0,0 @@
|
|||
/****************************************************************************
|
||||
**
|
||||
** Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies).
|
||||
** Contact: http://www.qt-project.org/legal
|
||||
**
|
||||
** This file is part of the Qt Quick Controls module of the Qt Toolkit.
|
||||
**
|
||||
** $QT_BEGIN_LICENSE:BSD$
|
||||
** You may use this file under the terms of the BSD license as follows:
|
||||
**
|
||||
** "Redistribution and use in source and binary forms, with or without
|
||||
** modification, are permitted provided that the following conditions are
|
||||
** met:
|
||||
** * Redistributions of source code must retain the above copyright
|
||||
** notice, this list of conditions and the following disclaimer.
|
||||
** * Redistributions in binary form must reproduce the above copyright
|
||||
** notice, this list of conditions and the following disclaimer in
|
||||
** the documentation and/or other materials provided with the
|
||||
** distribution.
|
||||
** * Neither the name of Digia Plc and its Subsidiary(-ies) nor the names
|
||||
** of its contributors may be used to endorse or promote products derived
|
||||
** from this software without specific prior written permission.
|
||||
**
|
||||
**
|
||||
** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
|
||||
** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
|
||||
** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
|
||||
** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
|
||||
** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
|
||||
** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
|
||||
** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
|
||||
** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
|
||||
** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
|
||||
** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
|
||||
** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
|
||||
**
|
||||
** $QT_END_LICENSE$
|
||||
**
|
||||
****************************************************************************/
|
||||
|
||||
import QtQuick 2.2
|
||||
import QtQuick.Layouts 1.1
|
||||
import QtQuick.Dialogs 1.1
|
||||
import QtQuick.Controls 1.2
|
||||
import "qml/UI.js" as UI
|
||||
import "qml"
|
||||
//import "/Users/bdavis/Git/hifi/interface/resources/qml"
|
||||
|
||||
Item {
|
||||
anchors.fill: parent
|
||||
visible: true
|
||||
//title: "Qt Quick Controls Gallery"
|
||||
|
||||
MessageDialog {
|
||||
id: aboutDialog
|
||||
icon: StandardIcon.Information
|
||||
title: "About"
|
||||
text: "Qt Quick Controls Gallery"
|
||||
informativeText: "This example demonstrates most of the available Qt Quick Controls."
|
||||
}
|
||||
|
||||
Action {
|
||||
id: copyAction
|
||||
text: "&Copy"
|
||||
shortcut: StandardKey.Copy
|
||||
iconName: "edit-copy"
|
||||
enabled: (!!activeFocusItem && !!activeFocusItem["copy"])
|
||||
onTriggered: activeFocusItem.copy()
|
||||
}
|
||||
|
||||
Action {
|
||||
id: cutAction
|
||||
text: "Cu&t"
|
||||
shortcut: StandardKey.Cut
|
||||
iconName: "edit-cut"
|
||||
enabled: (!!activeFocusItem && !!activeFocusItem["cut"])
|
||||
onTriggered: activeFocusItem.cut()
|
||||
}
|
||||
|
||||
Action {
|
||||
id: pasteAction
|
||||
text: "&Paste"
|
||||
shortcut: StandardKey.Paste
|
||||
iconName: "edit-paste"
|
||||
enabled: (!!activeFocusItem && !!activeFocusItem["paste"])
|
||||
onTriggered: activeFocusItem.paste()
|
||||
}
|
||||
|
||||
// toolBar: ToolBar {
|
||||
// RowLayout {
|
||||
// anchors.fill: parent
|
||||
// anchors.margins: spacing
|
||||
// Label {
|
||||
// text: UI.label
|
||||
// }
|
||||
// Item { Layout.fillWidth: true }
|
||||
// CheckBox {
|
||||
// id: enabler
|
||||
// text: "Enabled"
|
||||
// checked: true
|
||||
// }
|
||||
// }
|
||||
// }
|
||||
|
||||
// menuBar: MenuBar {
|
||||
// Menu {
|
||||
// title: "&File"
|
||||
// MenuItem {
|
||||
// text: "E&xit"
|
||||
// shortcut: StandardKey.Quit
|
||||
// onTriggered: Qt.quit()
|
||||
// }
|
||||
// }
|
||||
// Menu {
|
||||
// title: "&Edit"
|
||||
// visible: tabView.currentIndex == 2
|
||||
// MenuItem { action: cutAction }
|
||||
// MenuItem { action: copyAction }
|
||||
// MenuItem { action: pasteAction }
|
||||
// }
|
||||
// Menu {
|
||||
// title: "&Help"
|
||||
// MenuItem {
|
||||
// text: "About..."
|
||||
// onTriggered: aboutDialog.open()
|
||||
// }
|
||||
// }
|
||||
// }
|
||||
|
||||
TabView {
|
||||
id: tabView
|
||||
|
||||
anchors.fill: parent
|
||||
anchors.margins: UI.margin
|
||||
tabPosition: UI.tabPosition
|
||||
|
||||
Layout.minimumWidth: 360
|
||||
Layout.minimumHeight: 360
|
||||
Layout.preferredWidth: 480
|
||||
Layout.preferredHeight: 640
|
||||
|
||||
Tab {
|
||||
title: "Buttons"
|
||||
ButtonPage {
|
||||
enabled: enabler.checked
|
||||
}
|
||||
}
|
||||
Tab {
|
||||
title: "Progress"
|
||||
ProgressPage {
|
||||
enabled: enabler.checked
|
||||
}
|
||||
}
|
||||
Tab {
|
||||
title: "Input"
|
||||
InputPage {
|
||||
enabled: enabler.checked
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
@ -1,461 +0,0 @@
|
|||
import QtQuick 2.5
|
||||
import QtQuick.Controls 1.4
|
||||
import QtQuick.Dialogs 1.2 as OriginalDialogs
|
||||
import Qt.labs.settings 1.0
|
||||
|
||||
import "../../../interface/resources/qml"
|
||||
//import "../../../interface/resources/qml/windows"
|
||||
import "../../../interface/resources/qml/windows"
|
||||
import "../../../interface/resources/qml/dialogs"
|
||||
import "../../../interface/resources/qml/hifi"
|
||||
import "../../../interface/resources/qml/hifi/dialogs"
|
||||
import "../../../interface/resources/qml/styles-uit"
|
||||
|
||||
ApplicationWindow {
|
||||
id: appWindow
|
||||
objectName: "MainWindow"
|
||||
visible: true
|
||||
width: 1280
|
||||
height: 800
|
||||
title: qsTr("Scratch App")
|
||||
toolBar: Row {
|
||||
id: testButtons
|
||||
anchors { margins: 8; left: parent.left; top: parent.top }
|
||||
spacing: 8
|
||||
property int count: 0
|
||||
|
||||
property var tabs: [];
|
||||
property var urls: [];
|
||||
property var toolbar;
|
||||
property var lastButton;
|
||||
|
||||
Button {
|
||||
text: HMD.active ? "Disable HMD" : "Enable HMD"
|
||||
onClicked: HMD.active = !HMD.active
|
||||
}
|
||||
|
||||
Button {
|
||||
text: desktop.hmdHandMouseActive ? "Disable HMD HandMouse" : "Enable HMD HandMouse"
|
||||
onClicked: desktop.hmdHandMouseActive = !desktop.hmdHandMouseActive
|
||||
}
|
||||
|
||||
// Window visibility
|
||||
Button {
|
||||
text: "toggle desktop"
|
||||
onClicked: desktop.togglePinned()
|
||||
}
|
||||
|
||||
Button {
|
||||
text: "Create Toolbar"
|
||||
onClicked: testButtons.toolbar = desktop.getToolbar("com.highfidelity.interface.toolbar.system");
|
||||
}
|
||||
|
||||
Button {
|
||||
text: "Toggle Toolbar Direction"
|
||||
onClicked: testButtons.toolbar.horizontal = !testButtons.toolbar.horizontal
|
||||
}
|
||||
|
||||
Button {
|
||||
readonly property var icons: [
|
||||
"edit-01.svg",
|
||||
"model-01.svg",
|
||||
"cube-01.svg",
|
||||
"sphere-01.svg",
|
||||
"light-01.svg",
|
||||
"text-01.svg",
|
||||
"web-01.svg",
|
||||
"zone-01.svg",
|
||||
"particle-01.svg",
|
||||
]
|
||||
property int iconIndex: 0
|
||||
readonly property string toolIconUrl: "../../../../../scripts/system/assets/images/tools/"
|
||||
text: "Create Button"
|
||||
onClicked: {
|
||||
var name = icons[iconIndex];
|
||||
var url = toolIconUrl + name;
|
||||
iconIndex = (iconIndex + 1) % icons.length;
|
||||
var button = testButtons.lastButton = testButtons.toolbar.addButton({
|
||||
imageURL: url,
|
||||
objectName: name,
|
||||
subImage: {
|
||||
y: 50,
|
||||
},
|
||||
alpha: 0.9
|
||||
});
|
||||
|
||||
button.clicked.connect(function(){
|
||||
console.log("Clicked on button " + button.imageURL + " alpha " + button.alpha)
|
||||
});
|
||||
}
|
||||
}
|
||||
|
||||
Button {
|
||||
text: "Toggle Button Visible"
|
||||
onClicked: testButtons.lastButton.visible = !testButtons.lastButton.visible
|
||||
}
|
||||
|
||||
// Error alerts
|
||||
/*
|
||||
Button {
|
||||
// Message without title.
|
||||
text: "Show Error"
|
||||
onClicked: {
|
||||
var messageBox = desktop.messageBox({
|
||||
text: "Diagnostic cycle will be complete in 30 seconds",
|
||||
icon: hifi.icons.critical,
|
||||
});
|
||||
messageBox.selected.connect(function(button) {
|
||||
console.log("You clicked " + button)
|
||||
})
|
||||
}
|
||||
}
|
||||
Button {
|
||||
// detailedText is not currently used anywhere in Interface but it is easier to leave in and style good enough.
|
||||
text: "Show Long Error"
|
||||
onClicked: {
|
||||
desktop.messageBox({
|
||||
informativeText: "Diagnostic cycle will be complete in 30 seconds Diagnostic cycle will be complete in 30 seconds Diagnostic cycle will be complete in 30 seconds Diagnostic cycle will be complete in 30 seconds Diagnostic cycle will be complete in 30 seconds Diagnostic cycle will be complete in 30 seconds Diagnostic cycle will be complete in 30 seconds Diagnostic cycle will be complete in 30 seconds ",
|
||||
text: "Baloney",
|
||||
icon: hifi.icons.warning,
|
||||
detailedText: "sakjd;laskj dksa;dl jka;lsd j;lkjas ;dlkaj s;dlakjd ;alkjda; slkjda; lkjda;lksjd ;alksjd; alksjd ;alksjd; alksjd; alksdjas;ldkjas;lkdja ;kj ;lkasjd; lkj as;dlka jsd;lka jsd;laksjd a"
|
||||
});
|
||||
}
|
||||
}
|
||||
*/
|
||||
|
||||
// query
|
||||
/*
|
||||
// There is no such desktop.queryBox() function; may need to update test to cover QueryDialog.qml?
|
||||
Button {
|
||||
text: "Show Query"
|
||||
onClicked: {
|
||||
var queryBox = desktop.queryBox({
|
||||
text: "Have you stopped beating your wife?",
|
||||
placeholderText: "Are you sure?",
|
||||
// icon: hifi.icons.critical,
|
||||
});
|
||||
queryBox.selected.connect(function(result) {
|
||||
console.log("User responded with " + result);
|
||||
});
|
||||
|
||||
queryBox.canceled.connect(function() {
|
||||
console.log("User cancelled query box ");
|
||||
})
|
||||
}
|
||||
}
|
||||
*/
|
||||
|
||||
// Browser
|
||||
/*
|
||||
Button {
|
||||
text: "Open Browser"
|
||||
onClicked: builder.createObject(desktop);
|
||||
property var builder: Component {
|
||||
Browser {}
|
||||
}
|
||||
}
|
||||
*/
|
||||
|
||||
|
||||
// file dialog
|
||||
/*
|
||||
|
||||
Button {
|
||||
text: "Open Directory"
|
||||
property var builder: Component {
|
||||
FileDialog { selectDirectory: true }
|
||||
}
|
||||
|
||||
onClicked: {
|
||||
var fileDialog = builder.createObject(desktop);
|
||||
fileDialog.canceled.connect(function(){
|
||||
console.log("Cancelled")
|
||||
})
|
||||
fileDialog.selectedFile.connect(function(file){
|
||||
console.log("Selected " + file)
|
||||
})
|
||||
}
|
||||
}
|
||||
Button {
|
||||
text: "Open File"
|
||||
property var builder: Component {
|
||||
FileDialog {
|
||||
title: "Open File"
|
||||
filter: "All Files (*.*)"
|
||||
//filter: "HTML files (*.html);;Other(*.png)"
|
||||
}
|
||||
}
|
||||
|
||||
onClicked: {
|
||||
var fileDialog = builder.createObject(desktop);
|
||||
fileDialog.canceled.connect(function(){
|
||||
console.log("Cancelled")
|
||||
})
|
||||
fileDialog.selectedFile.connect(function(file){
|
||||
console.log("Selected " + file)
|
||||
})
|
||||
}
|
||||
}
|
||||
*/
|
||||
|
||||
// tabs
|
||||
/*
|
||||
Button {
|
||||
text: "Add Tab"
|
||||
onClicked: {
|
||||
console.log(desktop.toolWindow);
|
||||
desktop.toolWindow.addWebTab({ source: "Foo" });
|
||||
desktop.toolWindow.showTabForUrl("Foo", true);
|
||||
}
|
||||
}
|
||||
|
||||
Button {
|
||||
text: "Add Tab 2"
|
||||
onClicked: {
|
||||
console.log(desktop.toolWindow);
|
||||
desktop.toolWindow.addWebTab({ source: "Foo 2" });
|
||||
desktop.toolWindow.showTabForUrl("Foo 2", true);
|
||||
}
|
||||
}
|
||||
|
||||
Button {
|
||||
text: "Add Tab 3"
|
||||
onClicked: {
|
||||
console.log(desktop.toolWindow);
|
||||
desktop.toolWindow.addWebTab({ source: "Foo 3" });
|
||||
desktop.toolWindow.showTabForUrl("Foo 3", true);
|
||||
}
|
||||
}
|
||||
|
||||
Button {
|
||||
text: "Destroy Tab"
|
||||
onClicked: {
|
||||
console.log(desktop.toolWindow);
|
||||
desktop.toolWindow.removeTabForUrl("Foo");
|
||||
}
|
||||
}
|
||||
*/
|
||||
|
||||
// Hifi specific stuff
|
||||
/*
|
||||
Button {
|
||||
// Shows the dialog with preferences sections but not each section's preference items
|
||||
// because Preferences.preferencesByCategory() method is not stubbed out.
|
||||
text: "Settings > General..."
|
||||
property var builder: Component {
|
||||
GeneralPreferencesDialog { }
|
||||
}
|
||||
onClicked: {
|
||||
var runningScripts = builder.createObject(desktop);
|
||||
}
|
||||
}
|
||||
|
||||
Button {
|
||||
text: "Running Scripts"
|
||||
property var builder: Component {
|
||||
RunningScripts { }
|
||||
}
|
||||
onClicked: {
|
||||
var runningScripts = builder.createObject(desktop);
|
||||
}
|
||||
}
|
||||
|
||||
Button {
|
||||
text: "Attachments"
|
||||
property var builder: Component {
|
||||
AttachmentsDialog { }
|
||||
}
|
||||
onClicked: {
|
||||
var attachmentsDialog = builder.createObject(desktop);
|
||||
}
|
||||
}
|
||||
Button {
|
||||
// Replicates message box that pops up after selecting new avatar. Includes title.
|
||||
text: "Confirm Avatar"
|
||||
onClicked: {
|
||||
var messageBox = desktop.messageBox({
|
||||
title: "Set Avatar",
|
||||
text: "Would you like to use 'Albert' for your avatar?",
|
||||
icon: hifi.icons.question, // Test question icon
|
||||
//icon: hifi.icons.information, // Test informaton icon
|
||||
//icon: hifi.icons.warning, // Test warning icon
|
||||
//icon: hifi.icons.critical, // Test critical icon
|
||||
//icon: hifi.icons.none, // Test no icon
|
||||
buttons: OriginalDialogs.StandardButton.Ok + OriginalDialogs.StandardButton.Cancel,
|
||||
defaultButton: OriginalDialogs.StandardButton.Ok
|
||||
});
|
||||
messageBox.selected.connect(function(button) {
|
||||
console.log("You clicked " + button)
|
||||
})
|
||||
}
|
||||
}
|
||||
*/
|
||||
// bookmarks
|
||||
/*
|
||||
Button {
|
||||
text: "Bookmark Location"
|
||||
onClicked: {
|
||||
desktop.inputDialog({
|
||||
title: "Bookmark Location",
|
||||
icon: hifi.icons.placemark,
|
||||
label: "Name"
|
||||
});
|
||||
}
|
||||
}
|
||||
Button {
|
||||
text: "Delete Bookmark"
|
||||
onClicked: {
|
||||
desktop.inputDialog({
|
||||
title: "Delete Bookmark",
|
||||
icon: hifi.icons.placemark,
|
||||
label: "Select the bookmark to delete",
|
||||
items: ["Bookmark A", "Bookmark B", "Bookmark C"]
|
||||
});
|
||||
}
|
||||
}
|
||||
Button {
|
||||
text: "Duplicate Bookmark"
|
||||
onClicked: {
|
||||
desktop.messageBox({
|
||||
title: "Duplicate Bookmark",
|
||||
icon: hifi.icons.warning,
|
||||
text: "The bookmark name you entered alread exists in yoru list.",
|
||||
informativeText: "Would you like to overwrite it?",
|
||||
buttons: OriginalDialogs.StandardButton.Yes + OriginalDialogs.StandardButton.No,
|
||||
defaultButton: OriginalDialogs.StandardButton.Yes
|
||||
});
|
||||
}
|
||||
}
|
||||
*/
|
||||
|
||||
}
|
||||
|
||||
|
||||
HifiConstants { id: hifi }
|
||||
|
||||
Desktop {
|
||||
id: desktop
|
||||
anchors.fill: parent
|
||||
|
||||
//rootMenu: StubMenu { id: rootMenu }
|
||||
//Component.onCompleted: offscreenWindow = appWindow
|
||||
|
||||
/*
|
||||
MouseArea {
|
||||
anchors.fill: parent
|
||||
acceptedButtons: Qt.RightButton
|
||||
onClicked: desktop.popupMenu(Qt.vector2d(mouseX, mouseY));
|
||||
}
|
||||
*/
|
||||
|
||||
Browser {
|
||||
url: "http://s3.amazonaws.com/DreamingContent/testUiDelegates.html"
|
||||
}
|
||||
|
||||
|
||||
Window {
|
||||
id: blue
|
||||
closable: true
|
||||
visible: true
|
||||
resizable: true
|
||||
destroyOnHidden: false
|
||||
title: "Blue"
|
||||
|
||||
width: 100; height: 100
|
||||
x: 1280 / 2; y: 720 / 2
|
||||
Settings {
|
||||
category: "TestWindow.Blue"
|
||||
property alias x: blue.x
|
||||
property alias y: blue.y
|
||||
property alias width: blue.width
|
||||
property alias height: blue.height
|
||||
}
|
||||
|
||||
Rectangle {
|
||||
anchors.fill: parent
|
||||
visible: true
|
||||
color: "blue"
|
||||
Component.onDestruction: console.log("Blue destroyed")
|
||||
}
|
||||
}
|
||||
|
||||
Window {
|
||||
id: green
|
||||
closable: true
|
||||
visible: true
|
||||
resizable: true
|
||||
title: "Green"
|
||||
destroyOnHidden: false
|
||||
|
||||
width: 100; height: 100
|
||||
x: 1280 / 2; y: 720 / 2
|
||||
Settings {
|
||||
category: "TestWindow.Green"
|
||||
property alias x: green.x
|
||||
property alias y: green.y
|
||||
property alias width: green.width
|
||||
property alias height: green.height
|
||||
}
|
||||
|
||||
Rectangle {
|
||||
anchors.fill: parent
|
||||
visible: true
|
||||
color: "green"
|
||||
Component.onDestruction: console.log("Green destroyed")
|
||||
}
|
||||
}
|
||||
|
||||
/*
|
||||
Rectangle { width: 100; height: 100; x: 100; y: 100; color: "#00f" }
|
||||
|
||||
Window {
|
||||
id: green
|
||||
alwaysOnTop: true
|
||||
frame: HiddenFrame{}
|
||||
hideBackground: true
|
||||
closable: true
|
||||
visible: true
|
||||
resizable: false
|
||||
x: 1280 / 2; y: 720 / 2
|
||||
width: 100; height: 100
|
||||
Rectangle {
|
||||
color: "#0f0"
|
||||
width: green.width;
|
||||
height: green.height;
|
||||
}
|
||||
}
|
||||
*/
|
||||
|
||||
/*
|
||||
Window {
|
||||
id: yellow
|
||||
closable: true
|
||||
visible: true
|
||||
resizable: true
|
||||
x: 100; y: 100
|
||||
width: 100; height: 100
|
||||
Rectangle {
|
||||
anchors.fill: parent
|
||||
visible: true
|
||||
color: "yellow"
|
||||
}
|
||||
}
|
||||
*/
|
||||
}
|
||||
|
||||
Action {
|
||||
id: openBrowserAction
|
||||
text: "Open Browser"
|
||||
shortcut: "Ctrl+Shift+X"
|
||||
onTriggered: {
|
||||
builder.createObject(desktop);
|
||||
}
|
||||
property var builder: Component {
|
||||
ModelBrowserDialog{}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
|
||||
|
||||
|
|
@ -4,34 +4,10 @@ QT += gui qml quick xml webengine widgets
|
|||
|
||||
CONFIG += c++11
|
||||
|
||||
SOURCES += src/main.cpp \
|
||||
../../libraries/ui/src/FileDialogHelper.cpp
|
||||
|
||||
HEADERS += \
|
||||
../../libraries/ui/src/FileDialogHelper.h
|
||||
SOURCES += src/main.cpp
|
||||
|
||||
# Additional import path used to resolve QML modules in Qt Creator's code model
|
||||
QML_IMPORT_PATH = ../../interface/resources/qml
|
||||
|
||||
|
||||
DISTFILES += \
|
||||
qml/*.qml \
|
||||
../../interface/resources/QtWebEngine/UIDelegates/original/*.qml \
|
||||
../../interface/resources/QtWebEngine/UIDelegates/*.qml \
|
||||
../../interface/resources/qml/*.qml \
|
||||
../../interface/resources/qml/controls/*.qml \
|
||||
../../interface/resources/qml/controls-uit/*.qml \
|
||||
../../interface/resources/qml/dialogs/*.qml \
|
||||
../../interface/resources/qml/dialogs/fileDialog/*.qml \
|
||||
../../interface/resources/qml/dialogs/preferences/*.qml \
|
||||
../../interface/resources/qml/dialogs/messageDialog/*.qml \
|
||||
../../interface/resources/qml/desktop/*.qml \
|
||||
../../interface/resources/qml/menus/*.qml \
|
||||
../../interface/resources/qml/styles/*.qml \
|
||||
../../interface/resources/qml/styles-uit/*.qml \
|
||||
../../interface/resources/qml/windows/*.qml \
|
||||
../../interface/resources/qml/hifi/*.qml \
|
||||
../../interface/resources/qml/hifi/toolbars/*.qml \
|
||||
../../interface/resources/qml/hifi/dialogs/*.qml \
|
||||
../../interface/resources/qml/hifi/dialogs/preferences/*.qml \
|
||||
../../interface/resources/qml/hifi/overlays/*.qml
|
||||
qml/*.qml
|
||||
|
|
|
|||
|
|
@ -3,88 +3,31 @@
|
|||
#include <QtWebEngine>
|
||||
#include <QFileSystemModel>
|
||||
|
||||
#include "../../../libraries/ui/src/FileDialogHelper.h"
|
||||
|
||||
|
||||
class Preference : public QObject {
|
||||
Q_OBJECT
|
||||
Q_PROPERTY(QString category READ getCategory() CONSTANT)
|
||||
Q_PROPERTY(QString name READ getName() CONSTANT)
|
||||
Q_PROPERTY(Type type READ getType() CONSTANT)
|
||||
Q_ENUMS(Type)
|
||||
public:
|
||||
enum Type {
|
||||
Editable,
|
||||
Browsable,
|
||||
Spinner,
|
||||
Checkbox,
|
||||
};
|
||||
|
||||
Preference(QObject* parent = nullptr) : QObject(parent) {}
|
||||
|
||||
Preference(const QString& category, const QString& name, QObject* parent = nullptr)
|
||||
: QObject(parent), _category(category), _name(name) { }
|
||||
const QString& getCategory() const { return _category; }
|
||||
const QString& getName() const { return _name; }
|
||||
virtual Type getType() { return Editable; }
|
||||
|
||||
protected:
|
||||
const QString _category;
|
||||
const QString _name;
|
||||
};
|
||||
|
||||
class Reticle : public QObject {
|
||||
Q_OBJECT
|
||||
Q_PROPERTY(QPoint position READ getPosition CONSTANT)
|
||||
public:
|
||||
|
||||
Reticle(QObject* parent) : QObject(parent) {
|
||||
}
|
||||
|
||||
QPoint getPosition() {
|
||||
if (!_window) {
|
||||
return QPoint(0, 0);
|
||||
}
|
||||
return _window->mapFromGlobal(QCursor::pos());
|
||||
}
|
||||
|
||||
void setWindow(QWindow* window) {
|
||||
_window = window;
|
||||
}
|
||||
|
||||
private:
|
||||
QWindow* _window{nullptr};
|
||||
};
|
||||
|
||||
QString getRelativeDir(const QString& relativePath = ".") {
|
||||
QDir path(__FILE__); path.cdUp();
|
||||
QDir path(__FILE__);
|
||||
path.cdUp();
|
||||
path.cdUp();
|
||||
auto result = path.absoluteFilePath(relativePath);
|
||||
result = path.cleanPath(result) + "/";
|
||||
return result;
|
||||
}
|
||||
|
||||
QString getTestQmlDir() {
|
||||
return getRelativeDir("../qml");
|
||||
QString getResourcesDir() {
|
||||
return getRelativeDir("../../interface/resources");
|
||||
}
|
||||
|
||||
QString getInterfaceQmlDir() {
|
||||
return getRelativeDir("/");
|
||||
QString getQmlDir() {
|
||||
return getRelativeDir("../../interface/resources/qml");
|
||||
}
|
||||
|
||||
|
||||
void setChild(QQmlApplicationEngine& engine, const char* name) {
|
||||
for (auto obj : engine.rootObjects()) {
|
||||
auto child = obj->findChild<QObject*>(QString(name));
|
||||
if (child) {
|
||||
engine.rootContext()->setContextProperty(name, child);
|
||||
return;
|
||||
}
|
||||
}
|
||||
qWarning() << "Could not find object named " << name;
|
||||
QString getScriptsDir() {
|
||||
return getRelativeDir("../../scripts");
|
||||
}
|
||||
|
||||
void addImportPath(QQmlApplicationEngine& engine, const QString& relativePath, bool insert = false) {
|
||||
QString resolvedPath = getRelativeDir(relativePath);
|
||||
|
||||
qDebug() << "adding import path: " << QDir::toNativeSeparators(resolvedPath);
|
||||
engine.addImportPath(resolvedPath);
|
||||
}
|
||||
|
||||
|
|
@ -93,44 +36,24 @@ int main(int argc, char *argv[]) {
|
|||
app.setOrganizationName("Some Company");
|
||||
app.setOrganizationDomain("somecompany.com");
|
||||
app.setApplicationName("Amazing Application");
|
||||
QDir::setCurrent(getRelativeDir(".."));
|
||||
|
||||
QtWebEngine::initialize();
|
||||
qmlRegisterType<Preference>("Hifi", 1, 0, "Preference");
|
||||
auto scriptsDir = getScriptsDir();
|
||||
auto resourcesDir = getResourcesDir();
|
||||
|
||||
QQmlApplicationEngine engine;
|
||||
addImportPath(engine, ".");
|
||||
addImportPath(engine, "qml");
|
||||
addImportPath(engine, "../../interface/resources/qml");
|
||||
addImportPath(engine, "../../interface/resources");
|
||||
engine.load(QUrl(QStringLiteral("qml/Stubs.qml")));
|
||||
addImportPath(engine, resourcesDir);
|
||||
addImportPath(engine, resourcesDir + "/qml");
|
||||
addImportPath(engine, scriptsDir);
|
||||
addImportPath(engine, scriptsDir + "/developer/tests");
|
||||
|
||||
setChild(engine, "offscreenFlags");
|
||||
setChild(engine, "Account");
|
||||
setChild(engine, "ApplicationCompositor");
|
||||
setChild(engine, "Controller");
|
||||
setChild(engine, "Desktop");
|
||||
setChild(engine, "ScriptDiscoveryService");
|
||||
setChild(engine, "HMD");
|
||||
setChild(engine, "GL");
|
||||
setChild(engine, "MenuHelper");
|
||||
setChild(engine, "Preferences");
|
||||
setChild(engine, "urlHandler");
|
||||
engine.rootContext()->setContextProperty("DebugQML", true);
|
||||
engine.rootContext()->setContextProperty("fileDialogHelper", new FileDialogHelper());
|
||||
QFontDatabase::addApplicationFont(resourcesDir + "/fonts/FiraSans-Regular.ttf");
|
||||
QFontDatabase::addApplicationFont(resourcesDir + "/fonts/FiraSans-SemiBold.ttf");
|
||||
QFontDatabase::addApplicationFont(resourcesDir + "/fonts/hifi-glyphs.ttf");
|
||||
|
||||
//engine.load(QUrl(QStringLiteral("qrc:/qml/gallery/main.qml")));
|
||||
engine.load(QUrl(QStringLiteral("qml/main.qml")));
|
||||
for (QObject* rootObject : engine.rootObjects()) {
|
||||
if (rootObject->objectName() == "MainWindow") {
|
||||
Reticle* reticle = new Reticle(rootObject);
|
||||
reticle->setWindow((QWindow*)rootObject);
|
||||
engine.rootContext()->setContextProperty("Reticle", reticle);
|
||||
engine.rootContext()->setContextProperty("Window", rootObject);
|
||||
break;
|
||||
}
|
||||
}
|
||||
auto url = getRelativeDir(".") + "qml/ControlsGalleryWindow.qml";
|
||||
|
||||
engine.load(url);
|
||||
return app.exec();
|
||||
}
|
||||
|
||||
#include "main.moc"
|
||||
|
||||
|
|
|
|||
Loading…
Reference in a new issue