3D-printing/Cura
1
0
Fork 0
mirror of https://github.com/Ultimaker/Cura.git synced 2025-08-07 22:13:58 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 9

Merge branch 'main' into CURA-9793_extend_recommended_print_settings

Browse source
This commit is contained in:
Joey de l'Arago 2022-12-05 11:39:51 +01:00
commit 0738f996d0
409 changed files with 44013 additions and 3888 deletions
Download patch file Download diff file Expand all files Collapse all files

8
resources/qml/Account/GeneralOperations.qml
View file

@ -1,4 +1,4 @@
// Copyright (c) 2019 Ultimaker B.V.
// Copyright (c) 2022 UltiMaker
// Cura is released under the terms of the LGPLv3 or higher.
import QtQuick 2.10
@ -16,7 +16,7 @@ Column
{
id: title
anchors.horizontalCenter: parent.horizontalCenter
text: catalog.i18nc("@label", "Sign in to the Ultimaker platform")
text: catalog.i18nc("@label", "Sign in to the UltiMaker platform")
font: UM.Theme.getFont("large_bold")
}
@ -36,7 +36,7 @@ Column
id: generalInformationPoints
anchors.horizontalCenter: parent.horizontalCenter
horizontalAlignment: Text.AlignLeft
text: catalog.i18nc("@text", "- Add material profiles and plug-ins from the Marketplace\n- Back-up and sync your material profiles and plug-ins\n- Share ideas and get help from 48,000+ users in the Ultimaker community")
text: catalog.i18nc("@text", "- Add material profiles and plug-ins from the Marketplace\n- Back-up and sync your material profiles and plug-ins\n- Share ideas and get help from 48,000+ users in the UltiMaker community")
lineHeight: 1.4
wrapMode: Text.NoWrap
}
@ -55,7 +55,7 @@ Column
{
anchors.horizontalCenter: parent.horizontalCenter
height: UM.Theme.getSize("account_button").height
text: catalog.i18nc("@button", "Create a free Ultimaker account")
text: catalog.i18nc("@button", "Create a free UltiMaker account")
onClicked: Qt.openUrlExternally("https://ultimaker.com/app/ultimaker-cura-account-sign-up?utm_source=cura&utm_medium=software&utm_campaign=menu-signup")
}
}

4
resources/qml/Account/UserOperations.qml
View file

@ -1,4 +1,4 @@
// Copyright (c) 2020 Ultimaker B.V.
// Copyright (c) 2022 UltiMaker
// Cura is released under the terms of the LGPLv3 or higher.
import QtQuick 2.10
@ -104,7 +104,7 @@ Column
width: parent.width
height: UM.Theme.getSize("account_button").height
text: catalog.i18nc("@button", "Ultimaker Account")
text: catalog.i18nc("@button", "UltiMaker Account")
onClicked: Qt.openUrlExternally(CuraApplication.ultimakerCloudAccountRootUrl + "?utm_source=cura&utm_medium=software&utm_campaign=menu-visit-account")
fixedWidthMode: false
}

7
resources/qml/Actions.qml
View file

@ -1,4 +1,4 @@
// Copyright (c) 2022 Ultimaker B.V.
// Copyright (c) 2022 UltiMaker
// Cura is released under the terms of the LGPLv3 or higher.
pragma Singleton
@ -187,7 +187,8 @@ Item
//- https://doc.qt.io/qt-5/qmenubar.html#qmenubar-as-a-global-menu-bar
text: (Qt.platform.os == "osx") ? "Configure Cura..." : catalog.i18nc("@action:inmenu", "Configure Cura...")
icon.name: "configure"
shortcut: "Ctrl+,"
// on MacOS it us customary to assign the ctrl+, hotkey to open a general settings menu
shortcut: (Qt.platform.os == "osx") ? "Ctrl+," : ""
}
Action
@ -214,7 +215,7 @@ Item
Action
{
id: marketplaceMaterialsAction
text: catalog.i18nc("@action:inmenu Marketplace is a brand name of Ultimaker's, so don't translate.", "Add more materials from Marketplace")
text: catalog.i18nc("@action:inmenu Marketplace is a brand name of UltiMaker's, so don't translate.", "Add more materials from Marketplace")
}
Action

