3D-printing/Cura
1
0
Fork 0
mirror of https://github.com/Ultimaker/Cura.git synced 2025-07-11 16:57:51 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 3
18800 commits 302 branches 270 tags 770 MiB
Commit graph

18800 commits

This branch
This branch
All branches
Author SHA1 Message Date
Diego Prado Gesto
c804610fa6 Make the stage menu in the preview using 85 percent of the total width in order to prevent the print setup panel to be in the middle 2018-12-11 15:19:40 +01:00
Jaime van Kessel
fcaa23ed0a Added smallRating widget to featured plugins 
CURA-6013
 2018-12-11 15:16:21 +01:00
Diego Prado Gesto
742fc34e75 Change labels in the layer view legend 2018-12-11 14:31:12 +01:00
Daniel Schiavini
f04db63594 Merge branch 'STAR-322_cloud-connection' of github.com:Ultimaker/Cura into STAR-322_cloud-connection 2018-12-11 14:28:07 +01:00
Daniel Schiavini
a5d8e6ceb8 STAR-322: Removing the print job after it was done 2018-12-11 14:28:00 +01:00
Jaime van Kessel
7a5701b001 Made smallrating widget re-usable 
Also added it to the details page

CURA-6013
 2018-12-11 14:12:34 +01:00
Diego Prado Gesto
db56aa028c Change the swatch from a circle to the extruder icon 2018-12-11 13:59:36 +01:00
Diego Prado Gesto
faa3f42acc Modify the header in the simulation view menu component 
This is needed to align with the designs.
 2018-12-11 13:53:05 +01:00
Jaime van Kessel
30057e2fcd Use user_rating instead of user 
In the end it was implemented as user_rating (and not as user)

CURA-6013
 2018-12-11 13:49:45 +01:00
Jaime van Kessel
4baf0d1bdb Always show average rating 
CURA-6013
 2018-12-11 13:49:20 +01:00
Diego Prado Gesto
3593b7f152
Merge pull request #4782 from Ultimaker/M&P-Setting-Optimization 
CPE and CPE+ Comb retractions and ABS first layer temperature.
 2018-12-11 13:24:43 +01:00
Jaime van Kessel
75ff03f3c8 Use setState instead of emitting the backend state 
CURA-6016
 2018-12-11 13:13:20 +01:00
ChrisTerBeke
e4939cf005 Remove outdated cloud icon, will be done in another PR 2018-12-11 12:55:49 +01:00
Jaime van Kessel
6c70543d11 Only set the containerID when the dialog is visible 
This prevents unneeded updates

CURA-6016
 2018-12-11 12:46:11 +01:00
ChrisTerBeke
7b7c687db7 Remove dismissable = False from messages as it's the default 2018-12-11 12:46:05 +01:00
ChrisTerBeke
e52339a424 Fix typing for output_device param in cloud output controller 2018-12-11 12:44:37 +01:00
ChrisTerBeke
a766effce8 Fix typing for optional callback for on_progress 2018-12-11 12:43:43 +01:00
ChrisTerBeke
c07fea1405 Merge branch 'STAR-322_cloud-connection' of https://github.com/Ultimaker/Cura into STAR-322_cloud-connection 2018-12-11 12:39:56 +01:00
Daniel Schiavini
073e8cd6dc Merge branch 'master' of github.com:Ultimaker/Cura into STAR-322_cloud-connection 2018-12-11 12:39:02 +01:00
ChrisTerBeke
1cfc6d850a Merge branch 'master' into STAR-322_cloud-connection 2018-12-11 12:35:19 +01:00
Diego Prado Gesto
4c82f8b74f
Merge pull request #4967 from Ultimaker/ui_rework_4_0 
Merge the entire UI rework planned for the new redesign of Cura 4.0
 2018-12-11 12:17:55 +01:00
Diego Prado Gesto
1f26b55731
Merge pull request #4966 from Ultimaker/CL-1160_fix_materials_none_type 
CL-1160 Replace fix for 'None' materials
 2018-12-11 12:14:34 +01:00
Lipu Fei
2275e5c71f Refactor code to use constants in CuraConstants 
CURA-6005
 2018-12-11 12:13:46 +01:00
Lipu Fei
8e4ad23da1 Add CuraConstants 
CURA-6005

Put constant values into a separate file CuraConstants.py
 2018-12-11 12:12:35 +01:00
