GitHub-Proxy/Cura
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/Ultimaker/Cura synced 2025-05-04 17:43:59 +08:00
Code Issues Packages Projects Releases Wiki Activity
30,845 Commits 289 Branches 260 Tags
Commit Graph

9297 Commits

Author SHA1 Message Date
c.lamboo
e60b96ac9a Fix selecting printer in monitor page 
CURA-9940
 2022-11-30 15:42:43 +01:00
Casper Lamboo
1672cd639f
Merge pull request #13914 from Ultimaker/CURA-9808_UltiMaker 
CURA 9808 UltiMaker
 2022-11-29 16:36:07 +01:00
c.lamboo
b22fafadbe Don't capitalise "M" in "Ultimaker Digital Library" and "Ultimaker Digital Factory" 
because these are brand names.

CURA-9793
 2022-11-29 15:26:51 +01:00
c.lamboo
7efbf6ed1e Translate string 
CURA-9793
 2022-11-29 15:26:15 +01:00
jspijker
f76f711790 Update mentions to UltiMaker 
Contributes to CURA-9808
 2022-11-28 14:11:21 +01:00
Joey de l'Arago
ff65c1a670
Merge pull request #13886 from Ultimaker/9773-add_quality_type_to_ufp_files 
Add quality type to ufp files
 2022-11-28 13:19:09 +01:00
c.lamboo
be40920042 Fix cura crashing 
`activeQualityDisplayNameMap` no longer returned a dict and could thus not be a pyqt property

Cura-9773
 2022-11-28 13:14:47 +01:00
Joey de l'Arago
5ed572779d remove redundant properties in settings 
CURA-9773
 2022-11-28 12:44:20 +01:00
Joey de l'Arago
8dcccd941b Add dataclass for ActiveQuality. Move some logic out of MachineManager into ActiveQuality. 
CURA-9793
 2022-11-28 12:40:35 +01:00
jspijker
61623720ca Update copyright using UltiMaker 
Contributes to CURA-9808
 2022-11-28 10:48:38 +01:00
jspijker
696c0f8547 Update company name to UltiMaker 
Contributes to CURA-9808
 2022-11-28 09:05:21 +01:00
c.lamboo
1ae8f2da62 Add quality display name with ufp files 
Cura-9773
 2022-11-25 16:12:44 +01:00
c.lamboo
e8f6786e97 Revert "Add quality type to ufp files" 
This reverts commit 7e84082aff26195d82b8d3c9239dee863949c099.
 2022-11-24 22:56:35 +01:00
Remco Burema
6dc0a24311 Cache and genericize ID to Product table. 
part of CURA-9931
 2022-11-24 15:33:39 +01:00
c.lamboo
7e84082aff Add quality type to ufp files 
Cura-9773
 2022-11-24 13:55:31 +01:00
Joey de l'Arago
f60463a237 Add left padding 
CURA-9424
 2022-11-18 11:33:00 +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
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
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
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
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
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
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
Joey de l'Arago
e947959ca9 Merge branch 'main' into CURA-9424_update_loading_projects_design 2022-11-14 12:56:47 +01:00
Joey de l'Arago
62274c4dac Revert Some of "Fix show/hide button in WorkSpaceDialog printer selector" 
This reverts commit 0c79ec73
 2022-11-11 17:04:39 +01:00
Joey de l'Arago
44d9df57e4 Update drop down to show correct printer icons in header 
CURA-9424
 2022-11-11 16:34:22 +01:00
Joey de l'Arago
1d34cd01c1 Removed unused UpdatableMachinesModel.py 
CURA-9424
 2022-11-11 16:34:08 +01:00
Joey de l'Arago
ebbefb5439
Merge pull request #13718 from discip/patch-2 
minor fixes + layer_no instead of height
 2022-11-11 11:17:22 +01:00
Joey de l'Arago
c59f5a5c00 Add tooltip in WorkspaceDialog over the printer selection drop down. 
CURA-9424
 2022-11-10 14:48:38 +01:00
c.lamboo
0c79ec738e Fix show/hide button in WorkSpaceDialog printer selector 
CURA-9424
 2022-11-09 23:05:06 +01:00
c.lamboo
27267deb22 Fix clicking PrepareMenu 
CURA-9424
 2022-11-09 17:16:47 +01:00
c.lamboo
79a7b1e064 Round width to prevent drawing text on non-integer offsets 
Contribution from @fieldOfView

CURA-9424
 2022-11-09 16:56:07 +01:00
c.lamboo
8ee5bc2bd4 Remove column with single child 
Just rendering the single child produces the same result

CURA-9424
 2022-11-09 16:04:39 +01:00
c.lamboo
95e0021cce Align dropdown in open project dialog 
CURA-9424
 2022-11-09 15:55:48 +01:00
c.lamboo
948ac84070 Add create new button 
CURA-9424
 2022-11-09 15:49:04 +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
Remco Burema
3d645140f2 Fix: Sort updateables on top of others instead of vice-versa. 2022-11-09 10:37:49 +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
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