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

Merge branch '3.0'

Browse source
This commit is contained in:
Ghostkeeper 2017-10-10 14:36:38 +02:00
commit d962ffb8d8
No known key found for this signature in database
GPG key ID: C5F96EE2BC0F7E75
6 changed files with 720 additions and 568 deletions
Download patch file Download diff file Expand all files Collapse all files

13
plugins/MachineSettingsAction/MachineSettingsAction.qml
View file

@ -71,6 +71,7 @@ Cura.MachineAction
anchors.topMargin: UM.Theme.getSize("default_margin").height anchors.topMargin: UM.Theme.getSize("default_margin").height
property real columnWidth: ((width - 3 * UM.Theme.getSize("default_margin").width) / 2) | 0 property real columnWidth: ((width - 3 * UM.Theme.getSize("default_margin").width) / 2) | 0
property real labelColumnWidth: columnWidth * 0.5
Tab Tab
{ {
@ -247,13 +248,13 @@ Cura.MachineAction
Row Row
{ {
spacing: UM.Theme.getSize("default_margin").width * 4 / 5 spacing: UM.Theme.getSize("default_margin").width
Label Label
{ {
text: catalog.i18nc("@label", "Number of Extruders") text: catalog.i18nc("@label", "Number of Extruders")
elide: Text.ElideRight elide: Text.ElideRight
width: Math.max(0, settingsTabs.columnWidth - 2 * UM.Theme.getSize("default_margin").width - extruderCountComboBox.width) width: Math.max(0, settingsTabs.labelColumnWidth)
anchors.verticalCenter: extruderCountComboBox.verticalCenter anchors.verticalCenter: extruderCountComboBox.verticalCenter
} }
ComboBox ComboBox
@ -562,7 +563,7 @@ Cura.MachineAction
text: _label text: _label
visible: _label != "" visible: _label != ""
elide: Text.ElideRight elide: Text.ElideRight
width: Math.max(0, settingsTabs.columnWidth - 2 * UM.Theme.getSize("default_margin").width - textFieldWithUnit.width) width: Math.max(0, settingsTabs.labelColumnWidth)
anchors.verticalCenter: textFieldWithUnit.verticalCenter anchors.verticalCenter: textFieldWithUnit.verticalCenter
} }
@ -648,14 +649,14 @@ Cura.MachineAction
Row Row
{ {
spacing: UM.Theme.getSize("default_margin").width * 4 / 5 spacing: UM.Theme.getSize("default_margin").width
Label Label
{ {
text: _label text: _label
visible: _label != "" visible: _label != ""
elide: Text.ElideRight elide: Text.ElideRight
width: Math.max(0, settingsTabs.columnWidth - 2 * UM.Theme.getSize("default_margin").width - comboBox.width) width: Math.max(0, settingsTabs.labelColumnWidth)
anchors.verticalCenter: comboBox.verticalCenter anchors.verticalCenter: comboBox.verticalCenter
} }
ComboBox ComboBox
@ -787,7 +788,7 @@ Cura.MachineAction
text: _label text: _label
visible: _label != "" visible: _label != ""
elide: Text.ElideRight elide: Text.ElideRight
width: Math.max(0, settingsTabs.columnWidth - 2 * UM.Theme.getSize("default_margin").width - textFieldWithUnit.width) width: Math.max(0, settingsTabs.labelColumnWidth)
anchors.verticalCenter: textFieldWithUnit.verticalCenter anchors.verticalCenter: textFieldWithUnit.verticalCenter
} }

20
plugins/UM3NetworkPrinting/ClusterMonitorItem.qml
View file

@ -13,7 +13,7 @@ Component
height: maximumHeight height: maximumHeight
color: UM.Theme.getColor("viewport_background") color: UM.Theme.getColor("viewport_background")
property var emphasisColor: "#44c0ff" //TODO: should be linked to theme. property var emphasisColor: UM.Theme.getColor("setting_control_border_highlight")
property var lineColor: "#DCDCDC" // TODO: Should be linked to theme. property var lineColor: "#DCDCDC" // TODO: Should be linked to theme.
property var cornerRadius: 4 * screenScaleFactor // TODO: Should be linked to theme. property var cornerRadius: 4 * screenScaleFactor // TODO: Should be linked to theme.
UM.I18nCatalog UM.I18nCatalog
@ -27,19 +27,13 @@ Component
id: activePrintersLabel id: activePrintersLabel
font: UM.Theme.getFont("large") font: UM.Theme.getFont("large")
text: anchors {
{ top: parent.top
if (OutputDevice.connectedPrinters.length == 0){ topMargin: UM.Theme.getSize("default_margin").height * 2 // a bit more spacing to give it some breathing room
return catalog.i18nc("@label: arg 1 is group name", "%1 is not set up to host a group of connected Ultimaker 3 printers").arg(Cura.MachineManager.printerOutputDevices[0].name) horizontalCenter: parent.horizontalCenter
} else {
return ""
}
} }
anchors.left: parent.left
anchors.right: parent.right text: OutputDevice.connectedPrinters.length == 0 ? catalog.i18nc("@label: arg 1 is group name", "%1 is not set up to host a group of connected Ultimaker 3 printers").arg(Cura.MachineManager.printerOutputDevices[0].name) : ""
anchors.top: parent.top
anchors.horizontalCenter: parent.horizontalCenter
anchors.topMargin: UM.Theme.getSize("default_margin").height
visible: OutputDevice.connectedPrinters.length == 0 visible: OutputDevice.connectedPrinters.length == 0
} }

