8158 Commits

Author SHA1 Message Date
Ghostkeeper
15fcad454d
Merge branch '4.11' 2021-08-31 13:35:58 +02:00
Ghostkeeper
34531656d6
Merge branch 'CURA-8520_Fix_missing_icons_in_deprecated_icons_list' into 4.11 2021-08-31 13:35:33 +02:00
Ghostkeeper
d08d5d6625
Merge branch '4.11' 2021-08-31 12:07:42 +02:00
Ghostkeeper
9ea025885a
Update links to network troubleshooting page
The new links also have campaign identifiers. Because apparently the website doesn't read the HTTP metadata information saying that it redirected from Cura, and it adds information which button it came from.
The old links will remain working via redirects, for older Cura versions.

Contributes to issue CURA-8528.
2021-08-31 12:07:11 +02:00
Konstantinos Karmas
b3af6f3ec5
Merge pull request #10366 from Ultimaker/CURA-8214_use_new_controlstyle_for_cluster_printer_selecter
Fix greyed out cluster printers
2021-08-31 09:45:33 +02:00
jelle Spijker
d97c4e2c94 Don't use new controls for the buttons 2021-08-31 09:34:23 +02:00
jelle Spijker
2548fd8014 Fix greyed out cluster printers
The PrintWindow still used an old style combobox.
This resulted in a Mac user not being able to specify
which clustered printer he wanted to send a slice to.

Using the new QtQuick.Controls and specifically setting
the currentIndex fixed it for Mac.
2021-08-30 13:41:55 +02:00
Konstantinos Karmas
9504ee60d4
Merge pull request #10358 from Ultimaker/CURA-8521_Add_missing_preference_vesion_upgrade
Add the missing preference upgrade for 4.9 to 4.10
2021-08-30 13:17:08 +02:00
Jaime van Kessel
b2c6063b61 Merge branch '4.11' of github.com:Ultimaker/Cura 2021-08-30 13:11:21 +02:00
Jaime van Kessel
43fd38e48e Add missing return
This caused the slicing to not be correctly aborted when the primetower was
in the wrong location

CURA-8499
2021-08-30 13:10:10 +02:00
Jaime van Kessel
f12f1ea438 Merge branch '4.11' of github.com:Ultimaker/Cura 2021-08-30 13:04:48 +02:00
Jaime van Kessel
183fbfad41 Disable save to DF if the textfield is in an invalid state
CURA-8502
2021-08-30 11:09:55 +02:00
Jaime van Kessel
9bdeb82314 Add the missing preference upgrade for 4.9 to 4.10
This could break backups in certain cases

CURA-8521
2021-08-30 10:51:27 +02:00
Konstantinos Karmas
3e0b395c72 Add the Buildplate.svg to the Cura icons
The icon existed only in the UM3NetworkPrinting plugin but it was also used in the ConfigurationItem.qml in Cura, so it had to be moved to the Cura icons.

CURA-8520
2021-08-30 10:45:45 +02:00
Jaime van Kessel
6feaecc450 Merge branch '4.11' of github.com:Ultimaker/Cura 2021-08-25 17:10:09 +02:00
Jaime van Kessel
88b5c4c8be Merge branch 'CURA-8497_Image_spacing_is_misaligned_in_messages' of github.com:Ultimaker/Cura into 4.11 2021-08-25 16:57:50 +02:00
Konstantinos Karmas
bbada73550 Remove outdated image from "new printers added" message
CURA-8497
2021-08-25 15:32:42 +02:00
Jaime van Kessel
deab3fd32b Merge branch '4.11' of github.com:Ultimaker/Cura 2021-08-25 13:01:27 +02:00
Konstantinos Karmas
99f8c85065 Style the "no plugin/material installed" texts in the installed tab
The default black text color was invisible in the dark theme.
2021-08-24 13:33:05 +02:00
Konstantinos Karmas
d24d520db0 Change background of Premium plugins and materials
Or else the link "Search materials" in the materials tab was very hard to see.

CURA-8380
2021-08-24 13:32:25 +02:00
Ghostkeeper
6b5ea9086f
Fix spelling in documentation
Saw this and wanted to take it along blindly with whatever next modification I made to Cura. However I need to switch branches now so it's just going to be a rather useless commit I guess.
2021-08-23 14:40:57 +02:00
Ghostkeeper
44913c0d87
Merge branch '4.11' 2021-08-20 17:37:49 +02:00
Konstantinos Karmas
ae3362f716 Fix "Manage printer" button pointing to the print job link
Both the "Manage printer" and the "Manage in browser" button were using the `openPrintJobControlPanel()` function, which was wrong. This is now fixed so that the "Manage printer" will use the `openPrinterControlPanel()` function as it should've in the first place.
2021-08-19 12:33:46 +02:00
Jaime van Kessel
0348293f87 Merge branch '4.11' of github.com:Ultimaker/Cura 2021-08-19 10:01:20 +02:00
Jaime van Kessel
668624e13d Set lifetimes correctly 2021-08-19 10:01:01 +02:00
Ghostkeeper
fcadba944a
Merge branch '4.11' into CURA-8491_sdk_upgrade_770 2021-08-19 09:17:17 +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
Remco Burema
898abc92a8
Update SDK 7.6 -> 7.7 because of API changes in 4.11
CURA-8491
2021-08-18 16:56:29 +02:00
Ghostkeeper
8650dd9b0f
Merge branch '4.11' 2021-08-18 16:18:43 +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
Konstantinos Karmas
e5374ada3b Merge branch '4.11' 2021-08-17 15:59:53 +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
fieldOfView
91b2a9b325 Fix typo 2021-08-16 21:07:55 +02:00
fieldOfView
e4a04c186f Merge branch 'master' into feature_pause_at_height_optional_parking
# Conflicts:
#	plugins/PostProcessingPlugin/scripts/PauseAtHeight.py
2021-08-16 12:19:49 +02:00
fieldOfView
6c585deb1e Make parking optional
Not adding parking gcode makes the repetier @pause method suitable for use with OctoPrint.

Contributes to #7842
2021-08-16 12:15:38 +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
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
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
71748bff8d Don't crash if the reply cannot be loaded
Fixes Sentry issue CURA-2RQ
2021-08-11 17:05:36 +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
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
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
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