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

16106 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Tim Kuipers
6068ed10c1 JSON fix: connect_infill_polygons by default only when polygons can be connected via the outline. 
Also let the user be able to edit the setting in some more situations,
for example when choosing concentric infill when the infill_line_distance = nozzle_size
 2018-09-13 13:12:51 +02:00
Aleksei S
5db008f763 New duplicated favorite material will be added to favorite category 
CURA-5673
 2018-09-13 12:56:51 +02:00
Ghostkeeper
cc77632357
Merge branch 'master' into refactor_singleton_settingsbase 2018-09-13 11:52:13 +02:00
Lipu Fei
7a3e61e8f1 chmod a+x check_shortcut_keys.py 
CURA-5642
 2018-09-13 10:56:31 +02:00
Lipu Fei
e629ea89ff Improve shortcut check script 
CURA-5642

More information in the output.
 2018-09-13 10:55:37 +02:00
Lipu Fei
7ec62315e0 Remove shortcut for About 
CURA-5642

It has conflict with "&Add Printer".
 2018-09-13 10:54:46 +02:00
Ian Paschal
7226bc45b5 Monitor Tab - Queued header is properly aligned 
Contributes to CL-1052
 2018-09-13 10:35:31 +02:00
Diego Prado Gesto
6dc53cc60a Select the next selected material when it is activated or removed. 
Contributes to CURA-5682.
 2018-09-12 18:39:19 +02:00
Diego Prado Gesto
7e1a833e9c Merge branch '3.5' into CURA-5682_material_manager_leftovers 2018-09-12 17:12:40 +02:00
Lipu Fei
efdec50614 Fix typo 2018-09-12 17:08:58 +02:00
Ian Paschal
0b66bf0448 Monitor Tab - Use camera button on camera stream 
- Fixes: Video feed close button is always out of sight
- Makes improvement to camera icon

Contributes to CL-1049
 2018-09-12 17:07:10 +02:00
Lipu Fei
d1301d16a9 Skip the do-not-handle URLs instead of returning 
CURA-5718

The request-url dict is not ordered so you cannot garuantee the ordering
when you use .items(). This can cause a problem that if a do-not-handle
item occurs first then nothing will be handled at all.
 2018-09-12 16:58:22 +02:00
Diego Prado Gesto
3368428dbb Fix text field alignment. 
The color text field was too short in many cases, when the color name is
long.

Contributes to CURA-5682.
 2018-09-12 16:57:43 +02:00
Aleksei S
3da6e3c453 Set simulation path to 0 after updating layer 
CURA-5677
 2018-09-12 16:56:54 +02:00
Ian Paschal
08d5e48407 Monitor Tab - Create reusable button 
Contributes to CL-1049
 2018-09-12 16:52:26 +02:00
Ian Paschal
dccc95f817 Monitor Tab - Camera button toggles 
Contributes to CL-1049
 2018-09-12 16:46:18 +02:00
Diego Prado Gesto
e3f67f1147 Fix code style. 
Contributes to CURA-5682.
 2018-09-12 16:37:16 +02:00
Diego Prado Gesto
6183a07d76 Activate the material right after it was created or duplicated. 
Contributes to CURA-5682.
 2018-09-12 16:35:01 +02:00
Ian Paschal
0a01e7c25b Monitor Tab - Improved camera icon 
- Fixed: Camera icon is too small, and the icon does not look centred
- Fixed: No hover effect for the camera button

Contributes to CL-1049
 2018-09-12 16:31:59 +02:00
Diego Prado Gesto
921b11974c Improve the way the categories are highlighted. 
When a material is selected, but the brand or the type is collapsed,
those components are also highlighted to indicate the path to the
material.

Reuse the MaterialBrandSection also for the generic materials, that
allow us to only mantain one component.

Contributes to CURA-5682.
 2018-09-12 15:42:02 +02:00
Jaime van Kessel
ecc66fe05b Merge branch 'CURA-5672_fix_s5_extruder_start_end_locations' of github.com:Ultimaker/Cura into 3.5 2018-09-12 14:17:45 +02:00
Diego Prado Gesto
56dcc2dded Highlight the material that is currently selected. 
Contributes to CURA-5682.
 2018-09-12 14:09:29 +02:00
Lipu Fei
b27e5a1f77 Fix getActiveExtruderStacks() 
CURA-5719

The dict values can be a random list. We need to fetch the first N
extruders starting from position 0.
 2018-09-12 14:00:36 +02:00
