Skip to content

Commit

Permalink
Refs #19743: [ARS] Fix style in the imported qml files
Browse files Browse the repository at this point in the history 
Signed-off-by: JesusPoderoso <[email protected]>
  • Loading branch information
@JesusPoderoso
JesusPoderoso committed Nov 13, 2023
1 parent 5b533f9 commit 1a105ea
Show file tree
Hide file tree
Showing 2 changed files with 87 additions and 80 deletions.
9 changes: 8 additions & 1 deletion qml/StatusTreeView.qml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -110,7 +110,14 @@ Flickable {
}
}

Connections { function onCurrentIndexChanged() { if(currentIndex) currentData = model.data(currentIndex) } }
Connections {
function onCurrentIndexChanged() {
if(currentIndex)
{
currentData = model.data(currentIndex)
}
}
}

StatusTreeViewItem {
id: tree
Expand Down
158 changes: 79 additions & 79 deletions qml/StatusTreeViewItem.qml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -201,40 +201,40 @@ Item {
spacing: 0

QtObject {
id: _prop

property var currentIndex: root.model.index(index, 0, parentIndex)
property var currentData: root.model.data(currentIndex)
property var currentId: root.model.data(currentIndex, StatusTreeViewItem.Role.Id)
property var currentStatus: root.model.data(currentIndex, StatusTreeViewItem.Role.Status)
property var currentKind: root.model.data(currentIndex, StatusTreeViewItem.Role.Kind)
property var currentValue: root.model.data(currentIndex, StatusTreeViewItem.Role.Value)
property var currentDescription: root.model.data(currentIndex, StatusTreeViewItem.Role.Description)
property var currentAlive: root.model.data(currentIndex, StatusTreeViewItem.Role.Alive)
property Item currentItem: repeater.itemAt(index)
property bool expanded: true
property bool selected: false
property int itemChildCount: root.model.rowCount(currentIndex)
readonly property int depth: root.model.depth(currentIndex)
readonly property bool hasChildren: itemChildCount > 0
readonly property bool isSelectedIndex: root.selectionEnabled && currentIndex === root.selectedIndex
readonly property bool isHoveredIndex: root.hoverEnabled && currentIndex === root.hoveredIndex
readonly property bool isSelectedAndHoveredIndex: hoverEnabled && selectionEnabled && isHoveredIndex && isSelectedIndex

function toggle(){
if(_prop.hasChildren)
{
_prop.expanded = !_prop.expanded
}
id: _prop

property var currentIndex: root.model.index(index, 0, parentIndex)
property var currentData: root.model.data(currentIndex)
property var currentId: root.model.data(currentIndex, StatusTreeViewItem.Role.Id)
property var currentStatus: root.model.data(currentIndex, StatusTreeViewItem.Role.Status)
property var currentKind: root.model.data(currentIndex, StatusTreeViewItem.Role.Kind)
property var currentValue: root.model.data(currentIndex, StatusTreeViewItem.Role.Value)
property var currentDescription: root.model.data(currentIndex, StatusTreeViewItem.Role.Description)
property var currentAlive: root.model.data(currentIndex, StatusTreeViewItem.Role.Alive)
property Item currentItem: repeater.itemAt(index)
property bool expanded: true
property bool selected: false
property int itemChildCount: root.model.rowCount(currentIndex)
readonly property int depth: root.model.depth(currentIndex)
readonly property bool hasChildren: itemChildCount > 0
readonly property bool isSelectedIndex: root.selectionEnabled && currentIndex === root.selectedIndex
readonly property bool isHoveredIndex: root.hoverEnabled && currentIndex === root.hoveredIndex
readonly property bool isSelectedAndHoveredIndex: hoverEnabled && selectionEnabled && isHoveredIndex && isSelectedIndex

function toggle(){
if(_prop.hasChildren)
{
_prop.expanded = !_prop.expanded
}

_prop.focus()
root.toggled()
}
_prop.focus()
root.toggled()
}

function focus(){
controller.endpoint_click(_prop.currentId)
controller.participant_click(_prop.currentId)
}
function focus(){
controller.endpoint_click(_prop.currentId)
controller.participant_click(_prop.currentId)
}
}

Connections {
Expand Down Expand Up @@ -309,11 +309,11 @@ Item {
target: root.model
ignoreUnknownSignals: true
function onDataChanged(modelIndex) {
const changedId = modelIndex.internalId
const currentId = _prop.currentIndex.internalId
if(changedId === currentId){
contentItemLoader.currentRow.currentData = root.model.data(modelIndex);
}
const changedId = modelIndex.internalId
const currentId = _prop.currentIndex.internalId
if(changedId === currentId){
contentItemLoader.currentRow.currentData = root.model.data(modelIndex);
}
}
}
}
Expand Down Expand Up @@ -358,60 +358,60 @@ Item {

// loader to populate the children row for each node
Loader {
id: loader

Layout.fillWidth: true
id: loader

source: "StatusTreeViewItem.qml"
visible: _prop.expanded
Layout.fillWidth: true

onLoaded: {
item.model = root.model
item.parentIndex = _prop.currentIndex
item.childCount = _prop.itemChildCount
}
source: "StatusTreeViewItem.qml"
visible: _prop.expanded

Connections {
target: root.model
ignoreUnknownSignals: true
function onLayoutChanged() {
const parent = root.model.index(index, 0, parentIndex)
loader.item.childCount = root.model.rowCount(parent)
onLoaded: {
item.model = root.model
item.parentIndex = _prop.currentIndex
item.childCount = _prop.itemChildCount
}

function onToggled() {
root.toggled()
Connections {
target: root.model
ignoreUnknownSignals: true
function onLayoutChanged() {
const parent = root.model.index(index, 0, parentIndex)
loader.item.childCount = root.model.rowCount(parent)
}

function onToggled() {
root.toggled()
}
}
}

Binding { target: loader.item; property: "model"; value: root.model; when: loader.status == Loader.Ready }
Binding { target: loader.item; property: "handle"; value: root.handle; when: loader.status == Loader.Ready }
Binding { target: loader.item; property: "contentItem"; value: root.contentItem; when: loader.status == Loader.Ready }

Binding { target: loader.item; property: "currentItem"; value: root.currentItem; when: loader.status == Loader.Ready }
Binding { target: loader.item; property: "selectedIndex"; value: root.selectedIndex; when: loader.status == Loader.Ready }
Binding { target: root; property: "currentItem"; value: loader.item.currentItem; when: loader.status == Loader.Ready }
Binding { target: root; property: "selectedIndex"; value: loader.item.selectedIndex; when: loader.status == Loader.Ready }

Binding { target: loader.item; property: "color"; value: root.color; when: loader.status == Loader.Ready }
Binding { target: loader.item; property: "handleColor"; value: root.handleColor; when: loader.status == Loader.Ready }
Binding { target: loader.item; property: "hoverEnabled"; value: root.hoverEnabled; when: loader.status == Loader.Ready }
Binding { target: loader.item; property: "hoverColor"; value: root.hoverColor; when: loader.status == Loader.Ready }
Binding { target: loader.item; property: "selectionEnabled"; value: root.selectionEnabled; when: loader.status == Loader.Ready }
Binding { target: loader.item; property: "selectedColor"; value: root.selectedColor; when: loader.status == Loader.Ready }
Binding { target: loader.item; property: "selectedItemColor"; value: root.selectedItemColor; when: loader.status == Loader.Ready }

Binding { target: loader.item; property: "itemLeftPadding"; value: root.rowPadding; when: loader.status == Loader.Ready }
Binding { target: loader.item; property: "rowHeight"; value: root.rowHeight; when: loader.status == Loader.Ready }
Binding { target: loader.item; property: "rowPadding"; value: root.rowPadding; when: loader.status == Loader.Ready }
Binding { target: loader.item; property: "rowSpacing"; value: root.rowSpacing; when: loader.status == Loader.Ready }
Binding { target: loader.item; property: "fontMetrics"; value: root.selectedItemColor; when: loader.status == Loader.Ready }
Binding { target: loader.item; property: "model"; value: root.model; when: loader.status == Loader.Ready }
Binding { target: loader.item; property: "handle"; value: root.handle; when: loader.status == Loader.Ready }
Binding { target: loader.item; property: "contentItem"; value: root.contentItem; when: loader.status == Loader.Ready }

Binding { target: loader.item; property: "currentItem"; value: root.currentItem; when: loader.status == Loader.Ready }
Binding { target: loader.item; property: "selectedIndex"; value: root.selectedIndex; when: loader.status == Loader.Ready }
Binding { target: root; property: "currentItem"; value: loader.item.currentItem; when: loader.status == Loader.Ready }
Binding { target: root; property: "selectedIndex"; value: loader.item.selectedIndex; when: loader.status == Loader.Ready }

Binding { target: loader.item; property: "color"; value: root.color; when: loader.status == Loader.Ready }
Binding { target: loader.item; property: "handleColor"; value: root.handleColor; when: loader.status == Loader.Ready }
Binding { target: loader.item; property: "hoverEnabled"; value: root.hoverEnabled; when: loader.status == Loader.Ready }
Binding { target: loader.item; property: "hoverColor"; value: root.hoverColor; when: loader.status == Loader.Ready }
Binding { target: loader.item; property: "selectionEnabled"; value: root.selectionEnabled; when: loader.status == Loader.Ready }
Binding { target: loader.item; property: "selectedColor"; value: root.selectedColor; when: loader.status == Loader.Ready }
Binding { target: loader.item; property: "selectedItemColor"; value: root.selectedItemColor; when: loader.status == Loader.Ready }

Binding { target: loader.item; property: "itemLeftPadding"; value: root.rowPadding; when: loader.status == Loader.Ready }
Binding { target: loader.item; property: "rowHeight"; value: root.rowHeight; when: loader.status == Loader.Ready }
Binding { target: loader.item; property: "rowPadding"; value: root.rowPadding; when: loader.status == Loader.Ready }
Binding { target: loader.item; property: "rowSpacing"; value: root.rowSpacing; when: loader.status == Loader.Ready }
Binding { target: loader.item; property: "fontMetrics"; value: root.selectedItemColor; when: loader.status == Loader.Ready }
}
}
}
}

function filter (entityId) {
function filter(entityId) {
root.filter_(entityId)
}

Expand Down

0 comments on commit 1a105ea

Please sign in to comment.