13
plugins/UM3NetworkPrinting/NetworkPrinterOutputDevice.py
View file

@ -333,16 +333,15 @@ class NetworkPrinterOutputDevice(PrinterOutputDevice):
self._camera_timer.stop() self._camera_timer.stop()
if self._image_reply: if self._image_reply:
skip_abort = False
try: try:
# disconnect the signal
try: try:
self._image_reply.downloadProgress.disconnect(self._onStreamDownloadProgress) self._image_reply.downloadProgress.disconnect(self._onStreamDownloadProgress)
except Exception as e: except Exception:
if type(e) != RuntimeError: # can happen the RuntimeError occurs before calling abort (=see below), then then the application will crash pass
skip_abort = True # abort the request if it's not finished
pass #The signal was never connected. if not self._image_reply.isFinished():
if not skip_abort: self._image_reply.close()
self._image_reply.abort()
except Exception as e: #RuntimeError except Exception as e: #RuntimeError
pass # It can happen that the wrapped c++ object is already deleted. pass # It can happen that the wrapped c++ object is already deleted.
self._image_reply = None self._image_reply = None

1
plugins/UM3NetworkPrinting/NetworkPrinterOutputDevicePlugin.py
View file

@ -145,7 +145,6 @@ class NetworkPrinterOutputDevicePlugin(QObject, OutputDevicePlugin):
Logger.log("e", "Printer returned incorrect UTF-8.") Logger.log("e", "Printer returned incorrect UTF-8.")
return return
if address not in self._network_requests_buffer: if address not in self._network_requests_buffer:
self._network_requests_buffer[address] = {} self._network_requests_buffer[address] = {}
self._network_requests_buffer[address]["system"] = system_info self._network_requests_buffer[address]["system"] = system_info

2
plugins/UM3NetworkPrinting/PrinterInfoBlock.qml
View file

@ -51,7 +51,7 @@ Rectangle
property var printer property var printer
border.width: UM.Theme.getSize("default_lining").width border.width: UM.Theme.getSize("default_lining").width
border.color: mouse.containsMouse ? UM.Theme.getColor("setting_control_border_highlight") : lineColor border.color: mouse.containsMouse ? emphasisColor : lineColor
z: mouse.containsMouse ? 1 : 0 // Push this item up a bit on mouse over to ensure that the highlighted bottom border is visible. z: mouse.containsMouse ? 1 : 0 // Push this item up a bit on mouse over to ensure that the highlighted bottom border is visible.
property var printJob: property var printJob:

1239
resources/i18n/ja_JP/fdmprinter.def.json.po
View file

File diff suppressed because it is too large Load diff