From b5a7ab2af313bc27b5df433a5866cd3252113ef0 Mon Sep 17 00:00:00 2001 From: Balthasar Reuter Date: Mon, 4 Jun 2018 22:00:59 +0200 Subject: [PATCH] IdleMessage moved to Frames --- photobooth/gui/PyQt5Gui.py | 32 ++------------------------------ photobooth/gui/Qt5Gui/Frames.py | 24 ++++++++++++++++++++++++ 2 files changed, 26 insertions(+), 30 deletions(-) diff --git a/photobooth/gui/PyQt5Gui.py b/photobooth/gui/PyQt5Gui.py index 444e1ef..53a556c 100644 --- a/photobooth/gui/PyQt5Gui.py +++ b/photobooth/gui/PyQt5Gui.py @@ -209,7 +209,8 @@ class PyQt5Gui(Gui): self._p.handleKeypressEvent = self.handleKeypressEvent self._lastState = self.showIdle - self._p.setCentralWidget(PyQt5IdleMessage()) + self._p.setCentralWidget(Frames.IdleMessage()) + # self._p.setCentralWidget(PyQt5IdleMessage()) def showError(self, title, message): @@ -312,35 +313,6 @@ class PyQt5MainWindow(QtWidgets.QMainWindow): - -class PyQt5IdleMessage(QtWidgets.QFrame): - - def __init__(self): - - super().__init__() - - self.initFrame() - - - def initFrame(self): - - self.setStyleSheet('background-color: black; color: white;') - - - def paintEvent(self, event): - - painter = QtGui.QPainter(self) - - f = self.font() - f.setPixelSize(self.height() / 5) - painter.setFont(f) - - painter.drawText(event.rect(), QtCore.Qt.AlignCenter, 'Hit the button!') - - painter.end() - - - class PyQt5GreeterMessage(QtWidgets.QFrame): def __init__(self, num_x, num_y): diff --git a/photobooth/gui/Qt5Gui/Frames.py b/photobooth/gui/Qt5Gui/Frames.py index 7459889..a41224c 100644 --- a/photobooth/gui/Qt5Gui/Frames.py +++ b/photobooth/gui/Qt5Gui/Frames.py @@ -40,6 +40,30 @@ class Start(QtWidgets.QFrame): self.setLayout(lay) +class IdleMessage(QtWidgets.QFrame): + + def __init__(self): + + super().__init__() + + self._message = 'Hit the button!' + + def _paintMessage(self, painter): + + f = self.font() + f.setPixelSize(self.height() / 5) + painter.setFont(f) + + rect = self.rect() + painter.drawText(rect, QtCore.Qt.AlignCenter, self._message) + + def paintEvent(self, event): + + painter = QtGui.QPainter(self) + self._paintMessage(painter) + painter.end() + + class WaitMessage(QtWidgets.QFrame): # With spinning wait clock, inspired by # https://wiki.python.org/moin/PyQt/A%20full%20widget%20waiting%20indicator