Add replacement for QT.labs.models.TableModel

Implementation is intended to function the same as before.

CURA-8640
This commit is contained in:
j.delarago 2022-04-05 15:03:45 +02:00
parent 359bcc1bee
commit 4ec2edec67
3 changed files with 13 additions and 16 deletions

View file

@ -6,7 +6,7 @@ import QtQuick 2.15
import QtQuick.Window 2.2 import QtQuick.Window 2.2
import QtQuick.Controls 2.3 import QtQuick.Controls 2.3
import UM 1.2 as UM import UM 1.6 as UM
import Cura 1.6 as Cura import Cura 1.6 as Cura
import DigitalFactory 1.0 as DF import DigitalFactory 1.0 as DF
@ -66,13 +66,11 @@ Item
anchors.margins: parent.border.width anchors.margins: parent.border.width
columnHeaders: ["Name", "Uploaded by", "Uploaded at"] columnHeaders: ["Name", "Uploaded by", "Uploaded at"]
// model: TableModel model: UM.TableModel
// { {
// TableModelColumn { display: "fileName" } headers: ["fileName", "username", "uploadedAt"]
// TableModelColumn { display: "username" } rows: manager.digitalFactoryFileModel.items
// TableModelColumn { display: "uploadedAt" } }
// rows: manager.digitalFactoryFileModel.items
// }
onCurrentRowChanged: onCurrentRowChanged:
{ {

View file

@ -1,11 +1,11 @@
//Copyright (c) 2022 Ultimaker B.V. //Copyright (c) 2022 Ultimaker B.V.
//Cura is released under the terms of the LGPLv3 or higher. //Cura is released under the terms of the LGPLv3 or higher.
import Qt.labs.qmlmodels 1.0 //import Qt.labs.qmlmodels 1.0
import QtQuick 2.7 import QtQuick 2.7
import QtQuick.Controls 2.15 import QtQuick.Controls 2.15
import UM 1.5 as UM import UM 1.6 as UM
import Cura 1.6 as Cura import Cura 1.6 as Cura
Cura.TableView Cura.TableView
@ -39,13 +39,11 @@ Cura.TableView
catalog.i18nc("@title:column", "Current"), catalog.i18nc("@title:column", "Current"),
catalog.i18nc("@title:column Unit of measurement", "Unit") catalog.i18nc("@title:column Unit of measurement", "Unit")
] ]
model: TableModel
model: UM.TableModel
{ {
id: tableModel id: tableModel
TableModelColumn { display: "label" } headers: ["label", "profile_value", "user_value", "unit"]
TableModelColumn { display: "profile_value" }
TableModelColumn { display: "user_value" }
TableModelColumn { display: "unit" }
rows: modelRows rows: modelRows
} }
sectionRole: "category" sectionRole: "category"

View file

@ -56,8 +56,9 @@ Item
font: UM.Theme.getFont("medium_bold") font: UM.Theme.getFont("medium_bold")
elide: Text.ElideRight elide: Text.ElideRight
} }
Item //Resize handle. Item
{ {
//Resize handle.
anchors anchors
{ {
right: parent.right right: parent.right