GitHub-Proxy/Cura
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/Ultimaker/Cura synced 2025-05-01 08:14:22 +08:00
Code Issues Packages Projects Releases Wiki Activity
15,727 Commits 291 Branches 260 Tags
Commit Graph

4532 Commits

Author SHA1 Message Date
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
Remco Burema
109b3fc1d2 [CURA-5677] Removed some superfluous and/or dead lines. 2018-09-11 09:08:50 +02:00
Jaime van Kessel
e7d9f0ce45 Added typing for various setting classes 2018-09-10 15:24:11 +02:00
Thomas Karl Pietrowski
5139e61475 Found the dead line while reading some code 2018-09-10 09:42:47 +02:00
Ian Paschal
2bc1e4b397 Fix bug where disovery window does not appear 2018-09-10 09:27:59 +02:00
Jaime van Kessel
5c6c299b27 Cleanup extruder manager 
Few more unused functions removed & simplified.
It also fixes a few more typing issues that I encountered.
 2018-09-07 17:06:18 +02:00
Jaime van Kessel
a8fc6aabcc Switch incorrect usage of getMachineExtruders to getActiveExtruderStacks 2018-09-07 16:27:56 +02:00
Remco Burema
c8eeb737bb Automatically stop simulation when the user manually changes the layer (as opposed to the sim. itself). [CURA-5677] 2018-09-07 15:45:31 +02:00
Jaime van Kessel
c7350ff579 Merge branch 'master' of github.com:Ultimaker/Cura 2018-09-07 15:24:09 +02:00
Jaime van Kessel
4cde6c05ae Switch most usages of containerStackId to containerStack for settingPropertyProvider 
This mostly makes the code a bit more logic and also decreases the number of searches in the registry
 2018-09-07 15:23:09 +02:00
Diego Prado Gesto
a9f151670e Remove unused components. They are no longer used. 2018-09-07 14:31:53 +02:00
Ian Paschal
18e0dacda4 Organize files better 
First things first... organize!
 2018-09-07 14:11:37 +02:00
Ian Paschal
49d72f5855
Merge pull request #4301 from Ultimaker/cura_connect_UI_rework 
CL-893 CL-894 Cura connect ui rework
 2018-09-07 12:45:56 +02:00
Ghostkeeper
b0e7562579
Rename VersionUpgrade plug-in from 40 to 35 
Because the next version is going to be called 3.5, not 4.0.
 2018-09-07 10:59:45 +02:00
Lipu Fei
d6046c725a Fix Toolbox QML null object warnings 
CURA-5670
 2018-09-07 09:29:31 +02:00
Ian Paschal
4cc1b6ce02 Add typings and fix code style 2018-09-06 16:57:45 +02:00
Lipu Fei
a8a88e5ccb Remove mistake changes in CuraEngineBackend 2018-09-06 16:06:45 +02:00
Lipu Fei
c36434ebdd Fix TestShortcutKeys 2018-09-06 16:06:45 +02:00
Jaime van Kessel
53d083e232 Merge branch 'master' of github.com:Ultimaker/Cura into cura_connect_UI_rework 2018-09-06 10:50:51 +02:00
Lipu Fei
a7f421c60c
Merge pull request #4097 from Ultimaker/fix_layer_number_width 
Adjust size of layer number depending on the maximum number of layers
 2018-09-06 09:50:32 +02:00
Mark
cfcf52d7c3 Center in parent and increase width. Fits good on Mac 2018-09-05 22:05:08 +02:00
Lipu Fei
b21200c6a8 Check for None before updating model 
CURA-5670
 2018-09-05 17:16:58 +02:00
Mark
68a62f1a66 Merge branch 'master' into fix_layer_number_width 2018-09-05 14:50:12 +02:00
Jaime van Kessel
57a7c3bcd2 Decrease margin for "manage queue" label 
CL-896
 2018-09-05 14:26:11 +02:00
