GitHub-Proxy/Cura
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/Ultimaker/Cura synced 2025-04-29 15:25:02 +08:00
Code Issues Packages Projects Releases Wiki Activity
32,175 Commits 288 Branches 260 Tags
Commit Graph

5932 Commits

Author SHA1 Message Date
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
Jaime van Kessel
017560480a
Ensure that alignment is as set in the design 
CURA-9278
 2022-09-16 14:34:36 +02:00
Jaime van Kessel
614ab8ee7a
Increase size of print button for selector card 
CURA-9278
 2022-09-16 14:30:06 +02:00
Jaime van Kessel
681d33de81
Fix spacing between extruders in selector card 
CURA-9278
 2022-09-16 14:29:34 +02:00
Jaime van Kessel
b7fd75b2dd
Remove broken UI element 
Seems to have been broken since the move to 5.x...
 2022-09-16 13:54:56 +02:00
Jaime van Kessel
8e41a03c58
Grab focus when the dialog is hidden 
This ensures that all components in the loader lose the focus and thus trigger an update

CURA-9523
 2022-09-15 17:28:48 +02:00
Casper Lamboo
96bc5ed602
Simplify string notation 
CURA-9278
 2022-09-12 14:20:28 +02:00
Remco Burema
6adf05bbf0 Complete interface for selecting cloud printer. 
CURA-9278
 2022-09-09 11:05:05 +02:00
Remco Burema
d955a05d55 Merge remote-tracking branch 'origin/main' into CURA-9278_choose_printer_dialog 2022-09-08 13:37:02 +02:00
Remco Burema
04cd76cb3b Get extruder configs to frontend. 
When choosing the printer, all possible (single) extruder configs need to be shown for that printer.

CURA-9278
 2022-09-08 13:36:42 +02:00
Jaime van Kessel
242f8264da
Merge pull request #11573 from fieldOfView/feature_tray_icon_preference 
Add a preference to make tray icon optional
 2022-09-08 13:01:04 +02:00
Julian
75840426d7 Added machine action dialog optional 
Based on this change, users will be able to run their machine action plugins code just by clicking the action button, so without having to open a modal.
 2022-09-07 16:32:58 +02:00
Julian
ed14e3bd44 Added machine action buttons dynamic visibility 
Based on this change, users now will be able to manage the visibility of their machine action plugin implementations. For example, a machine action only visible when loggedIn.
 2022-09-07 16:29:55 +02:00
Remco Burema
5866560540 Merge remote-tracking branch 'origin/main' into CURA-9278_choose_printer_dialog 2022-09-06 23:33:45 +02:00
Joey de l'Arago
9c1e624b43 typo 
CURA-9278
 2022-09-05 17:58:33 +02:00
Joey de l'Arago
7f98ef70f0 Add printer cards 
CURA-9278
 2022-09-05 17:38:21 +02:00
c.lamboo
b6a461bd08 Revert "Prevent abstract machines from being deleted in the config menu" 
This reverts commit 27fc11b8404ed84a9b95b2fdddab239d2cd3c93b.
 2022-09-05 17:32:23 +02:00
Joey de l'Arago
d3ee9c4c24 Fix extruderIcon sizing 
CURA-9278
 2022-09-05 15:32:05 +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
27fc11b840 Prevent abstract machines from being deleted in the config menu 
CURA-9277
 2022-09-02 16:26:17 +02:00
c.lamboo
8bb2671a28 Don't show abstract machines in configuration page 
So they cannot be removed through the preferences

CURA-9289
 2022-09-02 16:26:17 +02:00
c.lamboo
c73b980a3d Merge branch 'main' into CURA-9422_abstract_cloud_monitor_redux 
# Conflicts:
#	resources/qml/PrinterSelector/MachineListButton.qml
 2022-08-31 16:05:00 +02:00
Remco Burema
a713b1e9e9
Merge pull request #13165 from Ultimaker/CURA-8463_cloud_configuration 
Show all configurations in "abstract" printer from cloud
 2022-08-31 14:50:13 +02:00
Remco Burema
afeec473f6 Small fixes (mostly QML warnings and the like). 
done as part of CURA-9422
 2022-08-31 14:15:05 +02:00
joeydelarago
19835844bf Change listType -> componentType. Makes it a bit more clear that this variable decides which component should be used for the model. 
CURA-9514
 2022-08-31 10:50:20 +02:00
joeydelarago
2ff0aed171 Remove height binding loop. 
CURA-9514
 2022-08-31 10:26:23 +02:00
c.lamboo
60b12b9247 Use list model to display show hide buttons 
CURA-9514
 2022-08-31 07:58:05 +02:00
c.lamboo
ac732e9604 Add button to hide/show connected printers 
CURA-9514
 2022-08-30 23:15:54 +02:00
Jaime van Kessel
d842013a76
Simplify onCompleted call in qml 
CURA-8463
 2022-08-26 13:31:48 +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
Joey de l'Arago
2013ad6baf
Update resources/qml/PrinterSelector/MachineListButton.qml 
Co-authored-by: Casper Lamboo <c.lamboo@ultimaker.com>
 2022-08-24 14:22:17 +02:00
joeydelarago
721f63b0d1 Give machine selector minimum width so it displays correctly on smaller screens. 
CURA-9514
 2022-08-24 10:06:03 +02:00
joeydelarago
db0b668739 Adjust button size according to width 
CURA-9514
 2022-08-23 16:17:36 +02:00
joeydelarago
790c373b38 Show icon for offline printers 
CURA-9514
 2022-08-23 15:57:40 +02:00