Commit graph

26063 commits

Author SHA1 Message Date
Konstantinos Karmas
ed32f24f45 Merge branch '4.11' into CURA-8490_Make_sure_no_keyring_backend_is_available_on_Linux 2021-08-18 17:27:32 +02:00
Konstantinos Karmas
0972f1b721 Merge branch '4.11' of https://github.com/Ultimaker/Cura into 4.11 2021-08-18 17:18:51 +02:00
Konstantinos Karmas
9f31e1421b Make lifetime optional in the getBackwardsCompatibleMessage
This should fix the failing tests
2021-08-18 17:18:21 +02:00
fvrmr
1d00f959c4 Update whats new pages
Updated the links in the whats new pages
2021-08-18 17:18:07 +02:00
Konstantinos Karmas
617c4a0a5d Merge branch '4.11' into CURA-8490_Make_sure_no_keyring_backend_is_available_on_Linux 2021-08-18 17:12:53 +02:00
Konstantinos Karmas
d218b0bff9 Remove check for "frozen" when setting the keyring backend
There is no need to have a different behavior from source compared to frozen builds when it comes to the keyring.

CURA-8490
2021-08-18 16:54:28 +02:00
Ghostkeeper
a40c7e7410
Default lifetime for successful upload messages
There is no real reason to keep this visible indefinitely.
2021-08-18 15:36:41 +02:00
fvrmr
57c6efd427 Merge branch '4.11' of https://github.com/Ultimaker/Cura into 4.11 2021-08-18 12:08:14 +02:00
fvrmr
da92033666 Update change log + whats new pages
Update change log 4.11 beta
Update whats new pages + img

Links in whats new pages still needs to be updated
2021-08-18 12:08:09 +02:00
Konstantinos Karmas
c5a956068f Fix mypy complaint
The `Keyring` is already imported from MacOS, so it's best to rename the fail on for Linux.

CURA-8490
2021-08-18 12:02:13 +02:00
Konstantinos Karmas
b1dc38f126 Don't load a keyring backend on Linux
We do not support it on Linux and it can cause problems if there is a system keyring configured.

CURA-8490
2021-08-18 11:57:09 +02:00
Konstantinos Karmas
e5856bf6bc Log the connection error message produced by the request 2021-08-17 15:52:12 +02:00
Konstantinos Karmas
bbb1f0f0f3 Fix wrong icon mapping
The deprecated icon "pencil" was being mapped to the new icon "Pencil" which is actually called "Pen".

This commit also replaces tabs with spaces in the deprecated_icons.json.

Fixes CURA-8488
2021-08-17 15:32:21 +02:00
Jelle Spijker
d87c7a70cb
Switch return order for Repetier pauseAtHeight
While testing I noticed that the movement after the pause will
first move the head down and then move to the position before
the pause. This could result in noticeable artifacts or
accidentally push thin towers from the bed.) See the code below.

```gcode
;TYPE:CUSTOM
;added code by post processing
;script: PauseAtHeight.py
;current z: 5
;current height: 5.0
M83 ; switch to relative E values for any needed retraction
G1 F300 Z6 ; move up a millimeter to get out of the way
G1 F9000 X190 Y190
G1 F300 Z20.0
M84 E0
@pause now change filament and press ; Do the actual pause
G1 F300 Z5
G1 F9000 X30.759 Y30.759
G1 F1800 ; restore extrusion feedrate
```
I have switched the lines in the script such that it will first move to the correct X, Y and then move down
```python
prepend_gcode += self.putValue(G = 1, X = x, Y = y, F = 9000) + "\n"
prepend_gcode += self.putValue(G = 1, Z = current_z, F = 300) + "\n"
```
As shown in the code below
```gcode
;TYPE:CUSTOM
;added code by post processing
;script: PauseAtHeight.py
;current z: 5
;current height: 5.0
M83 ; switch to relative E values for any needed retraction
G1 F300 Z6 ; move up a millimeter to get out of the way
G1 F9000 X190 Y190
G1 F300 Z20.0
M84 E0
@pause now change filament and press ; Do the actual pause
G1 F9000 X30.759 Y30.759
G1 F300 Z5
G1 F1800 ; restore extrusion feedrate
```
2021-08-17 13:38:50 +02:00
Ghostkeeper
33edc4a8c9
Fix display of unlinking button
It was not being displayed with Qt 5.15 due to the following error:
MaterialsView.qml:34:5: Unable to assign QStringList to QString
This is correct. And it should not just concatenate all of these material names; it should add a comma between them for human-readable display in the text label above the button.

