diff options
| author | Ghostkeeper <rubend@tutanota.com> | 2019-12-05 17:31:51 +0300 |
|---|---|---|
| committer | Ghostkeeper <rubend@tutanota.com> | 2019-12-05 17:31:51 +0300 |
| commit | f7709c11bc2a28fa5b45ae97dbff8c7a1e301fbf (patch) | |
| tree | f5f07ff8e3cdb6a6a0ca62dab7978be3cd861f06 | |
| parent | 4a9f09fa671f9a03a85644ef30cfe8f40167e553 (diff) | |
| parent | 4811f15a7b60e4e4f388035b7dd5cd4eb1e17aae (diff) | |
Merge branch 'master' of ssh://github.com/Ultimaker/Cura
| -rw-r--r-- | cura/CrashHandler.py | 4 | ||||
| -rwxr-xr-x | plugins/SliceInfoPlugin/SliceInfo.py | 3 |
2 files changed, 7 insertions, 0 deletions
diff --git a/cura/CrashHandler.py b/cura/CrashHandler.py index 1d85a1da54..1ec00787d7 100644 --- a/cura/CrashHandler.py +++ b/cura/CrashHandler.py @@ -25,6 +25,8 @@ from UM.View.GL.OpenGL import OpenGL from UM.i18n import i18nCatalog from UM.Resources import Resources +from cura import ApplicationMetadata + catalog = i18nCatalog("cura") MYPY = False @@ -181,6 +183,7 @@ class CrashHandler: self.cura_version = catalog.i18nc("@label unknown version of Cura", "Unknown") crash_info = "<b>" + catalog.i18nc("@label Cura version number", "Cura version") + ":</b> " + str(self.cura_version) + "<br/>" + crash_info += "<b>" + catalog.i18nc("@label Cura build type", "Cura build type") + ":</b> " + str(ApplicationMetadata.CuraBuildType) + "<br/>" crash_info += "<b>" + catalog.i18nc("@label Type of platform", "Platform") + ":</b> " + str(platform.platform()) + "<br/>" crash_info += "<b>" + catalog.i18nc("@label", "Qt version") + ":</b> " + str(QT_VERSION_STR) + "<br/>" crash_info += "<b>" + catalog.i18nc("@label", "PyQt version") + ":</b> " + str(PYQT_VERSION_STR) + "<br/>" @@ -191,6 +194,7 @@ class CrashHandler: group.setLayout(layout) self.data["cura_version"] = self.cura_version + self.data["cura_build_type"] = ApplicationMetadata.CuraBuildType self.data["os"] = {"type": platform.system(), "version": platform.version()} self.data["qt_version"] = QT_VERSION_STR self.data["pyqt_version"] = PYQT_VERSION_STR diff --git a/plugins/SliceInfoPlugin/SliceInfo.py b/plugins/SliceInfoPlugin/SliceInfo.py index acab445fd6..af8a8b9853 100755 --- a/plugins/SliceInfoPlugin/SliceInfo.py +++ b/plugins/SliceInfoPlugin/SliceInfo.py @@ -18,6 +18,8 @@ from UM.Logger import Logger from UM.PluginRegistry import PluginRegistry from UM.Qt.Duration import DurationFormat +from cura import ApplicationMetadata + from .SliceInfoJob import SliceInfoJob @@ -119,6 +121,7 @@ class SliceInfo(QObject, Extension): data["time_stamp"] = time.time() data["schema_version"] = 0 data["cura_version"] = application.getVersion() + data["cura_build_type"] = ApplicationMetadata.CuraBuildType active_mode = Application.getInstance().getPreferences().getValue("cura/active_mode") if active_mode == 0: |