From 46e53ff0c3bef0413b25cc4681193b47dc1b3455 Mon Sep 17 00:00:00 2001 From: Mark Date: Wed, 21 Mar 2018 10:26:23 +0100 Subject: [PATCH 1/2] Clarify text CURA-4833 --- cura/CrashHandler.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/cura/CrashHandler.py b/cura/CrashHandler.py index c082578218..f51174aec0 100644 --- a/cura/CrashHandler.py +++ b/cura/CrashHandler.py @@ -85,14 +85,14 @@ class CrashHandler: dialog = QDialog() dialog.setMinimumWidth(500) dialog.setMinimumHeight(170) - dialog.setWindowTitle(catalog.i18nc("@title:window", "Cura Crashed")) + dialog.setWindowTitle(catalog.i18nc("@title:window", "Cura can't startup")) dialog.finished.connect(self._closeEarlyCrashDialog) layout = QVBoxLayout(dialog) label = QLabel() - label.setText(catalog.i18nc("@label crash message", """

A fatal error has occurred.

-

Unfortunately, Cura encountered an unrecoverable error during start up. It was possibly caused by some incorrect configuration files. We suggest to backup and reset your configuration.

+ label.setText(catalog.i18nc("@label crash message", """

Oops, Ultimaker Cura has encountered something that doesn't seem right.

+

We encountered an unrecoverable error during start up. It was possibly caused by some incorrect configuration files. We suggest to backup and reset your configuration.

Backups can be found in the configuration folder.

Please send us this Crash Report to fix the problem.

""")) @@ -220,7 +220,7 @@ class CrashHandler: def _messageWidget(self): label = QLabel() - label.setText(catalog.i18nc("@label crash message", """

A fatal error has occurred. Please send us this Crash Report to fix the problem

+ label.setText(catalog.i18nc("@label crash message", """

A fatal error has occurred in Cura. Please send us this Crash Report to fix the problem

Please use the "Send report" button to post a bug report automatically to our servers

""")) From 42b40a713d58e12eecd8b5e0c960dc866a23bf8c Mon Sep 17 00:00:00 2001 From: Diego Prado Gesto Date: Wed, 21 Mar 2018 10:34:25 +0100 Subject: [PATCH 2/2] CURA-4870 Adapt the colors of the configuration list for the Ultimaker dark theme. --- .../qml/Menus/ConfigurationMenu/ConfigurationListView.qml | 2 ++ resources/themes/cura-dark/theme.json | 8 ++++++++ 2 files changed, 10 insertions(+) diff --git a/resources/qml/Menus/ConfigurationMenu/ConfigurationListView.qml b/resources/qml/Menus/ConfigurationMenu/ConfigurationListView.qml index 88173195be..331d78ead9 100644 --- a/resources/qml/Menus/ConfigurationMenu/ConfigurationListView.qml +++ b/resources/qml/Menus/ConfigurationMenu/ConfigurationListView.qml @@ -30,6 +30,7 @@ Column text: catalog.i18nc("@label:header configurations", "Available configurations") font: UM.Theme.getFont("large") width: parent.width - 2 * parent.padding + color: UM.Theme.getColor("configuration_item_text") } Component @@ -42,6 +43,7 @@ Column { text: section font: UM.Theme.getFont("default_bold") + color: UM.Theme.getColor("configuration_item_text") } } } diff --git a/resources/themes/cura-dark/theme.json b/resources/themes/cura-dark/theme.json index 5fbe36fcdb..26e6c2ac8b 100644 --- a/resources/themes/cura-dark/theme.json +++ b/resources/themes/cura-dark/theme.json @@ -207,6 +207,14 @@ "layerview_support_interface": [64, 192, 255, 255], "layerview_nozzle": [181, 166, 66, 120], + "configuration_item": [0, 0, 0, 0], + "configuration_item_active": [12, 169, 227, 179], + "configuration_item_text": [255, 255, 255, 255], + "configuration_item_text_active": [255, 255, 255, 255], + "configuration_item_border": [255, 255, 255, 255], + "configuration_item_border_active": [12, 169, 227, 179], + "configuration_item_border_hover": [12, 169, 227, 179], + "material_compatibility_warning": [255, 255, 255, 255], "quality_slider_unavailable": [179, 179, 179, 255],