8325 Commits

Author SHA1 Message Date
Ghostkeeper
85d0749f5f
Use Controls2 ListView instead of ScrollView for print job list
No need for a ScrollView in Controls 2. And specialise the scroll bar.
Be sure to also align the right side of the contents with the scroll bar though.

Contributes to issue CURA-8686.
2022-01-18 17:27:51 +01:00
Ghostkeeper
f808f5f545
Merge branch 'replace_controls_1_for_controls_2' into CURA-8686_views_controls2 2022-01-18 17:20:37 +01:00
Ghostkeeper
e0a6cb3383
Merge branch 'master' into replace_controls_1_for_controls_2
Conflicts:
	resources/qml/Actions.qml -> Translation fixes on master, while the QML elements were changed here for Controls2.
2022-01-18 17:17:10 +01:00
Ghostkeeper
d87551ac9c
Use Controls2 ListView instead of Controls1 ScrollView to scroll
Just a listview with a specialised scroll bar.

Contributes to issue CURA-8686.
2022-01-18 17:01:16 +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
Ghostkeeper
954a3cb1db
Replace ScrollView by ListView in settings picking dialogue
The ScrollView is no longer necessary in Controls2. Just have a ListView with customised scrollbar.

Contributes to issue CURA-8686.
2022-01-18 14:54:36 +01:00
Ghostkeeper
f630b84788
Replace ScrollView with QtControls2 ListView
I can't update the buttons (not part of this ticket) so I kept those Controls1.
The ScrollView is no longer necessary, just a ListView now with customised scroll bar.

Contributes to issue CURA-8686.
2022-01-18 14:53:25 +01:00
Ghostkeeper
10303c10f9
Use new ScrollBar with controls 2
Contributes to issue CURA-8686.
2022-01-17 17:15:23 +01:00
Jaime van Kessel
0501b71e13 Also accept original casing to match with ID for material profile
This fixes an issue reported by Essentium. They used capitals in their
id, so it could never match that with a material profile
2022-01-17 10:53:52 +01:00
Jaime van Kessel
b614cabae6 Put back import 2022-01-14 13:05:07 +01:00
Ghostkeeper
73a151ab49
Put focus on search bar when Digital Library opens
Fixes CURA-8768.
2022-01-13 13:55:42 +01:00
Jaime van Kessel
6e4143ba59 Merge branch '4.13' of github.com:Ultimaker/Cura 2022-01-05 14:08:00 +01:00
Jaime van Kessel
2aa931cbca Remove unneded styles import 2022-01-04 09:48:02 +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
3bfea5b970 Ensure that stored log lines are sent to sentry if they haven't already been logged
CURA-8760
2022-01-03 14:10:36 +01:00
Ghostkeeper
f97f7ca6af
Port relative mode handling to Repetier flavour too
As requested in #9518.
2021-12-24 16:18:13 +01:00
Jaime van Kessel
fd411512c6 Merge branch '4.13' of github.com:Ultimaker/Cura 2021-12-20 13:08:50 +01:00
fieldOfView
bec12c124f Add a description to the Simulation View plugin that better explains its purpose 2021-12-19 11:48:52 +01:00
Remco Burema
0e3524cddb
Reintroduce hack for waiting state in monitor.
Some printers don't send the correct state it seems, so we have to have this hack back.

CURA-8764
2021-12-17 11:50:45 +01:00
Ghostkeeper
385c02f0bd
Merge branch '4.13' 2021-12-16 17:17:08 +01:00
Ghostkeeper
5a9bafe453
Update SDK version to 7.9.0
This is going to be the new SDK version for Cura 4.13.
2021-12-16 17:15:59 +01:00
Ghostkeeper
9140b71b19
Merge branch 'libArachne_rebased'
Conflicts:
	plugins/SimulationView/SimulationPass.py -> Reverted layer view optimisation in Master while some whitespace changed in Arachne.
	resources/definitions -> Bunch of conflicts with profile updates.
	resources/quality -> Bunch of conflicts with profile updates.
	resources/texts/change_log.txt -> Removed the Arachne change log (as they are internal versions). It'll have to be re-added when we release this version as stable.
2021-12-14 11:48:58 +01:00
Remco Burema
8be1c29f0a
Merge pull request #11036 from Ultimaker/CURA-8736_revert_graphics_buffer
Revert graphics buffer update
2021-12-09 08:50:26 +01:00
Ghostkeeper
9674c54efb
Better type checking and handling of optionals
Adds type checking here and there to catch such errors in the future.
This makes it handle the optional fields of this model better.

