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

Merge branch 'master' into feature_setting_visibility_profiles

Browse Source
This commit is contained in:
fieldOfView 2018-02-15 11:56:36 +01:00
commit 85aed830a6
8 changed files with 17 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
cura/CuraApplication.py
View File

@ -1204,7 +1204,7 @@ class CuraApplication(QtApplication):
Logger.log("i", "Reloading all loaded mesh data.")
nodes = []
for node in DepthFirstIterator(self.getController().getScene().getRoot()):
if not isinstance(node, SceneNode) or not node.getMeshData():
if not isinstance(node, CuraSceneNode) or not node.getMeshData():
continue
nodes.append(node)

1
resources/qml/Settings/SettingCategory.qml
View File

@ -78,6 +78,7 @@ Button
verticalCenter: parent.verticalCenter;
}
text: definition.label
renderType: Text.NativeRendering
font: UM.Theme.getFont("setting_category")
color:
{

2
resources/qml/Settings/SettingComboBox.qml
View File

@ -80,6 +80,7 @@ SettingItem
anchors.right: downArrow.left
text: control.currentText
renderType: Text.NativeRendering
font: UM.Theme.getFont("default")
color: !enabled ? UM.Theme.getColor("setting_control_disabled_text") : UM.Theme.getColor("setting_control_text")
elide: Text.ElideRight
@ -116,6 +117,7 @@ SettingItem
contentItem: Label
{
text: modelData.value
renderType: Text.NativeRendering
color: control.contentItem.color
font: UM.Theme.getFont("default")
elide: Text.ElideRight

2
resources/qml/Settings/SettingExtruder.qml
View File

@ -117,6 +117,7 @@ SettingItem
rightPadding: swatch.width + UM.Theme.getSize("setting_unit_margin").width
text: control.currentText
renderType: Text.NativeRendering
font: UM.Theme.getFont("default")
color: enabled ? UM.Theme.getColor("setting_control_text") : UM.Theme.getColor("setting_control_disabled_text")
@ -171,6 +172,7 @@ SettingItem
contentItem: Label
{
text: model.name
renderType: Text.NativeRendering
color: UM.Theme.getColor("setting_control_text")
font: UM.Theme.getFont("default")
elide: Text.ElideRight

4
resources/qml/Settings/SettingItem.qml
View File

@ -112,11 +112,9 @@ Item {
anchors.right: settingControls.left;
anchors.verticalCenter: parent.verticalCenter
height: UM.Theme.getSize("section").height;
verticalAlignment: Text.AlignVCenter;
text: definition.label
elide: Text.ElideMiddle;
renderType: Text.NativeRendering
color: UM.Theme.getColor("setting_control_text");
opacity: (definition.visible) ? 1 : 0.5

2
resources/qml/Settings/SettingOptionalExtruder.qml
View File

@ -136,6 +136,7 @@ SettingItem
rightPadding: swatch.width + UM.Theme.getSize("setting_unit_margin").width
text: control.currentText
renderType: Text.NativeRendering
font: UM.Theme.getFont("default")
color: enabled ? UM.Theme.getColor("setting_control_text") : UM.Theme.getColor("setting_control_disabled_text")
@ -190,6 +191,7 @@ SettingItem
contentItem: Label
{
text: model.name
renderType: Text.NativeRendering
color: UM.Theme.getColor("setting_control_text")
font: UM.Theme.getFont("default")
elide: Text.ElideRight

7
resources/qml/Settings/SettingTextField.qml
View File

@ -83,11 +83,12 @@ SettingItem
Label
{
anchors.right: parent.right;
anchors.right: parent.right
anchors.rightMargin: Math.round(UM.Theme.getSize("setting_unit_margin").width)
anchors.verticalCenter: parent.verticalCenter;
anchors.verticalCenter: parent.verticalCenter
text: definition.unit;
text: definition.unit
renderType: Text.NativeRendering
color: UM.Theme.getColor("setting_unit")
font: UM.Theme.getFont("default")
}

5
resources/qml/Sidebar.qml
View File

@ -207,12 +207,13 @@ Rectangle
color: (control.checked || control.pressed) ? UM.Theme.getColor("action_button_active") : control.hovered ? UM.Theme.getColor("action_button_hovered") : UM.Theme.getColor("action_button")
}
contentItem: Text
contentItem: Label
{
text: model.text
font: UM.Theme.getFont("default")
horizontalAlignment: Text.AlignHCenter
verticalAlignment: Text.AlignVCenter
renderType: Text.NativeRendering
elide: Text.ElideRight
color:
{
@ -352,6 +353,7 @@ Rectangle
font: UM.Theme.getFont("large")
color: UM.Theme.getColor("text_subtext")
text: (!base.printDuration || !base.printDuration.valid) ? catalog.i18nc("@label Hours and minutes", "00h 00min") : base.printDuration.getDisplayString(UM.DurationFormat.Short)
renderType: Text.NativeRendering
MouseArea
{
@ -479,6 +481,7 @@ Rectangle
anchors.left: parent.left
anchors.bottom: parent.bottom
font: UM.Theme.getFont("very_small")
renderType: Text.NativeRendering
color: UM.Theme.getColor("text_subtext")
elide: Text.ElideMiddle
width: parent.width