diff --git a/.gitignore b/.gitignore
index af2f537..de2d5e0 100644
--- a/.gitignore
+++ b/.gitignore
@@ -20,6 +20,7 @@ parts/
sdist/
var/
wheels/
+share/python-wheels/
*.egg-info/
.installed.cfg
*.egg
@@ -38,13 +39,17 @@ pip-delete-this-directory.txt
# Unit test / coverage reports
htmlcov/
.tox/
+.nox/
.coverage
.coverage.*
.cache
nosetests.xml
coverage.xml
*.cover
+*.py,cover
.hypothesis/
+.pytest_cache/
+cover/
# Translations
*.mo
@@ -52,9 +57,9 @@ coverage.xml
# Django stuff:
*.log
-.static_storage/
-.media/
local_settings.py
+db.sqlite3
+db.sqlite3-journal
# Flask stuff:
instance/
@@ -67,16 +72,41 @@ instance/
docs/_build/
# PyBuilder
+.pybuilder/
target/
# Jupyter Notebook
.ipynb_checkpoints
-# pyenv
-.python-version
+# IPython
+profile_default/
+ipython_config.py
-# celery beat schedule file
+# pyenv
+# For a library or package, you might want to ignore these files since the code is
+# intended to run in multiple environments; otherwise, check them in:
+# .python-version
+
+# pipenv
+# According to pypa/pipenv#598, it is recommended to include Pipfile.lock in version control.
+# However, in case of collaboration, if having platform-specific dependencies or dependencies
+# having no cross-platform support, pipenv may install dependencies that don't work, or not
+# install all needed dependencies.
+#Pipfile.lock
+
+# poetry
+# Similar to Pipfile.lock, it is generally recommended to include poetry.lock in version control.
+# This is especially recommended for binary packages to ensure reproducibility, and is more
+# commonly ignored for libraries.
+# https://python-poetry.org/docs/basic-usage/#commit-your-poetrylock-file-to-version-control
+#poetry.lock
+
+# PEP 582; used by e.g. github.com/David-OConnor/pyflow
+__pypackages__/
+
+# Celery stuff
celerybeat-schedule
+celerybeat.pid
# SageMath parsed files
*.sage.py
@@ -102,3 +132,21 @@ venv.bak/
# mypy
.mypy_cache/
+.dmypy.json
+dmypy.json
+
+# Pyre type checker
+.pyre/
+
+# pytype static type analyzer
+.pytype/
+
+# Cython debug symbols
+cython_debug/
+
+# PyCharm
+# JetBrains specific template is maintained in a separate JetBrains.gitignore that can
+# be found at https://github.com/github/gitignore/blob/main/Global/JetBrains.gitignore
+# and can be added to the global gitignore or merged into this file. For a more nuclear
+# option (not recommended) you can uncomment the following to ignore the entire idea folder.
+#.idea/
diff --git a/data/opensesame-toolbox.svg b/data/opensesame-toolbox.svg
index a523460..27a806a 100644
--- a/data/opensesame-toolbox.svg
+++ b/data/opensesame-toolbox.svg
@@ -8,1360 +8,1456 @@
xmlns:svg="http://www.w3.org/2000/svg"
xmlns="http://www.w3.org/2000/svg"
xmlns:xlink="http://www.w3.org/1999/xlink"
+ xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
- version="1.0"
+ inkscape:export-ydpi="90.000000"
+ inkscape:export-xdpi="90.000000"
width="96"
height="96"
- id="svg2408">
+ id="svg11300"
+ sodipodi:version="0.32"
+ inkscape:version="0.91 r13725"
+ sodipodi:docname="opensesame.svg"
+ inkscape:output_extension="org.inkscape.output.svg.inkscape"
+ version="1.0"
+ style="display:inline;enable-background:new"
+ inkscape:export-filename="/home/sam/moka-next-template.png">
+
+
+
+
+
+ id="defs3">
+ inkscape:collect="always"
+ id="linearGradient4488">
+ style="stop-color:#0288d1;stop-opacity:1"
+ offset="0"
+ id="stop4490" />
+ style="stop-color:#0277bd;stop-opacity:1"
+ offset="1"
+ id="stop4492" />
+ id="linearGradient4272">
+ style="stop-color:#0288d1;stop-opacity:1"
+ offset="0"
+ id="stop4274" />
+ style="stop-color:#03a9f4;stop-opacity:1"
+ offset="1"
+ id="stop4276" />
+ id="linearGradient4269">
+ id="stop4271"
+ offset="0"
+ style="stop-color:#01579b;stop-opacity:1" />
+ id="stop4273"
+ offset="1"
+ style="stop-color:#03a9f4;stop-opacity:1" />
+ id="outerBackgroundGradient">
+ style="stop-color:#7469b3;stop-opacity:1;"
+ offset="0"
+ id="stop3864-8-6" />
+ style="stop-color:#a6afe2;stop-opacity:1;"
+ offset="1"
+ id="stop3866-9-1" />
-
-
-
+ inkscape:collect="always"
+ xlink:href="#outerBackgroundGradient"
+ id="linearGradient4097"
+ gradientUnits="userSpaceOnUse"
+ x1="264"
+ y1="280.00003"
+ x2="264"
+ y2="40.00005"
+ gradientTransform="matrix(0.06666667,0,0,0.06666667,414.4,137.33333)" />
+ inkscape:collect="always"
+ xlink:href="#outerBackgroundGradient"
+ id="linearGradient4101"
+ gradientUnits="userSpaceOnUse"
+ gradientTransform="matrix(0.0875,0,0,0.0875,414.9,97.5)"
+ x1="286.85715"
+ y1="302.85715"
+ x2="286.85715"
+ y2="28.571428" />
-
-
-
-
+ gradientTransform="matrix(0.11931818,0,0,0.11931818,414.13636,48.22727)"
+ x1="283.80957"
+ y1="299.80954"
+ x2="283.80957"
+ y2="31.61907" />
-
-
-
+ inkscape:collect="always"
+ xlink:href="#outerBackgroundGradient"
+ id="linearGradient4869"
+ gradientUnits="userSpaceOnUse"
+ gradientTransform="matrix(0.175,0,0,-0.175,286.79999,-215.99997)"
+ x1="281.14291"
+ y1="297.14304"
+ x2="281.14291"
+ y2="22.857315" />
+ clipPathUnits="userSpaceOnUse"
+ id="clipPath4891">
+ ry="9"
+ y="223"
+ x="307"
+ height="42"
+ width="42"
+ id="rect4893"
+ style="color:#bebebe;display:inline;overflow:visible;visibility:visible;fill:url(#linearGradient4895);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0;marker:none;enable-background:accumulate"
+ transform="matrix(0,1,-1,0,0,0)" />
-
-
-
+ inkscape:collect="always"
+ xlink:href="#outerBackgroundGradient"
+ id="linearGradient4895"
+ gradientUnits="userSpaceOnUse"
+ gradientTransform="matrix(0.175,0,0,0.175,302.79999,215.99997)"
+ x1="144.00006"
+ y1="280.00018"
+ x2="144.00006"
+ y2="40.000172" />
+
+
+
-
-
-
-
-
+ inkscape:collect="always"
+ xlink:href="#outerBackgroundGradient"
+ id="linearGradient4048"
+ gradientUnits="userSpaceOnUse"
+ gradientTransform="matrix(0.0875,0,0,0.0875,430.9,81.499996)"
+ x1="149.71428"
+ y1="291.42862"
+ x2="149.71428"
+ y2="40.000046" />
+
+
+
+ gradientTransform="matrix(0.11931818,0,0,0.11931818,430.13636,32.227267)"
+ x1="149.71432"
+ y1="291.42862"
+ x2="149.71432"
+ y2="40.00005" />
+
+
+
-
-
-
+ gradientTransform="matrix(0.06666667,0,0,0.06666667,302.4,209.33333)"
+ x1="144"
+ y1="280.00003"
+ x2="144"
+ y2="40.00005" />
+
+
+
-
-
-
+ gradientTransform="translate(0,-4)"
+ x1="144"
+ y1="280"
+ x2="144"
+ y2="40" />
-
-
-
+ gradientTransform="translate(0,-4)"
+ x1="272"
+ y1="288"
+ x2="272"
+ y2="32" />
+
+
+
-
-
-
+ x1="352"
+ y1="204"
+ x2="352"
+ y2="140" />
-
-
-
-
+ x1="384"
+ y1="124"
+ x2="384"
+ y2="28" />
-
-
-
+ x1="352"
+ y1="204"
+ x2="352"
+ y2="140" />
+
+
+
-
-
-
-
-
+ inkscape:collect="always"
+ xlink:href="#outerBackgroundGradient"
+ id="linearGradient4350"
+ gradientUnits="userSpaceOnUse"
+ x1="384"
+ y1="124"
+ x2="384"
+ y2="28" />
+
+
+
+
+
+
+
+ gradientTransform="matrix(0.11931818,0,0,0.11931818,414.13636,48.22727)"
+ x1="283.80957"
+ y1="299.80954"
+ x2="283.80957"
+ y2="31.61907" />
+ x1="384"
+ y1="124"
+ x2="384"
+ y2="28" />
+ gradientTransform="matrix(0,-1,1,0,-12,300)" />
+ gradientTransform="matrix(0,-1,1,0,276,572)" />
+ gradientTransform="matrix(0,-1,1,0,316,540)" />
+ gradientTransform="matrix(0,-1,1,0,364,500)" />
+ gradientTransform="matrix(0,-1,1,0,68,556)" />
+ gradientTransform="matrix(0,-1,1,0,260,412)" />
+ gradientTransform="matrix(0,-1,1,0,148,492)" />
+ inkscape:collect="always"
+ xlink:href="#linearGradient4272"
+ id="linearGradient3870"
+ gradientUnits="userSpaceOnUse"
+ gradientTransform="matrix(0,-1,1,0,316,540)"
+ x1="418"
+ y1="112"
+ x2="438"
+ y2="112" />
+ gradientTransform="translate(0,-4)"
+ x1="272"
+ y1="288"
+ x2="272"
+ y2="32" />
+
+ style="stop-color:#01448b;stop-opacity:1;"
+ offset="0"
+ id="stop3864-8-6-6" />
+ style="stop-color:#1155a1;stop-opacity:1;"
+ offset="1"
+ id="stop3866-9-1-9" />
+ gradientTransform="translate(0,-4)"
+ x1="272"
+ y1="288"
+ x2="272"
+ y2="32" />
+
+
+
+
+ id="linearGradient3981"
+ xlink:href="#outerBackgroundGradient-1"
+ inkscape:collect="always" />
+ gradientTransform="translate(0,-4)"
+ x1="272"
+ y1="288"
+ x2="272"
+ y2="32" />
+
+
+
+
+
+
+
+
+
+ id="linearGradient3876-0"
+ xlink:href="#outerBackgroundGradient-2"
+ inkscape:collect="always" />
+
+
+
+
+ id="linearGradient3876-7-8"
+ xlink:href="#outerBackgroundGradient-9"
+ inkscape:collect="always" />
+
+
+
+
+
+
+
+
+
+
+
+ id="metadata4">
image/svg+xml
-
+
+
+ Sam Hewitt
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ image/svg+xml
+
-
-
-
-
-
-
-
-
-
-
-
-
-
+ style="display:inline"
+ inkscape:groupmode="layer"
+ inkscape:label="Icon"
+ id="layer1"
+ transform="translate(-288,-28)">
+
+ misc
+ os-experiment
+
+
+
+
+
+
+
+
+
+ inkscape:groupmode="layer"
+ id="layer4"
+ inkscape:label="Shadow"
+ style="display:inline"
+ sodipodi:insensitive="true">
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ id="g4596"
+ transform="translate(0.52331088,-0.67331634)">
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+ id="g4500-2"
+ style="display:inline;opacity:0.5;fill:#010000;fill-opacity:1;enable-background:new"
+ transform="translate(0.5466065,2.15335)">
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+ inkscape:groupmode="layer"
+ id="layer5"
+ inkscape:label="Highlights"
+ style="display:inline"
+ sodipodi:insensitive="true">
+ style="color:#bebebe;display:inline;overflow:visible;visibility:visible;opacity:0.12999998;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0;marker:none;enable-background:accumulate"
+ d="M 84,47 C 56.836703,47 35,68.836703 35,96 l 0,1 C 35,69.836703 56.836703,48 84,48 l 120,0 c 27.1633,0 49,21.836703 49,49 l 0,-1 C 253,68.836703 231.1633,47 204,47 L 84,47 Z"
+ id="rect3894"
+ inkscape:connector-curvature="0" />
+ style="color:#bebebe;display:inline;overflow:visible;visibility:visible;opacity:0.12999998;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0;marker:none;enable-background:accumulate"
+ d="m 419,141 c -1.1253,0 -2,0.8747 -2,2 l 0,1 c 0,-1.1253 0.8747,-2 2,-2 l 10,0 c 1.1253,0 2,0.8747 2,2 l 0,-1 c 0,-1.1253 -0.8747,-2 -2,-2 l -10,0 z"
+ id="rect3896"
+ inkscape:connector-curvature="0" />
+ style="color:#bebebe;display:inline;overflow:visible;visibility:visible;opacity:0.12999998;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0;marker:none;enable-background:accumulate"
+ d="m 422,102 c -2.2333,0 -4,1.7667 -4,4 l 0,1 c 0,-2.2333 1.7667,-4 4,-4 l 12,0 c 2.2333,0 4,1.7667 4,4 l 0,-1 c 0,-2.2333 -1.7667,-4 -4,-4 l -12,0 z"
+ id="rect3898"
+ inkscape:connector-curvature="0" />
+ style="color:#bebebe;display:inline;overflow:visible;visibility:visible;opacity:0.12999998;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0;marker:none;enable-background:accumulate"
+ d="m 424,54 c -3.3413,0 -6,2.658703 -6,6 l 0,1 c 0,-3.341297 2.6587,-6 6,-6 l 16,0 c 3.3413,0 6,2.658703 6,6 l 0,-1 c 0,-3.341297 -2.6587,-6 -6,-6 l -16,0 z"
+ id="rect3900"
+ inkscape:connector-curvature="0" />
+ style="color:#bebebe;display:inline;overflow:visible;visibility:visible;opacity:0.12999998;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0;marker:none;enable-background:accumulate"
+ d="m 300,224 c -4.4493,0 -8,3.5507 -8,8 l 0,1 c 0,-4.4493 3.5507,-8 8,-8 l 24,0 c 4.4493,0 8,3.5507 8,8 l 0,-1 c 0,-4.4493 -3.5507,-8 -8,-8 l -24,0 z"
+ id="rect3902"
+ inkscape:connector-curvature="0" />
+ style="color:#bebebe;display:inline;overflow:visible;visibility:visible;opacity:0.12999998;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0;marker:none;enable-background:accumulate"
+ d="m 310,33 c -9.4353,0 -17,7.564703 -17,17 l 0,1 c 0,-9.435297 7.5647,-17 17,-17 l 52,0 c 9.4353,0 17,7.564703 17,17 l 0,-1 c 0,-9.435297 -7.5647,-17 -17,-17 l -52,0 z"
+ id="rect3904"
+ inkscape:connector-curvature="0" />
+ style="color:#bebebe;display:inline;overflow:visible;visibility:visible;opacity:0.12999998;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0;marker:none;enable-background:accumulate"
+ d="m 302.5,143 c -6.3883,0 -11.5,5.1117 -11.5,11.5 l 0,1 c 0,-6.3883 5.1117,-11.5 11.5,-11.5 l 35,0 c 6.3883,0 11.5,5.1117 11.5,11.5 l 0,-1 c 0,-6.3883 -5.1117,-11.5 -11.5,-11.5 l -35,0 z"
+ id="rect3906"
+ inkscape:connector-curvature="0" />
+
+
+
+
+
+
+
+ id="path4280"
+ d="M 84,265 C 56.836703,265 35,243.1633 35,216 l 0,-1 c 0,27.1633 21.836703,49 49,49 l 120,0 c 27.1633,0 49,-21.8367 49,-49 l 0,1 c 0,27.1633 -21.8367,49 -49,49 l -120,0 z"
+ style="color:#bebebe;display:inline;overflow:visible;visibility:visible;opacity:0.1;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0;marker:none;enable-background:accumulate" />
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
diff --git a/debian/changelog b/debian/changelog
index f784405..cd3b3b6 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+opensesame-toolbox (2.8-1) bullseye; urgency=medium
+
+ * Update icon
+
+ -- Bob Rosbag Wed, 27 Jul 2022 21:03:40 +0200
+
opensesame-toolbox (2.7-1) stretch; urgency=medium
* Fixed experiment manager ui.
diff --git a/libopensesametoolbox/experimentmanager_ui.py b/libopensesametoolbox/experimentmanager_ui.py
index 51c1da4..9c3493b 100644
--- a/libopensesametoolbox/experimentmanager_ui.py
+++ b/libopensesametoolbox/experimentmanager_ui.py
@@ -36,7 +36,7 @@
from libopensesametoolbox.clean_data import stringToBool
-version = "2.7"
+version = "2.8"
author = "Bob Rosbag"
email = "b.rosbag@let.ru.nl"