GitHub-Proxy/Cura
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/Ultimaker/Cura synced 2025-06-04 11:14:21 +08:00
Code Issues Packages Projects Releases Wiki Activity
16,749 Commits 295 Branches 268 Tags
Commit Graph

16749 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
fieldOfView
71d365c0c6 Fix case where Cura and the firmware could be waiting for eachother 2018-10-19 14:37:20 +02:00
Lipu Fei
97e6354c13 Fix material update upon extruder-compatible diameter change 
CURA-5834

Material models and the material container on an extruder need to be
updated when the extruder's compatible diameter gets changes.
 2018-10-19 13:48:52 +02:00
Diego Prado Gesto
6f12197cea Don't use an image to create a mask but a circle. 
Contributes to CURA-5772.
 2018-10-19 13:41:32 +02:00
Aleksei S
22db3cb32b Show retraction for G92 command 
CURA-5769
 2018-10-19 13:18:42 +02:00
Lipu Fei
ea10d5e608 Rename to comptabileMaterialDiameter 
CURA-5834

This property returns the material diameter an extruder is compatible
with, so this makes it more clear.
 2018-10-19 11:36:12 +02:00
Lipu Fei
afa3e62dc1
Merge pull request #4615 from Ultimaker/CURA-5814_Material_cost_now_always_shown 
CURA-5814 material cost now always shown
 2018-10-19 11:20:29 +02:00
Lipu Fei
537108032e Fix typing in PrinterOutputModel 
CURA-5812
 2018-10-19 09:58:06 +02:00
Lipu Fei
0e772beb14 Fix typing in MachineActionManager 
CURA-5812
 2018-10-19 09:58:06 +02:00
Lipu Fei
59704e4c0e Make sure that a machine's default actions are added before it gets activated 
CURA-5812
 2018-10-19 09:58:06 +02:00
Lipu Fei
c67abb61a8 Remove unused argument "index" in addFirstStartAction() 
CURA-5812
 2018-10-19 09:58:06 +02:00
Lipu Fei
6dc01d4c08 Add typing for MachineActionsManager 
CURA-5812
 2018-10-19 09:58:06 +02:00
Lipu Fei
c1b9d527bb Add typing for MachineAction 
CURA-5812
 2018-10-19 09:58:06 +02:00
Lipu Fei
9b94db8957 Directly use empty containers in MachineManager 
CURA-5812

Instead of looking up for the empty containers via ContainerRegistry,
import and use them directly.
 2018-10-19 09:57:57 +02:00
Lipu Fei
e5efd1e41f Move constant definition into constructor 
CURA-5812
 2018-10-19 09:57:57 +02:00
Ghostkeeper
2eb9b111fc
Fix changing flow rate in dual extrusion 
This potentially set the flow rate to -1, since it was changing the flow rate to the old['flowrateTwo'] which was left at -1 since initialisation because it didn't update here.
 2018-10-19 09:55:23 +02:00
THeijmans
2512800340 Support - Brim interactions 
Enable Support - brims and disable 'brim replaces support' for all support materials.
 2018-10-19 09:25:13 +02:00
Ghostkeeper
9aa7b76dbe
Update change log with 3.5.1 changes 
Too little, too late. But at least you'll be able to look back on it.
 2018-10-19 07:55:39 +02:00
Diego Prado Gesto
54f32a1d82 Merge branch 'ui_rework_4_0' into cura4.0_header 2018-10-18 19:33:39 +02:00
Diego Prado Gesto
405e4c5bbd Correct year, we live now in 2018 (keep it in mind) 
Contributes to CURA-5772.
 2018-10-18 17:52:42 +02:00
Diego Prado Gesto
66147f4172 Remove unused style button. 
Contributes to CURA-5772.
 2018-10-18 17:49:56 +02:00
Diego Prado Gesto
176c7bfc22 Small fixes in the CustomConfigurationSelector file 
Contributes to CURA-5772.
 2018-10-18 17:48:03 +02:00
Diego Prado Gesto
bf6817ce7a Reduce the size of the ApplicationMenu.qml file by moving some 
components out to different files.

Contributes to CURA-5772.
 2018-10-18 17:38:23 +02:00
Ghostkeeper
7b140277d6
Code style: Brackets on new line 2018-10-18 17:27:15 +02:00
Diego Prado Gesto
84adfa14ee Add license to the top of a file 
Contributes to CURA-5772.
 2018-10-18 17:26:10 +02:00
Ghostkeeper
4e54f13145
Move shortcut keys test to CMake 
So that when you run tests locally, you also test this one.
 2018-10-18 17:22:57 +02:00
Ghostkeeper
05c2349411
No longer run setting visibility script 
It no longer exists.

