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

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
Show Stats 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) # Count nbr of negative layers (raft)
elif ";LAYER:-" in line: elif ";LAYER:-" in line:
nbr_negative_layers += 1 nbr_negative_layers += 1
if not layers_started:
continue
#Track the latest printing temperature in order to resume at the correct temperature. #Track the latest printing temperature in order to resume at the correct temperature.
if line.startswith("T"): if line.startswith("T"):
current_t = self.getValue(line, "T") current_t = int(self.getValue(line, "T"))
m = self.getValue(line, "M") 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 extruder = current_t
if self.getValue(line, "T") is not None: 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") 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 a Z instruction is in the line, read the current Z
if self.getValue(line, "Z") is not None: if self.getValue(line, "Z") is not None:
current_z = self.getValue(line, "Z") current_z = self.getValue(line, "Z")

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

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

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

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

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

@ -15,6 +15,7 @@ ScrollView
width: parent.width width: parent.width
height: parent.height height: parent.height
style: UM.Theme.styles.scrollview style: UM.Theme.styles.scrollview
flickableItem.flickableDirection: Flickable.VerticalFlick
Column Column
{ {
spacing: UM.Theme.getSize("default_margin").height 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) viewportRect: Qt.rect(0, 0, (base.width - sidebar.width) / base.width, 1.0)
property bool showPrintMonitor: false 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 // 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. // It should be phased out in newer plugin versions.
Connections Connections

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

@ -570,7 +570,7 @@ UM.PreferencesPage
Component.onCompleted: 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 open as a project"), code: "open_as_project" })
append({ text: catalog.i18nc("@option:openProject", "Always import models"), code: "open_as_model" }) append({ text: catalog.i18nc("@option:openProject", "Always import models"), code: "open_as_model" })
} }
@ -617,7 +617,12 @@ UM.PreferencesPage
Label Label
{ {
font.bold: true 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 ComboBox
@ -632,8 +637,8 @@ UM.PreferencesPage
Component.onCompleted: Component.onCompleted:
{ {
append({ text: catalog.i18nc("@option:discardOrKeep", "Always ask me this"), code: "always_ask" }) 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", "Always discard changed settings"), code: "always_discard" })
append({ text: catalog.i18nc("@option:discardOrKeep", "Keep and never ask again"), code: "always_keep" }) append({ text: catalog.i18nc("@option:discardOrKeep", "Always transfer changed settings to new profile"), code: "always_keep" })
} }
} }