Merge tag '14.12' into upstream

[cura.git] / Cura / gui / printWindow.py

diff --git a/Cura/gui/printWindow.py b/Cura/gui/printWindow.py
index db57465ddc72f7b0d9aa00d1b9ef73526f156a78..6356df6491486bdc8cb380da8fbf6dd4f347dd80 100644 (file)
--- a/Cura/gui/printWindow.py
+++ b/Cura/gui/printWindow.py
@@ -27,9 +27,24 @@ if sys.platform.startswith('win'):
                else:
                        ctypes.windll.kernel32.SetThreadExecutionState(ES_CONTINUOUS)
 
+elif sys.platform.startswith('darwin'):
+       import objc
+       bundle = objc.initFrameworkWrapper("IOKit",
+       frameworkIdentifier="com.apple.iokit",
+       frameworkPath=objc.pathForFramework("/System/Library/Frameworks/IOKit.framework"),
+       globals=globals())
+       objc.loadBundleFunctions(bundle, globals(), [("IOPMAssertionCreateWithName", b"i@I@o^I")])
+       def preventComputerFromSleeping(prevent):
+               if prevent:
+                       success, preventComputerFromSleeping.assertionID = IOPMAssertionCreateWithName(kIOPMAssertionTypeNoDisplaySleep, kIOPMAssertionLevelOn, "Cura is printing", None)
+                       if success != kIOReturnSuccess:
+                               preventComputerFromSleeping.assertionID = None
+               else:
+                       if preventComputerFromSleeping.assertionID is not None:
+                               IOPMAssertionRelease(preventComputerFromSleeping.assertionID)
+                               preventComputerFromSleeping.assertionID = None
 else:
        def preventComputerFromSleeping(prevent):
-               #No preventComputerFromSleeping for MacOS and Linux yet.
                pass
 
 class printWindowPlugin(wx.Frame):
@@ -487,6 +502,12 @@ class printWindowBasic(wx.Frame):
                        preventComputerFromSleeping(self._isPrinting)
 
 
+       def _addTermLog(self, msg):
+               pass
+
+       def _addTermLog(self, msg):
+               pass
+
        def _updateButtonStates(self):
                self.connectButton.Show(self._printerConnection.hasActiveConnection())
                self.connectButton.Enable(not self._printerConnection.isActiveConnectionOpen() and not self._printerConnection.isActiveConnectionOpening())
@@ -632,7 +653,7 @@ class TemperatureGraph(wx.Panel):
 
 class LogWindow(wx.Frame):
        def __init__(self, logText):
-               super(LogWindow, self).__init__(None, title="Error log")
+               super(LogWindow, self).__init__(None, title=_("Error log"))
                self.textBox = wx.TextCtrl(self, -1, logText, style=wx.TE_MULTILINE | wx.TE_DONTWRAP | wx.TE_READONLY)
                self.SetSize((500, 400))
                self.Show(True)