GitHub-Proxy/Cura
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/Ultimaker/Cura synced 2025-05-16 06:38:02 +08:00
Code Issues Packages Projects Releases Wiki Activity
31,025 Commits 290 Branches 260 Tags
Commit Graph

31025 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
jspijker
f2147bb259 Enumerate steps 
Contributes to CURA-8689
 2022-11-09 10:09:22 +01:00
jspijker
2ef0c3d163 Don't trigger third-party printer dialog when onCloudPrintersDetected changed 
That signal is received basically every minute when you're already signed in
and it will close the dialog when no new cloud printers are found.

Contributes to CURA-8689
 2022-11-09 07:40:44 +01:00
jspijker
e9a1806570 Allign "learn more" left-side 
Contributes to CURA-8689
 2022-11-09 07:28:46 +01:00
jspijker
a3f259d004 Send user to external DF printer page 
Contributes to CURA-8689
 2022-11-08 18:27:09 +01:00
jspijker
f0966b1c57 Don't stretch in height and adhere border to UX design 
Contributes to CURA-8689
 2022-11-08 18:17:41 +01:00
Remco Burema
bcb88981b7 Add support interface wall count settings. 
part of CURA-9350
 2022-11-08 18:00:44 +01:00
Remco Burema
802effd805 The engine now operataes on the area _before_ the offset. 
The frontend should compensate for that: Do _not_ apply the formula, as this now happens implicitly.

CURA-9548
 2022-11-08 15:11:59 +01:00
Jelle Spijker
00bdd9d72c
Merge pull request #13705 from Ultimaker/feature/_CURA-8689_Make_it_easier_to_add_your_first_printer_via_cloud 
Make it easier to add your first printer via cloud
 2022-11-08 11:48:53 +01:00
jspijker
efa302ef19 Removed and extra space 2022-11-08 11:27:51 +01:00
jspijker
8800288359 Runs apt update on all Linux 2022-11-08 11:27:07 +01:00
jspijker
cbaf4bed16 Merge branch 'main' into feature/_CURA-8689_Make_it_easier_to_add_your_first_printer_via_cloud 2022-11-08 11:23:05 +01:00
jspijker
8969e34021 update the system packages for all Linux versions 2022-11-07 17:03:54 +01:00
jspijker
81af19dc43 Use GCC10 as default for Ubuntu-20.04 2022-11-07 09:19:58 +01:00
jspijker
96597152bc Use GCC10 as default for Ubuntu-20.04 2022-11-07 09:18:34 +01:00
jspijker
da304aec90 Revert "Use GCC12 as default for all Linux runners" 
This reverts commit 6ddc16709b4dcb9b6b2214ad36918dbe1c191b55.
 2022-11-07 09:18:34 +01:00
Joey de l'Arago
088ea0a768 Swap out UpdatableMachinesModel for MachineListModel. 
This has to be instantiated with the WorkspaceDialog but attaching the listeners throws an error because it is done too early. The listeners are not needed anyway, so they have been disabled.

Update WorkspaceDialog.qml to use MachineListModel

CURA-9424
 2022-11-04 16:44:04 +01:00
Joey de l'Arago
1ebf5bb650 Update MachineListModel to optionally take a list of global stack to show in list instead of searching the container registry. 
Add option not to listen to container change events in MachineListModel.

CURA-9424
 2022-11-04 16:42:07 +01:00
Joey de l'Arago
ccb4d181e6 Allow buttons to be passed in for drop down. 
The change also remove the "Add Printer" and "Manage Printer" buttons from the monitor page drop down.

CURA-9424
 2022-11-04 15:37:57 +01:00
Joey de l'Arago
2019d8f3af Start MachineSelector refactor by allowing list model to be passed in. 
CURA-9424
 2022-11-04 15:11:04 +01:00
c.lamboo
f803279a43 Merge branch '5.2' 
# Conflicts:
#	conandata.yml
 2022-11-04 14:00:40 +01:00
c.lamboo
4496f3fef3 Merge remote-tracking branch 'origin/feature/_CURA-8689_Make_it_easier_to_add_your_first_printer_via_cloud' into feature/_CURA-8689_Make_it_easier_to_add_your_first_printer_via_cloud 2022-11-04 13:48:39 +01:00
c.lamboo
c5788be6f7 Add ids with interactable components 
Makes it easier to perform automatic ui testing

