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 '5.0'

Browse source
This commit is contained in:
Remco Burema 2022-05-06 18:31:54 +02:00
commit 078b2613a5
62 changed files with 140332 additions and 111500 deletions
Download patch file Download diff file Expand all files Collapse all files

3
resources/qml/Preferences/MachinesPage.qml
View file

@ -12,6 +12,7 @@ import Cura 1.0 as Cura
UM.ManagementPage
{
id: base
Item { enabled: false; UM.I18nCatalog { id: catalog; name: "cura"} }
title: catalog.i18nc("@title:tab", "Printers")
detailsPlaneCaption: base.currentItem && base.currentItem.name ? base.currentItem.name : ""
@ -93,8 +94,6 @@ UM.ManagementPage
maximumHeight: minimumHeight * 3
}
UM.I18nCatalog { id: catalog; name: "cura"; }
UM.ConfirmRemoveDialog
{
id: confirmDialog

2
resources/qml/Preferences/Materials/MaterialsPage.qml
View file

@ -11,7 +11,7 @@ import Cura 1.5 as Cura
UM.ManagementPage
{
id: base
Item { enabled: false; UM.I18nCatalog { id: catalog; name: "cura"} }
// Keep PreferencesDialog happy
property var resetEnabled: false
property var currentItem: null

1
resources/qml/Preferences/ProfilesPage.qml
View file

@ -13,6 +13,7 @@ import Cura 1.6 as Cura
UM.ManagementPage
{
id: base
Item { enabled: false; UM.I18nCatalog { id: catalog; name: "cura"} }
property var extrudersModel: CuraApplication.getExtrudersModel()
property var qualityManagementModel: CuraApplication.getQualityManagementModel()

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

@ -12,6 +12,8 @@ UM.PreferencesPage
{
title: catalog.i18nc("@title:tab", "Setting Visibility")
Item { enabled: false; UM.I18nCatalog { id: catalog; name: "cura"} }
property QtObject settingVisibilityPresetsModel: CuraApplication.getSettingVisibilityPresetsModel()
property int scrollToIndex: 0

2
resources/qml/Settings/SettingTextField.qml
View file

@ -60,7 +60,7 @@ SettingItem
color: {
if(!enabled)
{
return UM.Theme.getColor("text_field")
return UM.Theme.getColor("setting_control_disabled")
}
switch(propertyProvider.properties.validationState)
{

1
resources/qml/Widgets/Menu.qml
View file

@ -12,6 +12,7 @@ import Cura 1.0 as Cura
UM.Menu
{
id: menu
Item { enabled: false; UM.I18nCatalog { id: catalog; name: "cura"} }
topPadding: UM.Theme.getSize("narrow_margin").height
bottomPadding: UM.Theme.getSize("narrow_margin").height
padding: 0