3D-printing/Cura
1
0
Fork 0
mirror of https://github.com/Ultimaker/Cura.git synced 2025-08-09 14:55:03 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Merge branch 'master' of github.com:Ultimaker/Cura

Browse source
This commit is contained in:
Aleksei S 2018-07-03 10:24:17 +02:00
commit 47300eabe7
6 changed files with 20 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

11
plugins/PostProcessingPlugin/scripts/PauseAtHeight.py
View file

@ -159,19 +159,20 @@ class PauseAtHeight(Script):
# Count nbr of negative layers (raft)
elif ";LAYER:-" in line:
nbr_negative_layers += 1
if not layers_started:
continue
#Track the latest printing temperature in order to resume at the correct temperature.
if line.startswith("T"):
current_t = self.getValue(line, "T")
current_t = int(self.getValue(line, "T"))
m = self.getValue(line, "M")
if m is not None and (m == 104 or m == 109) and self.getValue(line, "S") is not None:
if m is not None and (int(m) == 104 or int(m) == 109) and self.getValue(line, "S") is not None:
extruder = current_t
if self.getValue(line, "T") is not None:
extruder = self.getValue(line, "T")
extruder = int(self.getValue(line, "T"))
target_temperature[extruder] = self.getValue(line, "S")
if not layers_started:
continue
# If a Z instruction is in the line, read the current Z
if self.getValue(line, "Z") is not None:
current_z = self.getValue(line, "Z")

1
plugins/Toolbox/resources/qml/ToolboxDetailList.qml
View file

@ -14,6 +14,7 @@ Item
frameVisible: false
anchors.fill: detailList
style: UM.Theme.styles.scrollview
flickableItem.flickableDirection: Flickable.VerticalFlick
Column
{
anchors

1
plugins/Toolbox/resources/qml/ToolboxDownloadsPage.qml
View file

@ -12,6 +12,7 @@ ScrollView
width: parent.width
height: parent.height
style: UM.Theme.styles.scrollview
flickableItem.flickableDirection: Flickable.VerticalFlick
Column
{
width: parent.width - 2 * padding

1
plugins/Toolbox/resources/qml/ToolboxInstalledPage.qml
View file

@ -15,6 +15,7 @@ ScrollView
width: parent.width
height: parent.height
style: UM.Theme.styles.scrollview
flickableItem.flickableDirection: Flickable.VerticalFlick
Column
{
spacing: UM.Theme.getSize("default_margin").height

2
resources/qml/Cura.qml
View file

@ -20,6 +20,8 @@ UM.MainWindow
viewportRect: Qt.rect(0, 0, (base.width - sidebar.width) / base.width, 1.0)
property bool showPrintMonitor: false
backgroundColor: UM.Theme.getColor("viewport_background")
// This connection is here to support legacy printer output devices that use the showPrintMonitor signal on Application to switch to the monitor stage
// It should be phased out in newer plugin versions.
Connections

13
resources/qml/Preferences/GeneralPage.qml
View file

@ -570,7 +570,7 @@ UM.PreferencesPage
Component.onCompleted:
{
append({ text: catalog.i18nc("@option:openProject", "Always ask"), code: "always_ask" })
append({ text: catalog.i18nc("@option:openProject", "Always ask me this"), code: "always_ask" })
append({ text: catalog.i18nc("@option:openProject", "Always open as a project"), code: "open_as_project" })
append({ text: catalog.i18nc("@option:openProject", "Always import models"), code: "open_as_model" })
}
@ -617,7 +617,12 @@ UM.PreferencesPage
Label
{
font.bold: true
text: catalog.i18nc("@label", "Override Profile")
text: catalog.i18nc("@label", "Profiles")
}
Label
{
text: catalog.i18nc("@window:text", "Default behavior for changed setting values when switching to a different profile: ")
}
ComboBox
@ -632,8 +637,8 @@ UM.PreferencesPage
Component.onCompleted:
{
append({ text: catalog.i18nc("@option:discardOrKeep", "Always ask me this"), code: "always_ask" })
append({ text: catalog.i18nc("@option:discardOrKeep", "Discard and never ask again"), code: "always_discard" })
append({ text: catalog.i18nc("@option:discardOrKeep", "Keep and never ask again"), code: "always_keep" })
append({ text: catalog.i18nc("@option:discardOrKeep", "Always discard changed settings"), code: "always_discard" })
append({ text: catalog.i18nc("@option:discardOrKeep", "Always transfer changed settings to new profile"), code: "always_keep" })
}
}