Fixes #10235.
2021-08-17 13:34:43 +02:00
Konstantinos Karmas
e0e4a3f2c0 Add shadow behind the what's new pages
As discussed during the eCCB.
2021-08-16 17:00:30 +02:00
Jaime van Kessel
a124342127 Fix Pause at height issue
Fixes #8575

Thanks to @EGOiST1991 for suggesting the fix!
2021-08-16 11:15:30 +02:00
Jaime van Kessel
3dec4e228b Use leftpadding instead of binding anchors outside of siblings 2021-08-12 15:48:58 +02:00
Jaime van Kessel
4b324095ec Remove incorrect log
There is absolutely no reason that needed to be logged, since it
happens on *every* boot. It was also not a place where an exception
even happend.
2021-08-12 15:43:11 +02:00
Jaime van Kessel
1f523053d9 Add even more logging to authorization service 2021-08-12 15:35:14 +02:00
Jaime van Kessel
79ccccb1a1 Fix qml warning spam 2021-08-12 15:27:39 +02:00
Jaime van Kessel
21a076aea4 Set type of engine crash message to Error 2021-08-12 11:17:38 +02:00
Jaime van Kessel
34905857ee
Merge pull request #10267 from Ultimaker/CURA-8473_backwards_compat_messages_411
Digital Library plugin needs to be backwards compatible.
2021-08-12 11:15:01 +02:00
Remco Burema
3061490675
Fix look for string in enum-type.
CURA-8473
2021-08-12 10:05:16 +02:00
Konstantinos Karmas
f5bf88e546 Fix crashing when clicking the "Manage in browser"
The parenthesis should be placed at the end.
2021-08-12 09:51:27 +02:00
Konstantinos Karmas
7c8153eede Don't crash if the keyring password cannot be decoded
Fixes Sentry issue CURA-2S0
2021-08-11 17:25:45 +02:00
Konstantinos Karmas
0e26b9125a Merge branch '4.11' of https://github.com/Ultimaker/Cura into 4.11 2021-08-11 17:05:46 +02:00
Konstantinos Karmas
71748bff8d Don't crash if the reply cannot be loaded
Fixes Sentry issue CURA-2RQ
2021-08-11 17:05:36 +02:00
Jelle Spijker
fd79192055
Merge pull request #10266 from Ultimaker/CURA-8472_4.11_translations
CURA-8472: Prepare for the 4.11 translations
2021-08-11 13:19:58 +02:00
Remco Burema
ecf820f3db
Fix tests.
CURA-8473
2021-08-11 12:35:54 +02:00
Remco Burema
5d7804deae
Digital Library plugin needs to be backwards compatible.
Message-types are a new parameter to Messages, so they can't be used in SDK/API versions smaller than 7.7.0.

