433 Commits

Author SHA1 Message Date
j.delarago
e1068fb3bc Replace Text.Align with custom enum alignment
CURA-8943
2022-03-04 14:12:11 +01:00
j.delarago
3c7498feed Move ToolbarButton and ToolTip from Cura into Uranium. This makes it possible to use new styled ToolbarButton in plugins/Tools for the rotate tool.
Removed the ContentAlignment enum in ToolTip in favour of using the Text.ContentAlignment enum. For some reason references to this enum fail everywhere when ToolTip is moved into Uranium. There is some evil time-wasting magic cast on this component!

CURA-8943
2022-03-03 15:53:30 +01:00
j.delarago
50ac2eacc4 Fix property binding loop for height which was causing crashes when moving list items quickly up and down the list.
CURA-8688
2022-03-02 10:26:09 +01:00
casper
0a214b2c47 Fix dark mode issues Post processing plugin
Also revamped the post-processing list a bit.

CURA-8688
2022-02-28 11:41:21 +01:00
j.delarago
7a2b609b32 Left Margin for Listview items was doubled. Remove margin to left align text with "Add a script" button.
Swap default buttons for Cura.Primary/Cura.Secondary Buttons

CURA-8688
2022-02-23 15:28:38 +01:00
Ghostkeeper
c7d7dd11d1
Merge branch 'master' into PyQt6_upgrade
Conflicts:
	cura/PlatformPhysics.py -> Removed shapely on master, while QTimer import got updated to Qt6.
	plugins/Toolbox -> Entire folder is deleted in master, but it was updated to Qt6 here. This can all be removed.
2022-02-21 11:52:28 +01:00
Jaime van Kessel
f682f56923 Merge branch 'master' of github.com:Ultimaker/Cura into replace_controls_1_for_controls_2 2022-02-17 15:02:03 +01:00
Ghostkeeper
5fc89b6053
Merge branch 'patch-1' of https://github.com/inigoml/Cura into inigoml-patch-1 2022-02-16 12:46:47 +01:00
j.delarago
1375b1c657 Remove unused QtQuick.Dialogs imports
Cura-8687
2022-02-09 14:56:06 +01:00
Ghostkeeper
06bbeff21a
Merge branch 'marketplace_redesign' 2022-02-02 15:39:21 +01:00
Jaime van Kessel
c70c312286 Fix check if spec in postprocessing was None 2022-02-01 13:41:33 +01:00
Ghostkeeper
796779316f
Fix scrolling through post-processing scripts list
It turns out this has been broken for a while. I don't think anyone adds that many scripts that they'd need to scroll this, but if they want to they can now.

Contributes to issue CURA-8686.
2022-01-19 17:33:10 +01:00
Ghostkeeper
ca3f29daf7
Use ListView for settings list in post-processing scripts
With the customised scroll bar.

Contributes to issue CURA-8686.
2022-01-18 15:14:29 +01:00
Jaime van Kessel
f11d728c6b Merge branch 'master' of github.com:Ultimaker/Cura into replace_controls_1_for_controls_2 2022-01-03 15:32:58 +01:00
Jaime van Kessel
7692a6db78
Merge pull request #11165 from Ultimaker/8658_Implement_Notifications_for_the_new_marketplace
8658 implement notifications for the new marketplace
2022-01-03 10:18:20 +01:00
Jaime van Kessel
c92fcc8e03 Simplify the notifaction icon logic
CURA-8658
2022-01-03 10:14:22 +01:00
Remco Burema
abe7c1bf7f
Search/replace Qt5->Qt6.
part of upgrading Qt to v6.2: CURA-8591
2021-12-28 14:46:02 +01:00
Ghostkeeper
f97f7ca6af
Port relative mode handling to Repetier flavour too
As requested in #9518.
2021-12-24 16:18:13 +01:00
Iñigo Martinez Lasala
e5e774cd33
Update DisplayProgressOnLCD.py
Support for Octoprint via M118 A1 P1 action:notification command when using BTREETECH TFT
- ETA
- % advance
2021-11-30 19:07:35 +01:00
Jaime van Kessel
ef9b5506ce Convert postprocessing plugin to controls 2 2021-11-16 10:07:58 +01:00
Jaime van Kessel
561d0784f8 Merge branch 'CURA-8522_pause_extrusion_interruption' of github.com:Ultimaker/Cura 2021-11-08 10:23:49 +01:00
Ghostkeeper
74ff28cbea
Only unretract/retract when necessary for priming
Otherwise this is quite a useless move and would only cause blobs on the print.

