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

Merge branch 'master' into CURA-6711_support_structure_dropdown

Browse source
This commit is contained in:
Nino van Hooff 2020-07-15 11:57:34 +02:00
commit bc51db321f
22 changed files with 238 additions and 252 deletions
Download patch file Download diff file Expand all files Collapse all files

1
resources/definitions/fdmprinter.def.json
View file

@ -7151,6 +7151,7 @@
"description": "Detect bridges and modify print speed, flow and fan settings while bridges are printed.",
"type": "bool",
"default_value": false,
"resolve": "any(extruderValues('bridge_settings_enabled'))",
"settable_per_mesh": true,
"settable_per_extruder": false,
"settable_per_meshgroup": false

1
resources/qml/Cura.qml
View file

@ -866,6 +866,7 @@ UM.MainWindow
title: catalog.i18nc("@title:window", "What's New")
model: CuraApplication.getWhatsNewPagesModel()
progressBarVisible: false
visible: false
}
Connections

12
resources/qml/Menus/SettingsMenu.qml
View file

@ -2,7 +2,7 @@
//Cura is released under the terms of the LGPLv3 or higher.
import QtQuick 2.2
import QtQuick.Controls 1.1
import QtQuick.Controls 1.4
import UM 1.2 as UM
import Cura 1.0 as Cura
@ -24,7 +24,15 @@ Menu
title: modelData.name
property var extruder: (base.activeMachine === null) ? null : activeMachine.extruderList[model.index]
NozzleMenu { title: Cura.MachineManager.activeDefinitionVariantsName; visible: Cura.MachineManager.activeMachine.hasVariants; extruderIndex: index }
MaterialMenu { title: catalog.i18nc("@title:menu", "&Material"); visible: Cura.MachineManager.activeMachine.hasMaterials; extruderIndex: index }
MaterialMenu
{
title: catalog.i18nc("@title:menu", "&Material")
visible: Cura.MachineManager.activeMachine.hasMaterials
extruderIndex: index
updateModels: false
onAboutToShow: updateModels = true
onAboutToHide: updateModels = false
}
MenuSeparator
{

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

@ -85,8 +85,8 @@ UM.PreferencesPage
scaleTinyCheckbox.checked = boolCheck(UM.Preferences.getValue("mesh/scale_tiny_meshes"))
UM.Preferences.resetPreference("cura/select_models_on_load")
selectModelsOnLoadCheckbox.checked = boolCheck(UM.Preferences.getValue("cura/select_models_on_load"))
UM.Preferences.resetPreference("cura/job_name_template")
jobnameTemplateTextField.text = UM.Preferences.getValue("cura/job_name_template")
UM.Preferences.resetPreference("cura/jobname_prefix")
prefixJobNameCheckbox.checked = boolCheck(UM.Preferences.getValue("cura/jobname_prefix"))
UM.Preferences.resetPreference("view/show_overhang");
showOverhangCheckbox.checked = boolCheck(UM.Preferences.getValue("view/show_overhang"))
UM.Preferences.resetPreference("view/show_xray_warning");
@ -627,25 +627,14 @@ UM.PreferencesPage
{
width: childrenRect.width
height: childrenRect.height
text: catalog.i18nc("@info:tooltip. Note variable names themselves (ie. machine_name_short, project_name) should not be translated", "Variables: machine_name_short, machine_name, project_name")
text: catalog.i18nc("@info:tooltip", "Should a prefix based on the printer name be added to the print job name automatically?")
Column
CheckBox
{
spacing: 4 * screenScaleFactor
Label
{
id: jobNameTemplateLabel
text: catalog.i18nc("@label","Print job template:")
}
TextField
{
id: jobNameTemplateTextField
width: 250 * screenScaleFactor
text: UM.Preferences.getValue("cura/job_name_template")
onTextChanged: UM.Preferences.setValue("cura/job_name_template", text)
}
id: prefixJobNameCheckbox
text: catalog.i18nc("@option:check", "Add machine prefix to job name")
checked: boolCheck(UM.Preferences.getValue("cura/jobname_prefix"))
onCheckedChanged: UM.Preferences.setValue("cura/jobname_prefix", checked)
}
}
@ -681,7 +670,7 @@ UM.PreferencesPage
ComboBox
{
id: choiceOnOpenProjectDropDownButton
width: 250 * screenScaleFactor
width: 200 * screenScaleFactor
model: ListModel
{
@ -747,7 +736,7 @@ UM.PreferencesPage
ComboBox
{
id: choiceOnProfileOverrideDropDownButton
width: 250 * screenScaleFactor
width: 200 * screenScaleFactor
model: ListModel
{

70
resources/qml/Settings/SettingCategory.qml
View file

@ -22,22 +22,10 @@ Button
height: UM.Theme.getSize("section").height
color:
{
if (base.color)
{
return base.color
}
else if (!base.enabled)
if (!base.enabled)
{
return UM.Theme.getColor("setting_category_disabled")
}
else if (base.hovered && base.expanded)
{
return UM.Theme.getColor("setting_category_active_hover")
}
else if (base.pressed || base.expanded)
{
return UM.Theme.getColor("setting_category_active")
}
else if (base.hovered)
{
return UM.Theme.getColor("setting_category_hover")
@ -57,6 +45,21 @@ Button
property var focusItem: base
property bool expanded: definition.expanded
property color text_color:
{
if (!base.enabled)
{
return UM.Theme.getColor("setting_category_disabled_text")
} else if (base.hovered || base.pressed || base.activeFocus)
{
return UM.Theme.getColor("setting_category_active_text")
}
return UM.Theme.getColor("setting_category_text")
}
contentItem: Item
{
anchors.fill: parent
@ -75,25 +78,7 @@ Button
textFormat: Text.PlainText
renderType: Text.NativeRendering
font: UM.Theme.getFont("medium_bold")
color:
{
if (!base.enabled)
{
return UM.Theme.getColor("setting_category_disabled_text")
} else if ((base.hovered || base.activeFocus) && base.expanded)
{
return UM.Theme.getColor("setting_category_active_hover_text")
} else if (base.pressed || base.expanded)
{
return UM.Theme.getColor("setting_category_active_text")
} else if (base.hovered || base.activeFocus)
{
return UM.Theme.getColor("setting_category_hover_text")
} else
{
return UM.Theme.getColor("setting_category_text")
}
}
color: base.text_color
fontSizeMode: Text.HorizontalFit
minimumPointSize: 8
}
@ -118,26 +103,7 @@ Button
anchors.verticalCenter: parent.verticalCenter
anchors.left: parent.left
anchors.leftMargin: UM.Theme.getSize("thin_margin").width
color:
{
if (!base.enabled)
{
return UM.Theme.getColor("setting_category_disabled_text")
}
else if((base.hovered || base.activeFocus) && base.expanded)
{
return UM.Theme.getColor("setting_category_active_hover_text")
}
else if(base.pressed || base.expanded)
{
return UM.Theme.getColor("setting_category_active_text")
}
else if(base.hovered || base.activeFocus)
{
return UM.Theme.getColor("setting_category_hover_text")
}
return UM.Theme.getColor("setting_category_text")
}
color: base.text_color
source: UM.Theme.getIcon(definition.icon)
width: UM.Theme.getSize("section_icon").width
height: UM.Theme.getSize("section_icon").height

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

@ -156,7 +156,7 @@ Item
{
id: settingControls
height: Math.round(parent.height / 2)
height: UM.Theme.getSize("section_control").height
spacing: Math.round(UM.Theme.getSize("thick_margin").height / 2)
anchors

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

@ -153,7 +153,7 @@ SettingItem
selectByMouse: true
maximumLength: (definition.type == "str" || definition.type == "[int]") ? -1 : 10
clip: true; //Hide any text that exceeds the width of the text box.
clip: definition.type == "[int]" // Only clip for the list
validator: RegExpValidator { regExp: (definition.type == "[int]") ? /^\[?(\s*-?[0-9]{0,9}\s*,)*(\s*-?[0-9]{0,9})\s*\]?$/ : (definition.type == "int") ? /^-?[0-9]{0,10}$/ : (definition.type == "float") ? /^-?[0-9]{0,9}[.,]?[0-9]{0,3}$/ : /^.*$/ } // definition.type property from parent loader used to disallow fractional number entry

22
resources/qml/Settings/SettingView.qml
View file

@ -246,25 +246,18 @@ Item
}
property int indexWithFocus: -1
property double delegateHeight: UM.Theme.getSize("section").height + 2 * UM.Theme.getSize("default_lining").height
property string activeMachineId: Cura.MachineManager.activeMachine !== null ? Cura.MachineManager.activeMachine.id : ""
delegate: Loader
{
id: delegate
width: scrollView.width
height: provider.properties.enabled === "True" ? UM.Theme.getSize("section").height + 2 * UM.Theme.getSize("default_lining").height : 0
height: enabled ? contents.delegateHeight: 0
Behavior on height { NumberAnimation { duration: 100 } }
opacity: provider.properties.enabled === "True" ? 1 : 0
opacity: enabled ? 1 : 0
Behavior on opacity { NumberAnimation { duration: 100 } }
enabled:
{
if (!Cura.ExtruderManager.activeExtruderStackId && machineExtruderCount.properties.value > 1)
{
// disable all controls on the global tab, except categories
return model.type === "category"
}
return provider.properties.enabled === "True"
}
enabled: provider.properties.enabled === "True"
property var definition: model
property var settingDefinitionsModel: definitionsModel
@ -272,10 +265,7 @@ Item
property var globalPropertyProvider: inheritStackProvider
property bool externalResetHandler: false
//Qt5.4.2 and earlier has a bug where this causes a crash: https://bugreports.qt.io/browse/QTBUG-35989
//In addition, while it works for 5.5 and higher, the ordering of the actual combo box drop down changes,
//causing nasty issues when selecting different options. So disable asynchronous loading of enum type completely.
asynchronous: model.type !== "enum" && model.type !== "extruder" && model.type !== "optional_extruder"
asynchronous: true
active: model.type !== undefined
source:
@ -355,7 +345,7 @@ Item
id: provider
containerStackId: contents.activeMachineId
key: model.key ? model.key : ""
key: model.key
watchedProperties: [ "value", "enabled", "state", "validationState", "settable_per_extruder", "resolve" ]
storeIndex: 0
removeUnusedValue: model.resolve === undefined

4
resources/qml/Toolbar.qml
View file

@ -78,6 +78,10 @@ Item
{
base.activeY = y;
}
//Clear focus when tools change. This prevents the tool grabbing focus when activated.
//Grabbing focus prevents items from being deleted.
//Apparently this was only a problem on MacOS.
forceActiveFocus();
}
//Workaround since using ToolButton's onClicked would break the binding of the checked property, instead

1
resources/qml/WelcomePages/WizardDialog.qml
View file

@ -40,6 +40,7 @@ Window
id: wizardPanel
anchors.fill: parent
model: dialog.model
visible: dialog.visible
}
// Close this dialog when there's no more page to show

2
resources/qml/WelcomePages/WizardPanel.qml
View file

@ -71,7 +71,7 @@ Item
right: parent.right
}
source: base.pageUrl
enabled: base.visible
active: base.visible
}
}
}

13
resources/texts/change_log.txt
View file

@ -1,6 +1,15 @@
[4.6.2]
TODO
Patch release to fix some bugs that emerged with 4.6.1.
* Persistent notifications in the Marketplace.
We fixed a frustrating bug where a package would keep issuing a badge notification to update, even after the package had been updated.
* Removed Ultibot from Marketplace login screen.
For professionalism, Ultibot has been asked to leave the Marketplace login screen. He's now gone from everything.
* Ultimaker 2+ Z-hop.
The Ultimaker 2+ included an unwanted travel move that could drag purged material into the start of a print. This is now fixed.
[4.6.1]
@ -140,7 +149,7 @@ A new performance enhancement that limits re-rendering of the application interf
Previous versions used different ways of handling HTTP requests. This version uses a unified method, for better performance.
* Job names less sensitive to being touched.
A contribution from fieldOfview has fixed an issue where the job name in the bottom-left of the scene is no longer made static by clicking on it. If you load a model and change to another printer, the prefix is now correctly updated.
A contribution from fieldOfview has fixed an issue where the jobname in the bottom-left of the scene is no longer made static by clicking on it. If you load a model and change to another printer, the prefix is now correctly updated.
* Property checks on instance containers.
A new speed optimization for reading setting values from profiles.

4
resources/themes/cura-dark/theme.json
View file

@ -99,13 +99,9 @@
"setting_category": [75, 80, 83, 255],
"setting_category_disabled": [75, 80, 83, 255],
"setting_category_hover": [75, 80, 83, 255],
"setting_category_active": [75, 80, 83, 255],
"setting_category_active_hover": [75, 80, 83, 255],
"setting_category_text": [255, 255, 255, 152],
"setting_category_disabled_text": [255, 255, 255, 101],
"setting_category_hover_text": [255, 255, 255, 204],
"setting_category_active_text": [255, 255, 255, 204],
"setting_category_active_hover_text": [255, 255, 255, 204],
"setting_category_border": [39, 44, 48, 0],
"setting_category_disabled_border": [39, 44, 48, 0],
"setting_category_hover_border": [12, 169, 227, 255],

5
resources/themes/cura-light/theme.json
View file

@ -274,13 +274,9 @@
"setting_category": [240, 240, 240, 255],
"setting_category_disabled": [255, 255, 255, 255],
"setting_category_hover": [232, 242, 252, 255],
"setting_category_active": [240, 240, 240, 255],
"setting_category_active_hover": [232, 242, 252, 255],
"setting_category_text": [35, 35, 35, 255],
"setting_category_disabled_text": [24, 41, 77, 101],
"setting_category_hover_text": [35, 35, 35, 255],
"setting_category_active_text": [35, 35, 35, 255],
"setting_category_active_hover_text": [35, 35, 35, 255],
"setting_category_border": [240, 240, 240, 255],
"setting_category_disabled_border": [240, 240, 240, 255],
"setting_category_hover_border": [50, 130, 255, 255],
@ -502,6 +498,7 @@
"extruder_icon": [2.33, 2.33],
"section": [0.0, 2],
"section_control": [0, 1],
"section_icon": [1.6, 1.6],
"section_icon_column": [2.8, 0.0],
"rating_star": [1.0, 1.0],