GitHub-Proxy/Cura
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/Ultimaker/Cura synced 2025-05-23 13:09:28 +08:00
Code Issues Packages Projects Releases Wiki Activity
29,021 Commits 290 Branches 263 Tags
Commit Graph

1734 Commits

Author SHA1 Message Date
Ghostkeeper
fb3f065fe0
Catch ValueErrors from removing callbacks that were already removed 
This can happen from asynchronous access.

Fixes Sentry issue CURA-3YV.
 2022-06-07 13:55:56 +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
Jelle Spijker
334fca6691
Merge remote-tracking branch 'origin/gracefully_fail_cloud_printer' into 5.0 2022-05-09 10:54:07 +02:00
Jaime van Kessel
0c98ce2384 Use correct role for standardbutton 
Otherwise the no won't register...

CURA-9229
 2022-05-04 11:09:49 +02:00
fieldOfView
b622738ae3 Fix missing icons since move to PyQt6 2022-04-22 22:33:14 +02:00
Remco Burema
0232b4f639 Upgrade SDK version to 8.0.0 for Cura 5.0 2022-04-20 10:57:38 +02:00
Jaime van Kessel
e4e993a44e Fail gracefully when adding unknown cloud printer 2022-04-19 15:43:31 +02:00
Jaime van Kessel
c9e625767b Use right enum for message dialog 2022-04-13 16:40:14 +02:00
Ghostkeeper
70fdffb1c9
Allow redirects when talking with printer API 
Because newer firmware will redirect this API call.

Contributes to issue CURA-9119.
 2022-04-11 13:23:03 +02:00
Ghostkeeper
0deac84ec2
NetworkError is an enum, no longer comparable as int 
With the Qt6 upgrade, we have to treat enums as full enums, within their normal class namespace and such. They are no longer just integer-globals static in the QtCore.Qt class. They are no longer treated as integers by PyQt.
Other places that checked for such errors were already doing it like this.

Contributes to issue CURA-9100.
 2022-04-11 10:00:32 +02:00
c.lamboo
45bc498c7f Replace RecolorImage with ColorImage 
CURA-8640
 2022-04-08 15:55:34 +02:00
j.delarago
2ffcfafc77 Some place RegularExpressionValidator can't be found in QtQuick 2.10 but can be in 2.15 so all files using RegularExpressionValidator have been bumped to latest QtQuick 
CURA-8640
 2022-04-05 16:10:39 +02:00
j.delarago
2f96f7b410 RegularExpressionValidator requires newer version of QtQuick 
CURA-8640
 2022-04-04 10:45:00 +02:00
Jaime van Kessel
4520fc15f9 Fix display of UM monitor page 2022-04-01 13:45:11 +02:00
c.lamboo
3c9e2a1b08 Update RegExpValidator to RegularExpressionValidator 
Due to Qt6 API change

CURA-8640
 2022-03-30 15:10:37 +02:00
Jaime van Kessel
f436c97abd Roughly strip out the GraphicalEffects 
For some reason qt6 that we built still didn't like it.

Since we wanna know if the rest works, yeeting that stuff out for now
 2022-03-28 16:11:28 +02:00
j.spijker@ultimaker.com
ff21c93f9b
Qt6 dropped QtGraphicalEffects 
https://doc.qt.io/qt-6/qtgraphicaleffects5-index.html

Contributes to CURA-8640
 2022-03-28 15:33:43 +02: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
casper
fd3ef23784 Swap buttons in MonitorConfigOverrideDialog for cura buttons 
CURA-8975
 2022-03-09 12:23:21 +01:00
casper
071ddfb2b1 Fix text elide/word wrap issue in monitor page 
The print job name wasn't elided causing the text to overflow the
progress bar card.

CURA-8688
 2022-03-01 12:38:54 +01:00
casper
6159ccbdc7 Fix darkmode issues in the DiscoverUM3Actions dialog 
CURA-8688
 2022-02-28 12:20:46 +01:00
j.delarago
e2fe50baf1 Merge branch 'replace_controls_1_for_controls_2' into CURA-8688_qt6_cleanup 
# Conflicts:
#	resources/qml/Widgets/Menu.qml
#	resources/qml/Widgets/MenuItem.qml
#	resources/themes/cura-dark/theme.json
#	resources/themes/cura-light/theme.json
 2022-02-28 08:51:42 +01:00
Jaime van Kessel
75ec6f508c Remove unneeded fixed line hight properties 
No idea why this was even done, but there just isnt' a reason to use these.
 2022-02-25 14:27:47 +01:00
Jaime van Kessel
3f4f7f0fcf Remove some extra unneeded theme stuff for monitor page 2022-02-25 14:12:25 +01:00
Jaime van Kessel
2327a71642 Remove monitor margin 
No idea why it was even there as it's own size.
 2022-02-25 13:16:59 +01:00
casper
4a71278d7c Fix monitor page 
CURA-8688
 2022-02-25 10:54:03 +01:00
