GitHub-Proxy/Cura
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/Ultimaker/Cura synced 2025-06-30 19:05:11 +08:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Diego Prado Gesto 2017-09-15 16:05:28 +02:00
commit 255eb2f377
2 changed files with 3 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
plugins/RemovableDriveOutputDevice/RemovableDriveOutputDevice.py
View File

@ -60,7 +60,7 @@ class RemovableDriveOutputDevice(OutputDevice):
if len(file_formats) == 0: if len(file_formats) == 0:
Logger.log("e", "There are no file formats available to write with!") 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. # Just take the first file format available.
if file_handler is not None: if file_handler is not None:
@ -115,7 +115,7 @@ class RemovableDriveOutputDevice(OutputDevice):
name = child.getName() name = child.getName()
if name: if name:
return 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): def _onProgress(self, job, progress):
self.writeProgress.emit(self, progress) self.writeProgress.emit(self, progress)

16
resources/themes/cura-light/theme.json
View File

@ -116,20 +116,6 @@
"sync_button_text": [120, 120, 120, 255], "sync_button_text": [120, 120, 120, 255],
"sync_button_text_hovered": [0, 0, 0, 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": [255, 255, 255, 255],
"action_button_text": [0, 0, 0, 255], "action_button_text": [0, 0, 0, 255],
"action_button_border": [127, 127, 127, 255], "action_button_border": [127, 127, 127, 255],
@ -303,7 +289,7 @@
"extruder_button_material_margin": [0.70, 0.9], "extruder_button_material_margin": [0.70, 0.9],
"extruder_button_material": [0.75, 0.75], "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": [1.71, 1.43],
"sidebar_margin_thin": [0.71, 0.71], "sidebar_margin_thin": [0.71, 0.71],
"sidebar_header": [0.0, 4.0], "sidebar_header": [0.0, 4.0],