689 Commits

Author SHA1 Message Date
Joey de l'Arago
fa317a9e14 Use unique id for WorkspaceDialog
CURA-9424
2022-11-01 16:31:24 +01:00
Joey de l'Arago
afd3d92c5e Use wide button spacing
CURA-9424
2022-11-01 16:28:23 +01:00
Joey de l'Arago
25a0355cfe Update dialog size
CURA-9424
2022-11-01 16:20:09 +01:00
Joey de l'Arago
8e56631972 3mf project files saved with an abstract printer would crash on loading when selecting a non abstract printer to load the project with.
This was because the metadata "is_abstract_machine" was being loaded into the non abstract machine. This caused a crash in MachineListModel.py by trying to delete this non abstract machine from a list where it didn't exist.

The solution is to ignore the "is_abstract_machine" metadata when loading settings from saved machines in 3mf files.

CURA-9711
2022-10-05 15:27:39 +02:00
Jaime van Kessel
2f1325259c
Fix 3mf workspace reader crashing on certain invalid files
CURA-4DP (Sentry crash)
2022-09-06 14:47:32 +02:00
c.lamboo
0afab9f9e9 Add label-string to translations 2022-07-18 10:40:41 +02:00
Remco Burema
ca36b4f2ef Set proper background color for open project dialogs.
part of CURA-9402
2022-07-01 14:22:27 +02:00
Ghostkeeper
8970f46154
Better path to packages.json in the 3MF file
Let's put it in the Cura directory with the rest of such files, as to not muddy the 3MF file with all sorts of directories that are not known to other consumers.

Contributes to issue CURA-9413.
2022-06-20 11:04:14 +02:00
j.delarago
f9ea517e05 If package.json metadata file is missing from 3mf file output warning instead of error.
CURA-8610
2022-06-08 11:51:54 +02:00
Ghostkeeper
0f12b012cf
Create InstallMissingPackageDialog with newly-exposed function from Marketplace
This adds a new function to the API of the Marketplace plug-in.
It's not pretty, but it's going to be how it is for a while.

Done to fix a critical build issue. The 'import plugins' thing works from source but not on the build.
2022-06-08 10:19:51 +02:00
c.lamboo
76180eee01 Show warning on-close of the install missing packaged dialog
CURA-6990
2022-06-06 22:49:49 +02:00
c.lamboo
2f22002fd5 Add header and footer components to Dialog
This provides control over how the header (the header is newly introduced in this commit) and footer components are rendered. The footer is the area where the `leftButtoons` and `rightButtons` are rendered. Having control over how this is rendered introduces for instance the possibility to render the buttons within a warning area (an example of this can bee seen in the WorkspaceDialog).

CURA-6990
2022-06-06 21:45:48 +02:00
c.lamboo
34004df7af Un-capitalise materials
CURA-6990
2022-06-03 16:25:43 +02:00
c.lamboo
eccef62dc7 Add typing
CURA-6990
2022-06-03 15:22:29 +02:00
c.lamboo
8fe53163b3 Add Action button and learn more link to warning message
CURA-6990
2022-06-02 17:33:56 +02:00
c.lamboo
fccfcb0e2b Add scroll bar to the WorkSpaceDialog
The warning message took out some space from the dialog. Added a scroll bar to make sure the content can still be read.

CURA-6990
2022-06-02 16:58:41 +02:00
c.lamboo
812b728636 Show warning when opening file without installing missing materials
CURA-6990
2022-06-02 15:36:53 +02:00
j.delarago
0df21e6073 Refactor missing packages dialog into model (MissingPackageList) and controller (InstallMissingPackagesDialog.qml)
Rename classes and files to have unified naming.

CURA-6990
2022-06-01 16:50:53 +02:00
j.delarago
5a3836b841 Fix missingPackages not updating
CURA-8610
2022-06-01 10:39:03 +02:00
c.lamboo
cd9fde946f Add typing
CURA-6990
2022-06-01 10:09:57 +02:00
c.lamboo
cd18bfb893 Set warning only if there are missing materials
CURA-6990
2022-06-01 10:09:23 +02:00
c.lamboo
84f19458c5 Display error when opening 3mf files
CURA-6990
2022-05-31 16:49:47 +02:00
j.delarago
5c1b7470a7 Add pyqt access to missing package metadata.
CURA-6990
2022-05-31 15:26:56 +02:00
j.delarago
ce0623664a Include all missing package metadata instead of just ids so we have something to display before searching the package on the marketplace. This is also important so we can show something if we can't find the package on the marketplace.
CURA-6990
2022-05-31 15:21:11 +02:00
j.delarago
4572d53e11 Read package.json required package information. Put package_ids for packages we don't have installed inside the WorkspaceDialog
CURA-6990
2022-05-31 15:12:52 +02:00
c.lamboo
d5c0fde7f2 Render labels using Text.QtRendering on OSX
Fonts were looking a bit to thick on when using `Text.NativeRendering`, so using `Text.QtRendering` instead. After this the font weight looks identical to figma (as far as I can see).

