3D-printing/Cura
1
0
Fork 0
mirror of https://github.com/Ultimaker/Cura.git synced 2025-08-10 07:15:03 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 2
17157 commits 313 branches 275 tags 719 MiB
Commit graph

17157 commits

This branch
This branch
All branches
Author SHA1 Message Date
Diego Prado Gesto
0e22f6b672 Fix an issue that caused a non-deterministic segfault 
Also add a topMargin only when there are tabs in the custom print setup.

Contributes to CURA-5941.
 2018-12-05 13:30:01 +01:00
Diego Prado Gesto
909b0f3f7e Merge branch 'ui_rework_4_0' into CURA-5941_restyle_setting_dropdown 2018-12-05 13:10:42 +01:00
Diego Prado Gesto
537929893f Merge branch 'master' into ui_rework_4_0 2018-12-05 13:10:14 +01:00
Diego Prado Gesto
034b1660f7 Adjust sizes in the custom print setup mode 
Contributes to CURA-5941.
 2018-12-05 13:05:22 +01:00
Ian Paschal
e8a933331c Clean-up printer status label 
Contributes to CL-1153
 2018-12-05 12:14:18 +01:00
Jaime van Kessel
325137db83
Merge pull request #4888 from Ultimaker/CURA-5982_fix_crash_no_material 
CURA-5982 Return empty material model for empty material
 2018-12-05 10:43:31 +01:00
Diego Prado Gesto
cdb8020029 Add another expandable component 
Use one of them if the drop-panel has to act as a Popup and the other if it has to act as a standard component.

Contributes to CURA-5941.
 2018-12-05 09:39:04 +01:00
Lipu Fei
4ff5e43a28 Handle Empty and Unknown material cases 
CURA-5982
 2018-12-04 17:24:51 +01:00
Lipu Fei
fb3c1fc11d Merge remote-tracking branch 'origin/master' into CURA-5982_fix_crash_no_material 2018-12-04 17:15:26 +01:00
Lipu Fei
a13fb4a81e Merge remote-tracking branch 'origin/master' into ui_rework_4_0 2018-12-04 17:12:24 +01:00
Jaime van Kessel
fd6a8d7642 Merge branch 'master' of github.com:Ultimaker/Cura 2018-12-04 15:47:27 +01:00
Jaime van Kessel
b2238420fb Ensure that reset always correctly gets set to basic 
The old code that simply resetted the preferences was still active, but this could cause a race condition
in some situations. In those cases it would first set it to basic and then clear the preferences (thus
resulting in no settings being visible)

CURA-5981
 2018-12-04 15:46:13 +01:00
Simon Edwards
39c282fabe
Merge pull request #4925 from Ultimaker/CL-1153_printer_states_in_monitor 
CL-1153 printer states in monitor
 2018-12-04 15:30:12 +01:00
Ian Paschal
014a138fda Remove semi-colon 
Contributes to CL-1153
 2018-12-04 15:12:00 +01:00
Ian Paschal
1494daf671 Simplify preview icon logic 
Contributes to CL-1153
 2018-12-04 15:11:31 +01:00
Ian Paschal
ebb31409b8 Always return a string for preview icon 
Contributes to CL-1153
 2018-12-04 15:10:31 +01:00
Lipu Fei
5255bca9dd Merge remote-tracking branch 'origin/master' into ui_rework_4_0 2018-12-04 15:08:50 +01:00
Lipu Fei
43096c1baf Update USBPrinting version to 1.0.1 
CURA-5943
 2018-12-04 15:03:45 +01:00
Lipu Fei
02e7f90473 Fix module importing in USBPrinting 
CURA-5943
 2018-12-04 15:02:52 +01:00
Jaime van Kessel
5b4fad3c08 When toggling auto-slice, force a re-slice 
CURA-5997
 2018-12-04 14:54:15 +01:00
Diego Prado Gesto
47ff95b1f3 Set contentType to the different expandable components. 
Also add a color for the active state when the contentType is 'Fixed'.

Contributes to CURA-5941.
 2018-12-04 13:53:11 +01:00
Diego Prado Gesto
4dcce7616b Fix some leftover renamings 
Contributes to CURA-5941
 2018-12-04 13:21:26 +01:00
Diego Prado Gesto
e159cbdb1a Rename all the references from 'popup' to 'content' 
Contributes to CURA-5941.
 2018-12-04 13:14:12 +01:00
Diego Prado Gesto
692686597c Fix an issues that didn't calculate the correct height of the popup when the custom mode was selected from previous runs. 
Contributes to CURA-5941.
 2018-12-04 12:07:31 +01:00
Ian Paschal
96b9c7f3ea Fix multi-argument i18n string 
Contributes to CL-1153
 2018-12-04 11:40:56 +01:00
