From cb24549d7d0caa4f010bb0c26a40e0a8ace84a5e Mon Sep 17 00:00:00 2001
From: Lipu Fei <lipu.fei815@gmail.com>
Date: Thu, 1 Nov 2018 08:29:52 +0100
Subject: [PATCH 1/2] Set CuraApplication display name

CURA-5842
---
 cura/CuraApplication.py | 1 +
 1 file changed, 1 insertion(+)

diff --git a/cura/CuraApplication.py b/cura/CuraApplication.py
index fc9ba1ebf4..3e9e44149b 100755
--- a/cura/CuraApplication.py
+++ b/cura/CuraApplication.py
@@ -161,6 +161,7 @@ class CuraApplication(QtApplication):
 
     def __init__(self, *args, **kwargs):
         super().__init__(name = "cura",
+                         app_display_name = "Ultimaker Cura",
                          version = CuraVersion,
                          buildtype = CuraBuildType,
                          is_debug_mode = CuraDebugMode,

From ff4dfcf9a6259b477bee7a5685e025df1b6c5b12 Mon Sep 17 00:00:00 2001
From: Lipu Fei <lipu.fei815@gmail.com>
Date: Thu, 1 Nov 2018 12:14:49 +0100
Subject: [PATCH 2/2] Make Cura app display name configurable

CURA-5842
---
 CMakeLists.txt          | 1 +
 cura/CuraApplication.py | 5 +++--
 cura/CuraVersion.py.in  | 1 +
 3 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 9e9bf4b538..deb4e63935 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -17,6 +17,7 @@ if(CURA_DEBUGMODE)
     set(_cura_debugmode "ON")
 endif()
 
+set(CURA_APP_DISPLAY_NAME "Ultimaker Cura" CACHE STRING "Display name of Cura")
 set(CURA_VERSION "master" CACHE STRING "Version name of Cura")
 set(CURA_BUILDTYPE "" CACHE STRING "Build type of Cura, eg. 'PPA'")
 set(CURA_SDK_VERSION "" CACHE STRING "SDK version of Cura")
diff --git a/cura/CuraApplication.py b/cura/CuraApplication.py
index 3e9e44149b..454c2529dc 100755
--- a/cura/CuraApplication.py
+++ b/cura/CuraApplication.py
@@ -128,8 +128,9 @@ if TYPE_CHECKING:
 numpy.seterr(all = "ignore")
 
 try:
-    from cura.CuraVersion import CuraVersion, CuraBuildType, CuraDebugMode, CuraSDKVersion
+    from cura.CuraVersion import CuraAppDisplayName, CuraVersion, CuraBuildType, CuraDebugMode, CuraSDKVersion
 except ImportError:
+    CuraAppDisplayName = "Ultimaker Cura"
     CuraVersion = "master"  # [CodeStyle: Reflecting imported value]
     CuraBuildType = ""
     CuraDebugMode = False
@@ -161,7 +162,7 @@ class CuraApplication(QtApplication):
 
     def __init__(self, *args, **kwargs):
         super().__init__(name = "cura",
-                         app_display_name = "Ultimaker Cura",
+                         app_display_name = CuraAppDisplayName,
                          version = CuraVersion,
                          buildtype = CuraBuildType,
                          is_debug_mode = CuraDebugMode,
diff --git a/cura/CuraVersion.py.in b/cura/CuraVersion.py.in
index 226b2183f2..388429bc02 100644
--- a/cura/CuraVersion.py.in
+++ b/cura/CuraVersion.py.in
@@ -1,6 +1,7 @@
 # Copyright (c) 2015 Ultimaker B.V.
 # Cura is released under the terms of the LGPLv3 or higher.
 
+CuraAppDisplayName = "@CURA_APP_DISPLAY_NAME@"
 CuraVersion = "@CURA_VERSION@"
 CuraBuildType = "@CURA_BUILDTYPE@"
 CuraDebugMode = True if "@_cura_debugmode@" == "ON" else False