16
resources/qml/ApplicationSwitcher/ApplicationSwitcherPopup.qml
View file

@ -50,30 +50,30 @@ Popup
permissionsRequired: ["digital-factory.print-job.read"]
},
{
displayName: "Ultimaker Marketplace", //Not translated, since it's a brand name.
displayName: "UltiMaker Marketplace", //Not translated, since it's a brand name.
thumbnail: UM.Theme.getIcon("Shop", "high"),
description: catalog.i18nc("@tooltip:button", "Extend Ultimaker Cura with plugins and material profiles."),
description: catalog.i18nc("@tooltip:button", "Extend UltiMaker Cura with plugins and material profiles."),
link: "https://marketplace.ultimaker.com/?utm_source=cura&utm_medium=software&utm_campaign=switcher-marketplace-materials",
permissionsRequired: []
},
{
displayName: "Ultimaker Academy", //Not translated, since it's a brand name.
displayName: "UltiMaker Academy", //Not translated, since it's a brand name.
thumbnail: UM.Theme.getIcon("Knowledge"),
description: catalog.i18nc("@tooltip:button", "Become a 3D printing expert with Ultimaker e-learning."),
description: catalog.i18nc("@tooltip:button", "Become a 3D printing expert with UltiMaker e-learning."),
link: "https://academy.ultimaker.com/?utm_source=cura&utm_medium=software&utm_campaign=switcher-academy",
permissionsRequired: []
},
{
displayName: catalog.i18nc("@label:button", "Ultimaker support"),
displayName: catalog.i18nc("@label:button", "UltiMaker support"),
thumbnail: UM.Theme.getIcon("Help", "high"),
description: catalog.i18nc("@tooltip:button", "Learn how to get started with Ultimaker Cura."),
description: catalog.i18nc("@tooltip:button", "Learn how to get started with UltiMaker Cura."),
link: "https://support.ultimaker.com/?utm_source=cura&utm_medium=software&utm_campaign=switcher-support",
permissionsRequired: []
},
{
displayName: catalog.i18nc("@label:button", "Ask a question"),
thumbnail: UM.Theme.getIcon("Speak", "high"),
description: catalog.i18nc("@tooltip:button", "Consult the Ultimaker Community."),
description: catalog.i18nc("@tooltip:button", "Consult the UltiMaker Community."),
link: "https://community.ultimaker.com/?utm_source=cura&utm_medium=software&utm_campaign=switcher-community",
permissionsRequired: []
},
@ -87,7 +87,7 @@ Popup
{
displayName: "Ultimaker.com", //Not translated, since it's a URL.
thumbnail: UM.Theme.getIcon("Browser"),
description: catalog.i18nc("@tooltip:button", "Visit the Ultimaker website."),
description: catalog.i18nc("@tooltip:button", "Visit the UltiMaker website."),
link: "https://ultimaker.com/?utm_source=cura&utm_medium=software&utm_campaign=switcher-umwebsite",
permissionsRequired: []
}

6
resources/qml/Dialogs/AboutDialog.qml
View file