Found during work on CURA-8522.
2021-11-05 21:03:03 +01:00
Remco Burema
89ab394dc0
Code-style, revert unilateral descisions.
- Capitalization for camelCase.
- Indentation.
- We don't really even _have_ a concept of what a 'Beta' for a script is, and this was a unilateral descision from a single contributor instead of validated by the proper channels like QA, V&V, etc.
- Pretty sure that while those labels aren't used _within_ Cura proper, other people (and maybe plugins?) rely on them for (further)post-processing. Also the distinction between CAZO and CAZD was lost.

part of CURA-8655
2021-11-02 09:09:02 +01:00
Remco Burema
e286b17bd9
Merge branch 'master' of https://github.com/legend069/Cura into legend069-master 2021-11-02 08:45:27 +01:00
Jaime van Kessel
00a01569be Add clarifying comment to pause at height
It was a bit confusing what was happening, so i've added an extra comment to clarify
what was going on.

CURA-7292
2021-10-21 15:30:32 +02:00
Jaime van Kessel
bf2b42b0b8 Add clarifying comment to pause at height
It was a bit confusing what was happening, so i've added an extra comment to clarify
what was going on.

CURA-7292
2021-10-21 15:29:21 +02:00
Ghostkeeper
a349606fef
Make my name more anonymous
Yes, it's my name. I'm okay with people learning that if they are really looking. I'm less okay with search engines learning that. Removing my name here linked to my nickname will eventually cause search engines to unlink it too.
2021-10-16 11:45:48 +02:00
legend069
3b639d2119 Update ChangeAtZ.py
updated, as suggested by
https://github.com/Ultimaker/Cura/pull/10554#issuecomment-939812755
2021-10-11 19:57:42 +11:00
legend069
35dd43675c Update ChangeAtZ.py
fixed typos and the gcode insert makes it easier to find for others "changeatz"
2021-10-03 20:00:08 +11:00
legend069
4508f60ce5 Update ChangeAtZ.py
PR
2021-10-03 19:43:50 +11:00
Jaime van Kessel
f3e2e7f6ac Merge branch 'filament-change-marlin-unload-fix' of git://github.com/barnybug/Cura 2021-09-27 14:43:07 +02:00
Barnaby Gray
59c8858559 FilamentChange: Fix unload on marlin based printers
See related #10038. This fixes the issue by referencing the gcode flavor set for the machine.
2021-09-16 07:14:52 +01:00
luz paz
9b203c834a Fix source typos 2021-09-07 11:34:22 -04:00
luz paz
d68f375e38 Fix various typos
Found via `codespell -q 3 -S *.po,*.pot -L childs,initialy,lod,ned,te,slicable,sur,tutoriels,wont`
2021-09-07 11:33:54 -04: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
Ghostkeeper
9046506f2a
Convert icons to UTF-8
As per our architecture design, all of these files should be UTF-8. Luckily it maps well.

Contributes to issue CURA-8342.
2021-06-28 18:28:50 +02:00
Ghostkeeper
1d0620908e
Remove useless and unused SVG elements
- Remove unused imports of xlink.
- Remove comments about which application originally wrote the text file. It's untrue because PyCharm edited it, etc.
- Remove unused IDs.
- Remove unused colours for icons rendered with RecolorImage.
- Remove useless x and y positions on 0, which is the default.
- Remove useless style setting the background to transparent.
- Remove useless whitespace in the path d attribute, and remove the then-useless XML space preserving attribute.
- Remove unused groups.
- Remove unused CSS classes.

