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

Only show material info button for multi-extrusion machines

Browse Source 
CURA-3810
This commit is contained in:
Lipu Fei 2017-05-29 16:01:32 +02:00
parent 85e875257b
commit c80e1b67a5
2 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
cura/CuraApplication.py
View File

@ -1362,7 +1362,3 @@ class CuraApplication(QtApplication):
node = node.getParent() node = node.getParent()
Selection.add(node) Selection.add(node)
@pyqtSlot(result=str)
def getCuraVersion(self):
return CuraVersion

10
resources/qml/SidebarHeader.qml
View File

@ -213,6 +213,7 @@ Column
width: height width: height
anchors.margins: UM.Theme.getSize("default_margin").width anchors.margins: UM.Theme.getSize("default_margin").width
anchors.verticalCenter: parent.verticalCenter anchors.verticalCenter: parent.verticalCenter
visible: extrudersList.visible
text: "i" text: "i"
style: UM.Theme.styles.info_button style: UM.Theme.styles.info_button
@ -220,7 +221,7 @@ Column
onClicked: onClicked:
{ {
// open the material URL with web browser // open the material URL with web browser
var version = CuraApplication.getCuraVersion(); var version = UM.Application.version;
var machineName = Cura.MachineManager.activeMachineDefinitionId; var machineName = Cura.MachineManager.activeMachineDefinitionId;
var url = "https://ultimaker.com/materialcompatibility/" + version + "/" + machineName; var url = "https://ultimaker.com/materialcompatibility/" + version + "/" + machineName;
@ -243,6 +244,13 @@ Column
} }
} }
Text // to take the space of the material info button when the active machine doesn't have multiple extruders
{
height: parent.height * 0.70
width: height
visible: !extrudersList.visible
}
Text Text
{ {
width: parent.width * 0.10 - materialInfoButton.width - UM.Theme.getSize("default_margin").width width: parent.width * 0.10 - materialInfoButton.width - UM.Theme.getSize("default_margin").width