3D-printing/Cura
1
0
Fork 0
mirror of https://github.com/Ultimaker/Cura.git synced 2025-08-06 21:44:01 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 10

Merge branch 'master' of https://github.com/Ultimaker/Cura

Browse source
This commit is contained in:
Ian Paschal 2018-03-21 10:48:12 +01:00
commit ad735472ff
3 changed files with 14 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

8
cura/CrashHandler.py
View file

@ -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", """<p><b>A fatal error has occurred.</p></b>
<p>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.</p>
label.setText(catalog.i18nc("@label crash message", """<p><b>Oops, Ultimaker Cura has encountered something that doesn't seem right.</p></b>
<p>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.</p>
<p>Backups can be found in the configuration folder.</p>
<p>Please send us this Crash Report to fix the problem.</p>
"""))
@ -220,7 +220,7 @@ class CrashHandler:
def _messageWidget(self):
label = QLabel()
label.setText(catalog.i18nc("@label crash message", """<p><b>A fatal error has occurred. Please send us this Crash Report to fix the problem</p></b>
label.setText(catalog.i18nc("@label crash message", """<p><b>A fatal error has occurred in Cura. Please send us this Crash Report to fix the problem</p></b>
<p>Please use the "Send report" button to post a bug report automatically to our servers</p>
"""))

2
resources/qml/Menus/ConfigurationMenu/ConfigurationListView.qml
View file

@ -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")
}
}
}

8
resources/themes/cura-dark/theme.json
View file

@ -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],