Diego Prado Gesto
4949f39c34 Add translatable strings to empty and unknown material 
Contributes to CL-1160.
 2018-12-11 12:10:32 +01:00
Daniel Schiavini
4fddf1b7c7 Merge branch 'STAR-322_cloud-connection' of github.com:Ultimaker/Cura into STAR-322_cloud-connection 2018-12-11 11:56:43 +01:00
Daniel Schiavini
d54fc4182b STAR-322: Fixing style errors 2018-12-11 11:56:36 +01:00
Lipu Fei
76b9fa7998 Use "cura" as i18n catalog for CuraDrive 
CURA-6005
 2018-12-11 11:53:52 +01:00
Diego Prado Gesto
70b0d16fa4 Fix typo 
Missing parenthesis.

Contributes to CL-1160.
 2018-12-11 11:53:26 +01:00
Ian Paschal
1c373b7205 Improve config override text 
Contributes to CL-1152
 2018-12-11 11:51:13 +01:00
Diego Prado Gesto
0d9a09797a Merge branch 'ui_rework_4_0' into CL-1160_fix_materials_none_type 2018-12-11 11:49:27 +01:00
Diego Prado Gesto
2b2e8ebb31 Add some safety checks when checking for the guid of the material 
Don't crash if the guid doesn't exist.

Contributes to CL-1160.
 2018-12-11 11:37:01 +01:00
ChrisTerBeke
4365b03b12 Merge branch 'STAR-322_cloud-connection' of https://github.com/Ultimaker/Cura into STAR-322_cloud-connection 2018-12-11 11:12:43 +01:00
ChrisTerBeke
816c6bd4ec Fixes after merging UI changes 2018-12-11 11:12:36 +01:00
Daniel Schiavini
7668801564 STAR-322: Adding documentation and fixing model types 2018-12-11 11:12:32 +01:00
Diego Prado Gesto
4b6f4af44e Close the expandable panel when it becomes disabled 
It happens when it's open and the user loads a GCode.

Contributes to CURA-5941
 2018-12-11 11:10:45 +01:00
Jaime van Kessel
f67ac8d7c4 Update far less agressively for the material models 
CURA-6016
 2018-12-11 10:59:17 +01:00
ChrisTerBeke
79430f9faf Merge branch 'ui_rework_4_0' into STAR-322_cloud-connection 2018-12-11 10:56:38 +01:00
Ian Paschal
0f357e1078 Replace fix for 'None' materials 
This was fixed in 4.0 and accidentally got reverted when merging another branch in.

Contributes to CL-1160
 2018-12-11 10:51:05 +01:00
Diego Prado Gesto
4dab33d41b Remove the fancy snowflakes pattern 2018-12-11 10:44:30 +01:00
Lipu Fei
9618e8d4e0 Add CuraDrive 1.2.0 to bundled_packages 
CURA-6005
 2018-12-11 10:39:41 +01:00
Lipu Fei
badf2962bc Change CuraDrive version to 1.2.0 
CURA-6005

Because the previously version is 1.1.1
 2018-12-11 10:34:03 +01:00
Diego Prado Gesto
f0257e2b79 Merge branch 'master' into ui_rework_4_0 2018-12-11 10:29:46 +01:00
Diego Prado Gesto
523e744527 Merge branch 'ui_rework_4_0' of github.com:Ultimaker/Cura into ui_rework_4_0 2018-12-11 10:29:29 +01:00
Diego Prado Gesto
77703e1fb8 Catch an exception from numpy that happens when loading some models 2018-12-11 09:58:23 +01:00
Jaime van Kessel
bb1950525a Limit the amount of times the buildplate rebuild is done 
CURA-6016
 2018-12-11 09:42:34 +01:00
Marijn Deé
fa7cab3246 Merge branch 'STAR-322_cloud-connection' of github.com:Ultimaker/Cura into STAR-322_cloud-connection 2018-12-11 09:27:48 +01:00
Marijn Deé
3b54cb4b24 Use the NetworkManagerMock, added tests for the other functions 2018-12-11 09:27:40 +01:00
Marijn Deé
99cfef6cdc Use the NetworkManagerMock, added tests for the other functions 2018-12-11 09:25:26 +01:00
Jaime van Kessel
909f36d28e Let the settingsMenu use the extruders of the active machine instead of the extruderModel 
The extruder model gets updated way to much (for all material changes) but we only need the
number and names of the extruders, since the other menu's do this by themselves
 2018-12-11 09:24:22 +01:00