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

Camera module rewritten for new communicator scheme

Browse Source
This commit is contained in:
Balthasar Reuter
2018-07-14 01:09:47 +02:00
parent f8918e895e
commit 809db26109
13 changed files with 242 additions and 89 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
photobooth/gui/GuiSkeleton.py
View File

@@ -19,8 +19,6 @@
from . import GuiState
from .. import StateMachine
class GuiSkeleton:

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

@@ -27,8 +27,8 @@ from PyQt5 import QtWidgets
from PIL import ImageQt
from ... import StateMachine
from ...Threading import Workers
# from ... import StateMachine
# from ...Threading import Workers
from .. import GuiState
from ..GuiSkeleton import GuiSkeleton
@@ -184,8 +184,8 @@ class PyQt5Gui(GuiSkeleton):
self.restart))
def _showSettings(self):
self._comm.send(Workers.MASTER, StateMachine.GuiEvent('settings'))
# self._comm.send(Workers.MASTER, StateMachine.GuiEvent('settings'))
self._disableTrigger()
self._disableEscape()
@@ -195,7 +195,7 @@ class PyQt5Gui(GuiSkeleton):
def _showStart(self, state):
self._comm.send(Workers.MASTER, StateMachine.GuiEvent('start'))
# self._comm.send(Workers.MASTER, StateMachine.GuiEvent('start'))
self._disableTrigger()
self._enableEscape()