3D-printing/Cura
1
0
Fork 0
mirror of https://github.com/Ultimaker/Cura.git synced 2025-07-25 07:33:57 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 8

Merge pull request #13304 from Ultimaker/CURA-9278_UI_UX_Fixes

Browse source 
UI / UX fixes for printer selection card
This commit is contained in:
Vandresc 2022-09-20 10:28:31 +02:00 • committed by GitHub
commit 428e78f36f
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 18 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

4
cura/Machines/Models/CompatibleMachineModel.py
View file

@ -31,6 +31,10 @@ class CompatibleMachineModel(ListModel):
machine_manager.globalContainerChanged.connect(self._update) machine_manager.globalContainerChanged.connect(self._update)
machine_manager.outputDevicesChanged.connect(self._update) machine_manager.outputDevicesChanged.connect(self._update)
@pyqtSlot()
def forceUpdate(self):
self._update()
def _update(self) -> None: def _update(self) -> None:
self.clear() self.clear()

10
resources/qml/Dialogs/ChoosePrinterDialog.qml
View file

@ -11,7 +11,7 @@ import Cura 1.0 as Cura
UM.Dialog UM.Dialog
{ {
property var manager property var manager
property var compatible_machine_model: Cura.CompatibleMachineModel {}
id: base id: base
title: catalog.i18nc("@title:window", "Select Printer") title: catalog.i18nc("@title:window", "Select Printer")
@ -65,7 +65,11 @@ UM.Dialog
color: UM.Theme.getColor("text_link") color: UM.Theme.getColor("text_link")
hoverColor: UM.Theme.getColor("text_scene_hover") hoverColor: UM.Theme.getColor("text_scene_hover")
onClicked: manager.refresh() onClicked:
{
manager.refresh()
base.compatible_machine_model.forceUpdate()
}
} }
} }
@ -73,7 +77,7 @@ UM.Dialog
{ {
id: contents id: contents
model: Cura.CompatibleMachineModel {} model: base.compatible_machine_model
delegate: Cura.PrintSelectorCard delegate: Cura.PrintSelectorCard
{ {

14
resources/qml/PrinterSelector/PrintSelectorCard.qml
View file

@ -15,6 +15,7 @@ Rectangle
property var extruders property var extruders
property var manager property var manager
width: parent.width width: parent.width
height: childrenRect.height + 2 * UM.Theme.getSize("default_margin").height height: childrenRect.height + 2 * UM.Theme.getSize("default_margin").height
@ -35,7 +36,7 @@ Rectangle
Layout.preferredWidth: parent.width / 3 Layout.preferredWidth: parent.width / 3
Layout.fillWidth: true Layout.fillWidth: true
Layout.alignment: Qt.AlignTop Layout.alignment: extruders[0].materials.length > 1 ? Qt.AlignTop: Qt.AlignCenter
Layout.fillHeight: false Layout.fillHeight: false
source: UM.Theme.getIcon("Printer") source: UM.Theme.getIcon("Printer")
@ -50,7 +51,7 @@ Rectangle
Layout.fillWidth: true Layout.fillWidth: true
Layout.preferredWidth: parent.width / 2 Layout.preferredWidth: parent.width / 2
Layout.alignment: Qt.AlignTop Layout.alignment: Qt.AlignTop
spacing: UM.Theme.getSize("default_margin").width spacing: UM.Theme.getSize("narrow_margin").width
Repeater Repeater
{ {
@ -88,7 +89,6 @@ Rectangle
text: modelData.materials.length == 1 ? `${modelData.materials[0].brand} ${modelData.materials[0].name}` : "" text: modelData.materials.length == 1 ? `${modelData.materials[0].brand} ${modelData.materials[0].name}` : ""
visible: modelData.materials.length == 1 visible: modelData.materials.length == 1
} }
ColumnLayout ColumnLayout
{ {
id: multiMaterialText id: multiMaterialText
@ -98,7 +98,7 @@ Rectangle
visible: modelData.materials.length > 1 visible: modelData.materials.length > 1
Repeater Repeater
{ {
model: modelData.materials model: modelData.materials.length > 1 ? modelData.materials: null
UM.Label UM.Label
{ {
text: `${modelData.brand} ${modelData.name}` text: `${modelData.brand} ${modelData.name}`
@ -113,9 +113,9 @@ Rectangle
{ {
id: printButton id: printButton
implicitWidth: UM.Theme.getSize("medium_button").width implicitWidth: UM.Theme.getSize("large_button").width
implicitHeight: implicitWidth implicitHeight: implicitWidth
Layout.alignment: Qt.AlignTop Layout.alignment: extruders[0].materials.length > 1 ? Qt.AlignTop: Qt.AlignCenter
padding: 0 padding: 0
background: Rectangle background: Rectangle
@ -132,7 +132,7 @@ Rectangle
anchors.centerIn: parent anchors.centerIn: parent
source: UM.Theme.getIcon("Printer") source: UM.Theme.getIcon("Printer")
color: UM.Theme.getColor("border_accent_1") color: UM.Theme.getColor("border_accent_1")
width: UM.Theme.getSize("small_button_icon").width width: UM.Theme.getSize("medium_button_icon").width
height: width height: width
} }
} }