3D-printing/Cura
1
0
Fork 0
mirror of https://github.com/Ultimaker/Cura.git synced 2025-08-07 22:13:58 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 9

Merge branch 'CURA-7278_Differentiate_warning_messages_in_Cura'

Browse source
This commit is contained in:
Ghostkeeper 2021-07-26 15:18:14 +02:00
commit 41b1d8eff5
No known key found for this signature in database
GPG key ID: D2A8871EE34EC59A
7 changed files with 26 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

3
cura/Arranging/ArrangeObjectsJob.py
View file

@ -39,6 +39,7 @@ class ArrangeObjectsJob(Job):
no_full_solution_message = Message(
i18n_catalog.i18nc("@info:status",
"Unable to find a location within the build volume for all objects"),
title = i18n_catalog.i18nc("@info:title", "Can't Find Location"))
title = i18n_catalog.i18nc("@info:title", "Can't Find Location"),
message_type = Message.MessageType.ERROR)
no_full_solution_message.show()
self.finished.emit(self)

8
cura/BuildVolume.py
View file

@ -95,9 +95,11 @@ class BuildVolume(SceneNode):
self._edge_disallowed_size = None
self._build_volume_message = Message(catalog.i18nc("@info:status",
"The build volume height has been reduced due to the value of the"
" \"Print Sequence\" setting to prevent the gantry from colliding"
" with printed models."), title = catalog.i18nc("@info:title", "Build Volume"))
"The build volume height has been reduced due to the value of the"
" \"Print Sequence\" setting to prevent the gantry from colliding"
" with printed models."),
title = catalog.i18nc("@info:title", "Build Volume"),
message_type = Message.MessageType.WARNING)
self._global_container_stack = None # type: Optional[GlobalStack]

3
resources/themes/cura-light/icons/low/Cancel.svg Normal file
View file

@ -0,0 +1,3 @@
<svg width="24" height="24" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg">
<path d="M12 10.5106L8.48936 7L7 8.48936L10.5106 12L7 15.5106L8.48936 17L12 13.4894L15.5106 17L17 15.5106L13.4894 12L17 8.48936L15.5106 7L12 10.5106Z"/>
</svg>
Side by side

After

Width:  |  Height:  |  Size: 244 B

3
resources/themes/cura-light/icons/low/Check.svg Normal file
View file

@ -0,0 +1,3 @@
<svg width="24" height="24" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg">
<path d="M10.7 13.3L7.4 10L6 11.4L10.7 16.1L17.4 9.4L16 8L10.7 13.3Z"/>
</svg>
Side by side

After

Width:  |  Height:  |  Size: 163 B

3
resources/themes/cura-light/icons/low/CircleSolid.svg Normal file
View file

@ -0,0 +1,3 @@
<svg width="24" height="24" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg">
<circle cx="12" cy="12" r="10"/>
</svg>
Side by side

After

Width:  |  Height:  |  Size: 123 B

3
resources/themes/cura-light/icons/low/Warning.svg Normal file
View file

@ -0,0 +1,3 @@
<svg width="24" height="24" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg">
<path d="M13 6H11V13H13V6ZM13 15H11V17H13V15Z"/>
</svg>
Side by side

After

Width:  |  Height:  |  Size: 140 B

9
resources/themes/cura-light/theme.json
View file

@ -239,8 +239,9 @@
"text_scene": [102, 102, 102, 255],
"text_scene_hover": [123, 123, 113, 255],
"error": [255, 140, 0, 255],
"warning": [245, 166, 35, 255],
"error": [218, 30, 40, 255],
"warning": [253, 209, 58, 255],
"success": [36, 162, 73, 255],
"disabled": [229, 229, 229, 255],
"toolbar_button_hover": [232, 242, 252, 255],
@ -363,6 +364,9 @@
"message_close_hover": [8, 7, 63, 255],
"message_progressbar_background": [245, 245, 245, 255],
"message_progressbar_control": [50, 130, 255, 255],
"message_success_icon": [255, 255, 255, 255],
"message_warning_icon": [0, 0, 0, 255],
"message_error_icon": [255, 255, 255, 255],
"tool_panel_background": [255, 255, 255, 255],
@ -616,6 +620,7 @@
"message_radius": [0.25, 0.25],
"message_action_button": [0, 2.5],
"message_image": [15.0, 5.0],
"message_type_icon": [2, 2],
"infill_button_margin": [0.5, 0.5],