From e092b908a0a80b9816c6899e1b6dc47ec7f93755 Mon Sep 17 00:00:00 2001 From: Ghostkeeper Date: Fri, 15 Sep 2017 11:06:20 +0200 Subject: [PATCH 1/3] Add message content for WriteRequestFailedErrors The content of the exception is directly put inside a message, so we should give the exception a message. --- .../RemovableDriveOutputDevice/RemovableDriveOutputDevice.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/plugins/RemovableDriveOutputDevice/RemovableDriveOutputDevice.py b/plugins/RemovableDriveOutputDevice/RemovableDriveOutputDevice.py index 4b6a6e8071..e9ee47e810 100644 --- a/plugins/RemovableDriveOutputDevice/RemovableDriveOutputDevice.py +++ b/plugins/RemovableDriveOutputDevice/RemovableDriveOutputDevice.py @@ -60,7 +60,7 @@ class RemovableDriveOutputDevice(OutputDevice): if len(file_formats) == 0: Logger.log("e", "There are no file formats available to write with!") - raise OutputDeviceError.WriteRequestFailedError() + raise OutputDeviceError.WriteRequestFailedError(catalog.i18nc("There are no file formats available to write with!")) # Just take the first file format available. if file_handler is not None: @@ -115,7 +115,7 @@ class RemovableDriveOutputDevice(OutputDevice): name = child.getName() if name: return name - raise OutputDeviceError.WriteRequestFailedError("Could not find a file name when trying to write to {device}.".format(device = self.getName())) + raise OutputDeviceError.WriteRequestFailedError(catalog.i18nc("@info:status Don't translate the tag {device}!", "Could not find a file name when trying to write to {device}.").format(device = self.getName())) def _onProgress(self, job, progress): self.writeProgress.emit(self, progress) From 83e5c5c0532b5aba6a2b8adc8a8f67e39cd9d2a0 Mon Sep 17 00:00:00 2001 From: alekseisasin Date: Fri, 15 Sep 2017 13:27:09 +0200 Subject: [PATCH 2/3] Removed unused tags from cura-light theme.json CURA-4321 --- resources/themes/cura-light/theme.json | 14 -------------- 1 file changed, 14 deletions(-) diff --git a/resources/themes/cura-light/theme.json b/resources/themes/cura-light/theme.json index 92d51ae7d2..98626d3d45 100644 --- a/resources/themes/cura-light/theme.json +++ b/resources/themes/cura-light/theme.json @@ -116,20 +116,6 @@ "sync_button_text": [120, 120, 120, 255], "sync_button_text_hovered": [0, 0, 0, 255], - "tab_checked": [255, 255, 255, 255], - "tab_checked_border": [255, 255, 255, 255], - "tab_checked_text": [24, 41, 77, 255], - "tab_unchecked": [245, 245, 245, 255], - "tab_unchecked_border": [245, 245, 245, 255], - "tab_unchecked_text": [127, 127, 127, 255], - "tab_hovered": [245, 245, 245, 255], - "tab_hovered_border": [245, 245, 245, 255], - "tab_hovered_text": [32, 166, 219, 255], - "tab_active": [255, 255, 255, 255], - "tab_active_border": [255, 255, 255, 255], - "tab_active_text": [24, 41, 77, 255], - "tab_background": [245, 245, 245, 255], - "action_button": [255, 255, 255, 255], "action_button_text": [0, 0, 0, 255], "action_button_border": [127, 127, 127, 255], From b39fece86a3919aff0872137ad0b8315e6f42ac5 Mon Sep 17 00:00:00 2001 From: Mark Date: Fri, 15 Sep 2017 15:53:20 +0200 Subject: [PATCH 3/3] Tweak sidbar size so text is not cut off CURA-4321 --- resources/themes/cura-light/theme.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/resources/themes/cura-light/theme.json b/resources/themes/cura-light/theme.json index 98626d3d45..8cec4d1d03 100644 --- a/resources/themes/cura-light/theme.json +++ b/resources/themes/cura-light/theme.json @@ -289,7 +289,7 @@ "extruder_button_material_margin": [0.70, 0.9], "extruder_button_material": [0.75, 0.75], - "sidebar": [32.0, 10.0], + "sidebar": [34.0, 10.0], "sidebar_margin": [1.71, 1.43], "sidebar_margin_thin": [0.71, 0.71], "sidebar_header": [0.0, 4.0],