mirror of
https://git.mirrors.martin98.com/https://github.com/Ultimaker/Cura
synced 2025-08-14 16:25:52 +08:00
Merge branch 'master' of https://github.com/Ultimaker/Cura
This commit is contained in:
commit
1a47ec85ca
0
resources/extruders/hBp_extruder_left.def.json
Executable file → Normal file
0
resources/extruders/hBp_extruder_left.def.json
Executable file → Normal file
0
resources/extruders/hBp_extruder_right.def.json
Executable file → Normal file
0
resources/extruders/hBp_extruder_right.def.json
Executable file → Normal file
0
resources/meshes/BEEVERYCREATIVE-helloBEEprusa.stl
Executable file → Normal file
0
resources/meshes/BEEVERYCREATIVE-helloBEEprusa.stl
Executable file → Normal file
0
resources/qml/Actions.qml
Executable file → Normal file
0
resources/qml/Actions.qml
Executable file → Normal file
0
resources/qml/Cura.qml
Executable file → Normal file
0
resources/qml/Cura.qml
Executable file → Normal file
0
resources/qml/Menus/ContextMenu.qml
Executable file → Normal file
0
resources/qml/Menus/ContextMenu.qml
Executable file → Normal file
0
resources/qml/Preferences/GeneralPage.qml
Executable file → Normal file
0
resources/qml/Preferences/GeneralPage.qml
Executable file → Normal file
0
resources/qml/Sidebar.qml
Executable file → Normal file
0
resources/qml/Sidebar.qml
Executable file → Normal file
@ -277,10 +277,10 @@ Column
|
||||
}
|
||||
}
|
||||
|
||||
// Print core row
|
||||
//Variant row
|
||||
Item
|
||||
{
|
||||
id: printCoreRow
|
||||
id: variantRow
|
||||
height: UM.Theme.getSize("sidebar_setup").height
|
||||
visible: Cura.MachineManager.hasVariants && !sidebar.monitoringPrint && !sidebar.hideSettings
|
||||
|
||||
@ -294,7 +294,7 @@ Column
|
||||
|
||||
Label
|
||||
{
|
||||
id: printCoreLabel
|
||||
id: variantLabel
|
||||
text: Cura.MachineManager.activeDefinitionVariantsName;
|
||||
width: Math.floor(parent.width * 0.45 - UM.Theme.getSize("default_margin").width)
|
||||
font: UM.Theme.getFont("default");
|
||||
@ -302,7 +302,7 @@ Column
|
||||
}
|
||||
|
||||
ToolButton {
|
||||
id: printCoreSelection
|
||||
id: variantSelection
|
||||
text: Cura.MachineManager.activeVariantName
|
||||
tooltip: Cura.MachineManager.activeVariantName;
|
||||
visible: Cura.MachineManager.hasVariants
|
||||
|
Loading…
x
Reference in New Issue
Block a user