Jaime van Kessel
534e60d8e1 Added pausing text for pausing state 
CL-896
 2018-09-05 14:22:41 +02:00
Jaime van Kessel
8e66686d6f Change "waiting" lable to "available" 
Cl-896
 2018-09-05 14:06:18 +02:00
Jaime van Kessel
23cd46824f Ensure that printer icon has disabled color if the printer is disabled 
CL-896
 2018-09-05 13:52:41 +02:00
Jaime van Kessel
5be65688a0 Change label to action required 
In some cases it's not a configuration change that's required, so this is a more correct label

CL-896
 2018-09-05 13:48:47 +02:00
Jaime van Kessel
7096c7382b Add width to labels in printcore qml object. 
This ensures that the elide works correctly

CL-896
 2018-09-05 13:43:24 +02:00
Jaime van Kessel
cd6832544b Fix for compatible_machine_families breaking for older firmwares 
Older firmwares didn't have the compatible_machine_families field yet.

Cl-894
 2018-09-05 13:17:33 +02:00
Jaime van Kessel
882cc000ac Move to top is now disabled for the first job 
CL-896
 2018-09-05 13:15:09 +02:00
Jaime van Kessel
1b9deb2790 Add unreachable label if a printer can not be reached inside a cluster 
CL-896
 2018-09-05 10:25:20 +02:00
Jaime van Kessel
7ad2e67074 Fix margins for active print job name in printer tile for cluster 
CL-896
 2018-09-05 10:09:44 +02:00
Jaime van Kessel
a0302684d6 Add handling for cluster print jobs that are in error state 
CL-896
 2018-09-05 10:06:37 +02:00
Jaime van Kessel
be4357c635 Show different state when printer is disabled 
CL-896
 2018-09-04 13:45:16 +02:00
Jaime van Kessel
132366fa61 Revert "Add enabled state to printer, so that it can be displayed." 
This reverts commit dd778f0450219cbc2f7309eeb08bc20065bd51af.
 2018-09-04 13:42:24 +02:00
Jaime van Kessel
dd778f0450 Add enabled state to printer, so that it can be displayed. 
This ensures that if a printer is set to "Not available", that the interface can correctly show it

CL-896
 2018-09-04 13:27:17 +02:00
Diego Prado Gesto
4098d4d289
Merge pull request #4313 from Ultimaker/CURA-5670_use_tags_to_define_showcase 
Build models using reserved tags
 2018-09-03 16:11:05 +02:00
Diego Prado Gesto
b638b2274a Count only the material packages by author, not all packages. 
Contributes to CURA-5670.
 2018-09-03 15:12:52 +02:00
Diego Prado Gesto
bf1d3b964f Skip loading a reply if it's not later handled. 
Contributes to CURA-5670.
 2018-09-03 14:30:05 +02:00
Jaime van Kessel
3969463758 Remove the old "not setup as group" notification 
CL-896
 2018-09-03 11:16:17 +02:00
Ghostkeeper
1136033f97
Remove superfluous check for 'ok T:' 
This check is never hit because if there is 'ok T:' in the bytes array then it will have hit the first check for 'ok ' and 'T:'.
 2018-09-03 10:50:07 +02:00
Jaime van Kessel
b7d7091de8 Add padding around the printer icons 
CL-893
 2018-09-03 10:26:27 +02:00
Jaime van Kessel
2e5b11af9d Fixed codestyle issue 
Switching between codestyles is hard :(
 2018-09-03 10:05:20 +02:00
Jaime van Kessel
fb1033ad99 Add the compatible machine families property to printerOutputModel 
This is used by the cluster to indicate by which families of printers the job can be displayed

CL-894
 2018-09-03 10:03:11 +02:00
Ian Paschal
988b9059b9 Fix code-style 
Contributes to CURA-5670
 2018-08-31 16:55:03 +02:00
Jaime van Kessel
98d0ad6c27 Add printer pill type to cluster monitor printer tile 
CL-896
 2018-08-31 16:47:26 +02:00