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

1753 Commits

Author SHA1 Message Date
Jaime van Kessel
4ac8229c33
Clean up codestyle violations 
Boyscouting! CURA-8463
 2022-08-30 10:28:22 +02:00
Jaime van Kessel
36d3a92fc0
Fix gramar mistake in documentation 
CURA-8463
 2022-08-26 13:27:58 +02:00
joeydelarago
17e6bccf51 Create abstract printers when adding lan printers. 
CURA-9514
 2022-08-24 10:07:17 +02:00
jspijker
54e9dbf827 Show device name of failed machine creation in log 
CURA-9277 Detect and Load Specific printers and Cloud Printer Types
 2022-08-22 14:57:37 +02:00
Casper Lamboo
12f3581337
Assign result of createAbstractMachine to a variable 
With prepended underscore to highlight the result of the function is not being used.

CURA-9277
 2022-08-22 14:44:45 +02:00
c.lamboo
d7f119415f Use pretty-printed string for the AbstractMachine name 
Cura-9277

Co-authored-by: joeydelarago <joeydelarago@gmail.com>
 2022-08-19 16:35:00 +02:00
c.lamboo
761bf3b8fa Fix creating abstract machines on account sync 
Cura-9277

Co-authored-by: joeydelarago <joeydelarago@gmail.com>
 2022-08-19 14:44:19 +02:00
joeydelarago
b82f1f4a8c Add new Abstract machine stack type. This represents a type of printers (ultimaker_s3 etc). 
These are created whenever a cloud printer of a new printer type is added.

CURA-9277

Co-authored-by: casperlamboo <c.lamboo@ultimaker.com>
 2022-08-19 13:53:43 +02:00
Ghostkeeper
8a55a2aff6
Further review suggestions 
Contributes to issue CURA-9220.
 2022-08-01 10:49:29 +02:00
Ghostkeeper
7c1a254812
Add newlines before properties 
As suggested in the code review.

Contributes to issue CURA-9220.

Co-authored-by: Jelle Spijker <j.spijker@ultimaker.com>
 2022-08-01 10:47:57 +02:00
Ghostkeeper
615f16bda0
Hide 'show in browser' when the user can't visit the printer overview 
No use then. They can't visit that page.

Contributes to issue CURA-9220.
 2022-07-26 16:57:07 +02:00
Ghostkeeper
19ba092340
Add property of whether the printer details can be read 
We'd assume so, but there is a permissions node for it. If it can't be read by the user, they can't navigate to the printer's overview page. So we should hide the button then.

Contributes to issue CURA-9220.
 2022-07-26 16:56:19 +02:00
Ghostkeeper
e9f9730364
Don't show context menu button if it is empty 
It will likely be empty for guest accounts on networks where the administrator is the only one with rights to access other people's prints.

Contributes to issue CURA-9220.
 2022-07-26 16:36:38 +02:00
Ghostkeeper
5eb340e3f0
Check permissions before showing abort/pause/delete context buttons 
The user needs permissions to do these things, so don't show them if the user can't use them.

Contributes to issue CURA-9220.
 2022-07-25 17:34:34 +02:00
Ghostkeeper
99d93fa58a
Check if the user can change the queue before showing option 
If the user can't change the queue of other prints, then it can't move prints to the top.

Contributes to issue CURA-9220.
 2022-07-25 17:07:52 +02:00
Ghostkeeper
bef10b8b35
Hide print queue if the user can't read the print queue 
If there are no permissions, this would result in an error and a supposedly empty queue. That's incorrect. It should make it more clear that the user has no permissions to view the queue, while appearing that it is the normal workflow (it is for that user). So hide the queue entirely, just like with the UM2+C.

Contributes to issue CURA-9220.
 2022-07-25 16:57:47 +02:00
Ghostkeeper
9e1940dd4b
Move default behaviour up in inheritance hierarchy 
This way, any new printer types we define will automatically get these properties that are used by the monitor stage anyway.

Contributes to issue CURA-9220.
 2022-07-25 16:55:05 +02:00
Ghostkeeper
b4c4371929
Add properties of whether the queue can be manipulated 
Not all printers can do that.

Contributes to issue CURA-9220.
 2022-07-25 16:51:13 +02:00
Ghostkeeper
483911dc4a
Fix error of undefined property when using LAN printers 
This property was defined for Cloud printers, but not for Network printers. In QML this then resulted in an error saying that null cannot be assigned to a bool (for the 'visible' property). The visible property then defaulted to its default, true. And so it was always visible, but still had an error.
The error is now solved so that I can also check for other properties in this visible check.

Contributes to issue CURA-9220.
 2022-07-25 16:49:48 +02:00
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