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

17707 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Diego Prado Gesto
4949f39c34 Add translatable strings to empty and unknown material 
Contributes to CL-1160.
 2018-12-11 12:10:32 +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
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
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
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
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
Diego Prado Gesto
716fedc782 Use no text by default for the disabled state of the panels 
Contributes to CURA-5941.
 2018-12-10 17:06:51 +01:00
Jaime van Kessel
3132b1f689 Update the extruder Model a whole lot less 
CURA-6016
 2018-12-10 16:56:44 +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
Jaime van Kessel
1436301d78 Ensure setActiveExtruderIndex only gets called once when switching machines 
CURA-6016
 2018-12-10 16:20:00 +01:00
Lipu Fei
4e71af45d3
Merge pull request #4958 from Ultimaker/CURA-6018_fix_messages 
Fix styling of messages
 2018-12-10 15:53:04 +01:00
Diego Prado Gesto
4fc4aecf17 Avoid the overlapping of text when the name is too long 
Normally I happens in other languages other than English.
 2018-12-10 15:48:59 +01:00
Ian Paschal
0e19fa731f Codestyle 
Contributes to CL-1152
 2018-12-10 15:47:45 +01:00
Diego Prado Gesto
d318bb5c87 Merge branch 'master' into ui_rework_4_0 2018-12-10 15:41:28 +01:00
Diego Prado Gesto
11d8831d7a Use the capitalized version of the buildplate name 2018-12-10 15:40:18 +01:00
Diego Prado Gesto
1cd0d26db4 Change margins 
Instead of using multiplications and divisions, just use the corresponding margins.

Contributes to CURA-5876.
 2018-12-10 15:34:48 +01:00
Ian Paschal
04af8fbd50 Update MonitorConfigOverrideDialog.qml 
Contributes to CL-1152
 2018-12-10 15:33:16 +01:00
Jaime van Kessel
d495ec18bb Filter a bit more intelligently on when to check for errors 
CURA-6016
 2018-12-10 15:28:20 +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
Diego Prado Gesto
aa376e60da Make the disabled text translatable 
Contributes to CURA-5941.
 2018-12-10 14:45:11 +01:00
Diego Prado Gesto
590e8f5eb1 Wrap the disabled text in case it's too long. 
Contributes to CURA-5941.
 2018-12-10 14:41:15 +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
Diego Prado Gesto
437ba3848d Fix typo. Missing parenthesis 
Contributes to CURA-5941.
 2018-12-10 14:26:20 +01:00
Diego Prado Gesto
3f97f83c47 Add a disabled state to the expandable components 
In this case, when the component is disabled, there is an optional message that will show. It works for instance when loading a gcode and the print setup panel has to be disabled.

Contributes to CURA-5941.
 2018-12-10 14:17:56 +01:00
Diego Prado Gesto
90f822f683 Add the component header that I miss in a previous commit 
Contributes to CURA-5941.
 2018-12-10 13:44:50 +01:00
Diego Prado Gesto
154c6c1ff2 Change the color of the setting control button to be the same as for the small buttons 
Contributes to CURA-5941.
 2018-12-10 13:42:33 +01:00
Diego Prado Gesto
af37f51cf8 Make the expandable content header to be a common header for every expandable component. 
Contributes to CURA-5941.
 2018-12-10 13:36:06 +01:00
Jaime van Kessel
9d1701aacb Removed hardcoded color 
CURA-6013
 2018-12-10 13:29:58 +01:00
Lipu Fei
b745755a7d Remove TODO in ToolboxProgressButton 
CURA-6006

This file has been refactored.
 2018-12-10 13:22:38 +01:00
Lipu Fei
1487af167b Disable async loading for ToolboxDetailTile 
CURA-6006
 2018-12-10 13:20:38 +01:00
Jaime van Kessel
70b9a44ae4 Removed import of CuraVersion 
CURA-6013
 2018-12-10 13:04:02 +01:00
Ian Paschal
df4e5c40df Rename ClusterMonitorItem 
Contributes to CL-1152
 2018-12-10 12:19:52 +01:00
Diego Prado Gesto
dff364ee30 Change the panel to have also rounded rectangle in the top part 
Contributes to CURA-5941.
 2018-12-10 12:03:29 +01:00
Diego Prado Gesto
99890e61df Merge branch 'ui_rework_4_0' into CURA-6018_fix_messages 2018-12-10 11:43:35 +01:00
Diego Prado Gesto
e479772f4d Merge branch 'master' into ui_rework_4_0 2018-12-10 11:43:24 +01:00
Ian Paschal
8a856f13d2 Re-add config changes in monitor tab 
Contributes to CL-1152
 2018-12-10 11:36:51 +01:00