chiark / gitweb /
Remove extra comma at the end of the print window title when in error state
[cura.git] / Cura / gui / printWindow.py
index a39cc459092da95cda11a90de60c14bd70c41d74..a50e06db38dd6ed8283a52e27fc73ca9177836e9 100644 (file)
@@ -403,7 +403,7 @@ class printWindowPlugin(wx.Frame):
                if self._infoText is not None:
                        self._infoText.SetLabel(info)
                else:
-                       self.SetTitle(info.replace('\n', ', '))
+                       self.SetTitle(info.replace('\n', ', ').strip().strip(','))
                if isPrinting != self._isPrinting:
                        self._isPrinting = isPrinting
                        preventComputerFromSleeping(self, self._isPrinting)
@@ -939,7 +939,7 @@ class printWindowAdvanced(wx.Frame):
                        info += 'Temperature: %d' % (self._printerConnection.getTemperature(0))
                if self._printerConnection.getBedTemperature() > 0:
                        info += ' Bed: %d' % (self._printerConnection.getBedTemperature())
-               self.SetTitle(info.replace('\n', ', '))
+               self.SetTitle(info.replace('\n', ', ').strip().strip(','))
                if isPrinting != self._isPrinting:
                        self._isPrinting = isPrinting
                        preventComputerFromSleeping(self, self._isPrinting)
@@ -953,7 +953,7 @@ class TemperatureField(wx.Panel):
 
                self.text = IntCtrl(self, -1)
                self.text.SetBounds(0, 300)
-               self.text.SetSize((60, 25))
+               self.text.SetSize((60, 28))
 
                self.unit = wx.StaticBitmap(self, -1, wx.BitmapFromImage(wx.Image(
                                resources.getPathForImage('print-window-temperature-unit.png'))), (0, 0))
@@ -1003,6 +1003,7 @@ class TemperatureGraph(wx.Panel):
                self._lastDraw = now
                dc = wx.MemoryDC()
                dc.SelectObject(self._backBuffer)
+               dc.SetBackground(wx.Brush(wx.WHITE))
                dc.Clear()
                dc.SetFont(wx.SystemSettings.GetFont(wx.SYS_SYSTEM_FONT))
                w, h = self.GetSizeTuple()