GitHub-Proxy/Cura
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/Ultimaker/Cura synced 2025-08-12 19:49:00 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch '3.0' into layerview-slider-refactor

Browse Source
This commit is contained in:
ChrisTerBeke 2017-10-10 09:17:07 +02:00
commit 4c072d5070
7 changed files with 11 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
plugins/3MFReader/WorkspaceDialog.py
View File

@ -285,14 +285,6 @@ class WorkspaceDialog(QObject):
except: except:
pass pass
@pyqtSlot(bool)
def _onVisibilityChanged(self, visible):
if not visible:
try:
self._lock.release()
except:
pass
@pyqtSlot() @pyqtSlot()
def onOkButtonClicked(self): def onOkButtonClicked(self):
self._view.hide() self._view.hide()

2
plugins/3MFReader/WorkspaceDialog.qml
View File

@ -14,7 +14,7 @@ UM.Dialog
title: catalog.i18nc("@title:window", "Open Project") title: catalog.i18nc("@title:window", "Open Project")
minimumWidth: 500 * screenScaleFactor minimumWidth: 500 * screenScaleFactor
minimumHeight: 400 * screenScaleFactor minimumHeight: 450 * screenScaleFactor
width: minimumWidth width: minimumWidth
height: minimumHeight height: minimumHeight

3
plugins/CuraEngineBackend/CuraEngineBackend.py
View File

@ -441,7 +441,7 @@ class CuraEngineBackend(QObject, Backend):
def _onStackErrorCheckFinished(self): def _onStackErrorCheckFinished(self):
self._is_error_check_scheduled = False self._is_error_check_scheduled = False
if self._need_slicing: if not self._slicing and self._need_slicing:
self.needsSlicing() self.needsSlicing()
self._onChanged() self._onChanged()
@ -536,7 +536,6 @@ class CuraEngineBackend(QObject, Backend):
# #
# \param message The protobuf message containing the print time per feature # \param message The protobuf message containing the print time per feature
def _parseMessagePrintTimes(self, message): def _parseMessagePrintTimes(self, message):
result = { result = {
"inset_0": message.time_inset_0, "inset_0": message.time_inset_0,
"inset_x": message.time_inset_x, "inset_x": message.time_inset_x,

4
plugins/MachineSettingsAction/MachineSettingsAction.qml
View File

@ -247,7 +247,7 @@ Cura.MachineAction
Row Row
{ {
spacing: UM.Theme.getSize("default_margin").width spacing: UM.Theme.getSize("default_margin").width * 4 / 5
Label Label
{ {
@ -648,7 +648,7 @@ Cura.MachineAction
Row Row
{ {
spacing: UM.Theme.getSize("default_margin").width spacing: UM.Theme.getSize("default_margin").width * 4 / 5
Label Label
{ {

2
plugins/UM3NetworkPrinting/DiscoverUM3Action.qml
View File

@ -321,7 +321,7 @@ Cura.MachineAction
title: catalog.i18nc("@title:window", "Printer Address") title: catalog.i18nc("@title:window", "Printer Address")
minimumWidth: 400 * screenScaleFactor minimumWidth: 400 * screenScaleFactor
minimumHeight: 120 * screenScaleFactor minimumHeight: 130 * screenScaleFactor
width: minimumWidth width: minimumWidth
height: minimumHeight height: minimumHeight

6
plugins/UM3NetworkPrinting/PrinterInfoBlock.qml
View File

@ -189,7 +189,7 @@ Rectangle
PrintCoreConfiguration PrintCoreConfiguration
{ {
id: leftExtruderInfo id: leftExtruderInfo
width: (parent.width - extruderSeperator.width) / 2 width: Math.floor((parent.width - extruderSeperator.width) / 2)
printCoreConfiguration: printer.configuration[0] printCoreConfiguration: printer.configuration[0]
} }
@ -204,7 +204,7 @@ Rectangle
PrintCoreConfiguration PrintCoreConfiguration
{ {
id: rightExtruderInfo id: rightExtruderInfo
width: (parent.width - extruderSeperator.width) / 2 width: Math.floor((parent.width - extruderSeperator.width) / 2)
printCoreConfiguration: printer.configuration[1] printCoreConfiguration: printer.configuration[1]
} }
} }
@ -404,6 +404,8 @@ Rectangle
anchors.left: parent.left anchors.left: parent.left
anchors.right: parent.right anchors.right: parent.right
elide: Text.ElideRight elide: Text.ElideRight
wrapMode: Text.Wrap
font: UM.Theme.getFont("default") font: UM.Theme.getFont("default")
} }

4
resources/qml/Preferences/MaterialView.qml
View File

@ -16,8 +16,8 @@ TabView
property bool editingEnabled: false; property bool editingEnabled: false;
property string currency: UM.Preferences.getValue("cura/currency") ? UM.Preferences.getValue("cura/currency") : "€" property string currency: UM.Preferences.getValue("cura/currency") ? UM.Preferences.getValue("cura/currency") : "€"
property real firstColumnWidth: (width * 0.45) | 0 property real firstColumnWidth: (width * 0.50) | 0
property real secondColumnWidth: (width * 0.45) | 0 property real secondColumnWidth: (width * 0.40) | 0
property string containerId: "" property string containerId: ""
property var materialPreferenceValues: UM.Preferences.getValue("cura/material_settings") ? JSON.parse(UM.Preferences.getValue("cura/material_settings")) : {} property var materialPreferenceValues: UM.Preferences.getValue("cura/material_settings") ? JSON.parse(UM.Preferences.getValue("cura/material_settings")) : {}