Jaime van Kessel
c28c20dbd7
Merge branch 'master' of github.com:Ultimaker/Cura into network_rewrite
2017-12-08 10:22:16 +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
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
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
Jaime van Kessel
4ba551a3af
Prevent crash when switching away from monitor tab
...
CL-541
2017-12-06 17:02:35 +01:00
Jaime van Kessel
73bae37544
Added missing string to verification failed Message
...
CL-541
2017-12-06 16:58:41 +01:00
Jaime van Kessel
b3a3c1e371
Camera image is now actually displayed for Legacy
...
CL-541
2017-12-06 16:46:33 +01:00
Jaime van Kessel
ba782b346f
Fixed re-requesting authentication
...
CL-541
2017-12-06 16:41:07 +01:00
Jaime van Kessel
77e3965fc7
Added videostream to cluster again
...
CL-541
2017-12-06 14:59:20 +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
Jaime van Kessel
aba8bd89c3
Merge branch 'master' of github.com:Ultimaker/Cura into network_rewrite
2017-12-06 13:33:20 +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
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
ChrisTerBeke
e33288b7c8
Move sidebar target for plugins to only middle section
2017-12-05 10:56:59 +01:00
Lipu Fei
0ac7b77572
Merge pull request #2908 from Ultimaker/thopiekar-extruder-row-comment
...
SidebarHeader: Adding missing comment about "extruder row"
2017-12-05 10:56:10 +01:00
Thomas Karl Pietrowski
6f8ed09d3d
SidebarHeader: Adding missing comment about "extruder row"
...
Just read the code and noticed that.
2017-12-05 00:14:19 +01:00
ChrisTerBeke
5673a834bc
Fix showing default sidebar, cleanup needed
2017-12-04 19:48:42 +01:00
ChrisTerBeke
caf56587fe
Implement switching sidebar views
2017-12-04 19:37:03 +01:00
Ghostkeeper
9e62b6e14b
Merge branch '3.1'
2017-12-04 17:13:52 +01:00
Ghostkeeper
a3818be46f
Reactivate layer view translation
...
The layer view mode was renamed back from Simulation View to Layer View after the string freeze. Luckily we still have this old translation.
Contributes to issue CURA-4601.
2017-12-04 17:05:38 +01:00
