GitHub-Proxy/Cura
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/Ultimaker/Cura synced 2025-05-21 12:09:13 +08:00
Code Issues Packages Projects Releases Wiki Activity
11,395 Commits 290 Branches 260 Tags
Commit Graph

248 Commits

Author SHA1 Message Date
Ghostkeeper
dad99f5292
Merge branch 'master' into feature_local_container_server 
Contributes to issue CURA-4243.
 2017-11-29 13:06:08 +01:00
Ghostkeeper
8707396ad7
Remove isReadOnly functionality 
Everyone should now ask it from the container registry.

Contributes to issue CURA-4243.
 2017-11-28 17:30:00 +01:00
Ghostkeeper
147cbdf592
Clarify translations of 'unknown' 
For some languages, the gender matters.

Contributes to issue CURA-4601.
 2017-11-24 13:16:14 +01:00
Lipu Fei
78456d5bc3 Fix clusterSize property check in QML 2017-11-09 09:06:46 +01:00
Mark
1468c3aae5 move undefined/null check 2017-11-09 07:37:09 +01:00
Mark
fdcce1780e Also check if base.selectedPrinter is null 2017-11-08 19:24:09 +01:00
ChrisTerBeke
142ff4e9dc
Merge pull request #2669 from fieldOfView/feature_jogging 
Jogging
 2017-11-01 16:15:40 +01:00
fieldOfView
7a9dda4022 Disable jogging for UM3 
NetworkPrinterOutputDevice does not have the API to control jogging
 2017-10-30 14:46:31 +01:00
Mark
334283e893 Found some more margins that wouldnt be fixed numbers and made the code more consistent 2017-10-27 14:12:35 +02:00
fieldOfView
ff847aa329 Fix qml error when there is no connected printer 
Also fixes code style
 2017-10-25 11:52:43 +02:00
Diego Prado Gesto
6dfd04928f CURA-4485 Activate configuration option disabled in printers within a 
cluster.
Just allow when there is a cluster with just one printer.
 2017-10-24 14:51:35 +02:00
fieldOfView
a9f2ad7ca3 Hide manual controls for outputdevices that don't support it 2017-10-24 11:03:51 +02:00
Ghostkeeper
6c4c7fff4d
Use findContainersMetadata whenever possible 
This ensures that we only load those containers that we actually need the data of.

Contributes to issue CURA-4243.
 2017-10-20 15:09:45 +02:00
Diego Prado Gesto
40f548ba99 Merge branch 'CURA-4252_improve_zeroconf_service' 2017-10-17 13:02:58 +02:00
Lipu Fei
b55efdd70e Remove timeout = 0 for get_service_info 
CURA-4252
 2017-10-16 10:36:14 +02:00
Lipu Fei
7f944ff08b Improve zeroconf service changed handling 
CURA-4252

Use a separate thread to handle zeroconf service changed callbacks. If a
service info cannot be retrieved successfully, the request will be
rescheduled and tried again later.
 2017-10-12 15:26:17 +02:00
Ghostkeeper
08d475b7ac
Merge branch 'master' of github.com:Ultimaker/Cura 2017-10-12 14:59:13 +02:00
Ghostkeeper
e4a53da763
Merge branch '3.0' 
Contributes to issue CL-508.
 2017-10-12 14:56:30 +02:00
Lipu Fei
920c90010f Fix base.selectedPrinter is undefined problem 2017-10-12 14:54:01 +02:00
Ghostkeeper
eda61f1ff9
Merge branch 'update_printer_blocked_icon' into 3.0 2017-10-12 14:49:07 +02:00
Simon Edwards
8ed7918b60 Update the icon used to show that a printer is blocked. 
This applies to the printer status icons shown in the monitor tab when connected via Cura Connect.
 2017-10-12 14:02:19 +02:00
Simon Edwards
eef4d61402 Correct the status message when a printer needs a config change but is unreachable 
CL-508
 2017-10-12 13:44:03 +02:00
Simon Edwards
427afdbe23 Correctly set up the cluster output device instances with the cluster size 
This fixes the Cura Connect messages shown in the network printer selection dialog.

CL-555
 2017-10-12 12:41:21 +02:00
Simon Edwards
af3c34b6fd Don't let the user select unreachable printers in the Cura Connect monitor tab 
CL-584
 2017-10-12 10:46:25 +02:00
