3D-printing/Cura
1
0
Fork 0
mirror of https://github.com/Ultimaker/Cura.git synced 2025-08-09 23:05:01 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Merge branch 'qt6_beyond_the_splash' of github.com:Ultimaker/Cura into qt6_beyond_the_splash

Browse source
This commit is contained in:
Jaime van Kessel 2022-04-05 16:03:58 +02:00
commit fa2ebf3e38
3 changed files with 7 additions and 213 deletions
Download patch file Download diff file Expand all files Collapse all files

15
resources/qml/Dialogs/DiscardOrKeepProfileChangesDialog.qml
View file

@ -1,11 +1,10 @@
//Copyright (c) 2022 Ultimaker B.V.
//Cura is released under the terms of the LGPLv3 or higher.
//import Qt.labs.qmlmodels 1.0
import QtQuick 2.1
import QtQuick.Controls 2.15
import UM 1.5 as UM
import UM 1.6 as UM
import Cura 1.6 as Cura
UM.Dialog
@ -77,13 +76,11 @@ UM.Dialog
Cura.MachineManager.activeQualityDisplayNameMap["main"],
catalog.i18nc("@title:column", "Current changes")
]
// model: TableModel
// {
// TableModelColumn { display: "label" }
// TableModelColumn { display: "original_value" }
// TableModelColumn { display: "user_value" }
// rows: userChangesModel.items
// }
model: UM.TableModel
{
headers: ["label", "original_value", "user_value"]
rows: userChangesModel.items
}
sectionRole: "category"
}
}