Jaime van Kessel
384c359db1
Merge branch 'master' of github.com:Ultimaker/Cura into ui_rework_4_0
2018-11-30 15:34:47 +01:00
Jaime van Kessel
a4a619370e
Fix QML warnings
2018-11-30 15:33:57 +01:00
Jaime van Kessel
205b939b99
Merge branch 'remove_transitions' of github.com:Ultimaker/Cura
2018-11-30 15:30:53 +01:00
Jaime van Kessel
1a79372afd
Fixed name of cocoon create
...
For some reason it was added as if it was 2 machines at once. Since we already have a wanhao I3, i've changed this one to only be a profile for the Cocoon.
2018-11-30 15:16:37 +01:00
Jaime van Kessel
59a81be65c
Fixed some leftover graphical issues
...
CURA-5943
2018-11-30 14:10:42 +01:00
Jaime van Kessel
48bdb735f2
Added MachineSelector to monitor menu
...
CURA-5943
2018-11-30 13:58:44 +01:00
Jaime van Kessel
6d4a460e58
Move USB sidebar into the main view of the monitorstage
...
CURA-5943
2018-11-30 13:53:53 +01:00
Marijn Deé
763291821f
Added models to process the data from the api results
...
Added code to update the UI models
2018-11-29 17:03:11 +01:00
Ghostkeeper
14a7b7b2ce
Merge branch 'update_example_postprocessing_script'
2018-11-29 15:33:03 +01:00
Mark
90aa8c1264
point people to a good example
2018-11-29 15:29:51 +01:00
Lipu Fei
6db52dde46
Fix merge conflicts from ui_rework_40
...
CURA-5943
2018-11-29 15:27:06 +01:00
Lipu Fei
c545d9df77
Add key check before accessing in StartSliceJob
...
CURA-5901
2018-11-29 15:17:43 +01:00
Mark
d88a465737
Increase possible visible description lines in the Marketplace
2018-11-29 14:45:42 +01:00
Marijn Deé
8a72ba3cfa
Merge branch 'cloud-output-device' of github.com:Ultimaker/Cura into cloud-output-device
2018-11-29 10:00:57 +01:00
Lipu Fei
5df7cdde48
Merge remote-tracking branch 'origin/master' into ui_rework_4_0
2018-11-29 08:54:22 +01:00
Lipu Fei
b1b773e464
Merge pull request #4891 from Ultimaker/show_website_as_support_in_marketplace
...
Show website for support
2018-11-29 08:50:32 +01:00
Lipu Fei
b44ddec01f
Change normal layer height of cocoon to 0.10
...
CURA-5902
So it's different from Fine 0.15, otherwise you get duplicates.
2018-11-29 08:35:40 +01:00
Ian Paschal
1f17896e78
Merge pull request #4899 from Ultimaker/monitor_tab_scroll_tweak
...
Improve monitor tab temporary scroll bar
2018-11-28 13:24:27 +01:00
Ian Paschal
14cee32cec
Improve monitor tab temporary scroll bar
2018-11-28 12:20:09 +01:00
Jaime van Kessel
7d42fdf183
Add missing typing
2018-11-28 11:52:30 +01:00
Jaime van Kessel
0baa4d20b3
Gracefully handle the case where machine definition is no in the map
2018-11-28 11:42:54 +01:00
Jaime van Kessel
c0d1c35a2b
Removed accidental copy paste
2018-11-28 11:35:48 +01:00
Jaime van Kessel
adf16310c7
Merge pull request #4883 from Ultimaker/CURA-5879_experimental_qualities
...
CURA-5879 experimental qualities
2018-11-28 11:34:21 +01:00
Simon Edwards
8262c2dfd6
Merge pull request #4889 from Ultimaker/CL-1150_restyle_monitor_printer_tile
...
CL-1150 restyle monitor printer tile
2018-11-28 11:31:11 +01:00
Diego Prado Gesto
fb152728e0
Merge branch 'master' into ui_rework_4_0
2018-11-28 11:19:43 +01:00
Jaime van Kessel
d9c3faaae2
Codestyle
...
CURA-5879
2018-11-28 11:19:37 +01:00
Jaime van Kessel
d09d8a6ae3
Minor codestyle fixes
...
CURA-5879
2018-11-28 11:18:36 +01:00
Jaime van Kessel
5ed2acadd0
Re-add wizard_progress size
...
I was a bit over enthosiastic deleting it as it was still used for the UMO first run wizard
2018-11-28 11:09:34 +01:00
Ian Paschal
9029d10ed0
Remove debug statement
...
Contributes to CL-1150
2018-11-28 10:47:34 +01:00
Jaime van Kessel
1d013dc1e7
Merge pull request #4893 from Ultimaker/fix_toolbar_style
...
Fix toolbar style
2018-11-28 10:47:05 +01:00
Ian Paschal
370fa0fd14
Remove old sidebar
...
Contributes to CL-1150
2018-11-28 10:46:22 +01:00
Ian Paschal
d54a1cb41b
Handle null print job more elegantly
...
Contributes to CL-1150
2018-11-28 10:46:12 +01:00
Jaime van Kessel
bfa2ff5f5e
Invert visibility of bottom & topsquare
...
It got derped.
2018-11-28 10:46:07 +01:00
Ian Paschal
255a7fa1fb
Fix binding loop
...
Contributes to CL-1150
2018-11-28 10:45:46 +01:00
Diego Prado Gesto
709750c9e2
Add global quality to the Anycubic i3 Mega
...
Fixes #4876 .
2018-11-28 10:39:32 +01:00
Jaime van Kessel
d0da70a7ee
Change visibility of the rectangle
...
CURA-5984
Co-Authored-By: diegopradogesto <d.pradogesto@ultimaker.com>
2018-11-28 10:29:53 +01:00
Jaime van Kessel
454b47e3a0
Change visibility behavior of the rectangle
...
CURA-5984
Co-Authored-By: diegopradogesto <d.pradogesto@ultimaker.com>
2018-11-28 10:29:35 +01:00
Jaime van Kessel
bfebb33123
Code style
...
CURA-5984
Co-Authored-By: diegopradogesto <d.pradogesto@ultimaker.com>
2018-11-28 10:28:16 +01:00
Jaime van Kessel
aeb2887796
Merge branch 'CURA-5979_gcode_loading_new_ui' of github.com:Ultimaker/Cura into ui_rework_4_0
2018-11-28 10:15:07 +01:00
Diego Prado Gesto
c1c5eb2219
Rename the properties to quickly identify that they are a boolean
...
Contributes to CURA-5984.
2018-11-28 09:44:37 +01:00
Jaime van Kessel
94c4366194
Merge branch 'master' of github.com:Ultimaker/Cura into ui_rework_4_0
2018-11-27 17:55:13 +01:00
Jaime van Kessel
d8c430abf6
Fix typing
2018-11-27 17:54:53 +01:00
Diego Prado Gesto
14b460a626
Remove unused styles
2018-11-27 17:25:10 +01:00
Diego Prado Gesto
309061ce31
Add a new ToolbarButton
...
Now also the Extruder button is a toolbar button since it will show in
the toolbar.
2018-11-27 17:16:52 +01:00
ChrisTerBeke
26f107d176
Use cluster_id as dict key, remove unneeded white space
2018-11-27 17:03:19 +01:00
ChrisTerBeke
4e150fb4bf
Merge branch 'master' into cloud-output-device
2018-11-27 16:59:28 +01:00
Diego Prado Gesto
dad2031e4b
Switch to the preview stage before to switch to simulation view
...
... since now the list of views are in a different stage.
Contributes to CURA-5979.
2018-11-27 16:06:37 +01:00
Lipu Fei
2c8ed99281
Add is_experimental to Qt models and QMLs
...
CURA-5879
2018-11-27 15:50:03 +01:00
Lipu Fei
c9c7ef7d67
Add "is_experimental" for experimental qualities
...
CURA-5879
2018-11-27 15:50:02 +01:00
Mark
b98df0f22f
Show one website link where to get the material
2018-11-27 15:46:23 +01:00
