3D-printing/Cura
1
0
Fork 0
mirror of https://github.com/Ultimaker/Cura.git synced 2025-07-06 22:47:29 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

wip qt changes

Browse source
This commit is contained in:
c.lamboo 2022-03-30 16:55:56 +02:00
parent 1acf96dfa1
commit 4f70d34631
6 changed files with 20 additions and 21 deletions
Download patch file Download diff file Expand all files Collapse all files

14
plugins/DigitalLibrary/resources/qml/OpenProjectFilesPage.qml
View file

@ -66,13 +66,13 @@ 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: TableModel
{ // {
TableModelColumn { display: "fileName" } // TableModelColumn { display: "fileName" }
TableModelColumn { display: "username" } // TableModelColumn { display: "username" }
TableModelColumn { display: "uploadedAt" } // TableModelColumn { display: "uploadedAt" }
rows: manager.digitalFactoryFileModel.items // rows: manager.digitalFactoryFileModel.items
} // }
onCurrentRowChanged: onCurrentRowChanged:
{ {

4
plugins/ModelChecker/ModelChecker.qml
View file

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

2
plugins/PostProcessingPlugin/PostProcessingPlugin.qml
View file

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

3
plugins/SliceInfoPlugin/MoreInfoWindow.qml
View file

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

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

@ -1,7 +1,7 @@
//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.1 import QtQuick 2.1
import QtQuick.Controls 2.15 import QtQuick.Controls 2.15
@ -77,13 +77,13 @@ UM.Dialog
Cura.MachineManager.activeQualityDisplayNameMap["main"], Cura.MachineManager.activeQualityDisplayNameMap["main"],
catalog.i18nc("@title:column", "Current changes") catalog.i18nc("@title:column", "Current changes")
] ]
model: TableModel // model: TableModel
{ // {
TableModelColumn { display: "label" } // TableModelColumn { display: "label" }
TableModelColumn { display: "original_value" } // TableModelColumn { display: "original_value" }
TableModelColumn { display: "user_value" } // TableModelColumn { display: "user_value" }
rows: userChangesModel.items // rows: userChangesModel.items
} // }
sectionRole: "category" sectionRole: "category"
} }
} }

2
resources/qml/TableView.qml
View file

@ -1,7 +1,7 @@
//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.15 import QtQuick 2.15
import QtQuick.Controls 2.15 import QtQuick.Controls 2.15