30686 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
jspijker	61623720ca	Update copyright using UltiMaker ... Contributes to CURA-9808	2022-11-28 10:48:38 +01:00
jspijker	0bb59acdf8	Update company name to UltiMaker ... Contributes to CURA-9808	2022-11-28 10:14:51 +01:00
jspijker	e1b9630ca4	Update company name to UltiMaker in po files ... Contributes to CURA-9808	2022-11-28 09:12:20 +01:00
jspijker	696c0f8547	Update company name to UltiMaker ... Contributes to CURA-9808	2022-11-28 09:05:21 +01:00
jspijker	772cc0d57f	Update company name in conanfile ... Contributes to CURA-9808	2022-11-28 08:44:21 +01:00
jspijker	ebd91623d0	Change company name in about dialog to UltiMaker ... Contributes to CURA-9808	2022-11-28 08:41:04 +01:00
jspijker	953bb38c92	Update app name to UltiMaker Cura ... Contributes to CURA-9808	2022-11-28 08:38:09 +01:00
Remco Burema	6a126f4d6b	Merge pull request #13799 from NilsRo/master ... disable lin. adv. if accidently enabled by earlier print	2022-11-25 12:41:24 +01:00
Joey de l'Arago	f6c8312403	Merge pull request #13847 from xommit/main ... Translating Cura - Update fr_FR language	2022-11-25 10:47:11 +01:00
jspijker	fb69cff511	fix typo	2022-11-18 13:04:38 +01:00
jspijker	87cea8f8f4	write directly to the env file	2022-11-18 13:02:04 +01:00
jspijker	be0b2b15c7	Use quotes for output to env files	2022-11-18 11:59:36 +01:00
jspijker	55040a7040	Use Env file for workflow output	2022-11-18 11:50:10 +01:00
jspijker	cc36da86b1	Fix channel when people use - instead of _ in their branch name	2022-11-18 11:45:07 +01:00
Joey de l'Arago	f60463a237	Add left padding ... CURA-9424	2022-11-18 11:33:00 +01:00
jspijker	73ac7fa716	Fix get version form PR's	2022-11-18 11:27:41 +01:00
Remco Burema	3761f03cea	Called workflow needs to inherit more information to run. ... part of CURA-9880	2022-11-17 18:26:45 +01:00
Remco Burema	ccdc67712a	Suddenly 'type' is required while previously it wasn't. ... Also attempt to standardize the ordering somewhat (description, default, required, type). part of CURA-9880	2022-11-17 18:04:25 +01:00
Remco Burema	6d810ccb9d	Split up installer workflow per OS. ... This requires a separate action to be run per OS, as there is no real way to have conditional lists within YML. The idea is that the installer can be build per OS (and also, another intent of this change is to make it so that people don't have to wait for all artifacts to be ready to download a single one). part of CURA-9880	2022-11-17 17:52:48 +01:00
Casper Lamboo	ee75fa02aa	Merge pull request #13848 from Ultimaker/CURA-9424_workspace_dialog_fixes ... [CURA-9424] Workspace dialog fixes	2022-11-17 17:15:34 +01:00
Joey de l'Arago	1d1800e440	Remove print statements ... CURA-9424	2022-11-17 17:03:05 +01:00
Joey de l'Arago	dd510a5dfc	Cleanup ... CURA-9424	2022-11-17 16:58:16 +01:00
Joey de l'Arago	d286f50fe9	Check for translated string ... CURA-9424	2022-11-17 16:39:59 +01:00
Joey de l'Arago	ff61097f13	Update resources/qml/RoundedRectangle.qml ... Co-authored-by: Casper Lamboo <c.lamboo@ultimaker.com>	2022-11-17 16:37:14 +01:00
Joey de l'Arago	4d2f6b9655	Previously there would always be one item in the updateableMachinesModel ("Create new"). This was moved to a button instead of being part of the model. ... This fixes new machines being incorrectly created when a machine already exists. CURA-9424	2022-11-17 16:21:57 +01:00
xommit	663dcb8968	Update cura.po	2022-11-17 15:21:34 +01:00
xommit	fd546c347e	Update cura.po	2022-11-17 15:16:38 +01:00
Casper Lamboo	5a75678caf	Merge pull request #13762 from Ultimaker/CURA-9548_min_support_area_split ... [CURA-9548] The engine now operates on the area _before_ the offset.	2022-11-17 14:47:30 +01:00
Joey de l'Arago	da71983891	Make combobox font and padding customizable. ... Style WorkspaceDialog comboboxes similar to MachineSelector CURA-9424	2022-11-17 14:41:14 +01:00
c.lamboo	9774349cb7	Make add printer component more responsive ... For some displays/screen resolutions the cut is expended beyond the borders of the window. By making the component more responsive this should be fixed. CURA-9894	2022-11-17 13:03:17 +01:00
Joey de l'Arago	70f7f68a51	Color icons in workspace dialog so they are themed correctly in dark mode. ... Don't show name when defaulting to create new printer. CURA-9424	2022-11-17 13:01:20 +01:00
Remco Burema	b0160b2d86	Revert "Specify to build installer per-OS." ... This reverts commit 957c25973b0fe57dde7bb16e960a7205e80407f4.	2022-11-16 19:36:26 +01:00
Casper Lamboo	35094ff47d	Merge pull request #13837 from Ultimaker/CURA-9424_fix_loading_files ... [CURA-9424] Fix loading files	2022-11-16 16:54:48 +01:00
Remco Burema	957c25973b	Specify to build installer per-OS. ... Exclusion happens _before_ additional includes unfortunaltely, so the matrix is back to being a plain list if OS's. This also means that, if we don't want to build each OS x OS_id, we have to put that information somewhere else. OS_id didn't really belong in the matrix anyway, since it's a derivative value. It's now replaced with a named environment variable. The way to exclude and select the 'name' used in the filename for each OS seems a little cumbersome, but I didn't find any better way so far. (should) implement the 'easy', 'lite' version of CURA-9880	2022-11-16 16:39:14 +01:00
Joey de l'Arago	156004cb17	Move logic for deciding the initially selected printer that was inside WorkspaceDialog.qml before into WorkspaceDialog.py. ... A block of code is run after dialog.show() and most of the dialog assignment. This is because dialog.show() resets the _result dictionary, we want to update the values in _result afterwards. CURA-9424	2022-11-16 16:11:19 +01:00
Jelle Spijker	cc9a698f42	Merge pull request #13775 from Ultimaker/CURA-9350_support_interface_wall ... [CURA-9350] support interface wall	2022-11-15 16:17:21 +01:00
Casper Lamboo	63b27d3ca8	Merge pull request #13774 from Ultimaker/CURA-9424_update_loading_projects_design ... Cura 9424 update loading projects design	2022-11-15 15:38:15 +01:00
c.lamboo	dc65e801d0	Set machine isAbractMachine in workspace dialog initialisation	2022-11-15 15:35:16 +01:00
Joey de l'Arago	a30fbf5a8f	Disable connection status icon for drop down in WorkspaceDialog. It is not possible to display the correct status for LAN printers without making them the active printer anyway. ... CURA-9424	2022-11-15 15:10:44 +01:00
Joey de l'Arago	28862c89e5	Show online badge and printer icon when initially loading machine selector ... CURA-9424	2022-11-15 15:03:23 +01:00
Joey de l'Arago	cd07647b24	Change misleading variable names ... CURA-9424	2022-11-15 14:57:39 +01:00
Joey de l'Arago	dd0411f171	isOnline was incorrectly being used instead of isNetworked. This caused offline printers not to show an Icon. ... Fixed CURA-9424	2022-11-15 14:56:25 +01:00
Joey de l'Arago	7254c8ac78	Merge remote-tracking branch 'origin/CURA-9424_update_loading_projects_design' into CURA-9424_update_loading_projects_design	2022-11-15 14:14:11 +01:00
Joey de l'Arago	e4ad9cb48c	Move base hovered logic out of ComboBox.qml since base is undefined in most places the component is used. ... CURA-9424	2022-11-15 14:08:47 +01:00
Joey de l'Arago	cac9d67352	Apply suggestions from code review ... Co-authored-by: Casper Lamboo <c.lamboo@ultimaker.com>	2022-11-15 13:49:55 +01:00
Joey de l'Arago	90ce031b27	Add default case ... CURA-9424	2022-11-15 13:49:02 +01:00
Casper Lamboo	52891f5a36	Merge pull request #11449 from Ultimaker/interlocking_gen ... Settings for Interlocking Structure Generation	2022-11-15 13:07:03 +01:00
Joey de l'Arago	7f9c183072	Remove redundant assignments ... CURA-9424	2022-11-14 13:35:03 +01:00
Joey de l'Arago	959c42d96a	The printer to override was not being set initially, causing file loading to fail when not selecting a printer in the MachineSelector. ... Fix is to set it on initialization from the WorkspaceReader CURA-9424	2022-11-14 13:34:46 +01:00
Joey de l'Arago	d6cab972c6	Fix call to incorrect function after revert. ... CURA-9424	2022-11-14 12:57:38 +01:00