Contributes to issue CURA-5734.
 2018-10-18 17:15:28 +02:00
Diego Prado Gesto
93b04190f8 Change name of some components to make them more indicative of what they 
do.

Contributes to CURA-5772.
 2018-10-18 17:13:15 +02:00
Diego Prado Gesto
8df3eb33d4 Minor changes: remove empty lines, small changes in the anchors, ... 
Contributes to CURA-5772.
 2018-10-18 16:51:32 +02:00
Diego Prado Gesto
1cc7e0e586 Set the height of the stage menu in the theme instead of hardcoded. 
I also adjusted a bit the design to fulfill the requirments from UX/UI
team.

Contributes to CURA-5772.
 2018-10-18 16:33:13 +02:00
Diego Prado Gesto
fdfa81b2b8 Make some items' size dependent on parent's. Also make the ActionButton 
more themable.

Contributes to CURA-5784.
 2018-10-18 16:06:21 +02:00
fieldOfView
777470db7f Don't force sending M105 requests without OK 
This prevents serial buffer overflow on the printer.
 2018-10-18 15:47:25 +02:00
Diego Prado Gesto
0a07f48375 Fix typo in a theme's key. 
Contributes to CURA-5784.
 2018-10-18 15:38:24 +02:00
fieldOfView
f4c88aff0f Merge branch 'master' into fix_marlin_press_to_resume 2018-10-18 15:35:57 +02:00
Diego Prado Gesto
119638efa1 Adjust outline color for the avatar image. Following the colors in the 
designs.

Contributes to CURA-5784.
 2018-10-18 15:35:21 +02:00
Diego Prado Gesto
b82dacbe19 Merge branch 'cura4.0_header' of github.com:Ultimaker/Cura into cura4.0_header 2018-10-18 15:19:07 +02:00
Diego Prado Gesto
237c360a88 The size of the avatar image is now themed. 
Some other small fixes in the AccountDetails componenent were done.

Contributes to CURA-5784.
 2018-10-18 15:18:00 +02:00
Ghostkeeper
3888d79b34
Merge branch 'CURA-5734-rework-and-unit-test-setting-visibility-preset' 2018-10-18 14:59:41 +02:00
Ghostkeeper
db0da61506
Forbid interpolation in setting visibility preset files 
We might use characters that collide with this.

Contributes to issue CURA-5734.
 2018-10-18 14:54:20 +02:00
Ghostkeeper
1bcd134f85
Fix code style 
Most stuff here was recently changed. Some of it was where I found a pattern in something that was likely copy-pasted from somewhere else, so I did a global search and replace on that.

Contributes to issue CURA-5784.
 2018-10-18 14:30:33 +02:00
Diego Prado Gesto
a4c609d514 Remove email label from the account widget. 
It's not needed and it's not currently public data that is published
with the user token.

Contributes to CURA-5784.
 2018-10-18 14:28:00 +02:00
Diego Prado Gesto
11693aad36 Change the behaviour of the Popup, that now closes when clicking the 
widget if it is open.

Contributes to CURA-5784.
 2018-10-18 09:51:42 +02:00
Diego Prado Gesto
54554bff89 Adjust colors to work with dark theme. 
Contributes to CURA-5784.
 2018-10-18 09:51:04 +02:00
ChrisTerBeke
38b615c734
Update OAuth2 scopes 
Part of STAR-273.
 2018-10-17 17:43:04 +02:00
Ian Paschal
1ad008f45c Style improvements 
Contributes to CL-897 and CL-1051
 2018-10-17 16:32:30 +02:00
Diego Prado Gesto
7fb72a1a58 Change Skeleton folder name to MainWindow. 
This folder is intended to store the files that construct the main
window. All the parts. The rest of the components are stored in more
specific folders.

Contributes to CURA-5784.
 2018-10-17 16:13:43 +02:00
Diego Prado Gesto
b670cd82c4 Merge branch 'master' into cura4.0_header 2018-10-17 16:10:45 +02:00
Jaime van Kessel
907ecc54bd Use the material weight as fallback 
CURA-5814
 2018-10-17 14:49:03 +02:00
Ian Paschal
6f33c4410c Review tweaks 
Contributes to CL-897 and CL-1051
 2018-10-17 14:39:42 +02:00
Ian Paschal
2dcfc049ba Remove skeleton loading after print jobs received 
Contributes to CL-1051
 2018-10-17 14:28:17 +02:00
Jaime van Kessel
3ad113f70f Added some missing typing. 
Since i was changing some stuff here, i better leave it more typed as I found it.

CURA-5814
 2018-10-17 14:14:12 +02:00