@ -1,4 +1,4 @@
// Copyright (c) 2022 Ultimaker B.V.
// Copyright (c) 2022 UltiMaker
// Cura is released under the terms of the LGPLv3 or higher.
import QtQuick 2.2
@ -84,7 +84,7 @@ UM.Dialog
width: parent.width
//: About dialog application author note
text: catalog.i18nc("@info:credit","Cura is developed by Ultimaker B.V. in cooperation with the community.\nCura proudly uses the following open source projects:")
text: catalog.i18nc("@info:credit","Cura is developed by UltiMaker in cooperation with the community.\nCura proudly uses the following open source projects:")
font: UM.Theme.getFont("system")
wrapMode: Text.WordWrap
anchors.top: description.bottom
@ -134,7 +134,7 @@ UM.Dialog
Component.onCompleted:
{
//Do NOT add dependencies of our dependencies here, nor CI-dependencies!
//Ultimaker's own projects and forks.
//UltiMaker's own projects and forks.
projectsModel.append({ name: "Cura", description: catalog.i18nc("@label Description for application component", "Graphical user interface"), license: "LGPLv3", url: "https://github.com/Ultimaker/Cura" });
projectsModel.append({ name: "Uranium", description: catalog.i18nc("@label Description for application component", "Application framework"), license: "LGPLv3", url: "https://github.com/Ultimaker/Uranium" });
projectsModel.append({ name: "CuraEngine", description: catalog.i18nc("@label Description for application component", "G-code generator"), license: "AGPLv3", url: "https://github.com/Ultimaker/CuraEngine" });

4
resources/qml/Dialogs/DiscardOrKeepProfileChangesDialog.qml
View file

@ -56,7 +56,7 @@ UM.Dialog
UM.Label
{
id: infoText
text: catalog.i18nc("@text:window, %1 is a profile name", "You have customized some profile settings. Would you like to Keep these changed settings after switching profiles? Alternatively, you can discard the changes to load the defaults from '%1'.").arg(Cura.MachineManager.activeQualityDisplayNameMap["main"])
text: catalog.i18nc("@text:window, %1 is a profile name", "You have customized some profile settings. Would you like to Keep these changed settings after switching profiles? Alternatively, you can discard the changes to load the defaults from '%1'.").arg(Cura.MachineManager.activeQualityDisplayNameMainStringParts.join(" - "))
anchors.left: parent.left
anchors.right: parent.right
wrapMode: Text.WordWrap
@ -83,7 +83,7 @@ UM.Dialog
columnHeaders: [
catalog.i18nc("@title:column", "Profile settings"),
Cura.MachineManager.activeQualityDisplayNameMap["main"],
Cura.MachineManager.activeQualityDisplayNameMainStringParts.join(" - "),
catalog.i18nc("@title:column", "Current changes")
]
model: UM.TableModel

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

@ -859,7 +859,7 @@ UM.PreferencesPage
{
width: childrenRect.width
height: visible ? childrenRect.height : 0
text: catalog.i18nc("@info:tooltip", "Should anonymous data about your print be sent to Ultimaker? Note, no models, IP addresses or other personally identifiable information is sent or stored.")
text: catalog.i18nc("@info:tooltip", "Should anonymous data about your print be sent to UltiMaker? Note, no models, IP addresses or other personally identifiable information is sent or stored.")
UM.CheckBox
{

42
resources/qml/PrintSetupSelector/Custom/CustomPrintSetup.qml
View file

@ -67,7 +67,7 @@ Item
UM.Label
{
id: textLabel
text: Cura.MachineManager.activeQualityDisplayNameMap["main"]
text: Cura.MachineManager.activeQualityDisplayNameMainStringParts.join(" - ")
Layout.margins: 0
Layout.maximumWidth: Math.floor(parent.width * 0.7) // Always leave >= 30% for the rest of the row.
height: contentHeight
@ -77,7 +77,19 @@ Item
UM.Label
{
text: activeQualityDetailText()
text:
{
const string_parts = Cura.MachineManager.activeQualityDisplayNameTailStringParts;
if (string_parts.length === 0)
{
return "";
}
else
{
` - ${string_parts.join(" - ")}`
}
}
color: UM.Theme.getColor("text_detail")
Layout.margins: 0
Layout.fillWidth: true
@ -85,32 +97,6 @@ Item
height: contentHeight
elide: Text.ElideRight
wrapMode: Text.NoWrap
function activeQualityDetailText()
{
var resultMap = Cura.MachineManager.activeQualityDisplayNameMap
var resultSuffix = resultMap["suffix"]
var result = ""
if (Cura.MachineManager.isActiveQualityExperimental)
{
resultSuffix += " (Experimental)"
}
if (Cura.MachineManager.isActiveQualitySupported)
{
if (Cura.MachineManager.activeQualityLayerHeight > 0)
{
if (resultSuffix)
{
result += " - " + resultSuffix
}
result += " - "
result += Cura.MachineManager.activeQualityLayerHeight + "mm"
}
}
return result
}
}
}

20
resources/qml/PrintSetupSelector/PrintSetupSelectorHeader.qml
View file

@ -17,26 +17,8 @@ RowLayout
{
source: UM.Theme.getIcon("Sliders", "medium")
iconSize: UM.Theme.getSize("button_icon").width
text:
{
if (Cura.MachineManager.activeStack)
{
var resultMap = Cura.MachineManager.activeQualityDisplayNameMap
var text = resultMap["main"]
if (resultMap["suffix"])
{
text += " - " + resultMap["suffix"]
}
if (!Cura.MachineManager.hasNotSupportedQuality)
{
text += " - " + layerHeight.properties.value + "mm"
text += Cura.MachineManager.isActiveQualityExperimental ? " - " + catalog.i18nc("@label", "Experimental") : ""
}
return text
}
return ""
}
text: Cura.MachineManager.activeQualityDisplayNameStringParts.join(" - ")
font: UM.Theme.getFont("medium")
elide: Text.ElideMiddle
wrapMode: Text.NoWrap

6
resources/qml/WelcomePages/AddPrinterByIpContent.qml
View file

@ -1,4 +1,4 @@
// Copyright (c) 2019 Ultimaker B.V.
// Copyright (c) 2022 UltiMaker
// Cura is released under the terms of the LGPLv3 or higher.
import QtQuick 2.15
@ -193,12 +193,12 @@ Item
if (addPrinterByIpScreen.hasRequestFinished)
{
return catalog.i18nc("@label", "Could not connect to device.") + "<br /><br /><a href=\"https://ultimaker.com/in/cura/troubleshooting/network?utm_source=cura&utm_medium=software&utm_campaign=add-network-printer-error\">"
+ catalog.i18nc("@label", "Can't connect to your Ultimaker printer?") + "</a>";
+ catalog.i18nc("@label", "Can't connect to your UltiMaker printer?") + "</a>";
}
else
{
return catalog.i18nc("@label", "The printer at this address has not responded yet.") + "<br /><br /><a href=\"https://ultimaker.com/in/cura/troubleshooting/network?utm_source=cura&utm_medium=software&utm_campaign=add-network-printer-error\">"
+ catalog.i18nc("@label", "Can't connect to your Ultimaker printer?") + "</a>";
+ catalog.i18nc("@label", "Can't connect to your UltiMaker printer?") + "</a>";
}
}
onLinkActivated: Qt.openUrlExternally(link)

4
resources/qml/WelcomePages/AddThirdPartyPrinter.qml
View file

@ -1,4 +1,4 @@
// Copyright (c) 2022 Ultimaker B.V.
// Copyright (c) 2022 UltiMaker
// Cura is released under the terms of the LGPLv3 or higher.
import QtQuick 2.10
@ -99,7 +99,7 @@ Item
id: backButton
anchors.left: parent.left
anchors.bottom: parent.bottom
text: catalog.i18nc("@button", "Add Ultimaker printer via Digital Factory")
text: catalog.i18nc("@button", "Add UltiMaker printer via Digital Factory")
onClicked: goToUltimakerPrinter()
}

6
resources/qml/WelcomePages/AddUltimakerOrThirdPartyPrinter.qml
View file

@ -1,4 +1,4 @@
// Copyright (c) 2022 Ultimaker B.V.
// Copyright (c) 2022 UltiMaker
// Cura is released under the terms of the LGPLv3 or higher.
import QtQuick 2.10
@ -52,7 +52,7 @@ Control
id: ultimakerPrinterCard
Layout.alignment: Qt.AlignBottom
onClicked: goToUltimakerPrinter
text: catalog.i18nc("@button", "Ultimaker printer")
text: catalog.i18nc("@button", "UltiMaker printer")
imageSource: UM.Theme.getImage("ultimaker_printer")
}
@ -61,7 +61,7 @@ Control
id: thrirdPartyPrinterCard
Layout.alignment: Qt.AlignBottom
onClicked: goToThirdPartyPrinter
text: catalog.i18nc("@button", "Non Ultimaker printer")
text: catalog.i18nc("@button", "Non UltiMaker printer")
imageSource: UM.Theme.getImage("third_party_printer")
}
}

