3D-printing/Cura
1
0
Fork 0
mirror of https://github.com/Ultimaker/Cura.git synced 2025-07-25 07:33:57 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 8

Merge branch 'master' of github.com:Ultimaker/cura

Browse source
This commit is contained in:
alekseisasin 2017-09-15 13:28:29 +02:00
commit cdde6da792
2 changed files with 7 additions and 14 deletions
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)

17
resources/qml/Sidebar.qml
View file

@ -337,27 +337,20 @@ Rectangle
if(base.printDuration.valid && !base.printDuration.isTotalDurationZero) if(base.printDuration.valid && !base.printDuration.isTotalDurationZero)
{ {
// All the time information for the different features is achieved
var print_time = PrintInformation.getFeaturePrintTimes() var print_time = PrintInformation.getFeaturePrintTimes()
var valid_data = []; // A message is created and displayed when the user hover the time label
var content = catalog.i18nc("@tooltip", "<b>Time information</b>")
for(var feature in print_time) for(var feature in print_time)
{ {
if(!print_time[feature].isTotalDurationZero) if(!print_time[feature].isTotalDurationZero)
{ {
valid_data.push(feature + ": " + print_time[feature].getDisplayString(UM.DurationFormat.Short)) content += "<br /><i>" + feature + "</i>: " + print_time[feature].getDisplayString(UM.DurationFormat.Short)
} }
} }
var output = "" base.showTooltip(parent, Qt.point(-UM.Theme.getSize("sidebar_margin").width, 0), content)
for(var counter = 0; counter < valid_data.length; counter++)
{
output += valid_data[counter];
if(counter + 1 != valid_data.length)
output += "\n"
}
var content = catalog.i18nc("@tooltip",output)
base.showTooltip(parent, Qt.point(-UM.Theme.getSize("sidebar_margin").width, 0), content)
} }
} }
onExited: onExited: