436 Commits

Author SHA1 Message Date
j.spijker@ultimaker.com
55cb86ebbd
use namespace AlignmentFlag
Contributes to CURA-8640
2022-03-24 11:58:42 +01: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
Ghostkeeper
25e914b1cb
Fix checkbox for automatic plug-in update checking
The checkbox was still there in the preferences page, but it didn't work at all, for two reasons:
- The preference entry didn't exist. This was causing warnings in the log (which is why I saw it).
- It wasn't checking the preference before making that API call. Could make a bunch of people pretty angry.
2022-03-11 10:25:31 +01: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
j.delarago
e1068fb3bc Replace Text.Align with custom enum alignment
CURA-8943
2022-03-04 14:12:11 +01:00
j.delarago
3c7498feed Move ToolbarButton and ToolTip from Cura into Uranium. This makes it possible to use new styled ToolbarButton in plugins/Tools for the rotate tool.
Removed the ContentAlignment enum in ToolTip in favour of using the Text.ContentAlignment enum. For some reason references to this enum fail everywhere when ToolTip is moved into Uranium. There is some evil time-wasting magic cast on this component!

CURA-8943
2022-03-03 15:53:30 +01:00
j.delarago
30083c13d3 Swap implicit width/height for preferredWidth/Height to avoid binding loop error
CURA-8688
2022-03-02 11:34:03 +01:00
Remco Burema
99449dbc34 Get rid of some errors first.
Was using Qt5 still, even though we're dumping that. Need a bit of a level playing field for an update to the way we handle libArcus and libSavitar.

part of CURA-7924
2022-02-25 13:25:35 +01:00
Jaime van Kessel
5f638ed6c6 Generalize the size of the licence window
No need to have a seperate size of the licence window. Just use
the default modal one
2022-02-25 13:22:55 +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
26c027cbdf Remove unneeded properties from package card
As per review.

CURA-8762
2022-02-24 13:30:25 +01:00
Jaime van Kessel
0d2c8777c5 Add clarifying comment to a small hack
CURA-8762
2022-02-24 13:28:39 +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
df9d2d85c4 Add help links to banners
CURA-8762
2022-02-23 10:12:21 +01:00
Jaime van Kessel
35f1ad4097 Remove read more button on packagecard
CURA-8762
2022-02-23 09:59:12 +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
d29b00b4be Let readmore point towards marketplace URL
CURA-8762
2022-02-22 16:38:47 +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
0d85b2be7f Ensure that scrollbar is centered
CURA-8762
2022-02-22 16:07:11 +01:00
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
61a7203726 Only reset marketplace page if the window isn't visible
CURA-8588
2022-01-04 13:13:31 +01:00
Jaime van Kessel
27e5905a32 Fix typing
CURA-8588
2022-01-03 11:44:05 +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
89c82964c3 Simplify restart check
CURA-8588
2022-01-03 11:14:28 +01:00
Jaime van Kessel
852076460f Remove unused imports
CURA-8588
2022-01-03 11:13:28 +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
0615369cba Clean up import order
CURA-8588
2022-01-03 10:29:15 +01:00
Jaime van Kessel
408b649db7 Add typing to tabmanager
CURA-8588
2022-01-03 10:22:36 +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
cf7772a40a Ensure that local list has update URL
CURA-8587
2021-12-22 14:27:24 +01:00
Jaime van Kessel
532c7a2109 Let new marketplace also check for updates
CURA-8587
2021-12-22 10:19:33 +01:00
Jaime van Kessel
8259868160 Fix update URL
CURA-8587
2021-12-22 10:04:27 +01:00
Jaime van Kessel
afef4f761b Update documentation
CURA-8587
2021-12-20 10:17:30 +01:00
Jaime van Kessel
8df204b327 Remove unneeded control
CURA-8587
2021-12-17 16:49:16 +01:00
Jaime van Kessel
a2a76fefdd Move cleaning up of request to after signals are disconnected
CURA-8587
2021-12-17 16:48:06 +01:00
Jaime van Kessel
83c78c4b4d Remove canInstallChanged signal
It's not needed, this can just be handled with a direct call!

CURA-8587
2021-12-17 16:41:52 +01:00
Jaime van Kessel
8a198f7911 Simplify sorting
CURA-8587
2021-12-17 16:31:11 +01:00
Jaime van Kessel
d015d94965
Update plugins/Marketplace/LocalPackageList.py
CURA-8587

Co-authored-by: Ghostkeeper <Ghostkeeper@users.noreply.github.com>
2021-12-17 16:23:54 +01:00
Jaime van Kessel
4b4229e20a Fix downgrading bundled packages
CURA-8587
2021-12-17 00:44:56 +01:00