Split the constants in to files, indicating which constants each file

stores.

Contributes to CURA-6005.

cura/API/Account.py

@@ -6,7 +6,7 @@ from PyQt5.QtCore import QObject, pyqtSignal, pyqtSlot, pyqtProperty
 
 from UM.i18n import i18nCatalog
 from UM.Message import Message
-from cura import CuraConstants
+from cura import UltimakerCloudAuthentication
 
 from cura.OAuth2.AuthorizationService import AuthorizationService
 from cura.OAuth2.Models import OAuth2Settings
@@ -38,7 +38,7 @@ class Account(QObject):
         self._logged_in = False
 
         self._callback_port = 32118
-        self._oauth_root = CuraConstants.CuraCloudAccountAPIRoot
+        self._oauth_root = UltimakerCloudAuthentication.CuraCloudAccountAPIRoot
 
         self._oauth_settings = OAuth2Settings(
             OAUTH_SERVER_URL= self._oauth_root,

cura/ApplicationMetadata.py

@@ -1,15 +1,14 @@
-#
+# Copyright (c) 2018 Ultimaker B.V.
-# This file contains all constant values in Cura
+# Cura is released under the terms of the LGPLv3 or higher.
-#
 
-# -------------
+# ---------
-# Cura Versions
+# Genearl constants used in Cura
-# -------------
+# ---------
 DEFAULT_CURA_DISPLAY_NAME = "Ultimaker Cura"
 DEFAULT_CURA_VERSION = "master"
 DEFAULT_CURA_BUILD_TYPE = ""
 DEFAULT_CURA_DEBUG_MODE = False
-DEFAULT_CURA_SDK_VERSION = "5.0.0"
+DEFAULT_CURA_SDK_VERSION = "6.0.0"
 
 try:
     from cura.CuraVersion import CuraAppDisplayName  # type: ignore
@@ -35,26 +34,3 @@ try:
     from cura.CuraVersion import CuraSDKVersion  # type: ignore
 except ImportError:
     CuraSDKVersion = DEFAULT_CURA_SDK_VERSION
-
-
-# ---------
-# Cloud API
-# ---------
-DEFAULT_CLOUD_API_ROOT = "https://api.ultimaker.com"  # type: str
-DEFAULT_CLOUD_API_VERSION = "1"  # type: str
-DEFAULT_CLOUD_ACCOUNT_API_ROOT = "https://account.ultimaker.com"  # type: str
-
-try:
-    from cura.CuraVersion import CuraCloudAPIRoot  # type: ignore
-except ImportError:
-    CuraCloudAPIRoot = DEFAULT_CLOUD_API_ROOT
-
-try:
-    from cura.CuraVersion import CuraCloudAPIVersion  # type: ignore
-except ImportError:
-    CuraCloudAPIVersion = DEFAULT_CLOUD_API_VERSION
-
-try:
-    from cura.CuraVersion import CuraCloudAccountAPIRoot  # type: ignore
-except ImportError:
-    CuraCloudAccountAPIRoot = DEFAULT_CLOUD_ACCOUNT_API_ROOT

cura/CuraApplication.py

@@ -115,7 +115,7 @@ from cura.ObjectsModel import ObjectsModel
 
 from cura.PrinterOutput.NetworkMJPGImage import NetworkMJPGImage
 
-from cura import CuraConstants
+from cura import ApplicationMetadata
 
 from UM.FlameProfiler import pyqtSlot
 from UM.Decorators import override
@@ -164,11 +164,11 @@ class CuraApplication(QtApplication):
 
     def __init__(self, *args, **kwargs):
         super().__init__(name = "cura",
-                         app_display_name = CuraConstants.CuraAppDisplayName,
+                         app_display_name = ApplicationMetadata.CuraAppDisplayName,
-                         version = CuraConstants.CuraVersion,
+                         version = ApplicationMetadata.CuraVersion,
-                         api_version = CuraConstants.CuraSDKVersion,
+                         api_version = ApplicationMetadata.CuraSDKVersion,
-                         buildtype = CuraConstants.CuraBuildType,
+                         buildtype = ApplicationMetadata.CuraBuildType,
-                         is_debug_mode = CuraConstants.CuraDebugMode,
+                         is_debug_mode = ApplicationMetadata.CuraDebugMode,
                          tray_icon_name = "cura-icon-32.png",
                          **kwargs)
 
@@ -953,7 +953,7 @@ class CuraApplication(QtApplication):
         engine.rootContext().setContextProperty("CuraApplication", self)
         engine.rootContext().setContextProperty("PrintInformation", self._print_information)
         engine.rootContext().setContextProperty("CuraActions", self._cura_actions)
-        engine.rootContext().setContextProperty("CuraSDKVersion", CuraConstants.CuraSDKVersion)
+        engine.rootContext().setContextProperty("CuraSDKVersion", ApplicationMetadata.CuraSDKVersion)
 
         qmlRegisterUncreatableType(CuraApplication, "Cura", 1, 0, "ResourceTypes", "Just an Enum type")
 

cura/UltimakerCloudAuthentication.py

@@ -0,0 +1,24 @@
+# Copyright (c) 2018 Ultimaker B.V.
+# Cura is released under the terms of the LGPLv3 or higher.
+
+# ---------
+# Constants used for the Cloud API
+# ---------
+DEFAULT_CLOUD_API_ROOT = "https://api.ultimaker.com"  # type: str
+DEFAULT_CLOUD_API_VERSION = "1"  # type: str
+DEFAULT_CLOUD_ACCOUNT_API_ROOT = "https://account.ultimaker.com"  # type: str
+
+try:
+    from cura.CuraVersion import CuraCloudAPIRoot  # type: ignore
+except ImportError:
+    CuraCloudAPIRoot = DEFAULT_CLOUD_API_ROOT
+
+try:
+    from cura.CuraVersion import CuraCloudAPIVersion  # type: ignore
+except ImportError:
+    CuraCloudAPIVersion = DEFAULT_CLOUD_API_VERSION
+
+try:
+    from cura.CuraVersion import CuraCloudAccountAPIRoot  # type: ignore
+except ImportError:
+    CuraCloudAccountAPIRoot = DEFAULT_CLOUD_ACCOUNT_API_ROOT

plugins/CuraDrive/src/Settings.py

@@ -1,7 +1,7 @@
 # Copyright (c) 2018 Ultimaker B.V.
 from UM import i18nCatalog
 
-from cura import CuraConstants
+from cura import UltimakerCloudAuthentication
 
 
 class Settings:
@@ -9,7 +9,7 @@ class Settings:
     Keeps the application settings.
     """
     DRIVE_API_VERSION = 1
-    DRIVE_API_URL = "{}/cura-drive/v{}".format(CuraConstants.CuraCloudAPIRoot, str(DRIVE_API_VERSION))
+    DRIVE_API_URL = "{}/cura-drive/v{}".format(UltimakerCloudAuthentication.CuraCloudAPIRoot, str(DRIVE_API_VERSION))
 
     AUTO_BACKUP_ENABLED_PREFERENCE_KEY = "cura_drive/auto_backup_enabled"
     AUTO_BACKUP_LAST_DATE_PREFERENCE_KEY = "cura_drive/auto_backup_date"

plugins/Toolbox/src/Toolbox.py

@@ -16,8 +16,8 @@ from UM.Extension import Extension
 from UM.i18n import i18nCatalog
 from UM.Version import Version
 
-import cura
+from cura import ApplicationMetadata
-from cura import CuraConstants
+from cura import UltimakerCloudAuthentication
 from cura.CuraApplication import CuraApplication
 
 from .AuthorsModel import AuthorsModel
@@ -39,9 +39,9 @@ class Toolbox(QObject, Extension):
 
         self._application = application  # type: CuraApplication
 
-        self._sdk_version = CuraConstants.CuraSDKVersion  # type: Union[str, int]
+        self._sdk_version = ApplicationMetadata.CuraSDKVersion  # type: Union[str, int]
-        self._cloud_api_version = CuraConstants.CuraCloudAPIVersion  # type: int
+        self._cloud_api_version = UltimakerCloudAuthentication.CuraCloudAPIVersion  # type: int
-        self._cloud_api_root = CuraConstants.CuraCloudAPIRoot  # type: str
+        self._cloud_api_root = UltimakerCloudAuthentication.CuraCloudAPIRoot  # type: str
         self._api_url = None  # type: Optional[str]
 
         # Network: