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

992 Commits

Author SHA1 Message Date
c.lamboo
1f1353802a Prefill material sync file name 
CURA-10174
 2023-02-20 17:41:07 +01:00
Remco Burema
8f65af61e5 Connect compare-and-safe profile dialog buttons to actions. 
Some rework was needed as to not get the entire Preferences window to show up, which previously came along with the add profile action.

part of CURA-9347
 2022-11-30 18:48:07 +01:00
jspijker
f76f711790 Update mentions to UltiMaker 
Contributes to CURA-9808
 2022-11-28 14:11:21 +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
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
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
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
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
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
Ghostkeeper
9d820b8d02
Redirect to USB workflow if user account doesn't have permissions 
If the user is not allowed to write profiles to the printers, then they'd get errors when trying to sync. Instead we'll redirect them to the USB workflow.
This also works for users that have accounts but don't have the printers in the cloud. The original requirements suggest that the entire sync button must be hidden for this case. But to allow those people to still sync via USB I'm opting for this solution instead.

Contributes to issue CURA-9220.
 2022-07-26 17:21:08 +02:00
c.lamboo
35fce917c6 Use UM.Window in the material sync dialog and the preference pages 
CURA-9428
 2022-07-15 07:25:54 +02:00
Jaime van Kessel
32121c7adc Add background color for rename dialogs 
CURA-9465
 2022-07-11 16:21:10 +02:00
Jaime van Kessel
6536b37525 Set background color for machine actions 
Otherwise the background is always white, which makes it unusuable for darktheme

CURA-9465
 2022-07-11 16:19:26 +02:00
Jaime van Kessel
b25e760c53 Remove incorrect enum usage 
This only needs to happen in code that uses PyQt, not in qml code
 2022-06-17 15:26:30 +02:00
Ghostkeeper
eee3a06743
Allow text to be wider if favourite button is not shown 
It can take the space of the favourite button then.
 2022-05-19 09:52:25 +02:00
c.lamboo
d5c0fde7f2 Render labels using Text.QtRendering on OSX 
Fonts were looking a bit to thick on when using `Text.NativeRendering`, so using `Text.QtRendering` instead. After this the font weight looks identical to figma (as far as I can see).

In this commit I also changed all `Label`'s to `UM.Label`'s and removed default properties where I could.

CURA-9154
 2022-05-10 15:40:09 +02:00
c.lamboo
35f5c3f959 Revert "Render labels using Text.QtRendering on OSX" 
This reverts commit f0e3c19a34d1fde3b7ec4fd95677fbefa2028b26.
 2022-05-10 15:39:02 +02:00
c.lamboo
f0e3c19a34 Render labels using Text.QtRendering on OSX 
Fonts were looking a bit to thick on when using `Text.NativeRendering`, so using `Text.QtRendering` instead. After this the font weight looks identical to figma (as far as I can see).

In this commit I also changed all `Label`'s to `UM.Label`'s and removed default properties where I could.

CURA-9154
 2022-05-10 15:36:50 +02:00
Remco Burema
c4f9669887 Move 'zh_TW' translation to incomplete status for 5.0.0 
The volunteer translator who'd normally do this never replied to our email. Hopefully this can be rectified in the next version.
 2022-05-10 13:31:37 +02:00
Jaime van Kessel
0ac4fa20fd Fix injection warning for hamburger menu 2022-05-10 13:30:24 +02:00
Jaime van Kessel
4819b2484e Merge branch 'fix_material_print_settings' of https://github.com/fieldOfView/Cura into 5.0 2022-05-10 13:11:05 +02:00
fieldOfView
81c6ade445 Fix setting values 2022-05-06 13:25:48 +02:00
fieldOfView
8aa08944f2 Disable "Print Settings" fields for read-only materials 2022-05-06 13:11:49 +02:00
j.delarago
ba3913395c Add catalog to files that weren't translating 
CURA-9141
 2022-05-05 16:42:01 +02:00
c.lamboo
cb4f1a8ab5 Replace SpinBox with NumericTextFieldWithUnit 
CURA-9146
 2022-05-02 17:07:52 +02:00
c.lamboo
4bb72cdd1a Set stepSize property on SpinBox that reflects its decimals 
CURA-9201
 2022-05-02 16:51:07 +02:00
