GitHub-Proxy/Cura
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/Ultimaker/Cura synced 2025-05-31 02:25:57 +08:00
Code Issues Packages Projects Releases Wiki Activity
18,863 Commits 294 Branches 267 Tags
Commit Graph

5896 Commits

Author SHA1 Message Date
ChrisTerBeke
47c6321e27 Merge branch 'master' into STAR-322_cloud-connection 2018-12-11 16:59:47 +01:00
Ian Paschal
1ababf38ad Use full printer name if no tag is known 
Contributes to CL-1173
 2018-12-11 16:42:44 +01:00
Daniel Schiavini
0467756ed6 STAR-322: Adding return type to init method 2018-12-11 16:01:52 +01:00
Ian Paschal
daeb86bdb1 Use short printer family tags 
Contributes to CL-1173
 2018-12-11 15:55:03 +01:00
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
Jaime van Kessel
75ff03f3c8 Use setState instead of emitting the backend state 
CURA-6016
 2018-12-11 13:13:20 +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
Daniel Schiavini
073e8cd6dc Merge branch 'master' of github.com:Ultimaker/Cura into STAR-322_cloud-connection 2018-12-11 12:39:02 +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
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
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
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
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
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
Daniel Schiavini
0357003e69 STAR-322: Testing encode independent 2018-12-10 21:47:06 +01:00
Ian Paschal
d43ba59b7c
Merge pull request #4959 from Ultimaker/CL-1152_config_change_monitor_tab 
CL-1152 config change monitor tab
 2018-12-10 16:43:57 +01:00
Daniel Schiavini
bfd236dae4 STAR-322: Testing cloud printing 2018-12-10 16:11:43 +01:00
Ian Paschal
0e19fa731f Codestyle 
Contributes to CL-1152
 2018-12-10 15:47:45 +01:00
Ian Paschal
04af8fbd50 Update MonitorConfigOverrideDialog.qml 
Contributes to CL-1152
 2018-12-10 15:33:16 +01:00
Ian Paschal
028d993bab Format .gcode.gz files too 
Contributes to CL-1152
 2018-12-10 15:27:51 +01:00
Ian Paschal
32f2b7ec1f Fix some warnings 
Contributes to CL-1152
 2018-12-10 15:05:01 +01:00
Ian Paschal
2db5d2b231 Add support for translation plurals 
Contributes to CL-1152
 2018-12-10 14:54:45 +01:00
Daniel Schiavini
d482924ea2 STAR-322: First tests for cloud output device 2018-12-10 14:43:02 +01:00
Ian Paschal
df0ae20dde Let's just get stepped up in here and get some personal space 
Contributes to CL-1152
 2018-12-10 14:39:15 +01:00
Lipu Fei
69744282e6 Fix rounding issue in toolbox QML widget size 
CURA-6006
 2018-12-10 14:38:40 +01:00
Lipu Fei
861deaa9f7 Add renderType native for toolbox QML Labels 
CURA-6006
 2018-12-10 14:38:33 +01:00
Ian Paschal
315bcf50c7 Get some personal space up in this personal space 
Contributes to CL-1152
 2018-12-10 14:31:49 +01:00
Aleksei S
c62cb84c75 Added CuraDirve plugin to Cura build 
CURA-6005
 2018-12-10 14:18:10 +01:00