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

Added comments, changed text of NotStarted. CURA-3214

Browse source
This commit is contained in:
Jack Ha 2017-02-16 15:07:26 +01:00
parent 18318348b6
commit 600a5d85e4
2 changed files with 6 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

2
plugins/CuraEngineBackend/CuraEngineBackend.py
View file

@ -388,7 +388,7 @@ class CuraEngineBackend(QObject, Backend):
## Convenient function: set need_slicing, emit state and clear layer data ## Convenient function: set need_slicing, emit state and clear layer data
def needSlicing(self): def needSlicing(self):
self._need_slicing = True # For now only for debugging purposes self._need_slicing = True
self.processingProgress.emit(0.0) self.processingProgress.emit(0.0)
self.backendStateChange.emit(BackendState.NotStarted) self.backendStateChange.emit(BackendState.NotStarted)
if not self._use_timer: if not self._use_timer:

8
resources/qml/SaveButton.qml
View file

@ -28,8 +28,7 @@ Item {
switch(base.backendState) switch(base.backendState)
{ {
case 1: case 1:
return ""; return catalog.i18nc("@label:PrintjobStatus", "Ready to slice");
//return catalog.i18nc("@label:PrintjobStatus", "Preparing to slice...");
case 2: case 2:
return catalog.i18nc("@label:PrintjobStatus", "Slicing..."); return catalog.i18nc("@label:PrintjobStatus", "Slicing...");
case 3: case 3:
@ -119,7 +118,7 @@ Item {
id: prepareButton id: prepareButton
tooltip: UM.OutputDeviceManager.activeDeviceDescription; tooltip: UM.OutputDeviceManager.activeDeviceDescription;
//enabled: (base.backendState == 3 || base.backendState == 5) && base.activity == true // 1 = not started, 2 = Processing
enabled: (base.backendState == 1 || base.backendState == 2) && base.activity == true enabled: (base.backendState == 1 || base.backendState == 2) && base.activity == true
visible: { visible: {
return !autoSlice && (base.backendState == 1 || base.backendState == 2) && base.activity == true; return !autoSlice && (base.backendState == 1 || base.backendState == 2) && base.activity == true;
@ -131,6 +130,7 @@ Item {
anchors.right: parent.right anchors.right: parent.right
anchors.rightMargin: UM.Theme.getSize("default_margin").width anchors.rightMargin: UM.Theme.getSize("default_margin").width
// 1 = not started, 5 = disabled
text: [1, 5].indexOf(UM.Backend.state) != -1 ? catalog.i18nc("@label:Printjob", "Prepare") : catalog.i18nc("@label:Printjob", "Cancel") text: [1, 5].indexOf(UM.Backend.state) != -1 ? catalog.i18nc("@label:Printjob", "Prepare") : catalog.i18nc("@label:Printjob", "Cancel")
onClicked: onClicked:
{ {
@ -198,6 +198,7 @@ Item {
id: saveToButton id: saveToButton
tooltip: UM.OutputDeviceManager.activeDeviceDescription; tooltip: UM.OutputDeviceManager.activeDeviceDescription;
// 3 = done, 5 = disabled
enabled: (base.backendState == 3 || base.backendState == 5) && base.activity == true enabled: (base.backendState == 3 || base.backendState == 5) && base.activity == true
visible: { visible: {
return autoSlice || ((base.backendState == 3 || base.backendState == 5) && base.activity == true); return autoSlice || ((base.backendState == 3 || base.backendState == 5) && base.activity == true);
@ -277,6 +278,7 @@ Item {
anchors.rightMargin: UM.Theme.getSize("default_margin").width anchors.rightMargin: UM.Theme.getSize("default_margin").width
width: UM.Theme.getSize("save_button_save_to_button").height width: UM.Theme.getSize("save_button_save_to_button").height
height: UM.Theme.getSize("save_button_save_to_button").height height: UM.Theme.getSize("save_button_save_to_button").height
// 3 = Done, 5 = Disabled
enabled: (base.backendState == 3 || base.backendState == 5) && base.activity == true enabled: (base.backendState == 3 || base.backendState == 5) && base.activity == true
visible: (devicesModel.deviceCount > 1) && (base.backendState == 3 || base.backendState == 5) && base.activity == true visible: (devicesModel.deviceCount > 1) && (base.backendState == 3 || base.backendState == 5) && base.activity == true