3D-printing/Cura
1
0
Fork 0
mirror of https://github.com/Ultimaker/Cura.git synced 2025-07-18 20:28:01 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 5

Merge branch 'ui_rework_4_0' of github.com:Ultimaker/Cura into STAR-322_cloud-connection

Browse source
This commit is contained in:
Daniel Schiavini 2018-12-10 10:45:37 +01:00
commit bfe04a55f9
62 changed files with 2555 additions and 2267 deletions
Download patch file Download diff file Expand all files Collapse all files

13
resources/qml/PrinterSelector/MachineSelector.qml
View file

@ -7,7 +7,7 @@ import QtQuick.Controls 2.3
import UM 1.2 as UM
import Cura 1.0 as Cura
Cura.ExpandableComponent
Cura.ExpandablePopup
{
id: machineSelector
@ -15,9 +15,8 @@ Cura.ExpandableComponent
property bool isPrinterConnected: Cura.MachineManager.printerConnected
property var outputDevice: Cura.MachineManager.printerOutputDevices.length >= 1 ? Cura.MachineManager.printerOutputDevices[0] : null
popupPadding: UM.Theme.getSize("default_lining").width
popupAlignment: Cura.ExpandableComponent.PopupAlignment.AlignLeft
iconSource: expanded ? UM.Theme.getIcon("arrow_bottom") : UM.Theme.getIcon("arrow_left")
contentPadding: UM.Theme.getSize("default_lining").width
contentAlignment: Cura.ExpandablePopup.ContentAlignment.AlignLeft
UM.I18nCatalog
{
@ -100,7 +99,7 @@ Cura.ExpandableComponent
}
}
popupItem: Item
contentItem: Item
{
id: popup
width: UM.Theme.getSize("machine_selector_widget_content").width
@ -154,7 +153,7 @@ Cura.ExpandableComponent
text: catalog.i18nc("@button", "Add printer")
onClicked:
{
togglePopup()
toggleContent()
Cura.Actions.addMachine.trigger()
}
}
@ -166,7 +165,7 @@ Cura.ExpandableComponent
text: catalog.i18nc("@button", "Manage printers")
onClicked:
{
togglePopup()
toggleContent()
Cura.Actions.configureMachines.trigger()
}
}

2
resources/qml/PrinterSelector/MachineSelectorButton.qml
View file

@ -83,7 +83,7 @@ Button
onClicked:
{
togglePopup()
toggleContent()
Cura.MachineManager.setActiveMachine(model.id)
}