diff --git a/blipblop/__pycache__/__init__.cpython-38.pyc b/blipblop/__pycache__/__init__.cpython-38.pyc index d48c5aa..aec5798 100644 Binary files a/blipblop/__pycache__/__init__.cpython-38.pyc and b/blipblop/__pycache__/__init__.cpython-38.pyc differ diff --git a/blipblop/main.py b/blipblop/main.py index 34817f8..c4fe103 100644 --- a/blipblop/main.py +++ b/blipblop/main.py @@ -3,12 +3,22 @@ import sys from PyQt5.QtWidgets import QApplication from PyQt5.QtCore import QSettings from blipblop.ui.mainwindow import BlipBlop +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' + QtWin.setCurrentProcessExplicitAppUserModelID(myappid) +except ImportError: + pass def main(): app = QApplication(sys.argv) app.setApplicationName("blipblop") app.setApplicationVersion("0.1") app.setOrganizationDomain("neuroetho.uni-tuebingen.de") + app.setWindowIcon(cnst.get_icon("blipblop_logo.png")) settings = QSettings() width = settings.value("app/width", 1024) height = settings.value("app/height", 768) diff --git a/blipblop/ui/mainwindow.py b/blipblop/ui/mainwindow.py index 172d4bb..8261d9c 100644 --- a/blipblop/ui/mainwindow.py +++ b/blipblop/ui/mainwindow.py @@ -1,8 +1,8 @@ -import sys from PyQt5.QtWidgets import QWidget, QMainWindow, QMenuBar, QToolBar, QAction, QStatusBar, QSizePolicy -from PyQt5.QtGui import QKeySequence +from PyQt5.QtGui import QIcon, QKeySequence from PyQt5.QtCore import QSize, Qt +import resources as res import blipblop.constants as cnst from blipblop.ui.help import HelpDialog from blipblop.ui.about import AboutDialog @@ -52,7 +52,8 @@ class BlipBlop(QMainWindow): self._help_action.setEnabled(True) self._help_action.triggered.connect(self.on_help) - self._visual_task_action = QAction(cnst.get_icon("visual_task"), "visual") + # self._visual_task_action = QAction(cnst.get_icon("visual_task"), "visual") + self._visual_task_action = QAction(QIcon(":/icons/visual_task"), "visual") self._visual_task_action.setStatusTip("Start measuring visual reaction times") self._visual_task_action.setShortcut(QKeySequence("Ctrl+1")) self._visual_task_action.setEnabled(True) diff --git a/icons/nixview_quit.png b/icons/blipblop_quit.png similarity index 100% rename from icons/nixview_quit.png rename to icons/blipblop_quit.png diff --git a/icons/nix_data_frame.png b/icons/blipblop_table.png similarity index 100% rename from icons/nix_data_frame.png rename to icons/blipblop_table.png diff --git a/icons/nixview_help.png b/icons/help.png similarity index 100% rename from icons/nixview_help.png rename to icons/help.png diff --git a/icons/new_task.png b/icons/new_session.png similarity index 100% rename from icons/new_task.png rename to icons/new_session.png diff --git a/icons/new_task_large.png b/icons/new_session_large.png similarity index 100% rename from icons/new_task_large.png rename to icons/new_session_large.png diff --git a/icons/nix_block_1d.png b/icons/nix_block_1d.png deleted file mode 100644 index c304899..0000000 Binary files a/icons/nix_block_1d.png and /dev/null differ diff --git a/icons/nix_close.png b/icons/nix_close.png deleted file mode 100644 index c75ec2c..0000000 Binary files a/icons/nix_close.png and /dev/null differ diff --git a/icons/nix_data_array.png b/icons/nix_data_array.png deleted file mode 100644 index 88d1897..0000000 Binary files a/icons/nix_data_array.png and /dev/null differ diff --git a/icons/nix_dimension.png b/icons/nix_dimension.png deleted file mode 100644 index 169541e..0000000 Binary files a/icons/nix_dimension.png and /dev/null differ diff --git a/icons/nix_fav1_cut.png b/icons/nix_fav1_cut.png deleted file mode 100644 index 67b2a53..0000000 Binary files a/icons/nix_fav1_cut.png and /dev/null differ diff --git a/icons/nix_feature.png b/icons/nix_feature.png deleted file mode 100644 index efedf04..0000000 Binary files a/icons/nix_feature.png and /dev/null differ diff --git a/icons/nix_group.png b/icons/nix_group.png deleted file mode 100644 index 838ab2c..0000000 Binary files a/icons/nix_group.png and /dev/null differ diff --git a/icons/nix_logo.png b/icons/nix_logo.png deleted file mode 100644 index acb1a1d..0000000 Binary files a/icons/nix_logo.png and /dev/null differ diff --git a/icons/nix_open.png b/icons/nix_open.png deleted file mode 100644 index a679253..0000000 Binary files a/icons/nix_open.png and /dev/null differ diff --git a/icons/nix_plot.png b/icons/nix_plot.png deleted file mode 100644 index 5f1bbf8..0000000 Binary files a/icons/nix_plot.png and /dev/null differ diff --git a/icons/nix_property.png b/icons/nix_property.png deleted file mode 100644 index cdb18d7..0000000 Binary files a/icons/nix_property.png and /dev/null differ diff --git a/icons/nix_section.png b/icons/nix_section.png deleted file mode 100644 index 8672df2..0000000 Binary files a/icons/nix_section.png and /dev/null differ diff --git a/icons/nix_source.png b/icons/nix_source.png deleted file mode 100644 index 92df782..0000000 Binary files a/icons/nix_source.png and /dev/null differ diff --git a/icons/nix_table.png b/icons/nix_table.png deleted file mode 100644 index a6ea080..0000000 Binary files a/icons/nix_table.png and /dev/null differ diff --git a/icons/nix_tag.png b/icons/nix_tag.png deleted file mode 100644 index 076de3e..0000000 Binary files a/icons/nix_tag.png and /dev/null differ diff --git a/icons/nixview.icns b/icons/nixview.icns deleted file mode 100644 index ccad903..0000000 Binary files a/icons/nixview.icns and /dev/null differ diff --git a/icons/nixview.ico b/icons/nixview.ico deleted file mode 100644 index c4ad993..0000000 Binary files a/icons/nixview.ico and /dev/null differ diff --git a/icons/nixview128.png b/icons/nixview128.png deleted file mode 100644 index 9bb37f7..0000000 Binary files a/icons/nixview128.png and /dev/null differ diff --git a/icons/nixview256.png b/icons/nixview256.png deleted file mode 100644 index 34a5c79..0000000 Binary files a/icons/nixview256.png and /dev/null differ diff --git a/icons/nixview32.png b/icons/nixview32.png deleted file mode 100644 index 3fb5ab4..0000000 Binary files a/icons/nixview32.png and /dev/null differ diff --git a/icons/nixview64.png b/icons/nixview64.png deleted file mode 100644 index 17bdb3b..0000000 Binary files a/icons/nixview64.png and /dev/null differ diff --git a/icons/nixview_close.png b/icons/nixview_close.png deleted file mode 100644 index ca9600c..0000000 Binary files a/icons/nixview_close.png and /dev/null differ diff --git a/icons/nixview_open.png b/icons/nixview_open.png deleted file mode 100644 index 67ecaf6..0000000 Binary files a/icons/nixview_open.png and /dev/null differ diff --git a/icons/nixview_transparent.png b/icons/nixview_transparent.png deleted file mode 100644 index e2ed381..0000000 Binary files a/icons/nixview_transparent.png and /dev/null differ diff --git a/icons/quit.png b/icons/quit.png deleted file mode 100644 index ed27c97..0000000 Binary files a/icons/quit.png and /dev/null differ