From 2e4ee73d2fa172035e117695e7b549f8501db93b Mon Sep 17 00:00:00 2001 From: Nino van Hooff Date: Wed, 11 Dec 2019 16:21:35 +0100 Subject: [PATCH] Add "Enterprise" to the app display name. Will also end up in the main window title and at the top of the debug log. app_name remains unchanged. CURA-7011 --- cura/ApplicationMetadata.py | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-) diff --git a/cura/ApplicationMetadata.py b/cura/ApplicationMetadata.py index 427cc77e65..eb6ab66296 100644 --- a/cura/ApplicationMetadata.py +++ b/cura/ApplicationMetadata.py @@ -22,13 +22,6 @@ try: except ImportError: CuraAppName = DEFAULT_CURA_APP_NAME -try: - from cura.CuraVersion import CuraAppDisplayName # type: ignore - if CuraAppDisplayName == "": - CuraAppDisplayName = DEFAULT_CURA_DISPLAY_NAME -except ImportError: - CuraAppDisplayName = DEFAULT_CURA_DISPLAY_NAME - try: from cura.CuraVersion import CuraVersion # type: ignore if CuraVersion == "": @@ -53,3 +46,13 @@ except ImportError: # Various convenience flags indicating what kind of Cura build it is. __ENTERPRISE_VERSION_TYPE = "enterprise" IsEnterpriseVersion = CuraBuildType.lower() == __ENTERPRISE_VERSION_TYPE + +try: + from cura.CuraVersion import CuraAppDisplayName # type: ignore + if CuraAppDisplayName == "": + if IsEnterpriseVersion: + CuraAppDisplayName = DEFAULT_CURA_DISPLAY_NAME + " Enterprise" + else: + CuraAppDisplayName = DEFAULT_CURA_DISPLAY_NAME +except ImportError: + CuraAppDisplayName = DEFAULT_CURA_DISPLAY_NAME