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

Merge branch 'master' of github.com:Ultimaker/Cura

Browse Source
This commit is contained in:
Jaime van Kessel 2016-07-25 13:51:27 +02:00
commit b28cf14288
4 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
plugins/PerObjectSettingsTool/PerObjectSettingsPanel.qml
View File

@ -183,6 +183,7 @@ Item {
settingLoader.item.showInheritButton = false settingLoader.item.showInheritButton = false
settingLoader.item.showLinkedSettingIcon = false settingLoader.item.showLinkedSettingIcon = false
settingLoader.item.doDepthIndentation = false settingLoader.item.doDepthIndentation = false
settingLoader.item.doQualityUserSettingEmphasis = false
} }
sourceComponent: sourceComponent:

5
plugins/SliceInfoPlugin/SliceInfo.py
View File

@ -10,6 +10,7 @@ from UM.Message import Message
from UM.i18n import i18nCatalog from UM.i18n import i18nCatalog
from UM.Logger import Logger from UM.Logger import Logger
from UM.Platform import Platform from UM.Platform import Platform
from UM.Qt.Duration import DurationFormat
import collections import collections
import json import json
@ -90,7 +91,7 @@ class SliceInfo(Extension):
"settings": global_container_stack.serialize(), # global_container with references on used containers "settings": global_container_stack.serialize(), # global_container with references on used containers
"version": Application.getInstance().getVersion(), "version": Application.getInstance().getVersion(),
"modelhash": "None", "modelhash": "None",
"printtime": print_information.currentPrintTime.getDisplayString(), "printtime": print_information.currentPrintTime.getDisplayString(DurationFormat.Format.ISO8601),
"filament": material_used, "filament": material_used,
"language": Preferences.getInstance().getValue("general/language"), "language": Preferences.getInstance().getValue("general/language"),
} }
@ -126,4 +127,4 @@ class SliceInfo(Extension):
except: except:
# We really can't afford to have a mistake here, as this would break the sending of g-code to a device # We really can't afford to have a mistake here, as this would break the sending of g-code to a device
# (Either saving or directly to a printer). The functionality of the slice data is not *that* important. # (Either saving or directly to a printer). The functionality of the slice data is not *that* important.
pass pass

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

@ -23,6 +23,7 @@ Item {
property var showInheritButton: true property var showInheritButton: true
property var showLinkedSettingIcon: true property var showLinkedSettingIcon: true
property var doDepthIndentation: true property var doDepthIndentation: true
property var doQualityUserSettingEmphasis: true
// Create properties to put property provider stuff in (bindings break in qt 5.5.1 otherwise) // Create properties to put property provider stuff in (bindings break in qt 5.5.1 otherwise)
property var state: propertyProvider.properties.state property var state: propertyProvider.properties.state
@ -117,7 +118,7 @@ Item {
color: UM.Theme.getColor("setting_control_text"); color: UM.Theme.getColor("setting_control_text");
// emphasize the setting if it has a value in the user or quality profile // emphasize the setting if it has a value in the user or quality profile
font: base.stackLevel != undefined && base.stackLevel <= 1 ? UM.Theme.getFont("default_italic") : UM.Theme.getFont("default") font: base.doQualityUserSettingEmphasis && base.stackLevel != undefined && base.stackLevel <= 1 ? UM.Theme.getFont("default_italic") : UM.Theme.getFont("default")
} }
Row Row

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

@ -33,8 +33,6 @@ ScrollView
exclude: ["machine_settings"] exclude: ["machine_settings"]
expanded: Printer.expandedCategories expanded: Printer.expandedCategories
onExpandedChanged: Printer.setExpandedCategories(expanded) onExpandedChanged: Printer.setExpandedCategories(expanded)
filter: {}
} }
delegate: Loader delegate: Loader
@ -183,7 +181,7 @@ ScrollView
//: Settings context menu action //: Settings context menu action
text: catalog.i18nc("@action:menu", "Copy value to all extruders") text: catalog.i18nc("@action:menu", "Copy value to all extruders")
visible: machineExtruderCount.properties.value > 1 visible: machineExtruderCount.properties.value > 1
enabled: contextMenu.provider.properties.settable_per_extruder != "False" enabled: contextMenu.provider != undefined && contextMenu.provider.properties.settable_per_extruder != "False"
onTriggered: Cura.MachineManager.copyValueToExtruders(contextMenu.key) onTriggered: Cura.MachineManager.copyValueToExtruders(contextMenu.key)
} }