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

Merge branch 'master' into CURA-8979_Materials_Preference_Page

Browse Source 
# Conflicts:
#	resources/qml/Preferences/ProfilesPage.qml
This commit is contained in:
casper 2022-03-21 14:06:59 +01:00
commit a8e63005f1
3 changed files with 29 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
plugins/USBPrinting/MonitorItem.qml
View File

@ -21,7 +21,10 @@ Component
Cura.PrintMonitor Cura.PrintMonitor
{ {
anchors.fill: parent anchors.top: parent.top
anchors.left: parent.left
anchors.right: parent.right
anchors.bottom: footerSeparator.top
} }
Rectangle Rectangle

4
resources/qml/MonitorButton.qml
View File

@ -316,7 +316,7 @@ Item
height: UM.Theme.getSize("save_button_save_to_button").height height: UM.Theme.getSize("save_button_save_to_button").height
text: catalog.i18nc("@label", "Abort Print") text: catalog.i18nc("@label", "Abort Print")
onClicked: confirmationDialog.visible = true onClicked: confirmationDialog.open()
} }
Cura.MessageDialog Cura.MessageDialog
@ -325,7 +325,7 @@ Item
title: catalog.i18nc("@window:title", "Abort print") title: catalog.i18nc("@window:title", "Abort print")
text: catalog.i18nc("@label", "Are you sure you want to abort the print?") text: catalog.i18nc("@label", "Are you sure you want to abort the print?")
standardButtons: Dialog.Yes | Dialog.No standardButtons: Cura.MessageDialog.Yes | Cura.MessageDialog.No
onAccepted: activePrintJob.setState("abort") onAccepted: activePrintJob.setState("abort")
} }
} }

28
resources/qml/PrintMonitor.qml
View File

@ -3,17 +3,33 @@
import QtQuick 2.7 import QtQuick 2.7
import QtQuick.Layouts 1.1 import QtQuick.Layouts 1.1
import QtQuick.Controls 2.15
import UM 1.2 as UM import UM 1.5 as UM
import Cura 1.0 as Cura import Cura 1.0 as Cura
import "PrinterOutput" import "PrinterOutput"
ScrollView
Item
{ {
id: base id: base
UM.I18nCatalog { id: catalog; name: "cura"} width: parent.width
height: parent.height
contentHeight: printMonitor.height
ScrollBar.vertical: UM.ScrollBar
{
id: scrollbar
parent: base
anchors
{
right: parent.right
top: parent.top
bottom: parent.bottom
}
}
clip: true
function showTooltip(item, position, text) function showTooltip(item, position, text)
{ {
@ -51,7 +67,9 @@ Item
{ {
id: printMonitor id: printMonitor
anchors.fill: parent UM.I18nCatalog { id: catalog; name: "cura" }
width: parent.width - scrollbar.width
property var extrudersModel: CuraApplication.getExtrudersModel() property var extrudersModel: CuraApplication.getExtrudersModel()