114 Commits

Author SHA1 Message Date
Jaime van Kessel
4a0a9f521c Bumped the required version numbers down again, as they should specifcy a min version number.
As the summary describes; We should use *min* version numbers. If we have a higher version installed as defined, it will have the bugfixes and not the features. Increasing version nr should therefore only be done if we want new features.
2018-02-16 11:13:40 +01:00
Ghostkeeper
ee9de1f11b
Merge branch '3.2'
Lots of conflicts due to rounding vs. flooring of text element positions for weirdness with the font aliasing.
2018-02-14 10:53:51 +01:00
Mark
b531c0550d Change Math.floor to Math.round as a last try to fix garbled fonts
CURA-4941
2018-02-14 09:28:47 +01:00
Mark
466926fecd Increased the version of QtQuick 2018-02-13 11:07:14 +01:00
Ghostkeeper
03b4213e92
Merge branch '3.2'
Conflicts in Cura.qml and SaveButton.qml from people fixing positioning rounding at the same time...
2018-02-12 13:10:24 +01:00
Mark
461da709ff Checked all divisions (again..) and multiplications on rounding errors
CURA-4941
2018-02-10 12:45:36 +01:00
Mark
b52bf6decf resolve conflict 2018-02-09 13:01:56 +01:00
Mark
8fca183a5e Fix rounding errors for garbled text
CURA-4941
2018-02-09 11:30:56 +01:00
Ghostkeeper
e157d8e045
Fix position of additional components
This fixes the position when disabling auto-slice.

The position of additional components was wrong, such as the post-processing button.
2018-02-08 15:02:52 +01:00
Lipu Fei
51316e1dc1 Fix Prepare/Cancel button visibility conditions for manual slicing
CURA-4525
2018-01-12 11:14:01 +01:00
Ghostkeeper
5f240229f9
Fix reference to addAdditionalComponents and updateAdditionalComponents
Nobody ever tested this, I think...

Contributes to issue CURA-4741.
2017-12-28 15:45:03 +01:00
ChrisTerBeke
876ad01597 Directly use CuraApplication.backend instead of via property 2017-12-15 13:32:45 +01:00
ChrisTerBeke
cac561600e Use pyqtProperty instead of slot to bind backend 2017-12-14 15:44:11 +01:00
ChrisTerBeke
47e5303a89 Catch situations where backend is not correctly set 2017-12-14 15:16:17 +01:00
ChrisTerBeke
ca413e0496 Add extra checks to ensure backend exists, use same state everywhere 2017-12-12 11:16:40 +01:00
ChrisTerBeke
84aa9367c7 Cleanup 2017-12-12 10:54:54 +01:00
ChrisTerBeke
2986a17c1d Fix for showing printer connect button on component load, use newer CuraApplication as target 2017-12-08 16:02:22 +01:00
ChrisTerBeke
8cd9439497 ignore octoprint plugin 2017-12-08 14:33:21 +01:00
ChrisTerBeke
f91a4db617 Set stage icon for monitor depending on output device state, prevent crash when accessing back-end from unloaded component 2017-12-07 10:38:06 +01:00
Diego Prado Gesto
0b434978dd CURA-4561 Add tooltip also to the Cancel button. 2017-11-24 10:34:38 +01:00
Jack Ha
b6410ecf12 CURA-4561 prepare button upgrades 2017-11-23 15:27:22 +01:00
fieldOfView
6fa4dd0a97 Fix qml binding loops 2017-10-30 12:26:02 +01:00
fieldOfView
208d365d51 Make sure saveRow does not extend sidebar 2017-10-29 09:20:59 +01:00
Lipu Fei
e4fec1f63d Move SaveButton downwards
CURA-4490

Move SaveButton downwards so it doesn't overlay with the estimated print
time in some language.
2017-10-25 16:35:38 +02:00
Mark
dcb630a24e Move text back to label and remove unused font 2017-10-03 14:02:07 +02:00
Mark
9a193ad5c5 Changing AGPLv3 to LGPLv3 2017-09-28 13:00:43 +02:00
ChrisTerBeke
045f1ce259 update print button dropdown color and hover color 2017-09-22 15:52:44 +02:00
ChrisTerBeke
a4ebedee83 CURA-4321 make print button blue when available, slight color changes on hover and pressed 2017-09-14 17:40:44 +02:00
Ghostkeeper
cdf43ea6a4
Forgotten sidebar margins
The buttons need the sidebar margins too.

Contributes to issue CURA-4148.
2017-08-23 17:58:05 +02:00
Ghostkeeper
6a4329c1a0
Align progress bar and save button better
So that they don't overlap with the now larger fonts and such.

Contributes to issue CURA-4149.
2017-08-14 10:36:39 +02:00
Ghostkeeper
0430a274d9
Make slicing status text smaller
Makes more room for the time/material estimates.

Contributes to issue CURA-4149.
2017-08-14 09:10:35 +02:00
Ghostkeeper
d277b16807
Capitalise '3D'
3d looks ugly to me.
2017-07-07 13:37:30 +02:00
Mark
bfda8712e1 Change all Label to Text so fonts are rendered correct
CURA-3389
2017-04-14 13:16:48 +02:00
Jaime van Kessel
f82aecb7ca Refactoring; no longer use "Printer" to identify CuraApplication 2017-03-30 20:19:05 +02:00
Lipu Fei
ef0a502dcf Add { } around statements in "if"
Make nitpicking people happy :P
2017-03-22 21:05:45 +01:00
Lipu Fei
12918b02b5 CTRL-P only works when the button is enabled
CURA-3496
2017-03-22 12:01:41 +01:00
Lipu Fei
eaad358e42 Remove shortcut text in the SaveButton 2017-03-21 09:51:07 +01:00
Lipu Fei
139bb76806 Add CTRL+P shortcut for save/print button
CURA-3496
2017-03-21 09:28:03 +01:00
Jaime van Kessel
138c3db26f Preferred mimetype is now used when saving to local or removable drive
CURA-3496
2017-03-15 09:23:47 +01:00
Jack Ha
057dc2fd7d Solved merge conflicts. CURA-3214 2017-02-21 11:01:20 +01:00
fieldOfView
9229027001 Refactor properties that start with 'get' to avoid confusion between slots & properties
Case in point: LayerViewProxy.getLayerViewType was decorated as a property but was used/intended as a slot.
2017-02-17 13:35:01 +01:00
Jack Ha
600a5d85e4 Added comments, changed text of NotStarted. CURA-3214 2017-02-16 15:07:26 +01:00
Jack Ha
18318348b6 Fixed last bugs in manual slicing. CURA-3214 2017-02-16 14:44:45 +01:00
Jack Ha
464bf73f85 Made backend available in qml, calling forceSlice and stopSlicing directly. CURA-3214 2017-02-16 10:56:01 +01:00
Jack Ha
59a8c21c73 Turn slice automatically off now correctly visualizes Prepare button. CURA-3214 2017-02-16 09:55:49 +01:00
Jack Ha
4e65a7034f Added switch for using timer and no timer in CuraEngineBackend. Still have to fix TODO and finish. CURA-3214 2017-02-15 10:32:38 +01:00
fieldOfView
a823980d17 Replace "transparent" Rectangles by Items 2017-01-25 15:21:37 +01:00
fieldOfView
bf3d3d46e2 Fix Rectangles that always show as white regardless of the theme 2017-01-25 15:12:57 +01:00
Victor Larchenko
90f7cebbbb D6: Fixed gcode loading to scene while undo/redo 2016-12-23 15:53:17 -05:00
Victor Larchenko
1631045d7a D5: Refactoring 2016-12-23 15:53:16 -05:00