Contributes to issue CURA-8730.
2021-12-08 17:36:09 +01:00
Ghostkeeper
41ebd593c5
Revert "Merge branch 'bremco-graphics_buffer_update'"
This reverts commit 5e60cc6208c16d966505e7a97d9bbbb0644d2716, reversing
changes made to c9feace0fbe02beb2089ec0af7be35127d7420f7.
2021-12-08 12:02:49 +01:00
Ghostkeeper
0da37ae6e7
Revert "Workaround for if layer is None somehow."
This reverts commit f0cb9dd39ef996225ebd6d7b8d5ffc986c90e2f0.
2021-12-08 12:02:42 +01:00
Jaime van Kessel
a64aa6ef2d
Merge pull request #10989 from Ultimaker/CURA-8671_dont_send_materials_to_um2c
[CURA-8671] Don't send materials to printers that can't receive them
2021-12-06 09:48:18 +01:00
Ghostkeeper
770adb2c02
Don't store None as capabilities, but empty list
This makes a few things easier. You could see None as being a signalling value to indicate that we don't know capabilities, but this signalling would get lost anyway in the serialising to the metadata. So just an empty list is fine for now.

Contributes to issue CURA-8671.
2021-12-03 13:36:06 +01:00
Ghostkeeper
6d9142579a
Add debuging repr to print more nicely
Otherwise you just see <CloudClusterResponse object> when you try to print this.

Contributes to issue CURA-8671.
2021-12-03 13:26:29 +01:00
Ghostkeeper
0477ba44b2
Encode capabilities as comma-separated list
Previously it was encoded as a stringified Python list of strings, which is much harder to parse.
This would go wrong if any of these capabilities have a comma in them, but I think that would be bad practice for keywords like this anyway.

Contributes to issue CURA-8671.
2021-12-03 13:25:41 +01:00
Jaime van Kessel
a49d9748ee Fix typing mistake 2021-12-02 16:02:36 +01:00
Jaime van Kessel
fb09e55b02 Fix typing
CURA-8723
2021-12-02 15:07:50 +01:00
Jaime van Kessel
9f6dacfced Merge branch 'feature_project_thumbnail' of git://github.com/fieldOfView/Cura 2021-12-02 14:37:14 +01:00
Remco Burema
f5604dfb1e
Add 'capabilities' to ignored metadata.
part of CURA-8671
2021-12-02 12:23:57 +01:00
Remco Burema
1253b41537
Only perform materials-sync-job for capable printers.
part of CURA-8671
2021-12-02 12:22:55 +01:00
fieldOfView
0a906accec Add thumbnail to all 3MF files, and add relation and content-type metadata 2021-12-01 21:49:12 +01:00
fieldOfView
0813f27389 Add a thumbnail to 3mf projects 2021-11-30 18:09:41 +01:00
Jaime van Kessel
b7af37022a Fix vesion update for beta 1 to beta 2
WHoops! Reviewed by Jelle ;)
2021-11-26 15:13:50 +01:00
Ghostkeeper
1df859e046
Catch IndexError when logging errors
And log that error too, then.

Fixes Sentry issue CURA-32J.
2021-11-23 19:04:33 +01:00
Ghostkeeper
2f1c157547
Don't attempt writing a workspace before there is a global stack
This is normally not possible from the interface. However on MacOS, the application menu gets carried to the top bar of the operating system. It is not blocked there, and the user could write a project file before they even add a printer. This prevents Cura from crashing when they do that.

Fixes Sentry issue CURA-2ZR.
2021-11-23 17:54:26 +01:00
Ghostkeeper
cecd033430
Merge branch 'CURA-8541_Aborted_state_not_reflected_correctly_in_Cura_Monitor_Page' 2021-11-23 16:28:46 +01:00
Jelle Spijker
8427555d6a
Merge pull request #10901 from Ultimaker/CURA-8539_oauth_via_httprequestmanager
OAuth via HttpRequestManager
2021-11-23 13:59:45 +01:00
Remco Burema
ac8d5fc12c
More explicit float's in shader just to be sure.
CURA-8714
2021-11-23 09:27:25 +01:00
Ghostkeeper
3f92b46ac8
Don't restart refresh token while it's already processing
If two requests to the API occur at the same time, they will both see at the same time that they need an access token, and if it is expired they will both see that it needs refreshing. The server then sees two refreshes, both with the same refresh token. This is not allowed. The second one then gets a failure to refresh the token, which causes the user to log out.
Instead, we'll stop one of the refresh requests. They were fire-and-forget anyway, so it's not needed to actually continue the request.

Contributes to issue CURA-8539.
2021-11-22 18:52:43 +01:00
casper
6be0d58039 Add handling of missing printJob status cases
The `printJob` now also contains a status for detecting aborted prints
that were awaiting cleanup, preventing the need for the additional
checks in the `await_cleanup` status.
2021-11-19 17:22:13 +01:00
fieldOfView
c6b6af668d Fix shader compilation on some GPUs
Some GPUs (rightly) complain about the difference between a float and an int. Fixes #10837
2021-11-18 08:04:14 +01:00
Jaime van Kessel
cefffe62cd Remove most of controls 1 references from networking plugin 2021-11-16 15:26:23 +01:00
Remco Burema
c2ed0a9181
Workaround for if layer is None somehow. 2021-11-16 12:40:56 +01:00
Remco Burema
f0cb9dd39e
Workaround for if layer is None somehow. 2021-11-16 12:33:29 +01:00
Jaime van Kessel
82e2f038ac Convert more items to controls 2 for toolbox 2021-11-16 10:23:32 +01:00