felix/photobooth
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Worker process adapted to new state machine

Browse Source
This commit is contained in:
Balthasar Reuter
2018-07-16 23:19:41 +02:00
parent 5b3934016e
commit bd358030cd
8 changed files with 69 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
photobooth/gui/Qt5Gui/Frames.py
View File

@@ -651,6 +651,10 @@ class Settings(QtWidgets.QFrame):
self.add('Picture', 'basedir', basedir)
self.add('Picture', 'basename', basename)
keep_pictures = QtWidgets.QCheckBox()
keep_pictures.setChecked(self._cfg.getBool('Picture', 'keep_pictures'))
self.add('Picture', 'keep_pictures', keep_pictures)
lay_num = QtWidgets.QHBoxLayout()
lay_num.addWidget(num_x)
lay_num.addWidget(QtWidgets.QLabel('x'))
@@ -688,6 +692,7 @@ class Settings(QtWidgets.QFrame):
lay_file)
layout.addRow('Basename of files (strftime possible):',
basename)
layout.addRow('Keep single shots:', keep_pictures)
widget = QtWidgets.QWidget()
widget.setLayout(layout)
@@ -808,6 +813,8 @@ class Settings(QtWidgets.QFrame):
self.get('Picture', 'basedir').text())
self._cfg.set('Picture', 'basename',
self.get('Picture', 'basename').text())
self._cfg.set('Picture', 'keep_pictures',
str(self.get('Picture', 'keep_pictures').isChecked()))
self._cfg.set('Gpio', 'enable',
str(self.get('Gpio', 'enable').isChecked()))

6
photobooth/gui/Qt5Gui/PyQt5Gui.py
View File

@@ -128,11 +128,7 @@ class PyQt5Gui(GuiSkeleton):
def teardown(self, state):
if state.target == TeardownEvent.EXIT:
self._app.exit(0)
elif state.target == TeardownEvent.RESTART:
self._app.exit(123)
elif state.target == TeardownEvent.WELCOME:
if state.target == TeardownEvent.WELCOME:
self._comm.send(Workers.MASTER, GuiEvent('welcome'))
def showError(self, state):