1327 Commits

Author SHA1 Message Date
c.lamboo
61ce8dff7d Add the abstract stack to the Resources
Cura-9277

Co-authored-by: joeydelarago <joeydelarago@gmail.com>
2022-08-22 11:58:05 +02:00
joeydelarago
544ac33537 Add resource type for abstract machine so they can be saved.
CURA-9277
2022-08-22 10:33:47 +02:00
j.spijker@ultimaker.com
1e4fe93d64
Output to log if no conan_install_info.json was found
Contributes to CURA-9365
2022-07-15 17:41:59 +02:00
j.spijker@ultimaker.com
7f27058a6b
Output the Conan Info to the logs
Contributes to CURA-9365
2022-07-15 17:37:37 +02:00
j.spijker@ultimaker.com
8500e34f25 Use the app_root to obtain the resources
Contributes to CURA-9365
2022-07-08 09:26:27 +02:00
j.spijker@ultimaker.com
ed3f342e7f Search unsecure when not frozen
Also added share/<dep>/resources releative to sys.executable

Contributes to CURA-9365
2022-06-29 15:48:04 +02:00
j.spijker@ultimaker.com
2cee093d0b Map new conan local cache resources
Contributes to CURA-9365
2022-06-29 15:42:24 +02:00
c.lamboo
a967462038 Add res folder to resource folder
CURA-9365
2022-06-27 15:39:48 +02:00
j.delarago
a87695cd8d Added new intent selection buttons and resolution drop down to replace the matrix.
We are now selecting intents first and then quality, however the container hierarchy quality -> intents. This is the reason for the new functions inside machine manager.

CURA-8849
2022-06-14 11:41:38 +02:00
j.delarago
be25029aca This fix will stop enterprise versions from searching the user config folder for non storage type resources.
Refer to SEC-253 for more information

