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

5965 Commits

Author SHA1 Message Date
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
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
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
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
90ce031b27 Add default case 
CURA-9424
 2022-11-15 13:49:02 +01:00
Joey de l'Arago
e947959ca9 Merge branch 'main' into CURA-9424_update_loading_projects_design 2022-11-14 12:56:47 +01:00
c.lamboo
06a2886139 Clean up section property logic 
CURA-9424
 2022-11-09 17:11:31 +01:00
c.lamboo
95e0021cce Align dropdown in open project dialog 
CURA-9424
 2022-11-09 15:55:48 +01:00
c.lamboo
dd4e1c66b7 Make MachineSelector more generic by detaching logic from view 
By detaching the logic from the view custom handlers can be added to selecting printers. This was needed as the MachineSelector in the `WorkspaceDialog` needed to do something different from the `PreparMenu`.

CURA-9424
 2022-11-09 14:16:33 +01:00
c.lamboo
efe86c27b0 Merge remote-tracking branch 'origin/CURA-8689_add_first_cloud_printer_tweaks' into CURA-8689_add_first_cloud_printer_tweaks 2022-11-09 14:02:49 +01:00
c.lamboo
f73d192d65 Use Label for each individual step in add UltiMaker printer 
CURA-8689
 2022-11-09 14:02:43 +01:00
jspijker
f1c8d3d9e0 Show busy indicator 
Contributes to CURA-8689
 2022-11-09 13:47:32 +01:00
c.lamboo
7639b0ba19 Center align UltiMaker onboarding wizzard-text 
CURA-8689
 2022-11-09 13:29:33 +01:00
jspijker
92fb7fd1a6 Show the add printer dialog in the browser 
Contributes to CURA-8689
 2022-11-09 11:14:28 +01:00
jspijker
adf2c16360 Fixed printer buttons conform UX design 
Contributes to CURA-8689
 2022-11-09 11:13:40 +01:00
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
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
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
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
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
jelle spijker
1dfac6bb71 Apply screenScaleFactor to image size 
Contributes to CURA-8689
 2022-11-02 14:00:35 +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
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
Joey de l'Arago
a9f4b2da71
Merge pull request #12254 from Ultimaker/fix_materials_list_too_small 
Allow text to be wider if favourite button is not shown
 2022-10-21 11:16:26 +02:00
Joey de l'Arago
09c86e6b98
Merge pull request #13319 from Ladnessness/main 
Update Actions.qml
 2022-10-21 10:26:47 +02:00
Remco Burema
d3305585fc Merge branch '5.2' 2022-10-12 15:33:26 +02:00
c.lamboo
e25048d88a Add width to intent tool tips 
CURA-9746
 2022-10-12 15:29:08 +02:00
Remco Burema
e9b268bc06
Review suggestion; best practices; javascript. 
done as part of CURA-9746

Co-authored-by: Casper Lamboo <c.lamboo@ultimaker.com>
 2022-10-12 14:54:33 +02:00
Remco Burema
8db3f02a4f Re-add tooltips for intent profile selection in recommended. 
They where skipped over when transferring the radio bar to the current large button based setup.

CURA-9746
 2022-10-12 14:43:55 +02:00
Jelle Spijker
48ea4cee9f Merge branch '5.2' 
# Conflicts:
#	conanfile.py
 2022-10-10 10:23:01 +02:00
c.lamboo
728daec6af Wrap material name in Compatible Printer List 
CURA-9690
 2022-10-05 14:19:38 +02:00
c.lamboo
75ca7babaf Add a circle to the background of the refresh button 
Be more consistent with rest of UI.

CURA-9677
 2022-09-30 13:46:57 +02:00
c.lamboo
61065ce46d Add a circle to the background of the refresh button 
Be more consistent with rest of UI.

CURA-9677
 2022-09-26 11:23:17 +02:00
Jaime van Kessel
ea16597dd6
Merge branch 'machine-actions-improvement' of github.com:julianCast/Cura 2022-09-26 10:22:18 +02:00
Julian
df16108938 Fixes for better decorators using pyqtProperty 2022-09-23 11:49:30 +02:00
c.lamboo
2440730e23 Fix bug in monitor page 
In commit b7fd75b2dd202f2516f9188e342eccc8a15ae6ab the component with id `printerTypeSelectorRow` was removed. As the `tabBar` element was anchored to this component the monitor page was broken. Fixed by anchoring to the component that was previously above `printerTypeSelectorRow`.

CURA-9665
 2022-09-21 11:23:05 +02:00
Ladnessness
dc06ccb698 Update Actions.qml 
Add shortcut command to preferences to allow easier access. Similar to MacOS implementation.
 2022-09-18 17:11:41 +10:00
Jaime van Kessel
1dc42cb69a
Fix refresh of ChoosePrinterDialog not working 
CURA-9278
 2022-09-16 14:39:36 +02:00