3D-printing/Cura
1
0
Fork 0
mirror of https://github.com/Ultimaker/Cura.git synced 2025-07-18 04:07:57 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 7
18800 commits 305 branches 270 tags 779 MiB
Commit graph

1151 commits

Author SHA1 Message Date
Ghostkeeper
bc419370d0
Merge branch '3.0' 2017-10-06 16:02:13 +02:00
Jaime van Kessel
fddb829273 Added check to see if selectedPrinter is set 
CL-500
 2017-10-06 14:15:15 +02:00
Jaime van Kessel
a2dabc6442 Re-added elide properties that seem to have gone lost in re-work 
CL-521
 2017-10-06 13:51:18 +02:00
Jaime van Kessel
8913a64fdc Removed some hardcoded UI values 2017-10-06 13:46:17 +02:00
Jaime van Kessel
af0615f985 Codestyle fixes 
CL-524
 2017-10-06 13:37:48 +02:00
Jaime van Kessel
21ad2548b7 Also check the status of the job if it's not printing 
CL-524
 2017-10-06 13:32:06 +02:00
Lipu Fei
e9462b17c8 Add try-excepts for signal disconnections 2017-10-06 12:04:16 +02:00
Ghostkeeper
7e00914e38
Merge branch '3.0' 2017-10-06 10:00:19 +02:00
Lipu Fei
39fc03c550 Revert "Replace new message string with a logging line" 
This reverts commit e052c3ba83.

CURA-4398
 2017-10-06 09:57:45 +02:00
Lipu Fei
e052c3ba83 Replace new message string with a logging line 
CURA-4398
 2017-10-06 09:50:03 +02:00
Diego Prado Gesto
c9e8f7c743 Block sending several files now works even if there is a mismatching - CURA-4398 2017-10-05 18:16:53 +02:00
Lipu Fei
185c350a19 Merge remote-tracking branch 'upstream/3.0' 2017-10-05 15:49:18 +02:00
Lipu Fei
18e636f928 Cleanup post_reply cleanup code 
CURA-4398

- Create 2 separate try-except blocks for disconnect()s
- Remove duplicated post_reply cleanup code by creating a function to do
  so
 2017-10-05 15:02:30 +02:00
ChrisTerBeke
cd59048475 Disconnect upload finished signals, move already uploading check down, CURA-4398 2017-10-05 13:11:45 +02:00
Ghostkeeper
d458fcde5c
Revert "Revert "Merge branch 'fix_garbled_fonts_macos' into 3.0"" 
This reverts commit e07e7bc9e7.

Contributes to issue CURA-4414.
 2017-10-05 10:58:49 +02:00
Ghostkeeper
e07e7bc9e7
Revert "Merge branch 'fix_garbled_fonts_macos' into 3.0" 
This reverts commit b62c19206f, reversing
changes made to 104926c6ed.

Contributes to issue CURA-4414.
 2017-10-05 10:28:54 +02:00
Jaime van Kessel
512a942f75 Added a tickle to zipping state of messages 2017-10-04 16:09:53 +02:00
ChrisTerBeke
b62c19206f Merge branch 'fix_garbled_fonts_macos' into 3.0 2017-10-04 14:09:59 +02:00
ChrisTerBeke
3328184fbc CURA-4398 block print over network when another upload is already in progress 2017-10-04 11:06:20 +02:00
Ghostkeeper
1d7792861d
Merge branch '3.0' 
Conflict in ClusterControlItem.qml where there was a new element in Master that wasn't present in 3.0. That element wasn't referenced anywhere else so I just removed it.
 2017-10-02 17:40:24 +02:00
Ghostkeeper
6fc62fd2b3
Don't try to disconnect after aborting 
Because if the signal is not connected then we'd get a segfault in this case.

Contributes to issue CURA-4376.
 2017-10-02 17:34:57 +02:00
Ghostkeeper
1aa6d2876c
Revert "Use self._camera_active to detect whether we should show the camera" 
This reverts commit bd0b38f688.
 2017-10-02 17:34:57 +02:00
