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

259 Commits

Author SHA1 Message Date
c.lamboo
1f1353802a Prefill material sync file name 
CURA-10174
 2023-02-20 17:41:07 +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
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
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
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
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
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
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
adccc5fd19 Use correct font and line height for the category btn in materials list 
CURA-8979
 2022-03-21 13:50:10 +01:00
casper
10339555f4 Simplify materials preference page by wrapping scroll items in ListView 
CURA-8979
 2022-03-21 13:20:41 +01:00
j.delarago
c10865b179 Fixes this error 
QML Column: ScrollBar must be attached to a Flickable or ScrollView

by wrapping the Column in a ScrollView the same way that is done for the information page.

CURA-8979
 2022-03-18 14:45:03 +01:00
j.delarago
bd91078e6e Accept click events on materials items in materials list 
CURA-8979
 2022-03-18 14:08:20 +01:00
j.delarago
c6bd020dec Anchor material name to star icon so text doesn't display under star icon. 
CURA-8979
 2022-03-18 13:58:41 +01:00
j.delarago
c7bb97aa6c Add tooltip to materials list itmes. 
CURA-8979
 2022-03-18 13:56:19 +01:00
j.delarago
503f21090e Swap materials page SpinBox for NumericTextFieldWithUnit 
This fixes,
filament cost iterating backwards with spinbox ( who knows why it did this )
text not updating when different material selected
value with decimals not saving

Remove margin from NumericTextFieldWithUnit.qml. Not sure why this was present, it made the TextField slightly smaller than the rest.

Remove some parsing str to float/int. Not needed since settings are stored as str

CURA-8979
 2022-03-18 13:42:55 +01:00
j.delarago
4b853b89bd Fix typo 
CURA-8979
 2022-03-15 16:23:18 +01:00
j.delarago
9dbc497fcb Move TabRow below so it renders over the top lining of content rectangles. 
Update Tab styles to match designs

CURA-8979
 2022-03-15 16:19:33 +01:00
j.delarago
b33a5d7b84 Add space, so content isn't bellow scrollbar 
CURA-8979
 2022-03-15 15:54:50 +01:00
j.delarago
99f9918db5 Remove Italics 
CURA-8979
 2022-03-15 15:05:26 +01:00
j.delarago
bf784dbba0 show star on hover 
CURA-8979
 2022-03-15 15:03:49 +01:00
j.delarago
59b7d20f75 Update ReadOnlyTextArea import 
Update ReadOnlyTextArea style (It's not really read only 🤔)

CURA-8979
 2022-03-15 14:50:02 +01:00
Jaime van Kessel
97124bf5a9 Fix various QML warnings 
CURA-8979
 2022-03-15 10:32:44 +01:00
Jaime van Kessel
f760ca146d Fix sizing of materialBrandSelection 
This also cleans up some stuff from the theme. Huzzah

CURA-8979
 2022-03-15 10:25:56 +01:00
Jaime van Kessel
93405bdb93 Add identation for the materials preferences page 
CURA-8979
 2022-03-15 10:19:34 +01:00
casper
5136838f56 Update materials list in materials preference page 
Main improvement of this commit is that the reusable category button
component is used as the collapsable header component for the material
brands/types.

CURA-8979
 2022-03-11 16:42:11 +01:00
casper
e2c9e0a461 Elide text in materials slot 
CURA-8979
 2022-03-11 16:29:37 +01:00
casper
c6b8abd53e Update materials slot 
CURA-8979
 2022-03-11 13:22:45 +01:00