mirror of
https://github.com/Ultimaker/Cura.git
synced 2025-07-10 00:07:51 -06:00
Merge branch '4.6'
This commit is contained in:
commit
4f50f42796
5 changed files with 27 additions and 4 deletions
|
@ -33,6 +33,10 @@ class FirmwareUpdater(QObject):
|
||||||
else:
|
else:
|
||||||
self._firmware_file = firmware_file
|
self._firmware_file = firmware_file
|
||||||
|
|
||||||
|
if self._firmware_file == "":
|
||||||
|
self._setFirmwareUpdateState(FirmwareUpdateState.firmware_not_found_error)
|
||||||
|
return
|
||||||
|
|
||||||
self._setFirmwareUpdateState(FirmwareUpdateState.updating)
|
self._setFirmwareUpdateState(FirmwareUpdateState.updating)
|
||||||
|
|
||||||
self._update_firmware_thread.start()
|
self._update_firmware_thread.start()
|
||||||
|
|
|
@ -92,13 +92,21 @@ class ImageReaderUI(QObject):
|
||||||
def onOkButtonClicked(self):
|
def onOkButtonClicked(self):
|
||||||
self._cancelled = False
|
self._cancelled = False
|
||||||
self._ui_view.close()
|
self._ui_view.close()
|
||||||
self._ui_lock.release()
|
try:
|
||||||
|
self._ui_lock.release()
|
||||||
|
except RuntimeError:
|
||||||
|
# We don't really care if it was held or not. Just make sure it's not held now
|
||||||
|
pass
|
||||||
|
|
||||||
@pyqtSlot()
|
@pyqtSlot()
|
||||||
def onCancelButtonClicked(self):
|
def onCancelButtonClicked(self):
|
||||||
self._cancelled = True
|
self._cancelled = True
|
||||||
self._ui_view.close()
|
self._ui_view.close()
|
||||||
self._ui_lock.release()
|
try:
|
||||||
|
self._ui_lock.release()
|
||||||
|
except RuntimeError:
|
||||||
|
# We don't really care if it was held or not. Just make sure it's not held now
|
||||||
|
pass
|
||||||
|
|
||||||
@pyqtSlot(str)
|
@pyqtSlot(str)
|
||||||
def onWidthChanged(self, value):
|
def onWidthChanged(self, value):
|
||||||
|
|
|
@ -85,7 +85,7 @@
|
||||||
"infill_before_walls": { "value": true },
|
"infill_before_walls": { "value": true },
|
||||||
"infill_overlap": { "value": 30.0 },
|
"infill_overlap": { "value": 30.0 },
|
||||||
"skin_overlap": { "value": 10.0 },
|
"skin_overlap": { "value": 10.0 },
|
||||||
"infill_wipe_dist": { "value": 1.0 },
|
"infill_wipe_dist": { "value": 0 },
|
||||||
"wall_0_wipe_dist": { "value": 0.2 },
|
"wall_0_wipe_dist": { "value": 0.2 },
|
||||||
|
|
||||||
"fill_perimeter_gaps": { "value": "'everywhere'" },
|
"fill_perimeter_gaps": { "value": "'everywhere'" },
|
||||||
|
|
|
@ -86,10 +86,20 @@ Button
|
||||||
renderType: Text.NativeRendering
|
renderType: Text.NativeRendering
|
||||||
height: parent.height
|
height: parent.height
|
||||||
anchors.verticalCenter: parent.verticalCenter
|
anchors.verticalCenter: parent.verticalCenter
|
||||||
width: fixedWidthMode ? button.width - button.leftPadding - button.rightPadding : ((maximumWidth != 0 && contentWidth > maximumWidth) ? maximumWidth : undefined)
|
|
||||||
horizontalAlignment: Text.AlignHCenter
|
horizontalAlignment: Text.AlignHCenter
|
||||||
verticalAlignment: Text.AlignVCenter
|
verticalAlignment: Text.AlignVCenter
|
||||||
elide: Text.ElideRight
|
elide: Text.ElideRight
|
||||||
|
|
||||||
|
Binding
|
||||||
|
{
|
||||||
|
// When settting width directly, an unjust binding loop warning would be triggered,
|
||||||
|
// because button.width is part of this expression.
|
||||||
|
// Using parent.width is fine in fixedWidthMode.
|
||||||
|
target: buttonText
|
||||||
|
property: "width"
|
||||||
|
value: button.fixedWidthMode ? button.width - button.leftPadding - button.rightPadding
|
||||||
|
: ((maximumWidth != 0 && contentWidth > maximumWidth) ? maximumWidth : undefined)
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
//Right side icon. Only displayed if isIconOnRightSide.
|
//Right side icon. Only displayed if isIconOnRightSide.
|
||||||
|
|
|
@ -15,6 +15,7 @@ import Cura 1.0 as Cura
|
||||||
Item
|
Item
|
||||||
{
|
{
|
||||||
id: base
|
id: base
|
||||||
|
width: actionPanelWidget.width + additionalComponents.width
|
||||||
height: childrenRect.height
|
height: childrenRect.height
|
||||||
visible: CuraApplication.platformActivity
|
visible: CuraApplication.platformActivity
|
||||||
|
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue