GitHub-Proxy/Cura
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/Ultimaker/Cura synced 2025-06-29 21:55:11 +08:00
Code Issues Packages Projects Releases Wiki Activity
10,580 Commits 295 Branches 268 Tags
Commit Graph

10580 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
ChrisTerBeke
3328184fbc CURA-4398 block print over network when another upload is already in progress 2017-10-04 11:06:20 +02:00
ChrisTerBeke
15d945a207 Merge branch '3.0' of https://github.com/Ultimaker/Cura into 3.0 2017-10-03 17:35:19 +02:00
ChrisTerBeke
b0fa87231c CURA-4390 add new menu item for plugins 2017-10-03 17:33:24 +02:00
Jaime van Kessel
6dcb542e64 Fixed issue where "create new" of quality changes in combination with machine caused issues 
CURA-4409
 2017-10-03 13:46:38 +02:00
Jaime van Kessel
bff3a5bb23 Naming of new machines now uses correct ordering again 
CURA-4408
 2017-10-03 13:16:04 +02:00
Jaime van Kessel
a3eae31982 Merge branch '3.0' of github.com:Ultimaker/Cura into 3.0 2017-10-03 11:22:37 +02:00
ChrisTerBeke
3c747dd69e Merge branch '3.0' of https://github.com/Ultimaker/Cura into 3.0 2017-10-03 11:22:18 +02:00
ChrisTerBeke
edc10e0630 fix topbar colors in monitor mode for UM3 networking 2017-10-03 11:21:47 +02:00
Ghostkeeper
9a30941ead
Set support horizontal expansion back to 3 
Also for Extended.
 2017-10-03 10:59:00 +02:00
Jaime van Kessel
8c5b5e32ac Loading multi extruder custom machine over a single extruder doesnt cause issue anymore 
CURA-4404
 2017-10-03 10:26:51 +02:00
Ghostkeeper
dd79b895f5
Set support horizontal expansion back to 3 
They discovered that the 2 was causing a lot of failed prints.
 2017-10-03 10:00:48 +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 bd0b38f6885d0dabb24aa078ade2eed6425ff5ce.
 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
Jaime van Kessel
189fc3fe94 Added missing activeStack changed signal 
This fixes some issues with the recommended view when the first machine is added.

CURA-4403
 2017-10-02 16:37:00 +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
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
Jaime van Kessel
d48ab89031 Overriding custom FDM printer with 1 extruder doesn't cause issue anymore. 
It would try to override extruders that weren't thare. This was caused by the previous
change that would always load the extruders, but that should only happen for new machines, not for
overrides.
 2017-10-02 15:30:24 +02:00
Jaime van Kessel
7539bddf83 Merge branch '3.0' of github.com:Ultimaker/Cura into 3.0 2017-10-02 15:13:18 +02:00
Jaime van Kessel
889753f958 Fix unit test 
CURA-4360
 2017-10-02 15:12:56 +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
Jerooney
9cbd710593 Update camera color 
This will apply to all UMO+, UM2, UM2+ and UM3 with old firmware users, which look at the camera view. The background changed from blue > grey.
 2017-10-02 14:41:06 +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
Jaime van Kessel
1f8a5a1957 Minor codestyle refactor 2017-10-02 14:19:44 +02:00
Jaime van Kessel
8e4bc433d6 Added missing has_machine_quality tag for UM2 
CURA-4382
 2017-10-02 14:15:13 +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
bd80a47652 Merge branch '3.0' of github.com:Ultimaker/Cura into 3.0 2017-10-02 13:36:33 +02:00
Jaime van Kessel
7a85dc28d7 Changing to a printer with user settings doesn't trigger keep/discard popup anymore 
Fixes #2499 CURA-4384
 2017-10-02 13:35:19 +02:00
Ghostkeeper
db46e9377d
Add translations for strings that were added after string freeze 
Please let's not do this again.

The Spanish, Dutch, French, German and Chinese translations were asked to a native or secondary speaker of the language in the office. The Finnish, Italian, Russian and Turkish translations are obtained from Google Translate (with some more clever searching than copy-paste). The Korean and Japanese translations are not needed since we don't translate cura.pot for those languages. The Polish and Brazillian Portuguese translations will be made after receiving the translations from the translators.

Contributes to issue CL-118.
 2017-10-02 13:33:08 +02:00
Jaime van Kessel
e33528538f Merge branch 'materials_empty' of github.com:Ultimaker/Cura into 3.0 2017-10-02 13:10:08 +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
Diego Prado Gesto
daa0793427 Minor code changes - CURA-4395 2017-10-02 11:15:24 +02:00
jack
9ac3f8654e Merge pull request #2522 from Ultimaker/CL-271_config_change_notification 
CL-271 Show a notification when a configuration change is needed for your print
 2017-10-02 10:41:31 +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