Commit graph

7988 commits

Author SHA1 Message Date
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
ChrisTerBeke
284e4d47b8 Merge branch '3.0' into layerview-slider-refactor 2017-10-10 09:30:43 +02:00
ChrisTerBeke
91e8e5812b add back missing function 2017-10-10 09:24:48 +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
ChrisTerBeke
4c072d5070 Merge branch '3.0' into layerview-slider-refactor 2017-10-10 09:17:07 +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
9996c829d8 Only schedule re-slice when there is none in progress
CURA-4427

After the stack error check is done, only schedule a re-slice when there
is none in progress and a re-slice is needed.
2017-10-10 08:50:22 +02:00
Lipu Fei
b14ef41056 Increase the minimumHeight of the workspace summary dialog
CURA-4428
2017-10-10 08:30:18 +02:00
Lipu Fei
60726ce179 Increase minimumHeight of the Print Address dialog
CURA-4428
2017-10-10 08:24:47 +02:00
Lipu Fei
7ca2ae9771 Adjust alignments for ComboBoxes in MachineSettings dialog
CURA-4428
2017-10-10 08:20:39 +02:00
ChrisTerBeke
e7e5e86611 Finish layer slider label positions and cursor manipulation - CURA-4412 2017-10-09 17:00:03 +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
Diego Prado Gesto
1d70426224 onVisibilityChanged function removed because it's never called - CURA-4405 2017-10-09 16:36:48 +02:00
ChrisTerBeke
30a14dd7d6 Merge branch '3.0' into layerview-slider-refactor 2017-10-09 16:14:17 +02:00
ChrisTerBeke
f8a1187a8c Re-sending after cancelling print job now really works - CURA-4398 2017-10-09 16:14:02 +02:00
ChrisTerBeke
52eac6635f Improve layer slider label positions - CURA-4412 2017-10-09 16:11:50 +02:00
Lipu Fei
8a25605413 Fix lock issue with workspace dialog
CURA-4405

- Add try-except around lock release
- Fix closing the dialog with ESC
2017-10-09 15:17:56 +02:00
ChrisTerBeke
84ec494023 Merge branch '3.0' into layerview-slider-refactor 2017-10-09 14:59:00 +02:00
ChrisTerBeke
f8122320d4 Merge branch '3.0' of https://github.com/Ultimaker/Cura into 3.0 2017-10-09 14:49:48 +02:00
ChrisTerBeke
cbd0bcd1b5 Manually trigger upload finished callback after request finished - CURA-4398 2017-10-09 14:49:18 +02:00
A.Sasin
14936f7999 Merge branch '3.0' of github.com:Ultimaker/cura into 3.0 2017-10-09 14:24:43 +02:00
A.Sasin
97c107d011 Change log update for version 3.0.0 Beta 2017-10-09 14:23:52 +02:00