GitHub-Proxy/Cura
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/Ultimaker/Cura synced 2025-07-03 14:55:12 +08:00
Code Issues Packages Projects Releases Wiki Activity

Directly use bindings in banner pages

Browse Source 
CURA-8564
This commit is contained in:
casper 2021-11-29 11:50:52 +01:00 committed by Jelle Spijker
parent 815aadb0d7
commit 7e1247b171
No known key found for this signature in database
GPG Key ID: 6662DC033BE6B99A
4 changed files with 8 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
cura/CuraApplication.py
View File

@ -2015,33 +2015,6 @@ class CuraApplication(QtApplication):
show_whatsnew_only = has_active_machine and has_app_just_upgraded show_whatsnew_only = has_active_machine and has_app_just_upgraded
return show_whatsnew_only return show_whatsnew_only
@pyqtSlot(result = bool)
def shouldShowMarketPlacePluginBanner(self) -> bool:
return self._preferences.getValue("cura/market_place_show_plugin_banner")
@pyqtSlot(result = bool)
def shouldShowMarketPlaceMaterialBanner(self) -> bool:
return self._preferences.getValue("cura/market_place_show_material_banner")
@pyqtSlot(result = bool)
def shouldShowMarketPlaceManagePackagesBanner(self) -> bool:
return self._preferences.getValue("cura/market_place_show_manage_packages_banner")
@pyqtSlot()
def closeMarketPlacePluginBanner(self) -> None:
Logger.log("i", "Close market place plugin banner")
self._preferences.setValue("cura/market_place_show_plugin_banner", False)
@pyqtSlot()
def closeMarketPlaceMaterialBanner(self) -> None:
Logger.log("i", "Close market place material banner")
self._preferences.setValue("cura/market_place_show_material_banner", False)
@pyqtSlot()
def closeMarketPlaceManagePackagesBanner(self) -> None:
Logger.log("i", "Close market place manage packages banner")
self._preferences.setValue("cura/market_place_show_manage_packages_banner", False)
@pyqtSlot(result = int) @pyqtSlot(result = int)
def appWidth(self) -> int: def appWidth(self) -> int:
main_window = QtApplication.getInstance().getMainWindow() main_window = QtApplication.getInstance().getMainWindow()

4
plugins/Marketplace/resources/qml/ManagedPackages.qml
View File

@ -11,12 +11,12 @@ Packages
{ {
pageTitle: catalog.i18nc("@header", "Manage packages") pageTitle: catalog.i18nc("@header", "Manage packages")
bannerVisible: CuraApplication.shouldShowMarketPlaceManagePackagesBanner() bannerVisible: UM.Preferences.getValue("cura/market_place_show_manage_packages_banner");
bannerIcon: "ArrowDoubleCircleRight" bannerIcon: "ArrowDoubleCircleRight"
bannerBody: catalog.i18nc("@text", "Manage your Ultimaker Cura plugins and material profiles here. Make sure to keep your plugins up to date and backup your setup regularly.") bannerBody: catalog.i18nc("@text", "Manage your Ultimaker Cura plugins and material profiles here. Make sure to keep your plugins up to date and backup your setup regularly.")
readMoreUrl: "" // TODO add when support page is ready readMoreUrl: "" // TODO add when support page is ready
onRemoveBanner: function() { onRemoveBanner: function() {
CuraApplication.closeMarketPlaceManagePackagesBanner(); UM.Preferences.setValue("cura/market_place_show_manage_packages_banner", false);
bannerVisible = false; bannerVisible = false;
} }

5
plugins/Marketplace/resources/qml/Materials.qml
View File

@ -2,17 +2,18 @@
// Cura is released under the terms of the LGPLv3 or higher. // Cura is released under the terms of the LGPLv3 or higher.
import Marketplace 1.0 as Marketplace import Marketplace 1.0 as Marketplace
import UM 1.4 as UM
Packages Packages
{ {
pageTitle: catalog.i18nc("@header", "Install Materials") pageTitle: catalog.i18nc("@header", "Install Materials")
bannerVisible: CuraApplication.shouldShowMarketPlaceMaterialBanner() bannerVisible: UM.Preferences.getValue("cura/market_place_show_material_banner")
bannerIcon: "Spool" bannerIcon: "Spool"
bannerBody: catalog.i18nc("@text", "Streamline your workflow and customize your Ultimaker Cura experience with plugins contributed by our amazing community of users.") bannerBody: catalog.i18nc("@text", "Streamline your workflow and customize your Ultimaker Cura experience with plugins contributed by our amazing community of users.")
readMoreUrl: "" // TODO add when support page is ready readMoreUrl: "" // TODO add when support page is ready
onRemoveBanner: function() { onRemoveBanner: function() {
CuraApplication.closeMarketPlaceMaterialBanner(); UM.Preferences.setValue("cura/market_place_show_material_banner", false);
bannerVisible = false; bannerVisible = false;
} }

5
plugins/Marketplace/resources/qml/Plugins.qml
View File

@ -2,17 +2,18 @@
// Cura is released under the terms of the LGPLv3 or higher. // Cura is released under the terms of the LGPLv3 or higher.
import Marketplace 1.0 as Marketplace import Marketplace 1.0 as Marketplace
import UM 1.4 as UM
Packages Packages
{ {
pageTitle: catalog.i18nc("@header", "Install Plugins") pageTitle: catalog.i18nc("@header", "Install Plugins")
bannerVisible: CuraApplication.shouldShowMarketPlacePluginBanner() bannerVisible: UM.Preferences.getValue("cura/market_place_show_plugin_banner")
bannerIcon: "Shop" bannerIcon: "Shop"
bannerBody: catalog.i18nc("@text", "Select and install material profiles optimised for your Ultimaker 3D printers.") bannerBody: catalog.i18nc("@text", "Select and install material profiles optimised for your Ultimaker 3D printers.")
readMoreUrl: "" // TODO add when support page is ready readMoreUrl: "" // TODO add when support page is ready
onRemoveBanner: function() { onRemoveBanner: function() {
CuraApplication.closeMarketPlacePluginBanner(); UM.Preferences.setValue("cura/market_place_show_plugin_banner", false)
bannerVisible = false; bannerVisible = false;
} }