Showing the changes to scripts/developer (2 of 2 files). Show all
Unified · Split
| @@ -12,9 +12,6 @@ import QtQuick 2.7 · 11 unmodified lines | |||
| 12 | import QtQuick.Controls 1.4 as Original | 12 | import QtQuick.Controls 1.4 as Original |
| 13 | import QtQuick.Controls.Styles 1.4 | 13 | import QtQuick.Controls.Styles 1.4 |
| 14 | 14 | ||
| 15 | import stylesUit 1.0 | ||
| 16 | import controlsUit 1.0 as HifiControls | ||
| 17 | |||
| 18 | import "../../prop" as Prop | 15 | import "../../prop" as Prop |
| 19 | 16 | ||
| 20 | import "../jet.js" as Jet | 17 | import "../jet.js" as Jet |
| @@ -23,6 +20,8 @@ Prop.PropGroup { · 2 unmodified lines | |||
| 23 | 20 | ||
| 24 | id: root; | 21 | id: root; |
| 25 | 22 | ||
| 23 | Prop.Global { id: global;} | ||
| 24 | |||
| 26 | property var rootConfig : Render | 25 | property var rootConfig : Render |
| 27 | property var jobPath: "" | 26 | property var jobPath: "" |
| 28 | property alias label: root.label | 27 | property alias label: root.label |
| @@ -8,23 +8,32 @@ · 7 unmodified lines | |||
| 8 | // See the accompanying file LICENSE or https://www.apache.org/licenses/LICENSE-2.0.html | 8 | // See the accompanying file LICENSE or https://www.apache.org/licenses/LICENSE-2.0.html |
| 9 | // | 9 | // |
| 10 | import QtQuick 2.7 | 10 | import QtQuick 2.7 |
| 11 | import QtQuick.Controls 1.4 | 11 | import QtQuick.Controls 2.5 |
| 12 | import QtQuick.Layouts 1.3 | 12 | import QtQuick.Layouts 1.3 |
| 13 | 13 | ||
| 14 | import stylesUit 1.0 | ||
| 15 | import controlsUit 1.0 as HifiControls | ||
| 16 | 14 | ||
| 17 | import "../lib/jet/qml" as Jet | 15 | import "../lib/jet/qml" as Jet |
| 18 | 16 | ||
| 19 | Item { | 17 | Item { |
| 20 | HifiConstants { id: hifi;} | 18 | anchors.fill: parent |
| 21 | id: root; | 19 | id: root; |
| 22 | anchors.fill: parent | 20 | |
| 23 | |||
| 24 | property var rootConfig: Render.getConfig("") | 21 | property var rootConfig: Render.getConfig("") |
| 25 | 22 | ||
| 26 | Jet.TaskPropView { | 23 | ScrollView { |
| 27 | rootConfig: root.rootConfig | 24 | id: scrollView |
| 28 | anchors.fill: root | 25 | anchors.fill: parent |
| 26 | contentWidth: parent.width | ||
| 27 | clip: true | ||
| 28 | |||
| 29 | Column { | ||
| 30 | anchors.left: parent.left | ||
| 31 | anchors.right: parent.right | ||
| 32 | |||
| 33 | Jet.TaskPropView { | ||
| 34 | rootConfig: root.rootConfig | ||
| 35 | anchors.fill: root | ||
| 36 | } | ||
| 37 | } | ||
| 29 | } | 38 | } |
| 30 | } | 39 | } |