Skip to content
Snippets Groups Projects
Commit 47da757f authored by littletux89@gmail.com's avatar littletux89@gmail.com
Browse files

[*] Merge conflicts fixed.

parent 461f4188
No related branches found
No related tags found
No related merge requests found
...@@ -7,6 +7,26 @@ Page { ...@@ -7,6 +7,26 @@ Page {
id: dapUiQmlWidgetChainNodeLogs id: dapUiQmlWidgetChainNodeLogs
title: "Logs" title: "Logs"
ListModel
{
id: nodeModel
ListElement
{
name: "Node 1"
}
ListElement
{
name: "Node 2"
}
ListElement
{
name: "Node 3"
}
}
TabView TabView
{ {
id: tabViewLogs id: tabViewLogs
...@@ -16,7 +36,7 @@ Page { ...@@ -16,7 +36,7 @@ Page {
anchors.right: parent.right anchors.right: parent.right
Repeater { Repeater {
anchors.fill: parent anchors.fill: parent
model: dapUiQmlWidgetModel model: nodeModel
delegate: delegate:
Tab{ Tab{
...@@ -88,7 +108,7 @@ Page { ...@@ -88,7 +108,7 @@ Page {
headerDelegate: Rectangle { headerDelegate: Rectangle {
height: 20 height: 20
color: "red" color: "orange"
Text { Text {
text: styleData.value text: styleData.value
...@@ -107,97 +127,98 @@ Page { ...@@ -107,97 +127,98 @@ Page {
} }
} }
TabView // TabView
{ // {
id: tabViewLogs // id: tabViewLogs
anchors.top: parent.top // anchors.top: parent.top
anchors.bottom: parent.bottom // anchors.bottom: parent.bottom
anchors.left: parent.left // anchors.left: parent.left
anchors.right: parent.right // anchors.right: parent.right
Repeater { // Repeater {
anchors.fill: parent // anchors.fill: parent
model: dapUiQmlWidgetModel // model: dapUiQmlWidgetModel
delegate: // delegate:
Tab{ // Tab{
title: qsTr(name) // title: qsTr(name)
TableView { // TableView {
id: tableViewLogs // id: tableViewLogs
model: dataModel // model: dataModel
clip: true // clip: true
TableViewColumn { // TableViewColumn {
id: columnType // id: columnType
role: "type" // role: "type"
title: "Type" // title: "Type"
delegate: // delegate:
Item // Item
{ // {
height: parent.height // height: parent.height
width: parent.height // width: parent.height
Rectangle { // Rectangle {
anchors.fill: parent // anchors.fill: parent
color: "transparent" // color: "transparent"
Image { // Image {
id: names // id: names
height: parent.height // height: parent.height
width: parent.height // width: parent.height
// source: model.type //// source: model.type
anchors.centerIn: parent // anchors.centerIn: parent
} // }
} // }
} // }
} // }
TableViewColumn { // TableViewColumn {
id: columnDate // id: columnDate
role: "name" // role: "name"
title: "Date" // title: "Date"
} // }
TableViewColumn { // TableViewColumn {
id: columnTime // id: columnTime
role: "cost" // role: "cost"
title: "Time" // title: "Time"
} // }
TableViewColumn { // TableViewColumn {
id: columnFile // id: columnFile
role: "file" // role: "file"
title: "File" // title: "File"
} // }
TableViewColumn { // TableViewColumn {
id: columnMessage // id: columnMessage
role: "Message" // role: "Message"
title: "Message" // title: "Message"
} // }
itemDelegate: Item { // itemDelegate: Item {
Text { // Text {
anchors.centerIn: parent // anchors.centerIn: parent
renderType: Text.NativeRendering // renderType: Text.NativeRendering
text: styleData.value // text: styleData.value
} // }
} // }
headerDelegate: Rectangle { // headerDelegate: Rectangle {
height: 20 // height: 20
color: "#29333f" // color: "#29333f"
Text { // Text {
text: styleData.value // text: styleData.value
color: "#FFF" // color: "#FFF"
width: parent.width // width: parent.width
height: parent.height // height: parent.height
font.pointSize: 24 // font.pointSize: 24
minimumPointSize: 3 // minimumPointSize: 3
font.family: "Roboto" // font.family: "Roboto"
fontSizeMode: Text.Fit // fontSizeMode: Text.Fit
horizontalAlignment: Text.AlignHCenter // horizontalAlignment: Text.AlignHCenter
verticalAlignment: Text.AlignVCenter // verticalAlignment: Text.AlignVCenter
} // }
} // }
} // }
} // }
} // }
// }
} }
} }
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment