3D-printing/Cura
1
0
Fork 0
mirror of https://github.com/Ultimaker/Cura.git synced 2025-08-09 06:45:09 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Added switch for using timer and no timer in CuraEngineBackend. Still have to fix TODO and finish. CURA-3214

Browse source
This commit is contained in:
Jack Ha 2017-02-15 10:32:38 +01:00
parent e5cdc318f7
commit 4e65a7034f
11 changed files with 250 additions and 894 deletions
Download patch file Download diff file Expand all files Collapse all files

90
resources/qml/SaveButton.qml
View file

@ -27,7 +27,8 @@ Item {
switch(base.backendState)
{
case 1:
return catalog.i18nc("@label:PrintjobStatus", "Preparing to slice...");
return "";
//return catalog.i18nc("@label:PrintjobStatus", "Preparing to slice...");
case 2:
return catalog.i18nc("@label:PrintjobStatus", "Slicing...");
case 3:
@ -102,11 +103,96 @@ Item {
}
}
// Prepare button, only shows if auto_slice is off
Button {
id: prepareButton
tooltip: UM.OutputDeviceManager.activeDeviceDescription;
//enabled: (base.backendState == 3 || base.backendState == 5) && base.activity == true
enabled: (base.backendState == 1 || base.backendState == 2) && base.activity == true
visible: {
CuraApplication.log("pref: " + UM.Preferences.getValue("general/auto_slice"));
CuraApplication.log("backend state: " + base.backendState);
CuraApplication.log("activity: " + base.activity);
return !UM.Preferences.getValue("general/auto_slice") && (base.backendState == 1 || base.backendState == 2) && base.activity == true
}
height: UM.Theme.getSize("save_button_save_to_button").height
anchors.top: parent.top
anchors.right: parent.right
anchors.rightMargin: UM.Theme.getSize("default_margin").width
text: [1, 5].indexOf(UM.Backend.state) != -1 ? catalog.i18nc("@label:Printjob", "Prepare") : catalog.i18nc("@label:Printjob", "Cancel")
onClicked:
{
if ([1, 5].indexOf(UM.Backend.state) != -1) {
CuraApplication.log("Prepare....");
CuraApplication.slice();
} else {
CuraApplication.log("Cancel....");
CuraApplication.sliceStop();
}
}
style: ButtonStyle {
background: Rectangle
{
border.width: UM.Theme.getSize("default_lining").width
border.color:
{
if(!control.enabled)
return UM.Theme.getColor("action_button_disabled_border");
else if(control.pressed)
return UM.Theme.getColor("action_button_active_border");
else if(control.hovered)
return UM.Theme.getColor("action_button_hovered_border");
else
return UM.Theme.getColor("action_button_border");
}
color:
{
if(!control.enabled)
return UM.Theme.getColor("action_button_disabled");
else if(control.pressed)
return UM.Theme.getColor("action_button_active");
else if(control.hovered)
return UM.Theme.getColor("action_button_hovered");
else
return UM.Theme.getColor("action_button");
}
Behavior on color { ColorAnimation { duration: 50; } }
implicitWidth: actualLabel.contentWidth + (UM.Theme.getSize("default_margin").width * 2)
Label {
id: actualLabel
anchors.centerIn: parent
color:
{
if(!control.enabled)
return UM.Theme.getColor("action_button_disabled_text");
else if(control.pressed)
return UM.Theme.getColor("action_button_active_text");
else if(control.hovered)
return UM.Theme.getColor("action_button_hovered_text");
else
return UM.Theme.getColor("action_button_text");
}
font: UM.Theme.getFont("action_button")
text: control.text;
}
}
label: Item { }
}
}
Button {
id: saveToButton
tooltip: UM.OutputDeviceManager.activeDeviceDescription;
enabled: (base.backendState == 3 || base.backendState == 5) && base.activity == true
visible: UM.Preferences.getValue("general/auto_slice") || ((base.backendState == 3 || base.backendState == 5) && base.activity == true)
height: UM.Theme.getSize("save_button_save_to_button").height
anchors.top: parent.top
@ -182,7 +268,7 @@ Item {
width: UM.Theme.getSize("save_button_save_to_button").height
height: UM.Theme.getSize("save_button_save_to_button").height
enabled: (base.backendState == 3 || base.backendState == 5) && base.activity == true
visible: devicesModel.deviceCount > 1
visible: (devicesModel.deviceCount > 1) && (base.backendState == 3 || base.backendState == 5) && base.activity == true
style: ButtonStyle {

6
resources/qml/Sidebar.qml
View file

@ -15,7 +15,7 @@ Rectangle
id: base;
property int currentModeIndex;
property bool monitoringPrint: false
property bool monitoringPrint: false; // When adding more "tabs", one want to replace this bool with a ListModel
property bool hideSettings: PrintInformation.preSliced
Connections
{
@ -31,6 +31,7 @@ Rectangle
// Is there an output device for this printer?
property bool printerConnected: Cura.MachineManager.printerOutputDevices.length != 0
property bool printerAcceptsCommands: printerConnected && Cura.MachineManager.printerOutputDevices[0].acceptsCommands
property int backendState: UM.Backend.state;
color: UM.Theme.getColor("sidebar")
UM.I18nCatalog { id: catalog; name:"cura"}
@ -529,6 +530,8 @@ Rectangle
anchors.bottomMargin: UM.Theme.getSize("default_margin").height
}
// SaveButton and MonitorButton are actually the bottom footer panels.
// "!monitoringPrint" currently means "show-settings-mode"
SaveButton
{
id: saveButton
@ -553,6 +556,7 @@ Rectangle
id: tooltip;
}
// Setting mode: Recommended or Custom
ListModel
{
id: modesListModel;