Jaime van Kessel
c59ff82c64 Revert "[CURA-5708] Hide the Materials-tab in ToolBox (v3.5 only)" 
This reverts commit f9585b5fae9cdd3f56dc8d8b04f28db5fcf15434.
 2018-09-12 13:39:10 +02:00
Jaime van Kessel
00494d8301 Merge branch '3.5' of github.com:Ultimaker/Cura 2018-09-12 13:38:56 +02:00
Jaime van Kessel
e22a47462e Merge branch 'master' of github.com:Ultimaker/Cura 2018-09-12 13:38:31 +02:00
Remco Burema
f9585b5fae [CURA-5708] Hide the Materials-tab in ToolBox (v3.5 only) 2018-09-12 13:38:15 +02:00
Lipu Fei
e069e0db99 Fix S5 extruder start and end locations 
CURA-5672

X coordinate 310 is not at the rightmost position, and this causes the
prime tower to start printing from somewhere in the middle.
 2018-09-12 13:18:43 +02:00
Ian Paschal
e51089a880 Mointor Tab - CL-1046 Make fonts bold 2018-09-12 13:03:12 +02:00
Diego Prado Gesto
6d2492e5cb Remove spurious signal, it does the same as materialsUpdated. 
Contributes to CURA-5682.
 2018-09-12 12:59:13 +02:00
Ghostkeeper
d7649f9ee4
Print buffer filling rate rather than time frame 
The filling rate is more interesting. It's our input.
 2018-09-12 11:54:35 +02:00
Diego Prado Gesto
f298d37134 WIP: Moving current selected material to the material list instead of 
the page.

Change all the previous references to the currentItem in the page.
Automatically and correctly select the element that is selected in the
extruder.

Contributes to CURA-5682.
 2018-09-11 22:12:54 +02:00
Diego Prado Gesto
9ba4c723f7 Fix the linked materials button. 
Contributes to CURA-5682.
 2018-09-11 22:07:14 +02:00
Diego Prado Gesto
a909c8f029 Don't emit signal if the favorite list didn't change. 
Contributes to CURA-5682.
 2018-09-11 22:05:39 +02:00
Ian Paschal
e7704ede3c Monitor Tab - Fix queue/manage queue alignment 
Contributes to CL-1052
 2018-09-11 17:01:26 +02:00
Jaime van Kessel
a809575bc8 Add bunch of ID's to qml components so it's easier to test them. 
CURA-5618
 2018-09-11 16:05:53 +02:00
Jaime van Kessel
f628b63c29 Merge branch '3.5' of github.com:Ultimaker/Cura 2018-09-11 15:50:26 +02:00
Diego Prado Gesto
e3681ddd9f Also hack the way to get the generic materials, since the tag-filtered 
calls to the api don't work yet.

Contributes to CURA-5670.
 2018-09-11 13:39:53 +02:00
Jaime van Kessel
301605c30c Added missing typing to toolbox 2018-09-11 13:20:42 +02:00
Jaime van Kessel
4f30dffaf9 Ensure that when a corrupt 3mf file is loaded, the "failed to load" message will pop up 2018-09-11 12:58:00 +02:00
Lipu Fei
1fb6441327 Fix default hardware type NOZZLE in XML material 
CURA-5716
 2018-09-11 11:20:00 +02:00
Jaime van Kessel
c84a2213a7 Merge branch '3.5' of github.com:Ultimaker/Cura 2018-09-11 11:01:55 +02:00
Jaime van Kessel
d9e23bf02b Fix issue caused by making metadata of containerNode private 2018-09-11 10:42:42 +02:00
Jaime van Kessel
8a6c4a9fb6 Merge branch 'CURA-5677_auto_stop_sim_on_layer_change' of github.com:Ultimaker/Cura into 3.5 2018-09-11 10:40:01 +02:00
Jaime van Kessel
e717fa2251 Fix issue caused by making metadata of containerNode private 2018-09-11 10:36:53 +02:00
Ian Paschal
ac5a038065 Monitor Tab - Fix syntax error 
Contributes to CL-1048
 2018-09-11 10:27:50 +02:00
Diego Prado Gesto
19eefc71da Update SDK version for the bundled packages. 2018-09-11 09:38:23 +02:00
Diego Prado Gesto
bacae6c136 Update name of the VersionUpgrade for the version 3.5. 2018-09-11 09:38:23 +02:00
Diego Prado Gesto
1c4dddd8e2 Merge branch 'stelgenhof-master' 2018-09-11 09:20:06 +02:00
Diego Prado Gesto
ff8cbfa899 Merge branch 'master' of git://github.com/stelgenhof/Cura into stelgenhof-master 2018-09-11 09:19:18 +02:00