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

2707 Commits

Author SHA1 Message Date
Ghostkeeper
b119119ed2
Merge branch '3.0' 2017-10-18 13:09:38 +02:00
Ghostkeeper
4d0c0f606e
Use new version for downloading plugins 2017-10-17 16:44:27 +02:00
Diego Prado Gesto
40f548ba99 Merge branch 'CURA-4252_improve_zeroconf_service' 2017-10-17 13:02:58 +02:00
Lipu Fei
f4718162d3 Merge remote-tracking branch 'upstream/3.0' 2017-10-16 15:01:15 +02:00
Lipu Fei
8ef918829f Fix quality profile upgrade for UM2 family 2017-10-16 15:00:29 +02:00
Lipu Fei
38b9df80f3 Merge remote-tracking branch 'upstream/3.0' 2017-10-16 14:54:40 +02:00
Lipu Fei
aa7b456594 Fix custom quality profile upgrade for UM2 family 
The custom quality profiles for the UM2 family used to be saved as
profiles for "fdmprinter". They now should be updated to set for
"ultimaker2".
 2017-10-16 13:59:22 +02:00
alekseisasin
eebe4028ff Merge pull request #2610 from fieldOfView/fix_machinesettings_backend_crash 
Fix crash when exiting Machine Settings
 2017-10-16 13:46:03 +02:00
Lipu Fei
b55efdd70e Remove timeout = 0 for get_service_info 
CURA-4252
 2017-10-16 10:36:14 +02:00
Lipu Fei
7e0014eadd Create machine name-to-id map at runtime instead of using a hard-coded map 
CURA-4223
 2017-10-16 10:28:06 +02:00
fieldOfView
ad1c0046d9 Fix crash when exiting Machine Settings 
fixes #2609
 2017-10-15 11:54:49 +02:00
Ghostkeeper
4627c728b2
Merge branch '3.0' 2017-10-12 17:10:22 +02:00
Ghostkeeper
cfcb47234c
Add cross infill to the change log 
Contributes to issue CURA-4391 and CURA-4095.
 2017-10-12 17:10:04 +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
Ghostkeeper
e6f613248c
Merge branch 'CL-508_correct_status_msg_when_disconnected' into 3.0 2017-10-12 14:48:36 +02:00
Ghostkeeper
56ccc2e8b8
Merge branch 'CL-555_fix_incorrect_msg_in_discovery' into 3.0 2017-10-12 14:45:11 +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
A.Sasin
624aca324e Updated changelog, except Cross infill 
CURA-4391
 2017-10-12 13:42:21 +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
Lipu Fei
052ea7d90a Force use and update the job name with the loaded project file 
CURA-4348

- If no project is loaded beforehand and then a model file is loaded,
  the job name should be determined with the current machine name and
  the first loaded model name.
- If a project is loaded, the job name should be the same as the project
  name, and it should not change until another project is loaded.
 2017-10-12 07:59:43 +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
ChrisTerBeke
496791db7f simplify updating max layers changed - CURA-4432 2017-10-11 11:55:54 +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
Lipu Fei
0e7f209efa Fix updating upper handle in layer view 
CURA-4432
 2017-10-11 11:46:22 +02:00
ChrisTerBeke
ea01d6ad01 Set focus on text field when slider handle is active - CURA-4432 2017-10-11 11:13:04 +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
ChrisTerBeke
a7368e1751 Re-added active handler functionality in layer slider - CURA-4432 2017-10-10 17:12:13 +02:00
A.Sasin
2cdec7e47f Merge branch 'layerview-slider-refactor' 
CURA-4412
 2017-10-10 16:22:29 +02:00
A.Sasin
ed8e5309b5 Remove Comment TODO 
CURA-4412
 2017-10-10 16:20:17 +02:00
Ghostkeeper
d962ffb8d8
Merge branch '3.0' 2017-10-10 14:36:38 +02:00
ChrisTerBeke
c17493af3e Remove untrue comment line 2017-10-10 14:23:57 +02:00
ChrisTerBeke
a2520b6b56 Fix maximum value range handle drag movement - CURA-4412 2017-10-10 14:13:32 +02:00
ChrisTerBeke
e5c5f213a9 Fix info message when cluster has 0 machines 2017-10-10 12:58:43 +02:00
Lipu Fei
245eec9314 Hide settings visibility row if it is not in preferences 
CURA-4344

Hide the row which shows the number of settings that are visible on the
project file loading dialog if this information is not available.
 2017-10-10 11:31:37 +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
Lipu Fei
666ee81fb3 Set label width based on the column width 
CURA-4428

- Remove the magic number solution
- Use a fixed width for labels so the right side widgets can be properly
  left-aligned.
 2017-10-10 10:28:46 +02:00
ChrisTerBeke
0b5fac28b9 fix merge conflicts 2017-10-10 09:43:16 +02:00