Browse Source

wip qt changes

c.lamboo 2 years ago
parent
commit
4f70d34631

+ 7 - 7
plugins/DigitalLibrary/resources/qml/OpenProjectFilesPage.qml

@@ -66,13 +66,13 @@ Item
             anchors.margins: parent.border.width
 
             columnHeaders: ["Name", "Uploaded by", "Uploaded at"]
-            model: TableModel
-            {
-                TableModelColumn { display: "fileName" }
-                TableModelColumn { display: "username" }
-                TableModelColumn { display: "uploadedAt" }
-                rows: manager.digitalFactoryFileModel.items
-            }
+//            model: TableModel
+//            {
+//                TableModelColumn { display: "fileName" }
+//                TableModelColumn { display: "username" }
+//                TableModelColumn { display: "uploadedAt" }
+//                rows: manager.digitalFactoryFileModel.items
+//            }
 
             onCurrentRowChanged:
             {

+ 2 - 2
plugins/ModelChecker/ModelChecker.qml

@@ -2,7 +2,7 @@
 // Cura is released under the terms of the LGPLv3 or higher.
 
 import QtQuick 2.2
-import UM 1.2 as UM
+import UM 1.5 as UM
 
 
 UM.SimpleButton
@@ -14,7 +14,7 @@ UM.SimpleButton
 
     width: UM.Theme.getSize("save_button_specs_icons").width
     height: UM.Theme.getSize("save_button_specs_icons").height
-    iconSource: "model_checker.svg"
+//    iconSource: "model_checker.svg"
     anchors.verticalCenter: parent ? parent.verticalCenter : undefined
     color: UM.Theme.getColor("text_scene")
     hoverColor: UM.Theme.getColor("text_scene_hover")

+ 1 - 1
plugins/PostProcessingPlugin/PostProcessingPlugin.qml

@@ -481,7 +481,7 @@ UM.Dialog
             }
             toolTipContentAlignment: UM.Enums.ContentAlignment.AlignLeft
             onClicked: dialog.show()
-            iconSource: "Script.svg"
+//            iconSource: "Script.svg"
             fixedWidthMode: false
         }
 

+ 1 - 2
plugins/SliceInfoPlugin/MoreInfoWindow.qml

@@ -5,10 +5,9 @@ import QtQuick 2.10
 import QtQuick.Controls 2.3
 import QtQuick.Window 2.2
 
-import UM 1.3 as UM
+import UM 1.5 as UM
 import Cura 1.1 as Cura
 
-
 Window
 {
     UM.I18nCatalog { id: catalog; name: "cura" }

+ 8 - 8
resources/qml/Dialogs/DiscardOrKeepProfileChangesDialog.qml

@@ -1,7 +1,7 @@
 //Copyright (c) 2022 Ultimaker B.V.
 //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.1
 import QtQuick.Controls 2.15
 
@@ -77,13 +77,13 @@ 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: TableModel
+//            {
+//                TableModelColumn { display: "label" }
+//                TableModelColumn { display: "original_value" }
+//                TableModelColumn { display: "user_value" }
+//                rows: userChangesModel.items
+//            }
             sectionRole: "category"
         }
     }

+ 1 - 1
resources/qml/TableView.qml

@@ -1,7 +1,7 @@
 //Copyright (C) 2022 Ultimaker B.V.
 //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.15
 import QtQuick.Controls 2.15