GitHub-Proxy/Cura
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/Ultimaker/Cura synced 2025-07-06 08:35:13 +08:00
Code Issues Packages Projects Releases Wiki Activity
28,338 Commits 295 Branches 268 Tags
Commit Graph

8896 Commits

Author SHA1 Message Date
Ghostkeeper
61fdd5dc72
Restore check for parent before getting its width 
Delegates that are outside of the viewport may have no parent any more. Don't attempt to find their parents' width.

Contributes to issue CURA-8565.
 2021-11-29 16:32:55 +01:00
Ghostkeeper
616bf479e5
Set position and width of card in details page 
This means that the card itself shouldn't specify a width. It should get a width from how it's used.

Contributes to issue CURA-8565.
 2021-11-29 16:11:15 +01:00
casper
6ca20ba863 Rename properties in marketplace onboarding banner 
CURA-8564
 2021-11-29 15:09:33 +01:00
Ghostkeeper
d5cfaa1e0a
Add package card to detail page 
The card has the wrong layout, but it's a start. The data is communicated in any case.

Contributes to issue CURA-8565.
 2021-11-29 14:50:48 +01:00
casper
c136deb430 Remove top anchor from an element used in ColumnLayout 
This element did need additional margins at the top. Added margins
to the ColumnLayout element instead.

CURA-8564
 2021-11-29 14:34:15 +01:00
Ghostkeeper
5dd2dcce90
Split page in header and contents 
This requires a small refactor here.

Contributes to issue CURA-8565.
 2021-11-29 12:57:36 +01:00
casper
b53c1ba306 Move static anchor properties inside the TertiaryButton element 
CURA-8564
 2021-11-29 12:34:25 +01:00
casper
6909085733 Use color from theme for the market place banner banner text 
CURA-8564
 2021-11-29 12:26:48 +01:00
casper
0ca20e9b3d Use an alias property for the banner icon 
CURA-8564
 2021-11-29 12:16:52 +01:00
Ghostkeeper
07ee729cde
Increase size of icon to fit button exactly 
Contributes to issue CURA-8565.
 2021-11-29 12:03:29 +01:00
casper
f1a9bbd791 Use the Item element instead of Rectangle for banner icon 
To prevent un-necessary draw checks as the background is transparent

CURA-8564
 2021-11-29 12:01:42 +01:00
Ghostkeeper
6d1ffbde69
Remove superfluous anchors.fill 
This is already set by the StackView, which (logically) requires that the children fill the entire space taken by the StackView.

Contributes to issue CURA-8565.
 2021-11-29 11:59:46 +01:00
casper
f8d9f1e39c Use visible property of Rectangle 
rather than defining a separate property

CURA-8564
 2021-11-29 11:55:33 +01:00
casper
00135e574d Rename property bannerBody to bannerText 
CURA-8564
 2021-11-29 11:53:35 +01:00
casper
e5c8d5456d Directly use bindings in banner pages 
CURA-8564
 2021-11-29 11:50:52 +01:00
casper
f1ef1c283e Add links to read me support pages 
Note that since the support pages are not yet ready the "read more"
buttons are hidden. Once the correct link is added they become visible
again.
 2021-11-27 13:48:38 +01:00
casper
964de6c7fb Change font size in banner 2021-11-27 13:31:47 +01:00
casper
feb3046eac Add "readmore" button 2021-11-27 13:31:34 +01:00
Ghostkeeper
0d05e71f9d
Basis of header line 
I think the icon on the button is too small, but that's not currently configurable. Will have to look into that.

Contributes to issue CURA-8565.
 2021-11-26 16:48:02 +01:00
Ghostkeeper
a715274ca7
Add a StackView around Marketplace to allow extra pages on top 
This allows a sort of full-screen pop-up to replace the entire Marketplace window contents, on top of the normal contents. The normal contents are kept as they are, but out of view.

Contributes to issue CURA-8565.
 2021-11-26 16:04:23 +01:00
Jaime van Kessel
b7af37022a Fix vesion update for beta 1 to beta 2 
WHoops! Reviewed by Jelle ;)
 2021-11-26 15:13:50 +01:00
casper
3ddfa6486b Remove banners when clicking close button 2021-11-26 14:49:00 +01:00
Jaime van Kessel
09a569fdd1 Change fonts to default 
No idea why they were medium, but the design clearly shows that it should be the default font
 2021-11-26 14:39:26 +01:00
Jaime van Kessel
60b174177f Also set correct size for package card title 2021-11-26 14:39:02 +01:00
casper
20f94add47 Display different content on each of the marketplace onboarding banners 2021-11-26 10:10:09 +01:00
casper
853f915f2a Add basic onboarding banner to the market place 2021-11-26 10:06:50 +01:00
Ghostkeeper
1df859e046
Catch IndexError when logging errors 
And log that error too, then.

