ChrisTerBeke
47e5303a89
Catch situations where backend is not correctly set
2017-12-14 15:16:17 +01:00
ChrisTerBeke
c056fcb23d
Fix monitor sidebar machine selection - CURA-4234
2017-12-14 14:58:51 +01:00
Jack Ha
cda6aa2547
CURA-4234 splitted MachineSelection into a separate file and add it to PrintMonitor as well, because now it's part of the sidebar
2017-12-14 14:49:18 +01:00
Aleksei S
497bc756b7
Merge branch 'master' into CURA-4234_expand_collapse
2017-12-14 09:42:05 +01:00
Jack Ha
f3a6f50e2c
CURA-4234 fix topbar resize issues and removed hard coding numbers
2017-12-13 16:47:38 +01:00
Aleksei S
88af41769e
Check multiple models with non_printing settings
...
CURA-4703
2017-12-13 16:04:01 +01:00
Jack Ha
a44cea7ac6
Update log line
2017-12-13 14:48:25 +01:00
Jack Ha
3605edc565
CURA-4234 remove debugging logline
2017-12-13 14:16:35 +01:00
Jack Ha
63eec848fc
CURA-4234 view mode button now also moves with the sidebar
2017-12-13 14:15:27 +01:00
Jack Ha
4519f9b46a
CURA-4234 rename to cura/sidebar_collapse, fix spelling errors, styling
2017-12-13 14:04:02 +01:00
Jack Ha
80afda1912
Merge branch 'master' into CURA-4234_expand_collapse
2017-12-13 13:53:35 +01:00
Jack Ha
bae2193bfb
Merge branch 'master' of github.com:Ultimaker/Cura
2017-12-13 13:39:22 +01:00
Jack Ha
19b56404c6
Fix empty quality slider on start.
...
It seemed that:
- MachineManager was not connected to all the correct signals
- After connecting to the correct signal, ProfilesModel was not yet updated when looping over it in SidebarSimple
Because ProfilesModel's constructor already requests the MachineManager, we cannot do connect itemsChanged the way around as well.
CURA-4707
2017-12-13 13:33:05 +01:00
Ghostkeeper
9ea0119011
Rename 'exception' to 'error'
...
Error is a less technical term, so it's more user friendly.
2017-12-13 12:58:24 +01:00
Lipu Fei
6e6dc493f1
Fix material loading for unknown names
2017-12-13 12:27:55 +01:00
Aleksei S
c6c4c5be34
Merge branch 'master' of github.com:Ultimaker/cura
2017-12-13 12:03:06 +01:00
Aleksei S
5c5f08e9ca
Do not slice a model if it is only one on a build plane and has setting from non_printing_mesh
...
CURA-4703
2017-12-13 11:58:59 +01:00
Lipu Fei
7cd3449781
Fix material loading
2017-12-13 11:26:16 +01:00
Lipu Fei
e14d78b32a
Generate more possible machine IDs in XML material profile
2017-12-13 10:16:06 +01:00
Jack Ha
e10ba065ca
CURA-4707 better signal to connect solving this issue
2017-12-12 17:06:23 +01:00
Jack Ha
a85bea4bae
CURA-4707 fix extruder setting not triggering reslice
2017-12-12 16:37:21 +01:00
Jack Ha
f28846acb9
Merge branch 'master' into CURA-4234_expand_collapse
2017-12-12 15:43:32 +01:00
Aleksei S
3516d01f3d
Move back machine selection
...
CURA-4234
2017-12-12 15:30:19 +01:00
Diego Prado Gesto
d70bd0ebc9
CURA-4649 Blocking printers that have localhost IP address.
2017-12-12 13:45:35 +01:00
Aleksei S
6968c089db
Add sidebar_collapse to the saved preferences, typos, move back machine selection to the top bar
...
CURA-4234
2017-12-12 11:26:17 +01:00
ChrisTerBeke
ca413e0496
Add extra checks to ensure backend exists, use same state everywhere
2017-12-12 11:16:40 +01:00
ChrisTerBeke
19e459d930
Merge branch 'master' of https://github.com/Ultimaker/Cura
2017-12-12 10:55:05 +01:00
ChrisTerBeke
84aa9367c7
Cleanup
2017-12-12 10:54:54 +01:00
Aleksei S
fb91edd7eb
Solve arrange and multiply models issue
...
CURA-4703
2017-12-12 10:43:19 +01:00
Aleksei S
00529f37d9
After sidebar expanding the builplate stays in center of the screen
...
CURA-4234
2017-12-11 18:51:53 +01:00
Ghostkeeper
75df653d47
Merge branch 'feature_local_container_server'
2017-12-11 15:51:17 +01:00
Aleksei S
300f29e11b
Add expand button to menu
...
CURA-4234
2017-12-11 15:30:13 +01:00
Lipu Fei
c6cdc1d1db
Container cfg files need to be parsed without interpolation
...
CURA-4701
2017-12-11 14:35:27 +01:00
Aleksei S
a5cb4cd316
Expand/Collapse sidebar
...
CURA-4234
2017-12-11 10:53:48 +01:00
Ghostkeeper
097cc72d89
Document why we're only returning full profiles
...
It's a limitation of the quality manager that would require major refactoring there to fix.
Contributes to issue CURA-4243.
2017-12-11 09:44:56 +01:00
Ghostkeeper
430f3dad27
Use GlobalContainerStack.definition instead of .getBottom
...
If we know it's a CuraContainerStack we can use .definition safely.
Contributes to issue CURA-4243.
2017-12-08 16:57:48 +01:00
Ghostkeeper
1029d4509c
Merge branch 'master' into feature_local_container_server
2017-12-08 16:03:05 +01:00
ChrisTerBeke
2986a17c1d
Fix for showing printer connect button on component load, use newer CuraApplication as target
2017-12-08 16:02:22 +01:00
ChrisTerBeke
baea9eb1e0
Merge branch 'master' of https://github.com/Ultimaker/Cura
2017-12-08 14:56:18 +01:00
ChrisTerBeke
c4d7a33c31
Monitor view component loader should have width and height from parent
2017-12-08 14:56:03 +01:00
ChrisTerBeke
8cd9439497
ignore octoprint plugin
2017-12-08 14:33:21 +01:00
Ghostkeeper
e621ace3e4
Remove unnecessarily setting definition
...
This definition is included in the metadata of container 2.
Contributes to issue CURA-4243.
2017-12-08 12:42:19 +01:00
Lipu Fei
b4e7216f5b
Always show extruder tabs in Machine Settings dialog
...
CURA-4693
2017-12-08 11:08:24 +01:00
Lipu Fei
21fffcc099
Compare linux distro names in lower cases
2017-12-08 10:40:20 +01:00
Lipu Fei
39e301833e
Merge pull request #2903 from AndrewDonaldson/fedora-nvidia-test
...
Add Fedora to test for nvidia driver work around.
2017-12-08 10:36:35 +01:00
Lipu Fei
fbc267244e
Merge pull request #2926 from gitname/patch-1
...
Fix typo
2017-12-08 10:32:31 +01:00
ChrisTerBeke
7a6330fd08
Merge branch 'master' of https://github.com/Ultimaker/Cura
2017-12-08 09:52:06 +01:00
Diego Prado Gesto
012b8aef62
Merge branch 'feature_sidebar_plugin_target'
2017-12-08 09:45:52 +01:00
ChrisTerBeke
c6e72abfbe
Add switch to monitor support for legacy plugin that emit signal to switch
2017-12-07 12:00:07 +01:00
ChrisTerBeke
9bf954643c
Use new method of setting active stage when needing to switch to monitor
2017-12-07 11:56:52 +01:00