GitHub-Proxy/Cura
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/Ultimaker/Cura synced 2025-05-03 17:24:21 +08:00
Code Issues Packages Projects Releases Wiki Activity
31,339 Commits 289 Branches 260 Tags
Commit Graph

49 Commits

Author SHA1 Message Date
Ghostkeeper
d1747e09e1
Fix link to help page when material package is missing 
In this case we don't want to link to Ultimaker's internal help pages, but to the public support pages.
 2022-06-20 10:48:13 +02:00
c.lamboo
70c36fc80f Use correct status icon 
CURA-6990
 2022-06-03 10:13:29 +02:00
j.delarago
277a6a38b2 Update campaign link 
CURA-6990
 2022-06-02 17:40:14 +02:00
j.delarago
a0fd5afbe7 Add missing warning badge 
CURA-6990
 2022-06-02 17:38:50 +02:00
j.delarago
511b10c084 Display package cards in the package list for packages that can't be found on the marketplace api. 
When the final page of results is fetched, the list of all package_ids retrieved from the api will be compared with the ones we were searching for. Any that are missing have cards displayed with only basic information (name and version).

CURA-6990
 2022-06-02 16:54:08 +02:00
Ghostkeeper
fc4585e098
Merge branch '5.0' 
Conflicts:
	plugins/Marketplace/resources/qml/PackageCardHeader.qml -> An improvement for future translations was made at the same time as a change to the label here.
 2022-05-16 15:11:39 +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
7265509054 Merge branch '5.0' of github.com:Ultimaker/Cura 2022-05-03 13:48:31 +02:00
j.delarago
c11ff2ebf6 Add context to "By" string, lots of questions from the translators about this one. 2022-05-02 15:11:51 +02:00
j.delarago
16bb9952c7 Fix marketplace external link button being tiny. 
CURA-9194
 2022-04-26 15:55:08 +02:00
c.lamboo
45bc498c7f Replace RecolorImage with ColorImage 
CURA-8640
 2022-04-08 15:55:34 +02:00
Jaime van Kessel
c88ed076a1 Fix resolving of URL's 2022-04-06 09:57:45 +02:00
casper
70f66648f4 Recolor placeholder icon for packages/plugins correctly in dark-mode 
As we don't want to recolor the icon if the package has a custom icon
a `Image` or `UM.RecolorImage` is shown conditionally.

CURA-8975
 2022-03-09 12:10:49 +01:00
Casper Lamboo
9fa6698da3
Merge pull request #11536 from Ultimaker/CURA-8834_marketplace_packages_install_status_in_list 
Show install, uninstall & disable buttons in packages list
 2022-02-24 13:39:49 +01:00
Jaime van Kessel
19e43e8b66
Apply suggestions from code review 
CURA-8762

Co-authored-by: Casper Lamboo <c.lamboo@ultimaker.com>
 2022-02-24 13:26:28 +01:00
Jaime van Kessel
095b8dc5dd Show install, uninstall & disable buttons in packages list 
This splits up the single show controls property into three seperate ones
and no longer hides installed packages from the plugin & materials list

CURA-8834
 2022-02-23 16:51:26 +01:00
Jaime van Kessel
3b801e9f18 Change top external button to point to marketplace website 
CURA-8762
 2022-02-23 09:57:04 +01:00
Jaime van Kessel
7926a2bbdc Add placeholders for material & plugin icons 
CURA-8762
 2022-02-22 16:33:52 +01:00
Jaime van Kessel
0b39fb1c91 Hide download count in manage page 
CURA-8726
 2022-02-22 15:18:49 +01:00
Jaime van Kessel
60e6d7bcae Fix too large clickable area for author info in package card 
CURA-8588
 2022-01-03 11:20:27 +01:00
Jaime van Kessel
8df204b327 Remove unneeded control 
CURA-8587
 2021-12-17 16:49:16 +01:00
Jelle Spijker
bd7a73e7ef
Invert style of install button 
Contribute to CURA-8587
 2021-12-16 17:31:08 +01:00
Jelle Spijker
23d6c2390f
Fixed the updating button 
Contributes to CURA-8587
 2021-12-16 12:37:41 +01:00
