1416 Commits

Author SHA1 Message Date
c.lamboo
d2cd759e51 Merge branch 'main' into CURA-10951_gh_build_curapackage 2023-08-30 20:23:40 +02:00
Remco Burema
fa08848152
Merge pull request #15496 from Ultimaker/CURA-7951_lock_rotation
Add option to arrange in grid
2023-08-30 13:31:42 +02:00
Jelle Spijker
81b2aeaf4e
Merge branch 'main' into CURA-9494_nightly 2023-08-29 22:52:54 +02:00
Fernando Pietchaki
6aeb59eb15 Refactor object reload to handle 3mf files
Refactor object reload to better handling of 3mf files

Make a single file read for all objects from that file, and then
replace the objects in scene to the new ones, matching by name.

This is also required for an Uranium update to handle the automatic
file reload when a file change is detected.

3mf Files can have multiple objects in them. When that is the case,
and the file is updated, all objects from that file where being
replaced by the first object in the file.
2023-08-29 15:06:27 -03:00
Jelle Spijker
87b6ad63a7 Merge remote-tracking branch 'origin/main' into CURA-10951_gh_build_curapackage
# Conflicts:
#	conanfile.py
2023-08-29 16:13:39 +02:00
c.lamboo
6e045e8b37 Put back getAnyExtruderPositionWithOrDefault api function
CURA-10685
2023-08-29 14:11:36 +02:00
saumya.jain
ab8b7c3ab5 name changes
CURA-10685
2023-08-25 15:46:30 +02:00
c.lamboo
34aa631531 Re-add arrange to CuraApplication
CURA-7951
2023-08-24 16:13:39 +02:00
c.lamboo
668038c59f Implement factory for Arrange
CURA-7951
2023-08-23 17:58:00 +02:00
saumya.jain
118f49a052 review comments fixed
Co-authored-by: Casper Lamboo <c.lamboo@ultimaker.com>

CURA-7951
2023-08-23 15:39:23 +02:00
saumya.jain
b662da732e review comments fixed
Co-authored-by: Casper Lamboo <c.lamboo@ultimaker.com>

CURA-7951
2023-08-22 11:51:30 +02:00
saumya.jain
b62725b4f0 copy_paste in a grid
arrange all objects in grid
place in grid

Co-authored-by: Casper Lamboo <c.lamboo@ultimaker.com>

CURA-7951
2023-08-22 10:30:51 +02:00
saumya.jain
023dd3a9c5 Merge remote-tracking branch 'origin/main' into CURA-7951_lock_rotation
# Conflicts:
#	resources/i18n/cs_CZ/cura.po
#	resources/i18n/cura.pot
#	resources/i18n/de_DE/cura.po
#	resources/i18n/es_ES/cura.po
#	resources/i18n/fi_FI/cura.po
#	resources/i18n/fr_FR/cura.po
#	resources/i18n/hu_HU/cura.po
#	resources/i18n/it_IT/cura.po
#	resources/i18n/ja_JP/cura.po
#	resources/i18n/ko_KR/cura.po
#	resources/i18n/nl_NL/cura.po
#	resources/i18n/pl_PL/cura.po
#	resources/i18n/pt_BR/cura.po
#	resources/i18n/pt_PT/cura.po
#	resources/i18n/ru_RU/cura.po
#	resources/i18n/tr_TR/cura.po
#	resources/i18n/zh_CN/cura.po
#	resources/i18n/zh_TW/cura.po
2023-08-21 10:10:25 +02:00
Jelle Spijker
6424c26f78
Show warning message when using nightly build
Only shown in builds, for alpha versions

 Contributes to CURA-9494
2023-08-20 19:41:58 +02:00
Jelle Spijker
7efe485f65
Show version in Title bar except for actual releases
Contributes to CURA-9494
2023-08-20 19:24:38 +02:00
Jelle Spijker
e2584ad741
Merge branch 'main' into CURA-10446_modify_gcode_path 2023-08-19 19:46:44 +02:00
Remco Burema
4c82098745 Backend-plugins don't have to register separately for extra setting-defs.
Also they now have their own appender-type (previously it was _always_ 'PLUGIN', now the other plugins are 'EXTRA').

part of CURA-10722
2023-07-28 15:13:48 +02:00
Jaime van Kessel
202d802f61
Move the required plugins list to before it's actually checked
Cuz ya know. If you don't set the data before checking, you will have a baaaad time.
2023-07-28 13:46:04 +02:00
Jelle Spijker
3713207040
Merge branch 'main' into CURA-10475_engineplugin 2023-07-18 08:12:00 +02:00
Jaime van Kessel
f3bc7bf28a
Move backend plugin logic to Cura from Uranium
I was running into abstraction issues when it was defined in Uranium.
Instead of trying to fight those, it's just easier to move it to Cura

