--- a/Graphics/PixmapDiagram.py Fri Oct 18 23:00:41 2013 +0200 +++ b/Graphics/PixmapDiagram.py Fri Nov 01 15:48:48 2013 +0100 @@ -151,9 +151,11 @@ """ image = QImage(filename) if image.isNull(): - E5MessageBox.warning(self, + E5MessageBox.warning( + self, self.trUtf8("Pixmap-Viewer"), - self.trUtf8("""<p>The file <b>{0}</b> cannot be displayed.""" + self.trUtf8( + """<p>The file <b>{0}</b> cannot be displayed.""" """ The format is not supported.</p>""").format(filename)) return False @@ -382,15 +384,15 @@ painter.setPen(tc) painter.drawRect(marginX, marginY, width, height) painter.drawLine(marginX, marginY + height + 2, - marginX + width, marginY + height + 2) + marginX + width, marginY + height + 2) painter.setFont(font) painter.drawText(marginX, marginY + height + 4, width, - fontHeight, Qt.AlignRight, s) + fontHeight, Qt.AlignRight, s) # render the diagram size = self.pixmapLabel.pixmap().size() size.scale(QSize(width - 10, height - 10), # 5 px inner margin - Qt.KeepAspectRatio) + Qt.KeepAspectRatio) painter.setViewport(marginX + 5, marginY + 5, size.width(), size.height()) painter.setWindow(self.pixmapLabel.pixmap().rect())