Thomas Karl Pietrowski
b22981d089
It is cls not self!
2017-12-08 16:12:56 +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
Thomas Karl Pietrowski
11cf642a6e
COM: Prevent splash screen, when Embedding is set.
...
So when dispatching our service we won't see any splash screen. Just like we want for headless applications.
2017-12-08 15:43:28 +01:00
Thomas Karl Pietrowski
85e84a5745
Merge remote-tracking branch 'upstream/thopiekar-early-logs' into master-prepare-for-com-support
2017-12-08 15:39:30 +01:00
Thomas Karl Pietrowski
83d8c693bc
CuraApplication: Removing superflous check
...
Imagine that there was no "single_instance" in parsed_command_line, then the second half of the if-clause would automatically crash.
Also we defined single_instance to be False, whenever not set. Therefore it is always there.
Also since no issues ever happened here, let's remove this check.
2017-12-08 15:23:35 +01:00
Thomas Karl Pietrowski
00a77da9d4
COM: Adding missing argument for DCOM
2017-12-08 15:19:28 +01:00
Thomas Karl Pietrowski
a2d327af7f
Merge remote-tracking branch 'upstream/master'
2017-12-08 15:10:12 +01:00
Jaime van Kessel
ae629e2968
Fixed camera for legacy UM3 printer again
...
CL-541
2017-12-08 14:59:14 +01:00
Thomas Karl Pietrowski
e5096f731c
cura_app: We store logs now at "Roaming"
2017-12-08 14:58:24 +01:00
ChrisTerBeke
baea9eb1e0
Merge branch 'master' of https://github.com/Ultimaker/Cura
2017-12-08 14:56:18 +01:00
Thomas Karl Pietrowski
6d190479ac
Getting logs earlier!
...
Have currently the issue here, that when running Cura as a COM service, that the Cura.exe is popping up for (feels like) 1s or less and crashes.
2017-12-08 14:56:09 +01:00
ChrisTerBeke
c4d7a33c31
Monitor view component loader should have width and height from parent
2017-12-08 14:56:03 +01:00
Jaime van Kessel
9ccd643f64
Repaired the monitor icon not being updated
...
CL-541
2017-12-08 14:36:53 +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
Jaime van Kessel
a8695db1c8
Fixed displaying of icons in monitor stage tab
...
CL-541
2017-12-08 10:44:05 +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
Jaime van Kessel
c28c20dbd7
Merge branch 'master' of github.com:Ultimaker/Cura into network_rewrite
2017-12-08 10:22:16 +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
ChrisTerBeke
acbef72b68
Cleanup
2017-12-07 11:52:15 +01:00
ChrisTerBeke
faf77b2795
Cleanup
2017-12-07 11:50:01 +01:00
ChrisTerBeke
b6e84fb814
Merge branch 'master' of https://github.com/Ultimaker/Cura
2017-12-07 11:21:19 +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
gitname
9d2529c6d4
Fix typo
2017-12-07 00:54:20 -08: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
Jack Ha
4245847dab
Moved saveSettings and saveStack to Uraniums ContainerRegistry.
...
Contributes to issue CURA-4342.
2017-12-06 16:39:59 +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
