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 |
|
Lipu Fei
|
6db52dde46
|
Fix merge conflicts from ui_rework_40
CURA-5943
|
2018-11-29 15:27:06 +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
|
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 |
|
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 |
|
Jaime van Kessel
|
4fab546425
|
Fix codestyle issues
Boyscouting
|
2018-11-27 15:00:57 +01:00 |
|
Diego Prado Gesto
|
92d0717096
|
Hide the toolbar and don't show time and material information when loading a gcode
Contributes to CURA-5979.
|
2018-11-27 15:00:50 +01:00 |
|
Jaime van Kessel
|
352bfb15ce
|
Merge branch 'ui_rework_4_0' of github.com:Ultimaker/Cura into ui_rework_4_0
|
2018-11-27 14:55:07 +01:00 |
|
Jaime van Kessel
|
82ea562dc3
|
Add missing hoverEnabled property
|
2018-11-27 14:54:49 +01:00 |
|
Diego Prado Gesto
|
077b34b433
|
Fix size of the extruder icon
Now it should look the same in all places.
|
2018-11-27 14:49:01 +01:00 |
|
Jaime van Kessel
|
854755277c
|
Fix styling of comments
Because sentences should start with capitals
|
2018-11-27 14:37:01 +01:00 |
|
Jaime van Kessel
|
3ad1802ab6
|
Prevent a KeyError from messing
CURA-5978
|
2018-11-27 14:34:29 +01:00 |
|
Diego Prado Gesto
|
e863c34f68
|
Align the text to the center of the button
Contributes to CURA-5942.
|
2018-11-27 13:33:35 +01:00 |
|
Diego Prado Gesto
|
fcde6e3a34
|
Fix the open file button
Now it has the correct size and it doesn't look blurry.
Contributes to CURA-5942.
|
2018-11-27 13:28:28 +01:00 |
|
Diego Prado Gesto
|
ea75a60dd8
|
Merge branch 'master' into ui_rework_4_0
|
2018-11-27 13:17:10 +01:00 |
|
Diego Prado Gesto
|
a6a364c337
|
Move material diameter and machine nozzle size to the extruder
definition.
Contributes to CURA-5902.
|
2018-11-27 13:12:47 +01:00 |
|
Diego Prado Gesto
|
0794a2c8c9
|
Remove not needed printer and extruder definitions.
Contributes to CURA-5902.
|
2018-11-27 13:03:36 +01:00 |
|
Diego Prado Gesto
|
c56098d82c
|
Merge pull request #4816 from Ultimaker/tests-for-um3networkplugin
Tests for um3networkplugin
|
2018-11-27 12:59:44 +01:00 |
|
Jaime van Kessel
|
fb84b344ec
|
Add gradient to header bar
|
2018-11-27 12:58:06 +01:00 |
|