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 |
|
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 |
|
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 |
|
ChrisTerBeke
|
acbef72b68
|
Cleanup
|
2017-12-07 11:52:15 +01:00 |
|
ChrisTerBeke
|
faf77b2795
|
Cleanup
|
2017-12-07 11:50:01 +01:00 |
|
ChrisTerBeke
|
7a6d75fd08
|
Fix sidebar top margin for um3 network monitor controls
|
2017-12-07 11:02:52 +01:00 |
|
ChrisTerBeke
|
71ae78f7b6
|
Fix monitoring sidebar top margin
|
2017-12-07 10:45:54 +01:00 |
|
Jack Ha
|
79d5282b36
|
Added quality_changes to ContainerRegistry, rename saveStack to saveContainer.
Contributes to issue CURA-4243.
|
2017-12-07 10:39:13 +01:00 |
|
ChrisTerBeke
|
f91a4db617
|
Set stage icon for monitor depending on output device state, prevent crash when accessing back-end from unloaded component
|
2017-12-07 10:38:06 +01:00 |
|
Jack Ha
|
a387c10686
|
Fix serialize hotend id in xml material.
Contributes to issue CURA-4243.
|
2017-12-07 09:59:00 +01:00 |
|
ChrisTerBeke
|
dd92d8d5e0
|
Re-implement monitor view overlay when there is no monitor component
|
2017-12-07 09:22:02 +01:00 |
|
ChrisTerBeke
|
f6b570e299
|
Back to QUrl, fix monitor view overlay
|
2017-12-07 09:13:46 +01:00 |
|
ChrisTerBeke
|
9e3c681d66
|
Fix top bar tab layout when it has an icon
|
2017-12-06 18:47:11 +01:00 |
|
ChrisTerBeke
|
548761fcc3
|
Some cleanup
|
2017-12-06 18:15:17 +01:00 |
|
ChrisTerBeke
|
28c5debd61
|
Fix hiding topbar buttons in monitor stage
|
2017-12-06 18:11:46 +01:00 |
|
ChrisTerBeke
|
9702ffb794
|
Small fixes to sidebar layout after refactoring
|
2017-12-06 18:09:02 +01:00 |
|
ChrisTerBeke
|
ee643610e5
|
Fix sidebar loading and unloading depending on active stage
|
2017-12-06 17:46:18 +01:00 |
|
Jack Ha
|
4245847dab
|
Moved saveSettings and saveStack to Uraniums ContainerRegistry.
Contributes to issue CURA-4342.
|
2017-12-06 16:39:59 +01:00 |
|
Lipu Fei
|
298a659c09
|
Save is_debug_mode as string
CURA-4683
|
2017-12-06 14:49:00 +01:00 |
|
Lipu Fei
|
569e040955
|
Add more complete version info in project files
CURA-4683
|
2017-12-06 14:46:41 +01:00 |
|
Diego Prado Gesto
|
9561827bda
|
CURA-4680 Checking if there is global stack in the ExtruderManager.
Intead of checking for it in all the methods in MachineManager, now the
check is done in ExtruderManager when there is no printer in the list.
|
2017-12-06 14:12:51 +01:00 |
|
Jack Ha
|
f0c3aaf532
|
Add built-in profiles to profiles screen.
Contributes to issue CURA-4243.
|
2017-12-06 14:05:09 +01:00 |
|
ChrisTerBeke
|
2d044a37ae
|
Sidebar and main view via loader
|
2017-12-06 13:33:05 +01:00 |
|
ChrisTerBeke
|
a57a5aab6b
|
Make sidebar view working for active stage
|
2017-12-06 12:23:41 +01:00 |
|
Lipu Fei
|
c0a502f99c
|
Check if there is an active machine before doing anything else
CURA-4680
|
2017-12-06 11:48:14 +01:00 |
|
Jack Ha
|
20500b5c51
|
Merge branch 'feature_local_container_server' of github.com:Ultimaker/Cura into feature_local_container_server
|
2017-12-06 11:03:47 +01:00 |
|
Jack Ha
|
eb171231c2
|
Fix removeMaterial.
The base_file must be removed first, or it gets loaded halfway during remove containers.
Contributes to issue CURA-4243.
|
2017-12-06 11:02:50 +01:00 |
|
Ghostkeeper
|
ec36424a4d
|
Update UserProfilesModel when metadata of materials changes
The metadata may influence which profiles are being shown.
Contributes to issue CURA-4243.
|
2017-12-06 10:42:02 +01:00 |
|
Ghostkeeper
|
80f4c9181d
|
Correct variant name when duplicating materials
It needs to be the variant name (swapping spaces for underscores) to be consistent with the deserialize functions.
Contributes to issue CURA-4243.
|
2017-12-06 10:40:58 +01:00 |
|
Ghostkeeper
|
3e2e133682
|
Add type hinting for getMachineManager
I like it when my IDE can give me hints, so return types are important.
Contributes to issue CURA-4243.
|
2017-12-06 10:37:06 +01:00 |
|
ChrisTerBeke
|
0e1c9146cf
|
Implement stage model in top bar
|
2017-12-06 09:58:50 +01:00 |
|
ChrisTerBeke
|
9b4b6b2eae
|
Remove sidebar views from views menu
|
2017-12-06 09:44:59 +01:00 |
|
ChrisTerBeke
|
f1b9a17611
|
Remove sidebar controller implementation in favor of stages
|
2017-12-06 09:44:30 +01:00 |
|
ChrisTerBeke
|
a5b99bd862
|
Scaffold monitor stage
|
2017-12-06 09:36:09 +01:00 |
|
ChrisTerBeke
|
84ba486d57
|
Add plugins for prepare and monitor stages
|
2017-12-06 09:34:09 +01:00 |
|
ChrisTerBeke
|
840e80a1fb
|
Add missing init
|
2017-12-06 09:29:09 +01:00 |
|
ChrisTerBeke
|
44c66e2ad2
|
Get named view in CuraStage
|
2017-12-06 09:26:37 +01:00 |
|
ChrisTerBeke
|
ab5449b01e
|
Add CuraStage
|
2017-12-06 09:10:19 +01:00 |
|
Ruben D
|
aa727df525
|
Correct description of SOLIDWORKS macro
The original description was factually incorrect.
Fixes #2839.
|
2017-12-06 00:53:43 +01:00 |
|
ChrisTerBeke
|
833593bfa2
|
Merge branch 'master' into feature_sidebar_plugin_target
|
2017-12-05 14:14:57 +01:00 |
|
ChrisTerBeke
|
9a538b330a
|
Ignore new plugins
|
2017-12-05 14:14:52 +01:00 |
|
Ghostkeeper
|
13c7099e2f
|
Don't show slice info message if the preference is set to not send it
If the preference was set to not send it but the user never clicked on the message, don't show the message.
Fixes #2840.
|
2017-12-05 13:30:12 +01:00 |
|
ChrisTerBeke
|
51405ca0f7
|
tmp
|
2017-12-05 13:29:04 +01:00 |
|
ChrisTerBeke
|
a6a3602840
|
View default view selected in view menu
|
2017-12-05 12:27:13 +01:00 |
|
ChrisTerBeke
|
030dc74f3f
|
Fix now showing any sidebar when in monitor mode
|
2017-12-05 12:19:00 +01:00 |
|
Jack Ha
|
7d24933835
|
Fix save to file.
Changed order of setting metadata for correct overwriting.
Contributes to issue CURA-4243.
|
2017-12-05 11:55:54 +01:00 |
|