From af3f9c51710e2f5ee4ff78e810a71e56973f9ddd Mon Sep 17 00:00:00 2001 From: Jan Grewe Date: Thu, 4 Mar 2021 20:01:34 +0100 Subject: [PATCH] start screen --- .../ui/__pycache__/mainwindow.cpython-38.pyc | Bin 3895 -> 0 bytes blipblop/ui/centralwidget.py | 19 +++++++++--------- blipblop/ui/mainwindow.py | 9 +++++---- blipblop/ui/startscreen.py | 1 - 4 files changed, 15 insertions(+), 14 deletions(-) delete mode 100644 blipblop/ui/__pycache__/mainwindow.cpython-38.pyc diff --git a/blipblop/ui/__pycache__/mainwindow.cpython-38.pyc b/blipblop/ui/__pycache__/mainwindow.cpython-38.pyc deleted file mode 100644 index 1d2da908cb2111c32fad3de8c79d642846832b22..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 3895 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 SyQVV&_7P%p&!zGjdjAKyL%#O_ diff --git a/blipblop/ui/centralwidget.py b/blipblop/ui/centralwidget.py index 12b9128..56807bc 100644 --- a/blipblop/ui/centralwidget.py +++ b/blipblop/ui/centralwidget.py @@ -7,26 +7,28 @@ from blipblop.ui.resultsscreen import ResultsScreen class CentralWidget(QWidget): - def __init__(self, parent=None) -> None: + def __init__(self, parent=None): super().__init__(parent=parent) - self._splash = StartScreen() + self._start_screen = StartScreen() self._visual_screen = VisualBlip(self) - self._visual_screen.close_signal.connect(self.on_plot_close) + # self._visual_screen.close_signal.connect(self.on_plot_close) self._auditory_screen = AudioBlop(self) - self._auditory_screen.close_signal.connect(self.on_plot_close) + #self._auditory_screen.close_signal.connect(self.on_plot_close) - self._results_screen = AudioBlop(self) - self._results_screen.close_signal.connect(self.on_plot_close) + self._results_screen = ResultsScreen(self) + #self._results_screen.close_signal.connect(self.on_plot_close) self._stack = QStackedLayout(self) - self._stack.addWidget(self._splash) + self._stack.addWidget(self._start_screen) self._stack.addWidget(self._visual_screen) self._stack.addWidget(self._auditory_screen) self._stack.addWidget(self._results_screen) self.setLayout(self._stack) + self._task_results = [] + self._stack.setCurrentIndex(0) def show_file_content(self): self._stack.setCurrentIndex(1) @@ -40,6 +42,5 @@ class CentralWidget(QWidget): self._stack.setCurrentIndex(1) def reset(self): - self._visual_stims_screen.reset() - self._splash.reset() + self._task_results = [] self._stack.setCurrentIndex(0) diff --git a/blipblop/ui/mainwindow.py b/blipblop/ui/mainwindow.py index f0ef405..d58b149 100644 --- a/blipblop/ui/mainwindow.py +++ b/blipblop/ui/mainwindow.py @@ -6,6 +6,7 @@ from PyQt5.QtCore import QSize, QSettings, Qt import blipblop.constants as cnst from blipblop.ui.help import HelpDialog from blipblop.ui.about import AboutDialog +from blipblop.ui.centralwidget import CentralWidget class BlipBlop(QMainWindow): @@ -19,7 +20,8 @@ class BlipBlop(QMainWindow): self.setMenuBar(QMenuBar(self)) self.create_actions() self._task_results = [] - + self._cw = CentralWidget() + self.setCentralWidget(self._cw) self.show() def create_actions(self): @@ -119,9 +121,8 @@ class BlipBlop(QMainWindow): sys.exit() def on_new(self): - self._task_results = [] - self.__ - pass + self._cw.reset() + def on_about(self): about = AboutDialog(self) diff --git a/blipblop/ui/startscreen.py b/blipblop/ui/startscreen.py index fe3b674..e818d78 100644 --- a/blipblop/ui/startscreen.py +++ b/blipblop/ui/startscreen.py @@ -37,7 +37,6 @@ class StartScreen(QWidget): l.addWidget(QLabel("Recently opened files:")) self._file_list = QListWidget(self) self._file_list.setSelectionMode(QAbstractItemView.SingleSelection) - self._file_list.itemClicked.connect(self._on_file_clicked) self._file_list.setFrameShape(QFrame.NoFrame) self.keyPressed.connect(self._on_key_pressed) l.addWidget(self._file_list)