jack
6772d849f3
Revert "CL-523: Made sure printers are present before printjobs to avoid referring to…"
2017-10-02 16:36:58 +02:00
Robin den Hertog
e91409112c
Made sure printers are present before printjobs to avoid referring to unknown printers
...
CL-523
Signed-off-by: Robin den Hertog <r.denhertog@ultimaker.com>
2017-10-02 16:20:02 +02:00
Jaime van Kessel
b5ce439c96
Merge branch '3.0' of github.com:Ultimaker/Cura
2017-10-02 13:18:44 +02:00
Simon Edwards
58f22568c0
Merge pull request #2517 from Ultimaker/CL-460-avahi-connect-detect
...
CL-460 do not downgrade Cura Connect printer to legacy
2017-10-02 11:33:18 +02:00
Jack Ha
b7a6a13336
CL-271 correct string and change Unknown printer to Unknown which is already in the catalog
2017-10-02 10:14:34 +02:00
Simon Edwards
21af3fb109
Show a notification when a configuration change is needed for your print
...
CL-271
2017-09-29 17:17:57 +02:00
Jaime van Kessel
9f8691feef
Merge branch '3.0' of github.com:Ultimaker/Cura
2017-09-29 15:22:23 +02:00
Robin den Hertog
a18aaee6b6
Merge pull request #2507 from Ultimaker/CL-462_SyncTimeToPrinterIfPrinterHasNoTime
...
CL-462
Tested together with Randal seen by atleast me and @nallath and verry shortly @ghostkeeper
2017-09-29 05:15:59 -07:00
Jack Ha
67d730c851
CL-460 use name instead of object to cluster_printers_seen
2017-09-29 13:58:14 +02:00
Ghostkeeper
ffe3e16b56
Merge branch '3.0'
2017-09-29 13:38:50 +02:00
Jack Ha
10fab716d5
CL-460 do not downgrade Cura Connect printer to legacy
2017-09-29 13:14:14 +02:00
Simon Edwards
e868b972b5
Implement the print job pause, resume and abort for Cura Connect
...
CL-455
2017-09-29 13:07:06 +02:00
daid
7f6de3aed5
CL-462, time sync to the printer if a printer has no valid system datetime. As any datetime is better then no datetime at all.
2017-09-29 12:41:24 +02:00
Jack Ha
b7dd756427
CL-506 changed Aborted to Print aborted and added it to all translations on the top
2017-09-29 11:21:15 +02:00
Ghostkeeper
4932cc1e85
Revert string changes that can easily be reverted
...
These strings can be re-used from other places.
Contributes to issue CL-506.
2017-09-29 11:03:33 +02:00
Ghostkeeper
0dba424617
Revert string changes that can easily be reverted
...
These strings can be re-used from other places.
Contributes to issue CL-506.
2017-09-29 10:49:38 +02:00
fieldOfView
940a8a44c8
Apply screenScaleFactor to Cura Connect UI
...
Any pixel size specified in QML should not either use UM.Theme.getSize(), or use screenScaleFactor to make sure the pixel size is as intended on OSX, Windows and Linux regardless of display DPI.
Contributes to CURA-4376
2017-09-28 17:36:35 +02:00
Jaime van Kessel
8313ea3d23
Merge pull request #2512 from fieldOfView/fix_cura_connect_hi_dpi
...
Apply screenScaleFactor to Cura Connect UI
2017-09-28 17:35:42 +02:00
fieldOfView
1715f0578d
Apply screenScaleFactor to Cura Connect UI
...
Any pixel size specified in QML should not either use UM.Theme.getSize(), or use screenScaleFactor to make sure the pixel size is as intended on OSX, Windows and Linux regardless of display DPI.
Contributes to CURA-4376
2017-09-28 15:42:52 +02:00
Ghostkeeper
15f09d0757
Merge branch '3.0'
2017-09-28 15:33:13 +02:00
jack
585b1dea3a
Merge pull request #2508 from Ultimaker/CL-118_config_change
...
CL-118 Add support and text for disabled printers and print jobs which require config changes.
2017-09-28 15:15:51 +02:00
Simon Edwards
8658053a3b
Improved status messages, and the 'printing' counter in the sidebar.
...
CL-118
2017-09-28 14:37:38 +02:00
Mark
b4154b8cc0
Merge branch '3.0'
2017-09-28 13:01:10 +02:00
Mark
9a193ad5c5
Changing AGPLv3 to LGPLv3
2017-09-28 13:00:43 +02:00
Simon Edwards
01ff608a09
Change "Required action" to "Action required"
...
CL-118
2017-09-28 11:40:48 +02:00
Simon Edwards
4ca8bc5a9e
CL-118 Add support and text for disabled printers and print jobs which require config changes.
2017-09-28 11:25:34 +02:00
Ghostkeeper
d999d1c7f2
Remove extra space
...
Just a typo.
Contributes to issue CURA-4341.
2017-09-27 17:32:47 +02:00
Ghostkeeper
df14ea2b1a
Proper capitalisation of 'OK'
...
This is consistent with the rest.
Contributes to issue CURA-4341.
2017-09-27 17:32:24 +02:00
Ghostkeeper
2715ef604d
Use lower case text for translation, then transform to upper case
...
The formatting is done in QML, regardless of how the data looks.
Contributes to issue CURA-4341.
2017-09-27 17:31:26 +02:00
Ghostkeeper
d417bfc7cc
Merge branch '3.0' of github.com:Ultimaker/Cura into 3.0
2017-09-27 14:20:38 +02:00
Ghostkeeper
d8c1546be3
Revert making the camera image black while it doesn't react
...
This was giving segfaults sometimes on my computer. I suspect it's because the camera image could have been written to by both this Python code and by the camera itself, giving it a sort of data race or maybe that the image was discarded by the camera while it's being written to by Python. In any case, this should make it more stable.
Contributes to issue CURA-4376.
2017-09-27 14:20:20 +02:00
Jaime van Kessel
2dee054003
Merge branch 'fix_screen_scale_factor' of https://github.com/fieldOfView/Cura into 3.0
2017-09-27 12:57:42 +02:00
Simon Edwards
85efd9249c
Add in all of the changes for Cura Connect
...
CURA-4376
2017-09-27 10:29:48 +02:00
Jaime van Kessel
826773ae42
Added a lot more logging to debug the not-authenticated issue
2017-09-26 11:20:14 +02:00
fieldOfView
c5fd0e6c80
Use screenScaleFactor to consistently adapt sizes to display pixel ratio
2017-09-25 22:07:12 +02:00
alekseisasin
204019702d
Added Title for messages
...
CURA-4203
2017-09-13 13:58:08 +02:00
Lipu Fei
fc7207e77e
Remove "Sync" button
...
CURA-4211
2017-09-06 12:17:40 +02:00
Lipu Fei
e15a96263d
Update extruder button styles
...
CURA-4211
2017-09-06 12:00:53 +02:00
Jaime van Kessel
81b6675518
Improved logging for network output
2017-09-06 11:15:40 +02:00
Jaime van Kessel
295a4af22b
Merge pull request #2380 from fieldOfView/fix_camera_leak
...
Prevent a possible memory leak while showing a stuck camera stream
2017-09-05 09:19:21 +02:00
Jaime van Kessel
08766ee66f
Fix wrong indentation for camera view
2017-09-04 17:36:44 +02:00
fieldOfView
7e60d459b4
Prevent a possible memory leak while showing a stuck camera stream
2017-09-04 15:47:44 +02:00
Jaime van Kessel
a652ddbdd8
Reset lastResponseTime when trying to connect
...
CURA-3869
2017-09-01 14:54:57 +02:00
alekseisasin
7c637029b6
Merge pull request #2334 from fieldOfView/feature_target_hotend_temperature
...
Show target hotend temperatures
2017-08-31 13:46:55 +02:00
Jaime van Kessel
053fdd679d
Don't send duplicated materials to printer
...
CURA-4199
2017-08-30 15:52:31 +02:00
fieldOfView
85b20ab16b
Get UM3 target hotend temperatures
2017-08-29 11:05:36 +02:00
Ghostkeeper
df88772071
Add input checking for incorrect responses from printers
...
We should not crash when getting invalid data. Just put a warning in the log there and ignore the message for the rest.
2017-08-21 00:57:25 +02:00
alekseisasin
3116ff829c
Merge pull request #2200 from fieldOfView/fix_monitoritem_size
...
Adapt camera image to available space
2017-08-15 15:04:18 +02:00
Jaime van Kessel
021425ee06
Merge branch 'fix_system_text_rendering' of https://github.com/fieldOfView/Cura
2017-07-26 16:49:28 +02:00
Jaime van Kessel
a8a475a1a7
Only stop the camera if the timer is actually running
...
CURA-4081
2017-07-24 17:18:04 +02:00