casper
e03176a1fa Replace UM.MessageDialog with newly added Cura.MessageDialog 
This dialog is different from the `UM.MessageDialog` in that it

CURA-8688
 2022-02-23 14:09:38 +01:00
casper
5a2e26eff6 Merge branch 'replace_controls_1_for_controls_2' into CURA-8685-replace_text_and_progress_bars 
# Conflicts:
#	plugins/PerObjectSettingsTool/PerObjectItem.qml
#	plugins/PerObjectSettingsTool/SettingPickDialog.qml
 2022-02-18 09:07:25 +01:00
Jaime van Kessel
58e6cde6e8 Remove incorrect refferents to btnOk 2022-02-17 15:10:18 +01:00
Jaime van Kessel
40f835ed13 Replace labels for UM.Label in DiscoverUM3Action 
CURA-8685
 2022-02-15 15:51:07 +01:00
casper
aeb433b2a1 Keep showing ip enter dialog after wrongly entered ip address 
In component discover um 3 dialog. After a "complete" action the
dialog will immediately close. This was undesired behaviour as we want
to keep the dialog active if an IP address is wrongly added.

Additionally, it is no longer necessary to close/hide the dialog after
a reject/accept as this is done by default.

CURA-8955
 2022-02-15 09:29:32 +01:00
casper
3f658a4914 Change UM.Dialog to Controls.Dialog in connect to printer by ip window 
As `UM.Dialog` is opened using in a new window, the error-confirmation
that was displayed in a `UM.Dialog` was displayed _behind_ the window
object.

CURA 8687
 2022-02-11 14:37:32 +01:00
casper
1c711129e2 Merge branch 'replace_controls_1_for_controls_2' into CURA-8687_dialogs 
# Conflicts:
#	resources/qml/Account/SyncState.qml
#	resources/qml/Preferences/ReadOnlySpinBox.qml
 2022-02-11 10:44:52 +01:00
Jaime van Kessel
7abe62a8ec Fix weird wrapping in monitor page 2022-02-10 11:29:14 +01:00
casper
84ecc8d168 Remove unused imports 
CURA 8687
 2022-02-09 15:50:05 +01:00
j.delarago
1375b1c657 Remove unused QtQuick.Dialogs imports 
Cura-8687
 2022-02-09 14:56:06 +01:00
Ghostkeeper
2606a3b847
Change remaining MessageDialogs to our version 
Contributes to issue CURA-8687.
 2022-02-04 15:49:06 +01:00
Ghostkeeper
85d0749f5f
Use Controls2 ListView instead of ScrollView for print job list 
No need for a ScrollView in Controls 2. And specialise the scroll bar.
Be sure to also align the right side of the contents with the scroll bar though.

Contributes to issue CURA-8686.
 2022-01-18 17:27:51 +01:00
Ghostkeeper
d87551ac9c
Use Controls2 ListView instead of Controls1 ScrollView to scroll 
Just a listview with a specialised scroll bar.

Contributes to issue CURA-8686.
 2022-01-18 17:01:16 +01:00
Jaime van Kessel
2aa931cbca Remove unneded styles import 2022-01-04 09:48:02 +01:00
Jaime van Kessel
f11d728c6b Merge branch 'master' of github.com:Ultimaker/Cura into replace_controls_1_for_controls_2 2022-01-03 15:32:58 +01:00
Remco Burema
20b435af76
Qt5->Qt6: More renamed stuff. 
part of CURA-8591
 2021-12-29 11:18:49 +01:00
Remco Burema
abe7c1bf7f
Search/replace Qt5->Qt6. 
part of upgrading Qt to v6.2: CURA-8591
 2021-12-28 14:46:02 +01:00
Remco Burema
0e3524cddb
Reintroduce hack for waiting state in monitor. 
Some printers don't send the correct state it seems, so we have to have this hack back.

CURA-8764
 2021-12-17 11:50:45 +01:00
Ghostkeeper
9674c54efb
Better type checking and handling of optionals 
Adds type checking here and there to catch such errors in the future.
This makes it handle the optional fields of this model better.

Contributes to issue CURA-8730.
 2021-12-08 17:36:09 +01:00
Ghostkeeper
770adb2c02
Don't store None as capabilities, but empty list 
This makes a few things easier. You could see None as being a signalling value to indicate that we don't know capabilities, but this signalling would get lost anyway in the serialising to the metadata. So just an empty list is fine for now.

Contributes to issue CURA-8671.
 2021-12-03 13:36:06 +01:00
Ghostkeeper
6d9142579a
Add debuging repr to print more nicely 
Otherwise you just see <CloudClusterResponse object> when you try to print this.

Contributes to issue CURA-8671.
 2021-12-03 13:26:29 +01:00
Ghostkeeper
0477ba44b2
Encode capabilities as comma-separated list 
Previously it was encoded as a stringified Python list of strings, which is much harder to parse.
This would go wrong if any of these capabilities have a comma in them, but I think that would be bad practice for keywords like this anyway.

Contributes to issue CURA-8671.
 2021-12-03 13:25:41 +01:00