Jelle Spijker
62c6af1ef3
Don't show the enable button on recently installed plugins 
Contributes to CURA-8587
 2021-12-16 11:31:51 +01:00
Jelle Spijker
23cc7084c4
Switch between correct states of the un-/installed buttons 
Contributes to CURA-8587
 2021-12-15 17:51:38 +01:00
casper
5f444fa5b7 Simplify enabled busy state 
both the `installManageButton` and `updateManageButton` are busy when
`packageData.busy`, so the
`!(installManageButton.busy || updateManageButton.busy)` check didn't
make much sense.

CURA-8587
 2021-12-14 17:49:25 +01:00
casper
c338d8f5ce Only show enable/disable button if plugin is installed 
CURA-8587
 2021-12-14 16:37:16 +01:00
Jaime van Kessel
08eba9f21a Fix updating package 
CURA-8587
 2021-12-13 15:17:19 +01:00
Jaime van Kessel
d50dc59aac Simplifications and cleanup 
CURA-8587
 2021-12-13 15:13:00 +01:00
Jaime van Kessel
d422e0d4ee Simplify onClicked for install button 
CURA-8587
 2021-12-13 14:18:50 +01:00
Jaime van Kessel
62f99a28b3 Simplify the update logic in the package model / card 
CURA-8587
 2021-12-13 14:15:16 +01:00
Jaime van Kessel
4b358496d9 Simplify enable/disable button visibility 
CURA-8587
 2021-12-13 13:15:16 +01:00
Jaime van Kessel
aa29114470 Correctly set defaults of managebutton 
CURA-8587
 2021-12-13 13:13:42 +01:00
Jaime van Kessel
8c0d4899ed Remove unneeded {} 
CURA-8587
 2021-12-13 13:12:06 +01:00
Jaime van Kessel
274b98f9b1 Remove unneeded "primary_action" from managebutton 2021-12-13 13:09:17 +01:00
Jelle Spijker
e72655cc22
Moved busy/confirmed logic to QML 
COntributes to CURA-8587
 2021-12-10 17:38:20 +01:00
Jelle Spijker
a571e87553
Fixed the spinner 
Contributes to CURA-8587
 2021-12-10 12:39:44 +01:00
Jelle Spijker
d9f77d7ffd
Moved the update logic to the PackageManager 
Contributes to CURA-8587
 2021-12-10 11:14:51 +01:00
Jelle Spijker
1adae61f39
Enable and disabled now toggle correctly 
Contributes to: CURA-8587
 2021-12-09 15:49:05 +01:00
Jelle Spijker
4c5ca22b24
Handle bundled packages which can be Downgraded 
Contributes to: CURA-8587
 2021-12-09 12:04:47 +01:00
Jelle Spijker
8a583a4323
Fixed Enable button text and style 
Contributes to: CURA-8587
 2021-12-09 10:27:27 +01:00
Jelle Spijker
0299bb1694
Fixed update buttons 
Contributes to: CURA-8587
 2021-12-09 10:24:26 +01:00
Jelle Spijker
8dc88e52c2
Don't show the Enable buttons for materials 
Contributes to: CURA-8587
 2021-12-09 10:03:56 +01:00
Jelle Spijker
51a77f683d
Moved stateManageButton logic out of the packageModel 
Contributes to: CURA-8587
 2021-12-09 09:56:41 +01:00
Jelle Spijker
7734bf5169
Show Install and Update buttons in the correct scenario's 
Contributes to: CURA-8587
 2021-12-09 07:58:14 +01:00
casper
8708fd0f3a Merge remote-tracking branch 'origin/CURA-8587_disable_update_install_and_uninstall' into CURA-8587_disable_update_install_and_uninstall 
# Conflicts:
#	plugins/Marketplace/resources/qml/PackageCard.qml
#	plugins/Marketplace/resources/qml/PackagePage.qml
 2021-12-08 20:01:55 +01:00
casper
d405652db7 Combine dublicated elements from PackageCard and PackagePage into 
reusable component `PackageCardHeader`

cura 8734
 2021-12-08 19:41:50 +01:00