Fixes Sentry issue CURA-32J.
 2021-11-23 19:04:33 +01:00
Ghostkeeper
2f1c157547
Don't attempt writing a workspace before there is a global stack 
This is normally not possible from the interface. However on MacOS, the application menu gets carried to the top bar of the operating system. It is not blocked there, and the user could write a project file before they even add a printer. This prevents Cura from crashing when they do that.

Fixes Sentry issue CURA-2ZR.
 2021-11-23 17:54:26 +01:00
Ghostkeeper
cecd033430
Merge branch 'CURA-8541_Aborted_state_not_reflected_correctly_in_Cura_Monitor_Page' 2021-11-23 16:28:46 +01:00
Jelle Spijker
8427555d6a
Merge pull request #10901 from Ultimaker/CURA-8539_oauth_via_httprequestmanager 
OAuth via HttpRequestManager
 2021-11-23 13:59:45 +01:00
Remco Burema
b98e0d1753
Use author icon if no package icon known. 
part of CURA-8562
 2021-11-23 13:46:33 +01:00
Remco Burema
ac8d5fc12c
More explicit float's in shader just to be sure. 
CURA-8714
 2021-11-23 09:27:25 +01:00
Ghostkeeper
3f92b46ac8
Don't restart refresh token while it's already processing 
If two requests to the API occur at the same time, they will both see at the same time that they need an access token, and if it is expired they will both see that it needs refreshing. The server then sees two refreshes, both with the same refresh token. This is not allowed. The second one then gets a failure to refresh the token, which causes the user to log out.
Instead, we'll stop one of the refresh requests. They were fire-and-forget anyway, so it's not needed to actually continue the request.

Contributes to issue CURA-8539.
 2021-11-22 18:52:43 +01:00
Ghostkeeper
bddcf3cb0c
Add extensible switch case for tooltip 
This way it's
- more clear what the two cases are
- and more robust if we ever add a third.

Contributes to issue CURA-8562.
 2021-11-22 17:16:39 +01:00
Ghostkeeper
35ba8f78a0
Disambiguate associativity of and/or operators 
It's the same, but it's a bit easier to read what it's doing. Placing the package type check first also helps to read what the two cases are here.

Contributes to issue CURA-8562.
 2021-11-22 17:10:56 +01:00
casper
6be0d58039 Add handling of missing printJob status cases 
The `printJob` now also contains a status for detecting aborted prints
that were awaiting cleanup, preventing the need for the additional
checks in the `await_cleanup` status.
 2021-11-19 17:22:13 +01:00
Jelle Spijker
7fd9578599
Unified tooltip description 
Contributes to CURA-8562
 2021-11-19 11:21:29 +01:00
Jelle Spijker
eb3083c84d
use differentiate icon for Ultimaker controlled material/plugin 
Materials can be certified, while plugins can be verified.
Added packageType to the model such that the card knows which icon
to use.

Contributes to CURA-8562
 2021-11-19 11:21:29 +01:00
Jelle Spijker
584411e59e
Moved comments 
if they're inline they mess up the QML syntax highlighter in PyCharm
 2021-11-19 11:21:21 +01:00
Jelle Spijker
0fb78126d5
Merge pull request #10871 from Ultimaker/CURA-8559_mp_searchbar_fixes 
[CURA-8559] (New-)Marketplace Search-Bar UX Fixes
 2021-11-18 11:47:53 +01:00
Remco Burema
dcb9456848
Fix CApitalization and spurious space. 
part of CURA-8561
 2021-11-18 08:44:06 +01:00
Remco Burema
cd255b0ae5
Search Marketplace: Change message if no results found. 
part of CURA-8559
 2021-11-18 08:15:26 +01:00
Remco Burema
307d751c2d
Fix white rectangles in dark mode and height of search-bar. 
part of CURA-8559
 2021-11-18 08:14:04 +01:00
fieldOfView
c6b6af668d Fix shader compilation on some GPUs 
Some GPUs (rightly) complain about the difference between a float and an int. Fixes #10837
 2021-11-18 08:04:14 +01:00
Jaime van Kessel
07e9237d72 Add missing action for button 
CURA-8561
 2021-11-17 14:23:26 +01:00
Jaime van Kessel
183fa06cfe Fix look of external link button 
CURA-8561
 2021-11-17 11:54:12 +01:00
Jaime van Kessel
f6b351f97f Fix size of footer 
CURA-8561
 2021-11-17 11:22:57 +01:00
Jaime van Kessel
5ac0df8b0f Fix styling of scrollbar in marketplace 
CURA-8561
 2021-11-17 11:22:30 +01:00
Jaime van Kessel
f01ce5b43c Fix direction of tooltip point 
CURA-8561
 2021-11-17 10:59:31 +01:00
Jaime van Kessel
d7e023c5ee Fix sizes of icons in package card 
CURA-8561
 2021-11-17 10:56:06 +01:00