8
resources/qml/WelcomePages/AddUltimakerPrinter.qml
View file

@ -1,4 +1,4 @@
// Copyright (c) 2022 Ultimaker B.V.
// Copyright (c) 2022 UltiMaker
// Cura is released under the terms of the LGPLv3 or higher.
import QtQuick 2.10
@ -30,7 +30,7 @@ Control
UM.Label
{
Layout.fillWidth: true
text: catalog.i18nc("@label", "New Ultimaker printers can be connected to Digital Factory and monitored remotely.")
text: catalog.i18nc("@label", "New UltiMaker printers can be connected to Digital Factory and monitored remotely.")
wrapMode: Text.WordWrap
}
@ -67,7 +67,7 @@ Control
Layout.alignment: Qt.AlignTop
wrapMode: Text.WordWrap
font: UM.Theme.getFont("default_bold")
text: catalog.i18nc("@label", "If you are trying to add a new Ultimaker printer to Cura")
text: catalog.i18nc("@label", "If you are trying to add a new UltiMaker printer to Cura")
}
ColumnLayout
@ -77,7 +77,7 @@ Control
Repeater {
model: [
catalog.i18nc("@info", "Sign in into Ultimaker Digilal Factory"),
catalog.i18nc("@info", "Sign in into UltiMaker Digilal Factory"),
catalog.i18nc("@info", "Follow the procedure to add a new printer"),
catalog.i18nc("@info", "Your new printer will automatically appear in Cura"),
]

8
resources/qml/WelcomePages/CloudContent.qml
View file

@ -1,4 +1,4 @@
// Copyright (c) 2019 Ultimaker B.V.
// Copyright (c) 2022 UltiMaker
// Cura is released under the terms of the LGPLv3 or higher.
import QtQuick 2.10
@ -61,7 +61,7 @@ Item
id: titleLabel
anchors.horizontalCenter: parent.horizontalCenter
horizontalAlignment: Text.AlignHCenter
text: catalog.i18nc("@label", "Sign in to the Ultimaker platform")
text: catalog.i18nc("@label", "Sign in to the UltiMaker platform")
color: UM.Theme.getColor("primary_button")
font: UM.Theme.getFont("huge")
}
@ -172,7 +172,7 @@ Item
id: communityTextLabel
anchors.horizontalCenter: communityColumn.horizontalCenter
width: parent.width
text: catalog.i18nc("@text", "Share ideas and get help from 48,000+ users in the Ultimaker Community")
text: catalog.i18nc("@text", "Share ideas and get help from 48,000+ users in the UltiMaker Community")
horizontalAlignment: Text.AlignHCenter
}
}
@ -198,7 +198,7 @@ Item
anchors.rightMargin: UM.Theme.getSize("default_margin").width
anchors.bottom: parent.bottom
text: catalog.i18nc("@text", "Create a free Ultimaker Account")
text: catalog.i18nc("@text", "Create a free UltiMaker Account")
onClicked: Qt.openUrlExternally("https://ultimaker.com/app/ultimaker-cura-account-sign-up?utm_source=cura&utm_medium=software&utm_campaign=onboarding-signup")
}

