jgrewe/blipblop
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

fixes and additional icon to qrc

Browse Source
This commit is contained in:
Jan Grewe 2021-03-08 15:09:29 +01:00
parent f30c2eb36e
commit 4695d60cd1
4 changed files with 12 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
blipblop/main.py
View File

@ -9,7 +9,7 @@ import blipblop.constants as cnst
try:
# Include in try/except block if you're also targeting Mac/Linux
from PyQt5.QtWinExtras import QtWin
myappid = 'neuroetho.uni-tuebingen.de.blipblop.0.1'
myappid = "%s.%s" %(cnst.organization_name, cnst.application_version)
QtWin.setCurrentProcessExplicitAppUserModelID(myappid)
except ImportError:
pass
@ -17,7 +17,7 @@ except ImportError:
def main():
app = QApplication(sys.argv)
app.setApplicationName(cnst.application_name)
app.setApplicationVersion(cnst.application_version)
app.setApplicationVersion(str(cnst.application_version))
app.setOrganizationDomain(cnst.organization_name)
app.setWindowIcon(QIcon(":/icons/app_icon_png"))
settings = QSettings()
@ -40,6 +40,5 @@ def main():
settings.setValue("app/pos_y", pos.y())
sys.exit(code)
if __name__ == "__main__":
main()

11
blipblop/ui/mainwindow.py
View File

@ -24,17 +24,17 @@ class BlipBlop(QMainWindow):
self.show()
def create_actions(self):
self._quit_action = QAction(QIcon(":/icons/quit"), "Quit", self)
self._quit_action = QAction(QIcon(":/icons/quit"), "quit application", self)
self._quit_action.setStatusTip("Quit BlipBlop")
self._quit_action.setShortcut(QKeySequence("Ctrl+q"))
self._quit_action.triggered.connect(self.on_quit)
self._new_action = QAction(QIcon(":/icons/new_session"), "New session", self)
self._new_action = QAction(QIcon(":/icons/new_session"), "new session", self)
self._new_action.setStatusTip("Start a new session discarding previous results")
self._new_action.setShortcut(QKeySequence("Ctrl+n"))
self._new_action.triggered.connect(self.on_new)
self._results_action = QAction(QIcon(":/icons/results_table"), "Show results", self)
self._results_action = QAction(QIcon(":/icons/results_table"), "show results", self)
self._results_action.setStatusTip("Show results as table")
self._results_action.setShortcut(QKeySequence("Ctrl+r"))
self._results_action.setEnabled(True)
@ -51,13 +51,13 @@ class BlipBlop(QMainWindow):
self._help_action.setEnabled(True)
self._help_action.triggered.connect(self.on_help)
self._visual_task_action = QAction(QIcon(":/icons/visual_task"), "visual")
self._visual_task_action = QAction(QIcon(":/icons/visual_task"), "visual task")
self._visual_task_action.setStatusTip("Start measuring visual reaction times")
self._visual_task_action.setShortcut(QKeySequence("Ctrl+1"))
self._visual_task_action.setEnabled(True)
self._visual_task_action.triggered.connect(self.on_visual)
self._auditory_task_action = QAction(QIcon(":/icons/auditory_task"), "auditory")
self._auditory_task_action = QAction(QIcon(":/icons/auditory_task"), "auditory task")
self._auditory_task_action.setStatusTip("Start measuring auditory reaction times")
self._auditory_task_action.setShortcut(QKeySequence("Ctrl+2"))
self._auditory_task_action.setEnabled(True)
@ -77,6 +77,7 @@ class BlipBlop(QMainWindow):
self._toolbar.addAction(self._visual_task_action)
self._toolbar.addAction(self._auditory_task_action)
self._toolbar.addAction(self._results_action)
self._toolbar.addSeparator()
self._toolbar.addAction(self._help_action)
empty = QWidget()

6
blipblop/ui/startscreen.py
View File

@ -3,8 +3,6 @@ from PyQt5.QtWidgets import QWidget, QGridLayout, QLabel
from PyQt5.QtGui import QFont, QPixmap
from PyQt5.QtCore import Qt, pyqtSignal
import blipblop.constants as cnst
class MyLabel(QLabel):
clicked = pyqtSignal()
@ -38,13 +36,15 @@ class StartScreen(QWidget):
layout.addWidget(label, 1, 2, 1, 3, Qt.AlignCenter)
visual_task_label = MyLabel()
visual_task_label.setStatusTip("Start a new visual measurement (Ctrl+1)")
visual_task_label.setToolTip("Click to start a new visual task (Ctrl+1)")
visual_task_label.setPixmap(QPixmap(":/icons/visual_task_large"))
visual_task_label.setMaximumWidth(256)
visual_task_label.clicked.connect(self.new_visual_task)
auditory_task_label = MyLabel()
auditory_task_label.setToolTip("Click to start a new auditory task (Ctrl+2)")
auditory_task_label.setStatusTip("Start a new auditory measurement (Ctrl+2)")
auditory_task_label.setToolTip("click to start a new auditory task (Ctrl+2)")
auditory_task_label.setPixmap(QPixmap(":/icons/auditory_task_large"))
auditory_task_label.setMaximumWidth(256)
auditory_task_label.clicked.connect(self.new_auditory_task)

1
resources.qrc
View File

@ -12,6 +12,7 @@
<file alias="docs_back">icons/back_btn.png</file>
<file alias="docs_forward">icons/fwd_btn.png</file>
<file alias="help">icons/help.png</file>
<file alias="quit">icons/blipblop_quit.png</file>
<file alias="new_session">icons/new_session.png</file>
<file alias="new_session_larg">icons/new_session_large.png</file>
<file alias="results_table">icons/blipblop_table.png</file>