Simon Edwards
91c5515d4e Merge pull request #2541 from Ultimaker/CL-228-authorization 
CL-228 CL-229 authorization and fixup state display
 2017-10-02 17:33:11 +02:00
Simon Edwards
6dade56758 Unapply the @override decorator as it doesn't actually work 
CL-228
 2017-10-02 17:12:15 +02:00
Simon Edwards
b5b3f47e4d Apply the @override decorator 
CL-228
 2017-10-02 17:05:39 +02:00
Ghostkeeper
bd0b38f688
Use self._camera_active to detect whether we should show the camera 
Because the camera timer is whether we should request the camera.

Contributes to issue CURA-4376.
 2017-10-02 16:55:19 +02:00
jack
dfe4a76e85 Merge pull request #2543 from Ultimaker/CL-511_abort_crash 
CL-511 fix abort crash
 2017-10-02 16:51:46 +02:00
Ghostkeeper
894c3fc0da
Emit authenticationStateChanged when setting auth to NotAuthenticated 
So that the interface may display this as well.

Contributes to issue CURA-4376.
 2017-10-02 16:43:09 +02:00
Ghostkeeper
b7090feadb
Don't stop camera if it wasn't running 
Otherwise you get a segfault in the .abort() function down below.

Contributes to issue CURA-4376.
 2017-10-02 16:43:09 +02:00
Robin den Hertog
a9c732e624 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:39:28 +02:00
jack
6772d849f3 Revert "CL-523: Made sure printers are present before printjobs to avoid referring to…" 2017-10-02 16:36:58 +02:00
Simon Edwards
ece9f73a10 Don't actively none/null out the Qt network objects. Let them live longer to avoid "premature object destroy" crashes. 
CL-511
 2017-10-02 16:32:38 +02:00
Simon Edwards
4439ce1e43 Stop building and sending the POST request if the user has already aborted it all 
CL-511
 2017-10-02 16:31:32 +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
Jack Ha
2ae5334dde Solve merge conflicts 2017-10-02 16:13:32 +02:00
Jack Ha
341b2b3718 CL-228 CL-229 better fallback to printer status labels 2017-10-02 16:02:59 +02:00
Jack Ha
6d861c8a33 CL-228 CL-229 more detailed printer status labels 2017-10-02 15:41:07 +02:00
Jack Ha
e6fe33dcb9 CL-457 removed trailing spaces 2017-10-02 15:04:45 +02:00
Jack Ha
321e531b1c CL-457 remove screenScaleFactor because statusText.height already has devicePixelRatio included 2017-10-02 15:03:07 +02:00
jack
575c3ebebb Merge pull request #2530 from Ultimaker/CL-457_cura_connect_visual 
CL-457 cura connect visual
 2017-10-02 14:40:13 +02:00
Jack Ha
5a3e427450 CL-228 when adding a Cura Connect printer, do not ask authentication, it is always authenticated 2017-10-02 14:20:41 +02:00
Simon Edwards
e1001c1aa4 CL-470 Update the icon SVGs 
Subtask of CL-457 Cura plugin: primary visual improvements
 2017-10-02 13:53:09 +02:00
Jaime van Kessel
b5ce439c96 Merge branch '3.0' of github.com:Ultimaker/Cura 2017-10-02 13:18:44 +02:00
Jack Ha
f15f6e2e37 CL-457 added margin to top in monitor screen 2017-10-02 11:55:54 +02:00
Jack Ha
48ad909431 CL-457 removed commented out code 2017-10-02 11:45:09 +02:00
Jack Ha
2264c6c303 CL-457 corrected qml errors 2017-10-02 11:37:08 +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
3abf25937b CL-470 Add icons to the printer state box on the monitor tab. 
Subtask of CL-457 Cura plugin: primary visual improvements
 2017-10-01 13:30:44 +02:00
Simon Edwards
5865d52000 CL-474 Fix the image used for the camera icon 
Subtask of CL-457 Cura plugin: primary visual improvements
 2017-10-01 12:01:08 +02:00