8
resources/qml/WelcomePages/DataCollectionsContent.qml
View file

@ -1,4 +1,4 @@
// Copyright (c) 2019 Ultimaker B.V.
// Copyright (c) 2022 UltiMaker
// Cura is released under the terms of the LGPLv3 or higher.
import QtQuick 2.10
@ -21,7 +21,7 @@ Item
anchors.top: parent.top
anchors.horizontalCenter: parent.horizontalCenter
horizontalAlignment: Text.AlignHCenter
text: catalog.i18nc("@label", "Help us to improve Ultimaker Cura")
text: catalog.i18nc("@label", "Help us to improve UltiMaker Cura")
color: UM.Theme.getColor("primary_button")
font: UM.Theme.getFont("huge")
}
@ -53,7 +53,7 @@ Item
width: parent.width
anchors.horizontalCenter: parent.horizontalCenter
horizontalAlignment: Text.AlignHCenter
text: catalog.i18nc("@text", "Ultimaker Cura collects anonymous data to improve print quality and user experience, including:")
text: catalog.i18nc("@text", "UltiMaker Cura collects anonymous data to improve print quality and user experience, including:")
wrapMode: Text.WordWrap
font: UM.Theme.getFont("medium")
}
@ -96,7 +96,7 @@ Item
horizontalAlignment: Text.AlignHCenter
text:
{
var t = catalog.i18nc("@text", "Data collected by Ultimaker Cura will not contain any personal information.")
var t = catalog.i18nc("@text", "Data collected by UltiMaker Cura will not contain any personal information.")
var t2 = catalog.i18nc("@text", "More information")
t += " <a href='https://notusedref'>" + t2 + "</a>"
return t

8
resources/qml/WelcomePages/UserAgreementContent.qml
View file

@ -1,4 +1,4 @@
// Copyright (c) 2019 Ultimaker B.V.
// Copyright (c) 2022 UltiMaker
// Cura is released under the terms of the LGPLv3 or higher.
import QtQuick 2.10
@ -36,10 +36,10 @@ Item
right: parent.right
}
text: "<p><b>Disclaimer by Ultimaker</b></p>"
text: "<p><b>Disclaimer by UltiMaker</b></p>"
+ "<p>Please read this disclaimer carefully.</p>"
+ "<p>Except when otherwise stated in writing, Ultimaker provides any Ultimaker software or third party software \"As is\" without warranty of any kind. The entire risk as to the quality and performance of Ultimaker software is with you.</p>"
+ "<p>Unless required by applicable law or agreed to in writing, in no event will Ultimaker be liable to you for damages, including any general, special, incidental, or consequential damages arising out of the use or inability to use any Ultimaker software or third party software.</p>"
+ "<p>Except when otherwise stated in writing, UltiMaker provides any UltiMaker software or third party software \"As is\" without warranty of any kind. The entire risk as to the quality and performance of UltiMaker software is with you.</p>"
+ "<p>Unless required by applicable law or agreed to in writing, in no event will UltiMaker be liable to you for damages, including any general, special, incidental, or consequential damages arising out of the use or inability to use any UltiMaker software or third party software.</p>"
textFormat: Text.RichText
wrapMode: Text.WordWrap
font: UM.Theme.getFont("medium")

6
resources/qml/WelcomePages/WelcomeContent.qml
View file

@ -1,4 +1,4 @@
// Copyright (c) 2019 Ultimaker B.V.
// Copyright (c) 2022 UltiMaker
// Cura is released under the terms of the LGPLv3 or higher.
import QtQuick 2.10
@ -53,7 +53,7 @@ Item
id: titleLabel
anchors.horizontalCenter: parent.horizontalCenter
horizontalAlignment: Text.AlignHCenter
text: catalog.i18nc("@label", "Welcome to Ultimaker Cura")
text: catalog.i18nc("@label", "Welcome to UltiMaker Cura")
color: UM.Theme.getColor("primary_button")
font: UM.Theme.getFont("huge_bold")
}
@ -64,7 +64,7 @@ Item
anchors.horizontalCenter: parent.horizontalCenter
horizontalAlignment: Text.AlignHCenter
width: titleLabel.width + 2 * UM.Theme.getSize("thick_margin").width
text: catalog.i18nc("@text", "Please follow these steps to set up Ultimaker Cura. This will only take a few moments.")
text: catalog.i18nc("@text", "Please follow these steps to set up UltiMaker Cura. This will only take a few moments.")
font: UM.Theme.getFont("medium")
}