diff --git a/blipblop/main.py b/blipblop/main.py index 6929a56..faa5d03 100644 --- a/blipblop/main.py +++ b/blipblop/main.py @@ -18,7 +18,7 @@ def main(): app.setApplicationName(cnst.application_name) app.setApplicationVersion(str(cnst.application_version)) app.setOrganizationDomain(cnst.organization_name) - app.setWindowIcon(QIcon(":/icons/app_icon_png")) + # app.setWindowIcon(QIcon(":/icons/app_icon_png")) settings = QSettings() width = int(settings.value("app/width", 1024)) height = int(settings.value("app/height", 768)) diff --git a/blipblop/ui/audioblop.py b/blipblop/ui/audioblop.py index 518ad2d..d8ca4e1 100644 --- a/blipblop/ui/audioblop.py +++ b/blipblop/ui/audioblop.py @@ -28,14 +28,22 @@ class AudioBlop(QWidget): icon_label.setPixmap(QPixmap(":/icons/auditory_task")) grid.addWidget(icon_label, 0, 0, Qt.AlignLeft) - heading_label = QLabel("Measurement of auditory reaction times\npress enter to start") + heading_label = QLabel("Measurement of auditory reaction times") font = QFont() font.setBold(True) - font.setPointSize(20) + font.setPointSize(24) heading_label.setFont(font) heading_label.setStyleSheet("color: #2D4B9A") - grid.addWidget(heading_label, 1, 0, 1, 2, Qt.AlignLeft) + grid.addWidget(heading_label, 0, 1, 1, 2, Qt.AlignLeft) + instruction_label = QLabel("* press enter to start\n* press spacebar once you recognize the stimulus") + font = QFont() + font.setBold(True) + font.setPointSize(16) + instruction_label.setFont(font) + instruction_label.setStyleSheet("color: #2D4B9A") + grid.addWidget(instruction_label, 1, 1, 1, 2, Qt.AlignLeft) + settings_btn = QPushButton(QIcon(":/icons/settings"), "") settings_btn.setToolTip("edit task settings") settings_btn.setShortcut(QKeySequence("alt+s")) diff --git a/blipblop/ui/visualblip.py b/blipblop/ui/visualblip.py index eac2c72..9405757 100644 --- a/blipblop/ui/visualblip.py +++ b/blipblop/ui/visualblip.py @@ -26,14 +26,22 @@ class VisualBlip(QWidget): icon_label.setPixmap(QPixmap(":/icons/visual_task")) grid.addWidget(icon_label, 0, 0, Qt.AlignLeft) - heading_label = QLabel("Measurement of visual reaction times\npress enter to start") + heading_label = QLabel("Measurement of visual reaction times") font = QFont() font.setBold(True) - font.setPointSize(20) + font.setPointSize(24) heading_label.setFont(font) heading_label.setStyleSheet("color: #2D4B9A") - grid.addWidget(heading_label, 1, 0, 1, 2, Qt.AlignLeft) + grid.addWidget(heading_label, 0, 1, 1, 2, Qt.AlignLeft) + instruction_label = QLabel("* press enter to start\n* press spacebar once you recognize the stimulus") + font = QFont() + font.setBold(True) + font.setPointSize(16) + instruction_label.setFont(font) + instruction_label.setStyleSheet("color: #2D4B9A") + grid.addWidget(instruction_label, 1, 1, 1, 2, Qt.AlignLeft) + settings_btn = QPushButton(QIcon(":/icons/settings"), "") settings_btn.setToolTip("edit task settings") settings_btn.setShortcut(QKeySequence("alt+s")) diff --git a/blipblop_darwin.spec b/blipblop_darwin.spec index 65ac540..bd93de1 100644 --- a/blipblop_darwin.spec +++ b/blipblop_darwin.spec @@ -55,6 +55,7 @@ app = BUNDLE(exe, name='BlipBlop.app', icon='icons/blipblop_logo.icns', bundle_identifier='de.uni-tuebingen.neuroetho.blipblop', + version="0.1.0", info_plist={ 'NSPrincipalClass': 'NSApplication', 'NSAppleScriptEnabled': False, diff --git a/icons/blipblop_logo.icns b/icons/blipblop_logo.icns index 86e5b37..e202d8b 100644 Binary files a/icons/blipblop_logo.icns and b/icons/blipblop_logo.icns differ diff --git a/icons/blipblop_logo.ico b/icons/blipblop_logo.ico index 91fe575..bf363f3 100644 Binary files a/icons/blipblop_logo.ico and b/icons/blipblop_logo.ico differ diff --git a/icons/blipblop_logo.png b/icons/blipblop_logo.png index 5896d49..7b45ad5 100644 Binary files a/icons/blipblop_logo.png and b/icons/blipblop_logo.png differ