Contributes to issue CURA-8342.
2021-06-28 18:22:52 +02:00
Ghostkeeper
0a75c772ed
Unrevert new icon set for all of Cura's interface
We created a new set of icons for Cura. These icons had to be reverted though because they weren't working out in the interface for the last release yet.
This unreverts them, basically adding them back hoping that we'll get them fixed in time for the next release.

Contributes to issue CURA-8342.

Revert "Revert "Fix merge conflict""

This reverts commit bb20e3307f43edc1ff53cb154d2351ddfe39e158.

Revert "Revert "Merge pull request #9716 from Ultimaker/CURA-8010_new_icons""

This reverts commit 70e4e9640e561e18a12870f30c905203ce8ccee7.

Revert "Revert "Fix typo in icon name""

This reverts commit 38ce22ba7c3f40b971bc6e1e0a8e776ca9d51512.

Revert "Revert "Add list for deprecated icons""

This reverts commit 119a957e7f978dbf1ddbcb3b0005bf38e8fed943.

Revert "Revert "Add Function icon""

This reverts commit 760726cf0bb953bb1b0fc277b448f419d4bd2544.

Revert "Revert "Switch out inherit icon""

This reverts commit 26afff609381e2004d194c280f504b6226859bd3.

Revert "Revert "Merge branch 'CURA-8205_Introduce_new_icons_in_Cura' of github.com:Ultimaker/Cura""

This reverts commit 6483db3d47ee052c1a966cdee3af7190577a5769.

Revert "Fix incorrect icons"

This reverts commit 02a4ade2a50a943ff36fd4895bdc9261cf2133eb.
2021-06-28 17:16:56 +02:00
Ghostkeeper
9a470f639d
Only add G92 for Griffin if redoing layer
Also, don't add it twice for the Repetier flavour.
This way the code is separated better into if-else cases to make it easier to read, even though it has this line in there 3 times.

Fixes issue CURA-8331.
2021-06-22 16:29:28 +02:00
Remco Burema
8aa071056b
Now unused API field only took integers originally.
We want to keep it this way so people can still make plugins work for older versions of Cura, like 3.6, where the 'api' field with just a single major version, instead of the 'supported_sdk_versions', which can be either a version-string like '7.6.0' or a list of version strings.
2021-06-17 11:15:33 +02:00
Remco Burema
04002056ae
Update SDK/API from 7.5.0 to 7.6.0 for 4.10
CURA-8320
2021-06-15 16:08:07 +02:00
Ewald Kleefstra
94871a32e3
Update plugins/PostProcessingPlugin/scripts/PauseAtHeight.py
Get extrusion mode from global container stack instead of first extruder

Co-authored-by: Ghostkeeper <Ghostkeeper@users.noreply.github.com>
2021-06-14 15:26:57 +02:00
Ewald Kleefstra
76da7768e8
Added relative extrusion mode support for PauseAtHeight.py script 2021-06-14 15:26:41 +02:00
Jaime van Kessel
70e4e9640e
Revert "Merge pull request #9716 from Ultimaker/CURA-8010_new_icons"
This reverts commit 6120d8a054b8c04bf90b8b3d3cb219d691bece2f, reversing
changes made to 95652556fef90f70adbf25bfa9bd3b8af7220d4a.
2021-05-27 16:06:20 +02:00
Humsie
21baf90ec8
Add Z Position parameter to FilamentChange (#9658)
* Add Z Position

* PR Comment: Add minimum value for z_position

Co-authored-by: Konstantinos Karmas <konskarm@gmail.com>
2021-05-21 17:02:53 +02:00