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

30791 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
c.lamboo
4381a97c85 Elide button text when text becomes too wide 
contributes to CURA-8689
 2022-11-02 14:58:25 +01:00
Joey de l'Arago
1764c338a0 fix visibility check 
CURA-9424
 2022-11-02 14:23:36 +01:00
Joey de l'Arago
25ecb0e621 Make types specific 
Remove unused imports

CURA-9424
 2022-11-02 14:21:37 +01:00
Joey de l'Arago
3a07d14b4b remove comboboxheight 
CURA-9424
 2022-11-02 14:19:35 +01:00
Joey de l'Arago
cde07b9fe4 move signal function to bottom of file 
CURA-9424
 2022-11-02 14:18:47 +01:00
Joey de l'Arago
d12b59ec0f Refactor workspace sections into separate qml file. 
Refactor an existing hack to force trigger the onIndexChanged functions of the comboboxes.

CURA-9424
 2022-11-02 14:17:05 +01:00
c.lamboo
2487cf17dd 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-02 14:15:51 +01:00
c.lamboo
975775b7a0 Add various dark-mode welcome-page assets 
contributes to CURA-8689
 2022-11-02 14:15:37 +01:00
jelle spijker
1dfac6bb71 Apply screenScaleFactor to image size 
Contributes to CURA-8689
 2022-11-02 14:00:35 +01:00
c.lamboo
1ebc0b487e Add various assets welcome-page assets 
contributes to CURA-8689
 2022-11-02 13:54:00 +01:00
Joey de l'Arago
f72c980c20 Add icons to the left of titles 
Align title text with values in table

CURA-9424
 2022-11-01 18:19:50 +01:00
Joey de l'Arago
b01ff2f57e Add open with above printer drop down. 
CURA-9424
 2022-11-01 17:10:59 +01:00
Joey de l'Arago
41fd36a038 Adjust margins 
CURA-9424
 2022-11-01 17:10:24 +01:00
c.lamboo
056221cda6 Remove "Add cloud printer" button in onboarding-add printer flow 
From figma design

contributes to CURA-8689
 2022-11-01 17:00:40 +01:00
c.lamboo
846102be4e Update campaign links in onboarding-add printer flow 
contributes to CURA-8689
 2022-11-01 16:59:25 +01:00
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
c.lamboo
5cb67ab8c4 Add new pages in add-printer flow 
Pages added
- Page to select Ultimaker or third party printer
- Page with information how to add Ultimaker printer(s)

contributes to CURA-8689
 2022-11-01 16:11:34 +01:00
MariMakes
24c12fd3eb
Added Triage status label 
An attempt to improve responsiveness on feature requests.
 2022-11-01 13:23:08 +01:00