Diego Prado Gesto
2915199367 Avoid printer connection when the status is 'error' - CURA-3868 2017-10-11 15:55:30 +02:00
ChrisTerBeke
e97bdc526b Merge branch '3.0' 2017-10-11 14:13:57 +02:00
Ghostkeeper
c4339955b3
Merge branch '3.0' into CL-508_show_lost_connection_status 2017-10-11 14:05:10 +02:00
Ghostkeeper
bf1baa2791 Merge branch '3.0' of github.com:Ultimaker/Cura into 3.0 2017-10-11 14:04:17 +02:00
Simon Edwards
b68707d29c Show the printer unreachable status in the Cura Connect tab when needed. 
CL-508
 2017-10-11 13:52:45 +02:00
ChrisTerBeke
a5aa13f853 Merge pull request #2585 from Ultimaker/CL-555_manual_ip_connect_bug 
CL-555 Don't blow up at plugin start up due to the plugin path not being ready yet
 2017-10-11 12:40:50 +02:00
Simon Edwards
3c69442ceb Don't blow up at plugin start up due to the plugin path not being ready yet 
CL-555
 2017-10-11 11:54:00 +02:00
Ghostkeeper
3df98ecfc5
Change error/success messages for checking cluster-capability 
This breaks the string freeze. The developers of this plug-in are well aware. However, it turns out that for these two strings the string freeze had already broken. We'll change these strings first then translate them out of band. I hate this sort of menial administration that could've been prevented...

Contributes to issue CURA-4341.
 2017-10-11 11:10:08 +02:00
Ghostkeeper
d962ffb8d8
Merge branch '3.0' 2017-10-10 14:36:38 +02:00
ChrisTerBeke
e5c5f213a9 Fix info message when cluster has 0 machines 2017-10-10 12:58:43 +02:00
Lipu Fei
57b1cb3bc8 Refactor camera request fix 
CURA-4376

- Simplify the exception handling
- Use isFinished() to check the state of the network request
 2017-10-10 10:54:35 +02:00
Lipu Fei
d11b229118 Merge pull request #2575 from Ultimaker/CL-554_blue_color_in_monitor_tab 
CL-554 Make the blue color on the monitor tab consistent
 2017-10-10 10:53:35 +02:00
Simon Edwards
c6f4e263fb Make the blue color on the monitor tab consistent 
CL-554
 2017-10-10 10:49:04 +02:00
ChrisTerBeke
641b3c21f7 fix merge conflicts 2017-10-10 09:21:31 +02:00
A.Sasin
d1bee922ab Merge branch '3.0' of github.com:Ultimaker/cura into 3.0 2017-10-10 09:17:56 +02:00
A.Sasin
99d9961297 Cura crashed because of RuntimeError after switching between monitor and prepare view 
CURA-4376
 2017-10-10 09:16:35 +02:00
Lipu Fei
60726ce179 Increase minimumHeight of the Print Address dialog 
CURA-4428
 2017-10-10 08:24:47 +02:00
Simon Edwards
ebb8437bff Avoid using fractional pixel sizes and positions. It causes poor text rendering on Windows (and may be others) 2017-10-09 16:39:57 +02:00
Simon Edwards
0191215215 Let the printer state text wrap too 
CL-521
 2017-10-09 16:39:57 +02:00
ChrisTerBeke
f8a1187a8c Re-sending after cancelling print job now really works - CURA-4398 2017-10-09 16:14:02 +02:00
ChrisTerBeke
cbd0bcd1b5 Manually trigger upload finished callback after request finished - CURA-4398 2017-10-09 14:49:18 +02:00
Lipu Fei
f10397acf9 Always set finish flag when finalizing post_reply 
CURA-4398
 2017-10-09 12:38:18 +02:00
ChrisTerBeke
6c51034e5f Fix sending another file after aborting an upload - CURA-4398 2017-10-09 11:31:32 +02:00
Ghostkeeper
bc419370d0
Merge branch '3.0' 2017-10-06 16:02:13 +02:00
Jaime van Kessel
fddb829273 Added check to see if selectedPrinter is set 
CL-500
 2017-10-06 14:15:15 +02:00
Jaime van Kessel
a2dabc6442 Re-added elide properties that seem to have gone lost in re-work 
CL-521
 2017-10-06 13:51:18 +02:00