contributes to CURA-8689
 2022-11-04 13:48:31 +01:00
Casper Lamboo
81f8939c1f
Update resources/qml/WelcomePages/AddThirdPartyPrinter.qml 
Co-authored-by: Joey de l'Arago <joeydelarago@gmail.com>
 2022-11-04 13:40:49 +01:00
Remco Burema
00dbe92814 Revert "Restrict permissions, should only need to read here." 
This reverts commit 61a491f910abd2fbb69d3da02f76995ec2926c26.
 2022-11-04 12:00:39 +01:00
Remco Burema
61a491f910 Restrict permissions, should only need to read here. 2022-11-04 11:57:53 +01:00
Remco Burema
15f31a7c0c Merge branch 'main' into PR-13661 2022-11-04 11:51:26 +01:00
jelle spijker
6ddc16709b Use GCC12 as default for all Linux runners 2022-11-04 10:13:52 +01:00
Remco Burema
997b6f830d Manually revert part of PR. 
It shouldn't really be nescesary, but you _can_ put any gcode flavour in relative or absolute, so we should also deal with that in the pause-at-height script.
 2022-11-04 09:12:47 +01:00
Remco Burema
b1138e12d9 Merge branch 'main' 2022-11-04 08:47:50 +01:00
Joey de l'Arago
f8ed660d58 Update icons 
CURA-9424
 2022-11-03 16:54:56 +01:00
Joey de l'Arago
e954de7f01 Adjust dialog margins. 
Move title into full width white square.

CURA-9424

Co-authored-by: Casper Lamboo <casper.lamboo@ultimaker.com>
 2022-11-03 16:43:19 +01:00
Joey de l'Arago
6126135adb Adjust dialog margins. 
Move title into full width white square.

CURA-9424

Co-authored-by: Casper Lamboo <casper.lamboo@ultimaker.com>
 2022-11-03 16:43:01 +01:00
c.lamboo
c892bac27f Use paragraph for in favor of ordered list 
Text indentation became when the text would span multiple lines

contributes to CURA-8689
 2022-11-03 10:45:29 +01:00
c.lamboo
d07c2c2c0d Update copy 
contributes to CURA-8689
 2022-11-03 10:37:02 +01:00
jelle spijker
c8f51a6743 Correctly wrap text body 
to prevent weird alignment in welcome pages

CURA-8689
 2022-11-03 10:08:00 +01:00
j.spijker@ultimaker.com
c20410d732 build info and create in one step 2022-11-03 08:42:24 +01:00
jelle spijker
30555dbd5b Use lockfile and build_id 2022-11-03 08:14:07 +01:00
jelle spijker
ce8a7b6109 Create Artifactory build info 2022-11-03 07:50:57 +01:00
Jelle Spijker
50fad9caf4 Only translate when option devtools is set 2022-11-03 07:18:26 +01:00
discip
d5099111bb
minor fixes + layer_no instead of height 2022-11-03 00:45:42 +01:00
Ed Ropple
226dbe57a1
changed cr10smart to refer to creality_base for 5.2.1 compat 2022-11-02 18:24:11 -04:00
Ed Ropple
46d76edc20
renamed .json to .def.json 2022-11-02 18:16:20 -04:00
jspijker
6deb1d8968 Merge branch 'main' into boyscout_translations_conan_package 2022-11-02 22:11:32 +01:00
jelle spijker
b75e047348 Use ref.base_name for pr 2022-11-02 22:01:19 +01:00
jelle spijker
fc26413347 Check against str for conf_info bash path 2022-11-02 21:16:18 +01:00
Joey de l'Arago
c987ef5315 Adjust warning label margins 
CURA-9424
 2022-11-02 18:30:46 +01:00
Joey de l'Arago
8bb6083481 Create custom component for rows in WorkplaceDialog. 
CURA-9424
 2022-11-02 18:25:05 +01:00
Joey de l'Arago
b1e559ff1a Add padding below section titles 
CURA-9424
 2022-11-02 18:09:49 +01:00
Joey de l'Arago
7171249d3f Adjust margins on dialog to match designs 
CURA-9424
 2022-11-02 15:33:47 +01:00
Joey de l'Arago
dbba1c4110 patch checking for base parent component of Combobox to check if it exists first. This should be refactored out some time. 
CURA-9424
 2022-11-02 15:14:33 +01:00