350 Commits

Author SHA1 Message Date
Jaime van Kessel
a36fedabe5 Remove unused fontMetrics objects
CURA-8762
2022-02-22 15:53:07 +01:00
Jaime van Kessel
ac6375d17b Don't nest all content in background rect
This way we don't have an extra identation depth, makes it a bit easier to read

CURA-8726
2022-02-22 15:47:48 +01:00
Jaime van Kessel
a05650f64c Fix margins for OnboardBanner
Re-usable components shouldn't really be setting layout themselves.
This should be done by whomever creates them.

The actual fix is that the banner no longe sets all margins, only left & right

CURA-8726
2022-02-22 15:44:30 +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
adfb78e38a Fix spacing
CURA-8762
2022-02-22 15:11:11 +01:00
Jaime van Kessel
80f99b0a59 Fix positioning of marketplace searchbar
CURA-8762
2022-02-22 15:03:57 +01:00
Jaime van Kessel
7deeb26e13 Merge branch 'marketplace_redesign' of github.com:Ultimaker/Cura into CURA-8588_replace_toolbox_with_marketplace 2022-01-03 11:32:06 +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
6a39862349 Merge RestartManager into marketplace
CURA-8588
2022-01-03 11:12:52 +01:00
Jaime van Kessel
6af2677c52 Remove TabManager
Since marketplace itself already needed to be a qObject, there wasn't
really a need to have a seperate object for it
2022-01-03 11:06:19 +01:00
Jaime van Kessel
3b2be48390 Ensure that check for updates is called on startup of Cura
CURA-8588
2022-01-03 11:01:17 +01:00
Jaime van Kessel
c92fcc8e03 Simplify the notifaction icon logic
CURA-8658
2022-01-03 10:14:22 +01:00
casper
fe30a3c19e Add notification badge for the gear icon in the Market Place
CURA 8658
2021-12-30 12:24:14 +01:00
Remco Burema
1cdeaffab7
Make new Marktetplace react to 'get more materials'.
part of CURA-8588
2021-12-30 11:53:42 +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
62596a42e6 Remove un-needed column component
CURA-8587
2021-12-15 10:44:25 +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
Jaime van Kessel
08685af9de Switch ManageButton over to implicitWidth & height instead of layout
This makes it a much easier to re-use component.

CURA-8587
2021-12-13 12:24:18 +01:00
Jaime van Kessel
f993243d57 Remove unneeded import
CURA-8587
2021-12-13 12:08:33 +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
casper
4991c39535 Make sure ManageButton has the correct width and height
Cura 8587
2021-12-09 22:41:14 +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
59470814e2
Show spinner again
Contributes to: CURA-8587
2021-12-09 08:30:22 +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
Jelle Spijker
9f41115bc1
Rework of the ManageButton
Now uses the internal signal

Contributes to: CURA-8587
2021-12-08 18:47:56 +01:00
Jelle Spijker
fb950e39c9
Merge pull request #11037 from Ultimaker/CURA-8734_Package_card_refactor
Cura 8734 package card refactor
2021-12-08 16:08:24 +01:00
casper
c72fd12ea2 Make ManageButton a reusable Component
cura 8734
2021-12-08 15:50:00 +01:00
casper
4a436b5598 Display different types of manage buttons through Loader.sourceComponent
cura 8734
2021-12-08 14:46:29 +01:00