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

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

Browse Source
This commit is contained in:
Diego Prado Gesto 2017-10-19 13:58:19 +02:00
commit 1a47ec85ca
9 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

0
resources/extruders/hBp_extruder_left.def.json Executable file → Normal file
View File

0
resources/extruders/hBp_extruder_right.def.json Executable file → Normal file
View File

0
resources/meshes/BEEVERYCREATIVE-helloBEEprusa.stl Executable file → Normal file
View File

0
resources/qml/Actions.qml Executable file → Normal file
View File

0
resources/qml/Cura.qml Executable file → Normal file
View File

0
resources/qml/Menus/ContextMenu.qml Executable file → Normal file
View File

0
resources/qml/Preferences/GeneralPage.qml Executable file → Normal file
View File

0
resources/qml/Sidebar.qml Executable file → Normal file
View File

8
resources/qml/SidebarHeader.qml
View File

@ -277,10 +277,10 @@ Column
} }
} }
// Print core row //Variant row
Item Item
{ {
id: printCoreRow id: variantRow
height: UM.Theme.getSize("sidebar_setup").height height: UM.Theme.getSize("sidebar_setup").height
visible: Cura.MachineManager.hasVariants && !sidebar.monitoringPrint && !sidebar.hideSettings visible: Cura.MachineManager.hasVariants && !sidebar.monitoringPrint && !sidebar.hideSettings
@ -294,7 +294,7 @@ Column
Label Label
{ {
id: printCoreLabel id: variantLabel
text: Cura.MachineManager.activeDefinitionVariantsName; text: Cura.MachineManager.activeDefinitionVariantsName;
width: Math.floor(parent.width * 0.45 - UM.Theme.getSize("default_margin").width) width: Math.floor(parent.width * 0.45 - UM.Theme.getSize("default_margin").width)
font: UM.Theme.getFont("default"); font: UM.Theme.getFont("default");
@ -302,7 +302,7 @@ Column
} }
ToolButton { ToolButton {
id: printCoreSelection id: variantSelection
text: Cura.MachineManager.activeVariantName text: Cura.MachineManager.activeVariantName
tooltip: Cura.MachineManager.activeVariantName; tooltip: Cura.MachineManager.activeVariantName;
visible: Cura.MachineManager.hasVariants visible: Cura.MachineManager.hasVariants