Lipu Fei
0d086008ae Merge remote-tracking branch 'origin/master' into ui_rework_4_0 2018-12-04 11:38:47 +01:00
Ian Paschal
249a90199b Improve printer status handling 
Contributes to CL-1153
 2018-12-04 11:08:01 +01:00
Lipu Fei
9ec7428620 Fix setting visiblity current index 
CURA-5981
 2018-12-04 10:55:01 +01:00
Ian Paschal
ab245bbff6 Make "finishes at" single translatable string 
Contributes to CL-1153
 2018-12-04 10:23:26 +01:00
Ian Paschal
0363c1257c Improve exposed progress prop 
Contributes to CL-1153
 2018-12-04 10:18:09 +01:00
Diego Prado Gesto
a66bb4fab1 Merge branch 'ui_rework_4_0' into CURA-5941_restyle_setting_dropdown 2018-12-04 09:23:00 +01:00
Diego Prado Gesto
57a852a15a Don't show the background if there are less than 2 extruders to show in the Toolbar 
It caused a very tiny rectangle if the printer has only 1 extruder.

Contributes to CURA-5984.
 2018-12-04 09:19:08 +01:00
Diego Prado Gesto
c1f5c00a7e Forgot to add the icon 2018-12-04 09:18:45 +01:00
Diego Prado Gesto
e9f8757fac Change the info button in the action panel according to the designs 
Adjust the padding in the preview shortcut.
 2018-12-04 09:12:57 +01:00
Diego Prado Gesto
ca3c639069 Merge branch 'ui_rework_4_0' into CURA-5941_restyle_setting_dropdown 2018-12-04 09:03:13 +01:00
Ghostkeeper
6af1e72ea3
Show progress bar while autoslice is preparing 
Previously it would say 'preparing to slice'. Now it just says 'auto slicing' but with an indeterminate progress bar. Only the indeterminate progress bar just appears empty right now...

Contributes to issue CURA-5997.
 2018-12-04 07:51:48 +01:00
Diego Prado Gesto
004405e5f9 Change the colors to match the designs. 
Contributes to CURA-5941.
 2018-12-03 17:25:07 +01:00
Ghostkeeper
f320000ce5
Change default profile of Aurora and Alfawise printers 
Instead of the default layer height, we should change the default quality profile.
This is necessary because the 'normal' quality profile doesn't define a layer height, so that should inherit from the 0.1mm default layer height. But if the printer turned the default into a 0.15mm layer height then that is wrong.
Maybe we should let the normal quality profile overwrite it to 0.1mm, always?

Contributes to issue CURA-5902.
 2018-12-03 17:23:44 +01:00
Diego Prado Gesto
15415dc3b9 Fix position of the tooltips for the settings 
Contributes to CURA-5941
 2018-12-03 16:53:52 +01:00
Diego Prado Gesto
d3b5b2717d Add rounded corners to the settings 
Contributes to CURA-5941
 2018-12-03 15:56:21 +01:00
Diego Prado Gesto
4e9c595bdd Restyle the settings list 
Be sure that the alignments and the margins are corrects according to the designs.

Contributes to CURA-5941.
 2018-12-03 15:34:33 +01:00
Ian Paschal
95400282b9 Simplify logic slightly 
Contributes to CL-1153
 2018-12-03 14:44:15 +01:00
Diego Prado Gesto
ce6a0676dd Add a rectangle surrounding the settings listview 
Contributes to CURA-5941.
 2018-12-03 14:43:35 +01:00
Ian Paschal
cced42a55b Handle idle, unavailable, and unreachable states 
Contributes to CL-1153
 2018-12-03 14:41:45 +01:00
Ian Paschal
c9ed044205 Improve printer status and progress bar 
Contributes to CL-1153
 2018-12-03 14:41:22 +01:00
Diego Prado Gesto
4c468831f0 Add tabs for select the extruder in the custom print setup. 
Align some elements beneath the tabs.

Contributes to CURA-5941.
 2018-12-03 13:58:13 +01:00
Ian Paschal
a28cae0a43 Improve date rendering 
- Use "Mon Dec 3 at 12:39" if 7 days or more away.
- Use  "Mon at 12:39" if within 7 days but more than one away.
- Use "tomorrow at 12:39" if one day away.
- Use "today at 12:39" if today.

Contributes to CL-1153
 2018-12-03 12:18:33 +01:00
Ian Paschal
3d80e28174 Add some typings 
Contributes to CL-1153
 2018-12-03 12:15:38 +01:00
Ian Paschal
665e2d3060 Move isActive and timeRemaining logic from QML to Python 
Contributes to CL-1153
 2018-12-03 12:15:25 +01:00
Lipu Fei
c688f0ea88
Merge pull request #4864 from Ultimaker/CURA-5943_ui_usb_printing 
Cura 5943 ui usb printing
 2018-12-03 10:42:58 +01:00