CURA-10717
2023-07-11 11:24:28 +02:00
Jelle Spijker
63e78d313c
Add some basic hardware specs to logs
Contributes to CURA-10767
2023-07-10 15:10:14 +02:00
Remco Burema
68231c957d Add settings-function to get an extruder based on a property.
We wanted to select an extruder based on wether or not it has support-material, so that the user doesn't have to think about selecting a support extruder any more and in most cases, can't forget anymore either. The formula present in fdmprinter to do that was not only an unreadable nightmare, but also very slow. We decided to pull most of that functionality into the settings-function machinery instead (but just a bit more generic so other properties can be selected, not just 'material_is_support_material').

done as part of finishing off CURA-10643
2023-06-13 15:59:24 +02:00
c.lamboo
27cc89ff89 Allow for custom descriptions/icons in packaged intents
CURA-9709
2023-05-31 12:54:56 +02:00
c.lamboo
4f9d041ae8 Add rotation lock in arrange and multiply objects
Add rotation lock in
- context menu item arrange and
- checkbox in multiply objects dialog

CURA-7951
2023-05-11 16:14:38 +02:00
Jelle Spijker
28d6e993df
Bump up setting version to 22 2023-03-31 07:24:43 +02:00
Joey de l'Arago
1133e76e66 Add sign in wall
CURA-10183
2023-02-09 17:41:08 +01:00
jspijker
2d18482782 Bump up the settings version to 21
Contributes to CURA-10077
2023-01-30 11:39:13 +01:00
Remco Burema
c74e7be602 Appease reviewers.
- Ditch state in favour of enum.
- Comment explaining 'extraInfo'.

part of CURA-9347
2022-12-02 19:52:37 +01:00
Remco Burema
c13deba1ea Build correct states for safe profiles flow (except actual safe).
Re-use Discard Or Keep dialogue, but have different buttons. (Safe to New/Override instead of Keep/Discard.) The actual safa action is still the old one though (for either new button, it still goes to the old 'make a new profile' action). Besides that, some cosmetics have to be done to the texts as well still.

part of CURA-9347
2022-11-30 12:40:07 +01:00
Remco Burema
0ea2830108 Add the 'safe to profile' button itself.
Currently only works for creating a new profile from current changes (when on top of a built-in profile). Only does the compare (not the safe yet) in the other circumstance. Also already anticipate the next commits by being able to hide the text and icon (because this will be added to the custom mode view as well).

part of CURA-9347
2022-11-29 22:54:30 +01:00
Jaime van Kessel
3400210f9b
Merge branch 'per-object-autodropdown' of github.com:Piezoid/Cura 2022-09-14 14:46:08 +02:00
Maël Kerbiriou
4b7f18c08c SceneNode settings use native python types 2022-09-06 18:06:31 +02:00
Remco Burema
a56a21cf93 W.I.P.: Press print on abstract cloud printer. User should see dialog.
Start of implementation. When printing on an abstract printer, a user should see a dialog with the matching concrete cloud printers to pick from to actually print. Names are not final. Very much a work in progress. Very not finished also.

start of implementation for CURA-9278
2022-09-02 17:49:39 +02:00
c.lamboo
8b84db7059 Remove AbstractMachine
Having a separate class for the AbstractMachine complicated things; it's behaviour was extremely similar to the GlobalStack so adding one more stack container type in addition to the many similar setting container types we already have adds complexity to the system. Having these different classes for machines and abstract machines also add complexity to the update script as the abstract machines were stored in a separate folder from the machine types.

Because of these reasons we decided to replace the AbstractMachine by a GlobalStack where the is_abstract_machine property metadata property is set to True.

CURA-9514, CURA-9277

Co-authored-by: joeydelarago <joeydelarago@gmail.com>
2022-08-26 10:45:45 +02:00
joeydelarago
b18080c332 Rename AbstractStacksModel.py -> MachineListModel.py since this model includes both abstract machine stacks and regular machines
Add machineCount for displaying the number of machines of a type.

MachineSelectorButton is in use in other places, swapped it out for a new Component MachineListButton.

CURA-9514
2022-08-23 14:29:05 +02:00
joeydelarago
7ffa770fb4 Searching container registry returns ContainerStacks.
Made typing more generic to work with an ContainerStack to compensate.

Made AbstractMachine getMachines a classmethod so it can be called with ContainerStacks.

CURA-9514
2022-08-23 10:35:00 +02:00
Jelle Spijker
d262d71b5d
Merge pull request #13089 from Ultimaker/CURA-9277_cloud_printer_types
Cura 9277 cloud printer types
2022-08-22 17:03:58 +02:00
Casper Lamboo
35502e45fa
Apply suggestions from code review
CURA-9277

Co-authored-by: Jelle Spijker <j.spijker@ultimaker.com>
2022-08-22 14:48:04 +02:00
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
joeydelarago
57d739a848 Move source of truth for latest.json url into ApplicationMetadata.py and out of the Uranium repository.
CURA-9272
2022-08-15 15:43:37 +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