3D-printing/Cura
1
0
Fork 0
mirror of https://github.com/Ultimaker/Cura.git synced 2025-07-13 09:47:50 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 2
19507 commits 302 branches 270 tags 770 MiB
Commit graph

19507 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
Diego Prado Gesto
17945c6b16 [WIP] Separate components in different files 
Contributes to CURA-5941
 2018-11-30 11:32:24 +01:00
Ghostkeeper
4e2f51e7e8
Use public activeExtruderIndex rather than internal _activeExtruderIndex 
So that this getter still does what it needs to do if we ever decide to add side-effects.

Contributes to issue CURA-5876.
 2018-11-30 11:13:04 +01:00
Ghostkeeper
1c96c81ba9
Remove unnecessary extra setMetaDataEntry 
This is a relic from when you first had to add the metadata entry. Now it does nothing any more because it's being set directly afterwards to the actual value that is desired in the end.

Contributes to issue CURA-5876.
 2018-11-30 11:11:17 +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
Diego Prado Gesto
bc8bf87809 Align the buttons at the bottom of the panel 
Contributes to CURA-5941.
 2018-11-29 15:54:02 +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
Diego Prado Gesto
f67c725b2a Merge branch 'CURA-5941_restyle_setting_dropdown' of github.com:Ultimaker/Cura into CURA-5941_restyle_setting_dropdown 2018-11-29 14:03:39 +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
Diego Prado Gesto
7639983925 Clean the recommended mode print setup 
Contributes to CURA-5941
 2018-11-29 08:54:04 +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
Aleksei S
706fc311bc Added margins to the setting list 
CURA-5941
 2018-11-29 00:47:25 +01:00
Aleksei S
b9d9a35868 Move profile dropdown to another file 
CURA-5941
 2018-11-29 00:00:22 +01:00
Diego Prado Gesto
990c653af4 Refactor the code a bit more to better align the components in the 
recommended mode.

Contributes to CURA-5941.
 2018-11-28 17:29:25 +01:00
Aleksei S
0fdaebaaf8 Updated action button 
CURA-5941
 2018-11-28 13:51:54 +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
Diego Prado Gesto
85b34d6005 Refactor the PrintSetupSelector 
The file was splitted in several other files to improve readability.
There is a new folder called PrintSetupSelector where all those files
will be.

Contributes to CURA-5941.
 2018-11-28 13:07:39 +01:00
Ian Paschal
14cee32cec Improve monitor tab temporary scroll bar 2018-11-28 12:20:09 +01:00
Diego Prado Gesto
56f20648f5 Merge branch 'ui_rework_4_0' into CURA-5941_restyle_setting_dropdown 2018-11-28 11:58:55 +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
Artem Leshchev
6f5dfc4677 Added definitions for Wanhao Duplicator 9 2018-11-27 19:46:49 +03:00