Casper Lamboo
784cd2c99b
Apply suggestions from code review 2022-04-29 10:30:11 +02:00
j.delarago
8bb1b0bee8 selectedNameFilter is now an object instead of a string. The nameFilter has to be manually pulled out using the index in selectedNameFilter. 
If only one filter is supplied to nameFilters, the index will always be -1. I assume this is because we are not selecting the file type in the Dialog, it just defaults to the only item.

This code should still work if the behaviour is changed in the future.

FileDialog now uses currentFolder instead of folder.

CURA-9214
 2022-04-28 14:29:44 +02:00
Jaime van Kessel
271868eafd Fix export material to usb 
CURA-9122
 2022-04-20 11:23:35 +02:00
Jaime van Kessel
e85420f9fa Fix few more instances of old usage of fileUrl vs selectedFile 2022-04-19 17:12:58 +02:00
Jaime van Kessel
f070a695b1 Change standardbutton.yes & no to dialog.yes & no 2022-04-19 17:10:51 +02:00
Jaime van Kessel
1ce84fec69 Fix all import dialogs 
Fixes CURA-9129
 2022-04-19 17:09:02 +02:00
j.delarago
3674af01b7 selectExisting is replaced with using fileMode:FileDialog.OpenFile in QT6. This forces selecting an existing file. 
This is also the default value in QT6 so this line can be removed without changing the functionality
 2022-04-12 10:21:34 +02:00
c.lamboo
45bc498c7f Replace RecolorImage with ColorImage 
CURA-8640
 2022-04-08 15:55:34 +02:00
j.delarago
53efb78cf6 Fix combobox and label heights in general page 
CURA-8640
 2022-04-05 17:22:57 +02:00
Jaime van Kessel
5f71518f9d Use correct enum values for materialsview 2022-04-01 16:25:11 +02:00
j.delarago
f327c2479b Update Dialog imports to remove version 
Update FileDialogs selectExisting -> fileMode and folder -> currentFolder

CURA-8640
 2022-04-01 16:08:35 +02:00
j.delarago
99a3a8d11d QTQuick.Dialogs jumped to using 6.0 in QT6 
Update imports to use correct version number.

CURA-8640
 2022-03-29 16:04:02 +02:00
j.spijker@ultimaker.com
55cb86ebbd
use namespace AlignmentFlag 
Contributes to CURA-8640
 2022-03-24 11:58:42 +01:00
Jelle Spijker
3f8907d02a
Merge branch 'master' into CURA-8640_PyQt6 
# Conflicts:
#	cura/CuraApplication.py
#	resources/qml/Preferences/Materials/MaterialsSyncDialog.qml
#	resources/qml/Preferences/Materials/MaterialsView.qml
 2022-03-24 11:53:44 +01:00
Jaime van Kessel
43da68c898 Merge branch 'fix_scrollview_scrollbars' of https://github.com/fieldOfView/Cura 2022-03-22 16:13:46 +01:00
fieldOfView
09c3ae628e Fix "double"/non-functional scrollbars on ScrollViews 2022-03-22 14:46:14 +01:00
Aldo Hoeben
d655350aac
Merge branch 'master' into feature_tray_icon_preference 2022-03-22 14:38:50 +01:00
casper
5d3b22f45a Don't check on type equality to check if material is set 
As suggested by code review

CURA-9044
 2022-03-22 13:46:31 +01:00
casper
1e15197d44 Show active material in italics 
behaviour is not perfect; only one (of the possible multiple if you have
multiple materials) active material is shown in italics. However, this
behavior is similar as the behavior in cura v4.13

see
https://github.com/Ultimaker/Cura/pull/11668/files#diff-ba2e4797d4d21e847be25e2c272d6a7a45e3bab97def420bed7643d762be8cfaL54

CURA-9044
 2022-03-22 12:00:56 +01:00
casper
d7cf7ee97d Re-implement showing active profile as italic 
This went got removed during a merge conflict

see
https://github.com/Ultimaker/Cura/pull/11696
https://github.com/Ultimaker/Uranium/pull/798

CURA-9044
 2022-03-22 11:43:36 +01:00