3D-printing/Cura
1
0
Fork 0
mirror of https://github.com/Ultimaker/Cura.git synced 2025-07-14 02:07:51 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 2
18800 commits 302 branches 270 tags 770 MiB
Commit graph

1151 commits

Author SHA1 Message Date
Diego Prado Gesto
e706020639 Improve the text when there is no configuration available 
It can happen that the list is empty because the data is still coming or because the connection has been lost.

There are also some improvements in the link to the compatibility chart. Now the two external links in Cura have the same behaviour.

Contributes to CURA-6011.
 2019-01-11 14:44:49 +01:00
Ian Paschal
616d5a1f43 Update MonitorPrintJobCard.qml 
Contributes to CL-1165
 2019-01-11 10:43:50 +01:00
ChrisTerBeke
32ad50864e
Merge pull request #5029 from Ultimaker/STAR-347_update_cura_connect_models 
Star-347: Update Cura Connect models
 2019-01-10 17:46:26 +01:00
Ian Paschal
8d76bd8678 Small clean-up of log warnings 
Contributes to CL-1165
 2019-01-10 16:04:57 +01:00
Ian Paschal
3377ed0e6e Remove some unused code 
Contributes to CL-1165
 2019-01-10 15:55:25 +01:00
Ian Paschal
612b0d0165 Reset pop-up orientation if it moved 
Contributes to CL-1165
 2019-01-10 15:54:58 +01:00
ChrisTerBeke
36191fbe0f Fix typevar typing issue 2019-01-10 15:36:12 +01:00
Ian Paschal
292d04f3ea Remove transitions which caused graphical glitches 
Contributes to CL-1165
 2019-01-10 15:27:31 +01:00
Ian Paschal
9c711cc8aa Pop-up flips directions 
Contributes to CL-1165
 2019-01-10 15:27:04 +01:00
ChrisTerBeke
56f0a341bc Fix merge conflicts 2019-01-10 15:17:53 +01:00
ChrisTerBeke
764769f4bb Merge branch '4.0' into STAR-322_cloud-connection 2019-01-10 09:48:48 +01:00
Ian Paschal
0622c5cb8b Rename MonitorPrinterContextMenu to MonitorContextMenu 2019-01-10 09:22:27 +01:00
Ian Paschal
8831ba04e1 Fix missing extruder number 2019-01-09 17:05:10 +01:00
Ian Paschal
669f6d8f0c Fix available space bug 
Contributes to CL-1165
 2019-01-09 17:04:51 +01:00
Ian Paschal
548882e398 Use new context menu 
Contributes to CL-1165
 2019-01-09 17:04:33 +01:00
Ian Paschal
cdc24081a5 Create MonitorPrinterContextMenu.qml 
Contributes to CL-1165
 2019-01-09 17:03:56 +01:00
Ian Paschal
5a15ffc090 Create MonitorContextMenuButton.qml 
Contributes to CL-1165
 2019-01-09 17:03:41 +01:00
Ian Paschal
5a78eb0541 Temporarily disable context menu and camera button 
Contributes to CL-1165
 2019-01-09 16:32:26 +01:00
Ian Paschal
4248deeb76 Line-length fixes 2019-01-09 16:31:49 +01:00
Ian Paschal
f6c754c57f Remove PropertyAnimation test 2019-01-09 16:31:26 +01:00
Ian Paschal
4ce244362c Make camera button grey if disabled 
Contributes to CL-1165
 2019-01-09 16:30:39 +01:00
Ian Paschal
920b7b6706 Create MonitorInfoBlurb.qml 
Contributes to CL-1165
 2019-01-09 16:30:11 +01:00
Ian Paschal
e7b60a5290 Create GenericPopUp.qml 
Contributes to CL-1165
 2019-01-09 16:29:57 +01:00
ChrisTerBeke
edf64bef85 Merge branch '4.0' into STAR-322_cloud-connection 2019-01-09 10:45:49 +01:00
Ian Paschal
97e17d9fb8 Remove debug behavior 
Contributes to CL-1157
 2019-01-08 15:17:42 +01:00
Ian Paschal
8f37b65ffe Add skeleton loading to print job queue 
Contributes to CL-1157
 2019-01-08 15:15:21 +01:00
Ian Paschal
e81742d296 Add skeleton loading to printer cards 
Contributes to CL-1157
 2019-01-08 14:27:54 +01:00
ChrisTerBeke
b8da720c1d Move translations in-line 2019-01-08 13:10:42 +01:00
ChrisTerBeke
485b471522 Fix some review comments 2019-01-08 12:19:00 +01:00
ChrisTerBeke
7c7bca31c7 Fix renamed property connectionType 2019-01-08 11:52:27 +01:00
ChrisTerBeke
a6114d39e4 Fix merge conflicts with 4.0 2019-01-08 11:49:36 +01:00
Ian Paschal
4dbab88792 Add dummy printer for loading 2019-01-07 13:56:04 +01:00
Ian Paschal
18545e18ce Merge remote-tracking branch 'origin/4.0' into CL-1157_skeleton_loading_monitor_tab 2019-01-07 13:38:23 +01:00
Jaime van Kessel
4c1f68a447 Ensure that the connectiontype of a connected printer is set correctly 
CURA-6011
 2019-01-04 15:24:01 +01:00
Jaime van Kessel
1973397b92 Remove confusing printer preference text 
CURA-6003
 2019-01-03 15:34:41 +01:00
Jaime van Kessel
e769b324e1 Merge branch 'CURA-6035_send_materials_fix' of github.com:Ultimaker/Cura into 4.0 2019-01-03 11:41:05 +01:00
Lipu Fei
d97b812ccd
Merge branch '4.0' into unify_font_types 2019-01-03 10:46:49 +01:00
Lipu Fei
ee72284616 Use appropriate log level 
CURA-6035
 2019-01-03 08:32:42 +01:00
Jaime van Kessel
a16e406507 Properly display the full type + brand of unknown material 
CURA-6033
 2018-12-31 11:01:30 +01:00
Ghostkeeper
b54312fb9b
Merge branch '4.0' into unify_font_types 2018-12-28 15:51:54 +01:00
Marijn Dee
12a4a5e9f5 Fixing the rest of the automatic test failures 2018-12-21 15:06:02 +01:00
Marijn Dee
131211e604 Fixed the unit tests 2018-12-21 09:42:28 +01:00
ChrisTerBeke
5403f5241b Fix not registering cloud output device for every machine 2018-12-20 17:21:07 +01:00
Marijn Dee
9d27c29c8c Fixed indentation and relative import, tests still fail though 2018-12-20 17:04:17 +01:00
Marijn Dee
403010aa90 Mirrored the changes made to the models in Commons 2018-12-20 16:32:00 +01:00
ChrisTerBeke
af2061cd52 Simplify some checks for connection types and group size 2018-12-20 14:26:30 +01:00
Lipu Fei
346d8d884e Remove unnecessary patches in TestSendMaterialJob 
CURA-6035
 2018-12-20 14:23:39 +01:00
Lipu Fei
e79f312fa0 Fix unit tests for SendMaterialJob 
CURA-6035
 2018-12-20 14:20:34 +01:00
ChrisTerBeke
2f92f6ef50 Simplify checking if cloud or network printer, small fixes 2018-12-20 13:45:59 +01:00
Lipu Fei
68372aff60 Use MaterialManager in SendMaterialJob 
CURA-6035
 2018-12-20 10:45:40 +01:00