CURA-8473
2021-08-11 12:14:02 +02:00
Konstantinos Karmas
d36435db5f Update po files for 4.11 translations
CURA-8472
2021-08-11 11:12:25 +02:00
Konstantinos Karmas
df5dad3066 Update pot files for 4.11 translations
CURA-8472
2021-08-11 11:05:20 +02:00
Jaime van Kessel
8b2904ee3b Merge branch 'CURA-8441_campaign_links' of github.com:Ultimaker/Cura 2021-08-09 14:09:27 +02:00
Konstantinos Karmas
e18a840c43 Change troubleshooting link
CURA-8441
2021-08-09 13:00:25 +02:00
Konstantinos Karmas
332475562b Change account signup link
CURA-8441
2021-08-09 13:00:03 +02:00
Konstantinos Karmas
b37716de58 Add missing campaign tags
CURA-8441
2021-08-09 12:59:29 +02:00
Konstantinos Karmas
5a8167cbff Fix unescaped &
CURa-8441
2021-08-09 12:48:07 +02:00
Konstantinos Karmas
3be4b1a441 Fix failing test
CURA-8441
2021-08-09 12:42:11 +02:00
Konstantinos Karmas
5bf24ed678 Add campaign tags to the logoff link
CURA-8441
2021-08-09 11:56:41 +02:00
Jaime van Kessel
f8df3facc5 Merge branch 'CURA-8444_Digital_Library_does_not_work_on_earlier_Cura_versions' of github.com:Ultimaker/Cura 2021-08-09 11:03:24 +02:00
Jaime van Kessel
176077c910 Merge branch 'CURA-8436_Inform_user_that_the_webcam_is_disabled_for_cloud_printers' of github.com:Ultimaker/Cura 2021-08-09 11:00:58 +02:00
goofoo3d
d709b86c16
add goofoo,renkforce printf (#8959)
* add goofoo,renkforce printf

* 优化PVA打印的配置

* 修正双喷打印不能重叠的问题

* 修改配置信息

* 添加机型配置

* 新增 goofoo 2-1混色脚本,优化机型配置.

* 优化goofoo 2-1混色脚本

* 调整了机型配置

* 添加不同口径喷嘴

* 添加喷嘴口径

* 修改机器名称不对的问题

* modify setting_version = 16 to setting_version = 17

* modify renkforce & goofoo's files setting_version = 16 to 17

* modify pva support_pattern & e-one size

* modify pva support pattern to grid

Co-authored-by: laiqiqi <laiqiqi886@163.com>
2021-08-06 15:14:24 +02:00
Konstantinos Karmas
97c779cc53 Use the old icon names
So that they can still be found in 4.9 and 4.10 Cura version.

CURA-8444
2021-08-06 09:50:04 +02:00
Konstantinos Karmas
10ec9e2754 Remove the tooltipWidth property
The `tooltipWidth` property is not available in 4.9 and 4.10. This property was added to make sure that the tooltip has a smaller width than the DigitalLibrary window, or else the tooltip doesn't get drawn at all, which is confusing. Since it was not available in 4.9 and 4.10, the tooltip text smaller had to become smaller to make sure that it will fit.

CURA-8444
2021-08-06 09:49:29 +02:00
Konstantinos Karmas
22e407207f Manually add the magnifier icon in the search bar in DL
The `leftIcon` property, which is not available in 4.9 and 4.10, so the DigitalLibrary window wasn't getting drawn. To keep having the icon, I manually added the RecolorImage in the search textfield.

CURA-8444
2021-08-06 09:47:47 +02:00
Jaime van Kessel
57e66a5796 Add campaign links
CURA-8441
2021-08-05 15:42:23 +02:00
Ghostkeeper
b78651e45f
Add monotonic settings to advanced and expert visibility
Contributes to issue CURA-7928.
2021-08-05 14:10:52 +02:00
Konstantinos Karmas
c3f26d4daa Move layer.enabled inside the child item in ExtruderIcon
When it was in the outer item, it was causing the label to disappear when then extruder icon was getting disabled. Moving it inside the child item which has the opacity change seems to fix that issue.

CURA-8417
2021-08-05 09:52:03 +02:00
Konstantinos Karmas
b86e6ddfe6
Merge pull request #10189 from Ultimaker/CURA-7689_beta_release_notifications
Allow update checking for BETA and stable releases
2021-08-04 15:59:08 +02:00