In this commit I also changed all `Label`'s to `UM.Label`'s and removed default properties where I could.

CURA-9154
2022-05-10 15:40:09 +02:00
c.lamboo
35f5c3f959 Revert "Render labels using Text.QtRendering on OSX"
This reverts commit f0e3c19a34d1fde3b7ec4fd95677fbefa2028b26.
2022-05-10 15:39:02 +02:00
c.lamboo
f0e3c19a34 Render labels using Text.QtRendering on OSX
Fonts were looking a bit to thick on when using `Text.NativeRendering`, so using `Text.QtRendering` instead. After this the font weight looks identical to figma (as far as I can see).

In this commit I also changed all `Label`'s to `UM.Label`'s and removed default properties where I could.

CURA-9154
2022-05-10 15:36:50 +02:00
Remco Burema
0232b4f639 Upgrade SDK version to 8.0.0 for Cura 5.0 2022-04-20 10:57:38 +02:00
c.lamboo
45bc498c7f Replace RecolorImage with ColorImage
CURA-8640
2022-04-08 15:55:34 +02:00
Jelle Spijker
12ee57e4ad
Merge branch 'master' into CURA-8640_PyQt6
# Conflicts:
#	cura/UI/CuraSplashScreen.py
2022-03-28 15:02:18 +02:00
Jaime van Kessel
f043750f70 Fix errors in workspace dialog 2022-03-25 10:29:36 +01:00
Jelle Spijker
3f8907d02a
Merge branch 'master' into CURA-8640_PyQt6
# Conflicts:
#	cura/CuraApplication.py
#	resources/qml/Preferences/Materials/MaterialsSyncDialog.qml
#	resources/qml/Preferences/Materials/MaterialsView.qml
2022-03-24 11:53:44 +01:00
casper
f31b8051df Fix darkmode issues in the Workspace dialog
CURA-8688
2022-02-28 15:59:56 +01:00
j.spijker@ultimaker.com
ca430c80be
Change imported namespace pySavitar to Savitar
Because we had to rename our Python bindings module from Savitar to
pySavitar we also changed our import downstream (Cura and Uranium). But
in order to limit the changes on our existing code we decided during the
review that we should just import pySavitar as Savitar.

Contributes to CURA-7924
2022-02-28 10:44:16 +01:00
Remco Burema
7511ac843e Changes needed wrt how we build Savitar with Sip 6.
part of CURA-7924
2022-02-25 14:31:51 +01:00
casper
26470440f0 Update buttons in work space dialog
Use Cura-styled buttons
Use dialog accecpt-reject handlers

CURA-8688
2022-02-18 14:21:37 +01:00
Remco Burema
32b52c6166
Qt5->Qt6: Rectify constant locations: UserRole, CppOwnership
part of CURA-8591
2021-12-28 14:54:56 +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
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
f5604dfb1e
Add 'capabilities' to ignored metadata.
part of CURA-8671
2021-12-02 12:23:57 +01:00
Jaime van Kessel
988de58c4e Fix version upgrader for arachne
CURA-8468
2021-08-09 17:13:40 +02:00
Jaime van Kessel
900db57f0f
Update messages to use the message_types
CURA-8418
2021-07-27 11:54:43 +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
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
Ghostkeeper
3dc1dbbbdb
Load profile from ContainerRegistry if the stack refers to it
We encountered a case where the version upgrade changed the quality profile to a new one which was specific to the printer rather than a global profile. As the upgraded stack was being read from the project file, it would go look for the new quality profile in the workspace. That ID wouldn't be present in there, and so it would crash and pretend the project file is plain 3MF.
This change makes it fallback to the built-in profiles, for precisely such cases as when a version upgrade changes the stack.

Contributes to issue CURA-8212.
2021-06-03 17:13:22 +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
jelle Spijker
2bd6f28f3a
Update Icons
Subdivided the new icons in 3 size categories. As requested by UX
Used the company naming scheme for uniformity and easy recognition.

Known issues:
- Top/Bottom category wasn't taken into account by UX at the time. Since
 this is a recent addition. Both the Walls and Top/Bottom will be updated.
- Cloud/Network connection icons 12px don't render correctly. Due to the
 theme-ing.
- Extruder Icons do not render correctly.

CURA-8010_new_icons
2021-04-26 19:42:17 +02:00
Kostas Karmas
00ade8be3a Fix crashing if the quality_type_to_apply is None
Fixes sentry issue CURA-24D
2021-04-16 16:35:44 +02:00