SEC-253
2022-05-24 13:10:08 +02:00
Remco Burema
050a731663 In secure version: disable loading themes from unbundled folders.
This was a bit more tricky then it at first seemed, since the information wether this is a 'secure version' comes from the user-application and is not known in the Uranium library. This is not normally such a point, but both the theme and the preferences objects are loaded _very_ early in the process, and that information needs to be injected before then. (Well, in the case of the Theme object it's less important, since in the implementation choseen that is now security wise at least only in charge of wheter or not to even show the theme as selectable in the interface, so that it only needs to be aware of the 'security' status any time before the user can see a preference screen, but not nescesarily earlier.)

SEC-255 | CURA-8966
2022-05-20 14:32:28 +02:00
Ghostkeeper
4fd0d34b1c
Remove extra resource path from Python file
This was recently added. However it appears that we have the same path multiple times in the resources, leading to the resources being found twice. This would normally get removed by virtue of being a set, but not this time since it's a different way of writing the same path.
For the themes, it finds the following paths (in my unpacked directory): {'/home/trin/tempy/cura5/UM/../share/uranium/resources/themes', '/home/trin/tempy/cura5/cura/../share/cura/resources/themes', '/home/trin/tempy/cura5/share/cura/resources/themes', '/home/trin/.local/share/cura/5.0/themes', '/home/trin/tempy/cura5/share/uranium/resources/themes'} For both Cura and Uranium, this points to /home/trin/tempy/cura5/curanium/resources/themes twice. So let's remove this one.

Contributes to issue CURA-9147.
2022-05-10 18:10:32 +02:00
Remco Burema
5a43e5945c Fix Cura not closing properly on Windows.
May be a bit crude, but simple and readable, and we're supposed to have handled everything anyway at the point the event comes in.

CURA-9155
2022-04-19 14:28:41 +02:00
Jelle Spijker
fb22a04d4d Add search path for the pyinstaller locations
Contributes to CURA-8640
2022-04-08 20:34:42 +02:00
j.delarago
b2b1961b57 Merge branch 'master' into qt6_beyond_the_splash
# Conflicts:
#	cura/PrinterOutput/PrinterOutputDevice.py
2022-04-06 15:24:30 +02:00
Ghostkeeper
d9d90ab4b6
Increment setting_version to 20
We've removed a bunch of settings and transformed others. To allow profiles to be checked for these and edited if necessary, we now need to increment this version number.

Contributes to issue CURA-8466.
2022-03-29 15:03:48 +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
e925f07aad Remove old arranger code
Major vesion upgrade, time to clean some stuff up!

CURA-7810
2022-03-24 13:37:29 +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
Jaime van Kessel
daa4c20df4 Use intConversion instead of Str for extruder & optionalExtruder
CURA-8981
2022-03-16 11:08:28 +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
7f8591718d
Remove central messageBox in favour of local box
The profile import/export was the only place where it was used, in our code base.

Contributes to issue CURA-8687.
2022-02-04 14:31:27 +01:00
Ghostkeeper
efcd00e2f3
Merge branch 'master' into marketplace_redesign
Conflicts:
	plugins/DigitalLibrary/resources/qml/SelectProjectPage.qml -> Some things were probably accidentally committed here and then later also changed in master.
2022-01-20 15:57:28 +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
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
Jaime van Kessel
7deeb26e13 Merge branch 'marketplace_redesign' of github.com:Ultimaker/Cura into CURA-8588_replace_toolbox_with_marketplace 2022-01-03 11:32:06 +01:00
Ghostkeeper
a878cfae7a
Merge branch 'master' into marketplace_redesign 2021-12-31 14:07:51 +01:00
Remco Burema
b794ad6ed2
Delete old 'Toolbox' in favour of new Marketplace.
part of CURA-8588
2021-12-30 11:51:54 +01:00
Remco Burema
448fbf7408
Qt5->Qt6: Register QML enums as (uncreatable) meta object not type.
part of CURA-8591
2021-12-29 11:37:18 +01:00
Remco Burema
20b435af76
Qt5->Qt6: More renamed stuff.
part of CURA-8591
2021-12-29 11:18:49 +01:00
Remco Burema
97da0b9183
Qt5->Qt6: Fix another stack-overflow error for newer Python/Qt.
part of CURA-8591
2021-12-29 10:15:14 +01:00
Remco Burema
6dc6020217
Qt5->Qt6: GUI-attributes and flips params register singletons.
part of CURA-8591
2021-12-28 18:36:28 +01:00
Remco Burema
b62e708b87
Qt5->Qt6: (Until) attempted fix Python 3.10 'stack overflow' issue.
part of CURA-8591
2021-12-28 18:12:36 +01:00
Remco Burema
7021ff0b67
Qt5->Qt6: Replace QT_ENUMS with pyqtEnum.
part of CURA-8591
2021-12-28 14:59:25 +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
casper
e5c8d5456d Directly use bindings in banner pages
CURA-8564
2021-11-29 11:50:52 +01:00
casper
3ddfa6486b Remove banners when clicking close button 2021-11-26 14:49:00 +01:00
Ghostkeeper
b8ccb32836
Merge branch 'master' into libArachne_rebased
Conflicts:
	resources/definitions/ultimaker2.def.json -> Additions in Arachne around a place where we fixed an enum setting.
	resources/definitions/ultimaker3.def.json
	resources/definitions/ultimaker_s3.def.json
	resources/definitions/ultimaker_s5.def.json
2021-11-12 15:08:29 +01:00
Jaime van Kessel
c1a839ccaa Also ensure that extruder settings are correct when discarding unsaved changes
CURA-8584
2021-11-09 15:10:09 +01:00
Remco Burema
112f61e32f
Fix URL's for the update checker for Beta's.
part of CURA-CURA-8647
2021-11-02 16:54:07 +01:00
Remco Burema
8c8ec5391f
Revert settings-version to the one for Arachne-builds. 2021-10-20 11:01:13 +02:00
Remco Burema
86046a32b3
Merge branch 'master' into merge_main_20211019 2021-10-20 08:38:01 +02:00
Remco Burema
2ed837ba71
Merge pull request #10486 from Ultimaker/use_empty_qurl_if_path_doesnt_exist
Only return the path if the folder actually exist
2021-10-08 14:01:01 +02:00
Konstantinos Karmas
ad6a8d828e Merge branch 'master' into CURA-8510_version_upgrade 2021-09-23 17:01:00 +02:00
Jaime van Kessel
ee96080540 Only return the path if the folder actually exist
It seems that the dialog is acting up if the last known folder doesn't
exist anymore (usually when a network drive was unmounted).
2021-09-20 15:43:04 +02:00
Konstantinos Karmas
3e143a012a Change the setting version to 19
Since the setting version 18 is used in the arachne beta build, we decided to make the the setting version to 19 in the normal releases, so that we make sure that projects made in arachne beta won't use any version upgrade scripts if a user attempts to open them in 4.12.

CURA-8510
2021-09-15 16:25:04 +02:00
Jaime van Kessel
11b1998156 Fix single instance
CURA-7916
Fixes #3116
2021-09-15 16:22:58 +02:00
Ghostkeeper
453b666b1d
Increment setting_version to 18
We now have version 18, where Flsun Super Racer has customised profiles.
Nothing changes in the built-in profiles. It only needs a change in the machine instances.

Contributes to issue CURA-8510.
2021-09-14 16:32:43 +02:00