added in audio cues to the observation part - added appropriate attribution to Kenney

.gitignore

@@ -5,6 +5,9 @@
 # ---> Godot
 # Godot-specific ignores
 .import/
+.godot/
+godot/.import/
+godot/.godot/
 export.cfg
 export_presets.cfg
 *.import

COPYRIGHT.md

@@ -1,6 +1,6 @@
 # Copyrights
 
-This document attributes the different components used to build the Time Sampling Form application (c) 2022 Jaap Marsman.
+This document attributes the different components used to build the Time Sampling Form application (c) 2022-Present Jaap Marsman.
 
 ## The engine: Godot
 
@@ -24,6 +24,10 @@ Portions of this software are copyright © 2022 The FreeType Project (www.freety
 
 The app uses the Noto Sans font family, for which <a href="https://github.com/notofonts/noto-fonts/blob/main/LICENSE" target="_blank">the full Open Font License is available here</a>.
 
+## Audio
+
+The app uses <a href="https://kenney.nl/assets/digital-audio">Kenney's Digital Audio Pack</a>. Whilst distributed under CC0 and attribution is not required, I felt it only fair to mention it here.
+
 ## Internet module Mbed TLS (as part of Godot)
 
 Copyright The Mbed TLS Contributors

LICENSE.md

@@ -1 +1,652 @@
-<a rel="license" href="http://creativecommons.org/licenses/by-nc-nd/4.0/" target="_blank"><img alt="Creative Commons Licence" style="border-width:0" src="https://i.creativecommons.org/l/by-nc-nd/4.0/88x31.png" /></a><br />This work is licensed under a <a rel="license" href="http://creativecommons.org/licenses/by-nc-nd/4.0/" target="_blank">Creative Commons Attribution-NonCommercial-NoDerivatives 4.0 International License</a>.
+GNU Affero General Public License
+=================================
+
+_Version 3, 19 November 2007_
+_Copyright © 2007 Free Software Foundation, Inc. &lt;<http://fsf.org/>&gt;_
+
+Everyone is permitted to copy and distribute verbatim copies
+of this license document, but changing it is not allowed.
+
+## Preamble
+
+The GNU Affero General Public License is a free, copyleft license for
+software and other kinds of works, specifically designed to ensure
+cooperation with the community in the case of network server software.
+
+The licenses for most software and other practical works are designed
+to take away your freedom to share and change the works.  By contrast,
+our General Public Licenses are intended to guarantee your freedom to
+share and change all versions of a program--to make sure it remains free
+software for all its users.
+
+When we speak of free software, we are referring to freedom, not
+price.  Our General Public Licenses are designed to make sure that you
+have the freedom to distribute copies of free software (and charge for
+them if you wish), that you receive source code or can get it if you
+want it, that you can change the software or use pieces of it in new
+free programs, and that you know you can do these things.
+
+Developers that use our General Public Licenses protect your rights
+with two steps: **(1)** assert copyright on the software, and **(2)** offer
+you this License which gives you legal permission to copy, distribute
+and/or modify the software.
+
+A secondary benefit of defending all users' freedom is that
+improvements made in alternate versions of the program, if they
+receive widespread use, become available for other developers to
+incorporate.  Many developers of free software are heartened and
+encouraged by the resulting cooperation.  However, in the case of
+software used on network servers, this result may fail to come about.
+The GNU General Public License permits making a modified version and
+letting the public access it on a server without ever releasing its
+source code to the public.
+
+The GNU Affero General Public License is designed specifically to
+ensure that, in such cases, the modified source code becomes available
+to the community.  It requires the operator of a network server to
+provide the source code of the modified version running there to the
+users of that server.  Therefore, public use of a modified version, on
+a publicly accessible server, gives the public access to the source
+code of the modified version.
+
+An older license, called the Affero General Public License and
+published by Affero, was designed to accomplish similar goals.  This is
+a different license, not a version of the Affero GPL, but Affero has
+released a new version of the Affero GPL which permits relicensing under
+this license.
+
+The precise terms and conditions for copying, distribution and
+modification follow.
+
+## TERMS AND CONDITIONS
+
+### 0. Definitions
+
+“This License” refers to version 3 of the GNU Affero General Public License.
+
+“Copyright” also means copyright-like laws that apply to other kinds of
+works, such as semiconductor masks.
+
+“The Program” refers to any copyrightable work licensed under this
+License.  Each licensee is addressed as “you”.  “Licensees” and
+“recipients” may be individuals or organizations.
+
+To “modify” a work means to copy from or adapt all or part of the work
+in a fashion requiring copyright permission, other than the making of an
+exact copy.  The resulting work is called a “modified version” of the
+earlier work or a work “based on” the earlier work.
+
+A “covered work” means either the unmodified Program or a work based
+on the Program.
+
+To “propagate” a work means to do anything with it that, without
+permission, would make you directly or secondarily liable for
+infringement under applicable copyright law, except executing it on a
+computer or modifying a private copy.  Propagation includes copying,
+distribution (with or without modification), making available to the
+public, and in some countries other activities as well.
+
+To “convey” a work means any kind of propagation that enables other
+parties to make or receive copies.  Mere interaction with a user through
+a computer network, with no transfer of a copy, is not conveying.
+
+An interactive user interface displays “Appropriate Legal Notices”
+to the extent that it includes a convenient and prominently visible
+feature that **(1)** displays an appropriate copyright notice, and **(2)**
+tells the user that there is no warranty for the work (except to the
+extent that warranties are provided), that licensees may convey the
+work under this License, and how to view a copy of this License.  If
+the interface presents a list of user commands or options, such as a
+menu, a prominent item in the list meets this criterion.
+
+### 1. Source Code
+
+The “source code” for a work means the preferred form of the work
+for making modifications to it.  “Object code” means any non-source
+form of a work.
+
+A “Standard Interface” means an interface that either is an official
+standard defined by a recognized standards body, or, in the case of
+interfaces specified for a particular programming language, one that
+is widely used among developers working in that language.
+
+The “System Libraries” of an executable work include anything, other
+than the work as a whole, that **(a)** is included in the normal form of
+packaging a Major Component, but which is not part of that Major
+Component, and **(b)** serves only to enable use of the work with that
+Major Component, or to implement a Standard Interface for which an
+implementation is available to the public in source code form.  A
+“Major Component”, in this context, means a major essential component
+(kernel, window system, and so on) of the specific operating system
+(if any) on which the executable work runs, or a compiler used to
+produce the work, or an object code interpreter used to run it.
+
+The “Corresponding Source” for a work in object code form means all
+the source code needed to generate, install, and (for an executable
+work) run the object code and to modify the work, including scripts to
+control those activities.  However, it does not include the work's
+System Libraries, or general-purpose tools or generally available free
+programs which are used unmodified in performing those activities but
+which are not part of the work.  For example, Corresponding Source
+includes interface definition files associated with source files for
+the work, and the source code for shared libraries and dynamically
+linked subprograms that the work is specifically designed to require,
+such as by intimate data communication or control flow between those
+subprograms and other parts of the work.
+
+The Corresponding Source need not include anything that users
+can regenerate automatically from other parts of the Corresponding
+Source.
+
+The Corresponding Source for a work in source code form is that
+same work.
+
+### 2. Basic Permissions
+
+All rights granted under this License are granted for the term of
+copyright on the Program, and are irrevocable provided the stated
+conditions are met.  This License explicitly affirms your unlimited
+permission to run the unmodified Program.  The output from running a
+covered work is covered by this License only if the output, given its
+content, constitutes a covered work.  This License acknowledges your
+rights of fair use or other equivalent, as provided by copyright law.
+
+You may make, run and propagate covered works that you do not
+convey, without conditions so long as your license otherwise remains
+in force.  You may convey covered works to others for the sole purpose
+of having them make modifications exclusively for you, or provide you
+with facilities for running those works, provided that you comply with
+the terms of this License in conveying all material for which you do
+not control copyright.  Those thus making or running the covered works
+for you must do so exclusively on your behalf, under your direction
+and control, on terms that prohibit them from making any copies of
+your copyrighted material outside their relationship with you.
+
+Conveying under any other circumstances is permitted solely under
+the conditions stated below.  Sublicensing is not allowed; section 10
+makes it unnecessary.
+
+### 3. Protecting Users' Legal Rights From Anti-Circumvention Law
+
+No covered work shall be deemed part of an effective technological
+measure under any applicable law fulfilling obligations under article
+11 of the WIPO copyright treaty adopted on 20 December 1996, or
+similar laws prohibiting or restricting circumvention of such
+measures.
+
+When you convey a covered work, you waive any legal power to forbid
+circumvention of technological measures to the extent such circumvention
+is effected by exercising rights under this License with respect to
+the covered work, and you disclaim any intention to limit operation or
+modification of the work as a means of enforcing, against the work's
+users, your or third parties' legal rights to forbid circumvention of
+technological measures.
+
+### 4. Conveying Verbatim Copies
+
+You may convey verbatim copies of the Program's source code as you
+receive it, in any medium, provided that you conspicuously and
+appropriately publish on each copy an appropriate copyright notice;
+keep intact all notices stating that this License and any
+non-permissive terms added in accord with section 7 apply to the code;
+keep intact all notices of the absence of any warranty; and give all
+recipients a copy of this License along with the Program.
+
+You may charge any price or no price for each copy that you convey,
+and you may offer support or warranty protection for a fee.
+
+### 5. Conveying Modified Source Versions
+
+You may convey a work based on the Program, or the modifications to
+produce it from the Program, in the form of source code under the
+terms of section 4, provided that you also meet all of these conditions:
+
+* **a)** The work must carry prominent notices stating that you modified
+it, and giving a relevant date.
+* **b)** The work must carry prominent notices stating that it is
+released under this License and any conditions added under section 7.
+This requirement modifies the requirement in section 4 to
+“keep intact all notices”.
+* **c)** You must license the entire work, as a whole, under this
+License to anyone who comes into possession of a copy.  This
+License will therefore apply, along with any applicable section 7
+additional terms, to the whole of the work, and all its parts,
+regardless of how they are packaged.  This License gives no
+permission to license the work in any other way, but it does not
+invalidate such permission if you have separately received it.
+* **d)** If the work has interactive user interfaces, each must display
+Appropriate Legal Notices; however, if the Program has interactive
+interfaces that do not display Appropriate Legal Notices, your
+work need not make them do so.
+
+A compilation of a covered work with other separate and independent
+works, which are not by their nature extensions of the covered work,
+and which are not combined with it such as to form a larger program,
+in or on a volume of a storage or distribution medium, is called an
+“aggregate” if the compilation and its resulting copyright are not
+used to limit the access or legal rights of the compilation's users
+beyond what the individual works permit.  Inclusion of a covered work
+in an aggregate does not cause this License to apply to the other
+parts of the aggregate.
+
+### 6. Conveying Non-Source Forms
+
+You may convey a covered work in object code form under the terms
+of sections 4 and 5, provided that you also convey the
+machine-readable Corresponding Source under the terms of this License,
+in one of these ways:
+
+* **a)** Convey the object code in, or embodied in, a physical product
+(including a physical distribution medium), accompanied by the
+Corresponding Source fixed on a durable physical medium
+customarily used for software interchange.
+* **b)** Convey the object code in, or embodied in, a physical product
+(including a physical distribution medium), accompanied by a
+written offer, valid for at least three years and valid for as
+long as you offer spare parts or customer support for that product
+model, to give anyone who possesses the object code either **(1)** a
+copy of the Corresponding Source for all the software in the
+product that is covered by this License, on a durable physical
+medium customarily used for software interchange, for a price no
+more than your reasonable cost of physically performing this
+conveying of source, or **(2)** access to copy the
+Corresponding Source from a network server at no charge.
+* **c)** Convey individual copies of the object code with a copy of the
+written offer to provide the Corresponding Source.  This
+alternative is allowed only occasionally and noncommercially, and
+only if you received the object code with such an offer, in accord
+with subsection 6b.
+* **d)** Convey the object code by offering access from a designated
+place (gratis or for a charge), and offer equivalent access to the
+Corresponding Source in the same way through the same place at no
+further charge.  You need not require recipients to copy the
+Corresponding Source along with the object code.  If the place to
+copy the object code is a network server, the Corresponding Source
+may be on a different server (operated by you or a third party)
+that supports equivalent copying facilities, provided you maintain
+clear directions next to the object code saying where to find the
+Corresponding Source.  Regardless of what server hosts the
+Corresponding Source, you remain obligated to ensure that it is
+available for as long as needed to satisfy these requirements.
+* **e)** Convey the object code using peer-to-peer transmission, provided
+you inform other peers where the object code and Corresponding
+Source of the work are being offered to the general public at no
+charge under subsection 6d.
+
+A separable portion of the object code, whose source code is excluded
+from the Corresponding Source as a System Library, need not be
+included in conveying the object code work.
+
+A “User Product” is either **(1)** a “consumer product”, which means any
+tangible personal property which is normally used for personal, family,
+or household purposes, or **(2)** anything designed or sold for incorporation
+into a dwelling.  In determining whether a product is a consumer product,
+doubtful cases shall be resolved in favor of coverage.  For a particular
+product received by a particular user, “normally used” refers to a
+typical or common use of that class of product, regardless of the status
+of the particular user or of the way in which the particular user
+actually uses, or expects or is expected to use, the product.  A product
+is a consumer product regardless of whether the product has substantial
+commercial, industrial or non-consumer uses, unless such uses represent
+the only significant mode of use of the product.
+
+“Installation Information” for a User Product means any methods,
+procedures, authorization keys, or other information required to install
+and execute modified versions of a covered work in that User Product from
+a modified version of its Corresponding Source.  The information must
+suffice to ensure that the continued functioning of the modified object
+code is in no case prevented or interfered with solely because
+modification has been made.
+
+If you convey an object code work under this section in, or with, or
+specifically for use in, a User Product, and the conveying occurs as
+part of a transaction in which the right of possession and use of the
+User Product is transferred to the recipient in perpetuity or for a
+fixed term (regardless of how the transaction is characterized), the
+Corresponding Source conveyed under this section must be accompanied
+by the Installation Information.  But this requirement does not apply
+if neither you nor any third party retains the ability to install
+modified object code on the User Product (for example, the work has
+been installed in ROM).
+
+The requirement to provide Installation Information does not include a
+requirement to continue to provide support service, warranty, or updates
+for a work that has been modified or installed by the recipient, or for
+the User Product in which it has been modified or installed.  Access to a
+network may be denied when the modification itself materially and
+adversely affects the operation of the network or violates the rules and
+protocols for communication across the network.
+
+Corresponding Source conveyed, and Installation Information provided,
+in accord with this section must be in a format that is publicly
+documented (and with an implementation available to the public in
+source code form), and must require no special password or key for
+unpacking, reading or copying.
+
+### 7. Additional Terms
+
+“Additional permissions” are terms that supplement the terms of this
+License by making exceptions from one or more of its conditions.
+Additional permissions that are applicable to the entire Program shall
+be treated as though they were included in this License, to the extent
+that they are valid under applicable law.  If additional permissions
+apply only to part of the Program, that part may be used separately
+under those permissions, but the entire Program remains governed by
+this License without regard to the additional permissions.
+
+When you convey a copy of a covered work, you may at your option
+remove any additional permissions from that copy, or from any part of
+it.  (Additional permissions may be written to require their own
+removal in certain cases when you modify the work.)  You may place
+additional permissions on material, added by you to a covered work,
+for which you have or can give appropriate copyright permission.
+
+Notwithstanding any other provision of this License, for material you
+add to a covered work, you may (if authorized by the copyright holders of
+that material) supplement the terms of this License with terms:
+
+* **a)** Disclaiming warranty or limiting liability differently from the
+terms of sections 15 and 16 of this License; or
+* **b)** Requiring preservation of specified reasonable legal notices or
+author attributions in that material or in the Appropriate Legal
+Notices displayed by works containing it; or
+* **c)** Prohibiting misrepresentation of the origin of that material, or
+requiring that modified versions of such material be marked in
+reasonable ways as different from the original version; or
+* **d)** Limiting the use for publicity purposes of names of licensors or
+authors of the material; or
+* **e)** Declining to grant rights under trademark law for use of some
+trade names, trademarks, or service marks; or
+* **f)** Requiring indemnification of licensors and authors of that
+material by anyone who conveys the material (or modified versions of
+it) with contractual assumptions of liability to the recipient, for
+any liability that these contractual assumptions directly impose on
+those licensors and authors.
+
+All other non-permissive additional terms are considered “further
+restrictions” within the meaning of section 10.  If the Program as you
+received it, or any part of it, contains a notice stating that it is
+governed by this License along with a term that is a further
+restriction, you may remove that term.  If a license document contains
+a further restriction but permits relicensing or conveying under this
+License, you may add to a covered work material governed by the terms
+of that license document, provided that the further restriction does
+not survive such relicensing or conveying.
+
+If you add terms to a covered work in accord with this section, you
+must place, in the relevant source files, a statement of the
+additional terms that apply to those files, or a notice indicating
+where to find the applicable terms.
+
+Additional terms, permissive or non-permissive, may be stated in the
+form of a separately written license, or stated as exceptions;
+the above requirements apply either way.
+
+### 8. Termination
+
+You may not propagate or modify a covered work except as expressly
+provided under this License.  Any attempt otherwise to propagate or
+modify it is void, and will automatically terminate your rights under
+this License (including any patent licenses granted under the third
+paragraph of section 11).
+
+However, if you cease all violation of this License, then your
+license from a particular copyright holder is reinstated **(a)**
+provisionally, unless and until the copyright holder explicitly and
+finally terminates your license, and **(b)** permanently, if the copyright
+holder fails to notify you of the violation by some reasonable means
+prior to 60 days after the cessation.
+
+Moreover, your license from a particular copyright holder is
+reinstated permanently if the copyright holder notifies you of the
+violation by some reasonable means, this is the first time you have
+received notice of violation of this License (for any work) from that
+copyright holder, and you cure the violation prior to 30 days after
+your receipt of the notice.
+
+Termination of your rights under this section does not terminate the
+licenses of parties who have received copies or rights from you under
+this License.  If your rights have been terminated and not permanently
+reinstated, you do not qualify to receive new licenses for the same
+material under section 10.
+
+### 9. Acceptance Not Required for Having Copies
+
+You are not required to accept this License in order to receive or
+run a copy of the Program.  Ancillary propagation of a covered work
+occurring solely as a consequence of using peer-to-peer transmission
+to receive a copy likewise does not require acceptance.  However,
+nothing other than this License grants you permission to propagate or
+modify any covered work.  These actions infringe copyright if you do
+not accept this License.  Therefore, by modifying or propagating a
+covered work, you indicate your acceptance of this License to do so.
+
+### 10. Automatic Licensing of Downstream Recipients
+
+Each time you convey a covered work, the recipient automatically
+receives a license from the original licensors, to run, modify and
+propagate that work, subject to this License.  You are not responsible
+for enforcing compliance by third parties with this License.
+
+An “entity transaction” is a transaction transferring control of an
+organization, or substantially all assets of one, or subdividing an
+organization, or merging organizations.  If propagation of a covered
+work results from an entity transaction, each party to that
+transaction who receives a copy of the work also receives whatever
+licenses to the work the party's predecessor in interest had or could
+give under the previous paragraph, plus a right to possession of the
+Corresponding Source of the work from the predecessor in interest, if
+the predecessor has it or can get it with reasonable efforts.
+
+You may not impose any further restrictions on the exercise of the
+rights granted or affirmed under this License.  For example, you may
+not impose a license fee, royalty, or other charge for exercise of
+rights granted under this License, and you may not initiate litigation
+(including a cross-claim or counterclaim in a lawsuit) alleging that
+any patent claim is infringed by making, using, selling, offering for
+sale, or importing the Program or any portion of it.
+
+### 11. Patents
+
+A “contributor” is a copyright holder who authorizes use under this
+License of the Program or a work on which the Program is based.  The
+work thus licensed is called the contributor's “contributor version”.
+
+A contributor's “essential patent claims” are all patent claims
+owned or controlled by the contributor, whether already acquired or
+hereafter acquired, that would be infringed by some manner, permitted
+by this License, of making, using, or selling its contributor version,
+but do not include claims that would be infringed only as a
+consequence of further modification of the contributor version.  For
+purposes of this definition, “control” includes the right to grant
+patent sublicenses in a manner consistent with the requirements of
+this License.
+
+Each contributor grants you a non-exclusive, worldwide, royalty-free
+patent license under the contributor's essential patent claims, to
+make, use, sell, offer for sale, import and otherwise run, modify and
+propagate the contents of its contributor version.
+
+In the following three paragraphs, a “patent license” is any express
+agreement or commitment, however denominated, not to enforce a patent
+(such as an express permission to practice a patent or covenant not to
+sue for patent infringement).  To “grant” such a patent license to a
+party means to make such an agreement or commitment not to enforce a
+patent against the party.
+
+If you convey a covered work, knowingly relying on a patent license,
+and the Corresponding Source of the work is not available for anyone
+to copy, free of charge and under the terms of this License, through a
+publicly available network server or other readily accessible means,
+then you must either **(1)** cause the Corresponding Source to be so
+available, or **(2)** arrange to deprive yourself of the benefit of the
+patent license for this particular work, or **(3)** arrange, in a manner
+consistent with the requirements of this License, to extend the patent
+license to downstream recipients.  “Knowingly relying” means you have
+actual knowledge that, but for the patent license, your conveying the
+covered work in a country, or your recipient's use of the covered work
+in a country, would infringe one or more identifiable patents in that
+country that you have reason to believe are valid.
+
+If, pursuant to or in connection with a single transaction or
+arrangement, you convey, or propagate by procuring conveyance of, a
+covered work, and grant a patent license to some of the parties
+receiving the covered work authorizing them to use, propagate, modify
+or convey a specific copy of the covered work, then the patent license
+you grant is automatically extended to all recipients of the covered
+work and works based on it.
+
+A patent license is “discriminatory” if it does not include within
+the scope of its coverage, prohibits the exercise of, or is
+conditioned on the non-exercise of one or more of the rights that are
+specifically granted under this License.  You may not convey a covered
+work if you are a party to an arrangement with a third party that is
+in the business of distributing software, under which you make payment
+to the third party based on the extent of your activity of conveying
+the work, and under which the third party grants, to any of the
+parties who would receive the covered work from you, a discriminatory
+patent license **(a)** in connection with copies of the covered work
+conveyed by you (or copies made from those copies), or **(b)** primarily
+for and in connection with specific products or compilations that
+contain the covered work, unless you entered into that arrangement,
+or that patent license was granted, prior to 28 March 2007.
+
+Nothing in this License shall be construed as excluding or limiting
+any implied license or other defenses to infringement that may
+otherwise be available to you under applicable patent law.
+
+### 12. No Surrender of Others' Freedom
+
+If conditions are imposed on you (whether by court order, agreement or
+otherwise) that contradict the conditions of this License, they do not
+excuse you from the conditions of this License.  If you cannot convey a
+covered work so as to satisfy simultaneously your obligations under this
+License and any other pertinent obligations, then as a consequence you may
+not convey it at all.  For example, if you agree to terms that obligate you
+to collect a royalty for further conveying from those to whom you convey
+the Program, the only way you could satisfy both those terms and this
+License would be to refrain entirely from conveying the Program.
+
+### 13. Remote Network Interaction; Use with the GNU General Public License
+
+Notwithstanding any other provision of this License, if you modify the
+Program, your modified version must prominently offer all users
+interacting with it remotely through a computer network (if your version
+supports such interaction) an opportunity to receive the Corresponding
+Source of your version by providing access to the Corresponding Source
+from a network server at no charge, through some standard or customary
+means of facilitating copying of software.  This Corresponding Source
+shall include the Corresponding Source for any work covered by version 3
+of the GNU General Public License that is incorporated pursuant to the
+following paragraph.
+
+Notwithstanding any other provision of this License, you have
+permission to link or combine any covered work with a work licensed
+under version 3 of the GNU General Public License into a single
+combined work, and to convey the resulting work.  The terms of this
+License will continue to apply to the part which is the covered work,
+but the work with which it is combined will remain governed by version
+3 of the GNU General Public License.
+
+### 14. Revised Versions of this License
+
+The Free Software Foundation may publish revised and/or new versions of
+the GNU Affero General Public License from time to time.  Such new versions
+will be similar in spirit to the present version, but may differ in detail to
+address new problems or concerns.
+
+Each version is given a distinguishing version number.  If the
+Program specifies that a certain numbered version of the GNU Affero General
+Public License “or any later version” applies to it, you have the
+option of following the terms and conditions either of that numbered
+version or of any later version published by the Free Software
+Foundation.  If the Program does not specify a version number of the
+GNU Affero General Public License, you may choose any version ever published
+by the Free Software Foundation.
+
+If the Program specifies that a proxy can decide which future
+versions of the GNU Affero General Public License can be used, that proxy's
+public statement of acceptance of a version permanently authorizes you
+to choose that version for the Program.
+
+Later license versions may give you additional or different
+permissions.  However, no additional obligations are imposed on any
+author or copyright holder as a result of your choosing to follow a
+later version.
+
+### 15. Disclaimer of Warranty
+
+THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY
+APPLICABLE LAW.  EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT
+HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM “AS IS” WITHOUT WARRANTY
+OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO,
+THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+PURPOSE.  THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM
+IS WITH YOU.  SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF
+ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
+
+### 16. Limitation of Liability
+
+IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
+WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS
+THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY
+GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE
+USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF
+DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD
+PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS),
+EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF
+SUCH DAMAGES.
+
+### 17. Interpretation of Sections 15 and 16
+
+If the disclaimer of warranty and limitation of liability provided
+above cannot be given local legal effect according to their terms,
+reviewing courts shall apply local law that most closely approximates
+an absolute waiver of all civil liability in connection with the
+Program, unless a warranty or assumption of liability accompanies a
+copy of the Program in return for a fee.
+
+_END OF TERMS AND CONDITIONS_
+
+## How to Apply These Terms to Your New Programs
+
+If you develop a new program, and you want it to be of the greatest
+possible use to the public, the best way to achieve this is to make it
+free software which everyone can redistribute and change under these terms.
+
+To do so, attach the following notices to the program.  It is safest
+to attach them to the start of each source file to most effectively
+state the exclusion of warranty; and each file should have at least
+the “copyright” line and a pointer to where the full notice is found.
+
+    <one line to give the program's name and a brief idea of what it does.>
+    
+    Copyright (C) <year>  <name of author>
+
+    This program is free software: you can redistribute it and/or modify
+    it under the terms of the GNU Affero General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU Affero General Public License for more details.
+
+    You should have received a copy of the GNU Affero General Public License
+    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+Also add information on how to contact you by electronic and paper mail.
+
+If your software can interact with users remotely through a computer
+network, you should also make sure that it provides a way for users to
+get its source.  For example, if your program is a web application, its
+interface could display a “Source” link that leads users to an archive
+of the code.  There are many ways you could offer source, and different
+solutions will be better for different programs; see section 13 for the
+specific requirements.
+
+You should also get your employer (if you work as a programmer) or school,
+if any, to sign a “copyright disclaimer” for the program, if necessary.
+For more information on this, and how to apply and follow the GNU AGPL, see
+&lt;<http://www.gnu.org/licenses/>&gt;.

README.md

@@ -1,17 +1,26 @@
 <p align="center">
-<img src="./design_files/main_icon_small.png" width="200" height="200">
+<img src="./design_files/app_screenshot.png">
 </p>
 
-# Time Sampling Form
+<h1 align="center">Time Sampling Form</h1>
+<p align="center"><strong>Built with Godot</strong></p>
 
-A freeware and open source SEN-related observation tool. The <a href="https://www.internationalsengroup.org/tsf_web/" target="_blank">web version is available here</a> (now works on iPads too).
+<p align="center">
+<img alt="GitHub all releases" src="https://img.shields.io/github/downloads/hobbesjaap/time-sampling-form/total">
+<img alt="GitHub release (with filter)" src="https://img.shields.io/github/v/release/hobbesjaap/time-sampling-form">
+<img alt="GitHub" src="https://img.shields.io/github/license/hobbesjaap/time-sampling-form">
+</p>
+
+A freeware and open source education-related observation tool. The <a href="https://www.jaapmarsman.com/tsf_web/" target="_blank">web version is available here</a> (now works on iPads too).
 
 ## Manual
 
-For a detailed manual on how to use the Time Sampling Form, please go to <a href="https://www.internationalsengroup.org/resources/time-sampling-form/" target="_blank">this page on the ISENG website</a>.
+For a detailed manual on how to use the Time Sampling Form, please go to <a href="https://docs.jaapmarsman.com/time-sampling-form.html" target="_blank">this page</a>.
 
 ## License & Attributions
 
-<a rel="license" href="http://creativecommons.org/licenses/by-nc-nd/4.0/" target="_blank"><img alt="Creative Commons Licence" style="border-width:0" src="https://i.creativecommons.org/l/by-nc-nd/4.0/88x31.png" /></a><br />This work is licensed under a <a rel="license" href="http://creativecommons.org/licenses/by-nc-nd/4.0/" target="_blank">Creative Commons Attribution-NonCommercial-NoDerivatives 4.0 International License</a>.
+Licensed under the [AGPL-3.0](LICENSE.md)
 
-For an overview of all underlying licences, copyrights and attributions, please see the [Copyrights document](COPYRIGHTS.md).
+Copyright (c) 2022-present, [Jaap Marsman](https://www.jaapmarsman.com/)
+
+For an overview of all underlying attributions, please see the [Copyright document](COPYRIGHT.md).

godot/2d_only.build

@@ -0,0 +1,18 @@
+{
+	"disabled_build_options": {
+		"disable_3d": true,
+		"disable_3d_physics": true
+	},
+	"disabled_classes": [
+		"MultiplayerSpawner",
+		"MultiplayerSynchronizer",
+		"NavigationAgent3D",
+		"NavigationMeshSourceGeometryData3D",
+		"Node3D",
+		"Occluder3D",
+		"Shape3D",
+		"Texture3D",
+		"World3D"
+	],
+	"type": "build_profile"
+}

godot/Assets/icons/icon_timer.svg

@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="1200pt" height="1200pt" version="1.1" viewBox="0 0 1200 1200" xmlns="http://www.w3.org/2000/svg">
+ <g fill="#d7644d">
+  <path d="m643.78 137.75c78.223 6.3867 151.69 29.738 216.7 66.355l40.184-46.547c5.5859-6.4375 15.129-7.1875 21.594-1.5781l92.395 79.93c6.3633 5.5078 7.0859 15.207 1.5781 21.594l-34.547 40.031c93.043 95.809 150.35 226.48 150.35 370.43 0 293.61-238.42 532.03-532.03 532.03-293.61 0-532.03-238.42-532.03-532.03 0-278.87 215.07-507.93 488.25-530.22v-50.191h-55.754c-8.4297 0-15.309-6.8789-15.309-15.309v-56.941c0-8.4297 6.8789-15.309 15.309-15.309h199.07c8.4297 0 15.309 6.8789 15.309 15.309v56.941c0 8.4297-6.8789 15.309-15.309 15.309h-55.754v50.191zm-43.781 77.008c-250.45 0-453.21 202.76-453.21 453.21 0 250.45 202.76 453.21 453.21 453.21 250.45 0 453.21-202.76 453.21-453.21 0-250.45-202.76-453.21-453.21-453.21z"/>
+  <path d="m598.89 667.97v-404.7c-223.53 0-404.7 181.2-404.7 404.7 0 223.5 181.17 404.7 404.7 404.7 136.23 0 263.3-68.555 338.16-182.39z"/>
+ </g>
+</svg>

godot/Assets/icons/noun-chat-92638.svg

@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="1200pt" height="1200pt" version="1.1" viewBox="0 0 1200 1200" xmlns="http://www.w3.org/2000/svg">
+	<g fill="#ffffff">
+ <path d="m1110 330h-210v-180c0-16.801-13.199-30-30-30h-780c-16.801 0-30 13.199-30 30v540c0 16.801 13.199 30 30 30h60v120c0 13.199 9.6016 25.199 21.602 28.801 2.3984 1.1992 4.8008 1.1992 8.3984 1.1992 10.801 0 20.398-4.8008 25.199-14.398l81.602-135.6h13.199v180c0 16.801 13.199 30 30 30h583.2l81.602 135.6c6 9.6016 15.602 14.398 25.199 14.398 2.3984 0 4.8008 0 8.3984-1.1992 13.199-3.6016 21.602-15.602 21.602-28.801v-120h60c16.801 0 30-13.199 30-30v-540c0-16.801-13.199-30-30-30zm-30 540h-60c-16.801 0-30 13.199-30 30v42l-34.801-57.602c-6-9.6016-15.602-14.398-25.199-14.398h-570v-150h510c16.801 0 30-13.199 30-30v-300h180zm-835.2-195.6-34.801 57.602v-42c0-16.801-13.199-30-30-30h-60v-480h720v480h-570c-10.801 0-20.398 6-25.199 14.398z"/>
+</g></svg>

godot/Assets/icons/noun-dutch-1054558.svg

@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="1200pt" height="1200pt" version="1.1" viewBox="0 0 1200 1200" xmlns="http://www.w3.org/2000/svg">
+ <g fill="#ffffff">
+  <path d="m1008 60h-816c-73.199 0-132 55.199-132 123.6v620.4c0 68.398 58.801 123.6 132 123.6h86.398v183.6c0 10.801 7.1992 21.602 18 26.398 4.8008 2.3984 8.3984 2.3984 13.199 2.3984 7.1992 0 14.398-2.3984 20.398-6l272.4-206.4h405.61c73.199 0 132-55.199 132-123.6v-620.4c0-68.402-58.801-123.6-132-123.6zm70.801 742.8c0 36-31.199 64.801-69.602 64.801h-418.8c-7.1992 0-14.398 2.3984-20.398 6l-229.2 174v-151.2c0-15.602-14.398-28.801-31.199-28.801h-117.6c-38.398 0-69.602-28.801-69.602-64.801v-616.8c0-36 31.199-64.801 69.602-64.801h818.4c38.398 0 69.602 28.801 69.602 64.801v616.8z"/>
+  <path d="m530.4 560.4-139.2-244.8h-76.801v350.4h68.402v-248.4l142.8 248.4h73.199v-350.4h-68.402z"/>
+  <path d="m740.4 315.6h-73.199v350.4h248.4v-63.602h-175.2z"/>
+ </g>
+</svg>

godot/Assets/icons/noun-english-1054579.svg

@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="1200pt" height="1200pt" version="1.1" viewBox="0 0 1200 1200" xmlns="http://www.w3.org/2000/svg">
+ <g fill="#ffffff">
+  <path d="m1008 60h-816c-73.199 0-132 55.199-132 123.6v620.4c0 68.398 58.801 123.6 132 123.6h86.398v183.6c0 10.801 7.1992 21.602 18 26.398 4.8008 2.3984 8.3984 2.3984 13.199 2.3984 7.1992 0 14.398-2.3984 20.398-6l272.4-206.4h405.61c73.199 0 132-55.199 132-123.6v-620.4c0-68.402-58.801-123.6-132-123.6zm70.801 742.8c0 36-31.199 64.801-69.602 64.801h-418.8c-7.1992 0-14.398 2.3984-20.398 6l-229.2 174v-151.2c0-15.602-14.398-28.801-31.199-28.801h-117.6c-38.398 0-69.602-28.801-69.602-64.801v-616.8c0-36 31.199-64.801 69.602-64.801h818.4c38.398 0 69.602 28.801 69.602 64.801v616.8z"/>
+  <path d="m372 512.4h170.4v-60h-170.4v-74.398h184.8v-62.398h-256.8v350.4h265.2v-63.602h-193.2z"/>
+  <path d="m837.6 560.4-139.2-244.8h-76.797v350.4h68.398v-248.4l142.8 248.4h73.199v-350.4h-68.398z"/>
+ </g>
+</svg>

godot/Assets/icons/noun-file-59659.svg

@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="1200pt" height="1200pt" version="1.1" viewBox="0 0 1200 1200" xmlns="http://www.w3.org/2000/svg">
+	<g fill="#ffffff">
+ <path d="m1011.2 308.79-240-240c-5.625-5.6289-13.258-8.7852-21.215-8.7852h-540c-16.57 0-30 13.43-30 30v1020c0 16.57 13.43 30 30 30h780c16.57 0 30-13.43 30-30v-780c0-7.957-3.168-15.59-8.7852-21.215zm-231.21-146.36 137.58 137.58h-137.58zm-540 917.58v-960h480v210c0 16.57 13.43 30 30 30h210v720z"/>
+</g></svg>

godot/Assets/icons/noun-floppy-disk-104320.svg

@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="1200pt" height="1200pt" version="1.1" viewBox="0 0 1200 1200" xmlns="http://www.w3.org/2000/svg">
+ <g fill="#ffffff">
+  <path d="m1011.6 68.398c-6-4.7969-13.203-8.3984-21.602-8.3984h-900c-16.801 0-30 13.199-30 30v1020c0 16.801 13.199 30 30 30h1020c16.801 0 30-13.199 30-30v-900c0-8.3984-3.6016-15.602-8.3984-21.602zm-531.6 51.602h390v270h-390zm-150 0h90v270h-90zm750 960h-960v-960h150v300c0 16.801 13.199 30 30 30h600c16.801 0 30-13.199 30-30v-300h48l102 102z"/>
+  <path d="m810 150h-90c-16.801 0-30 13.199-30 30v150c0 16.801 13.199 30 30 30h90c16.801 0 30-13.199 30-30v-150c0-16.801-13.199-30-30-30zm-30 150h-30v-90h30z"/>
+  <path d="m930 690h-660c-16.801 0-30 13.199-30 30s13.199 30 30 30h660c16.801 0 30-13.199 30-30s-13.199-30-30-30z"/>
+  <path d="m930 810h-660c-16.801 0-30 13.199-30 30s13.199 30 30 30h660c16.801 0 30-13.199 30-30s-13.199-30-30-30z"/>
+  <path d="m930 930h-660c-16.801 0-30 13.199-30 30s13.199 30 30 30h660c16.801 0 30-13.199 30-30s-13.199-30-30-30z"/>
+ </g>
+</svg>

godot/Assets/icons/noun-glasses-56317.svg

@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="1200pt" height="1200pt" version="1.1" viewBox="0 0 1200 1200" xmlns="http://www.w3.org/2000/svg">
+	<g fill="#ffffff">
+ <path d="m895.55 305.05c-3.6953-6-9.3711-10.512-16.055-12.742l-90-30c-15.781-5.2578-32.723 3.2539-37.957 18.973-5.2422 15.719 3.2539 32.711 18.973 37.945l79.668 26.555 224.61 364.99h-44.09c-31.066-53.172-96.48-90-172.23-90-61.094 0-115.46 23.988-150.56 61.141-28.957-22.453-67.066-35.293-107.89-35.293-40.824 0-78.938 12.84-107.89 35.293-35.102-37.152-89.473-61.141-150.57-61.141-75.742 0-141.17 36.828-172.22 90h-44.09l224.61-364.99 79.668-26.555c15.719-5.2422 24.215-22.223 18.961-37.945-5.2422-15.73-22.246-24.227-37.945-18.973l-90 30c-6.6836 2.2305-12.359 6.7422-16.055 12.742l-240 390c-2.9141 4.7305-4.4609 10.176-4.4609 15.723v30c0 16.57 13.43 30 30 30h60.562c-0.21484 3.0703-0.5625 6.1172-0.5625 9.2266 0 87.805 85.922 159.24 191.53 159.24 105.62 0 191.54-71.438 191.54-159.24 0-16.332-2.9883-32.102-8.5195-46.957 18.77-16.5 46.164-26.438 75.445-26.438s56.676 9.9375 75.445 26.438c-5.5195 14.844-8.5195 30.613-8.5195 46.945 0 87.805 85.922 159.24 191.53 159.24 105.62 0.011719 191.54-71.422 191.54-159.23 0-3.1211-0.34766-6.1562-0.5625-9.2266h60.562c16.57 0 30-13.43 30-30v-30c0-5.543-1.5352-10.992-4.4531-15.719zm-554.02 574.19c-72.516 0-131.53-44.508-131.53-99.238 0-54.719 59.016-99.227 131.53-99.227 53.93 0 100.33 24.625 120.61 59.746 0.46875 0.94922 0.92578 1.8711 1.5 2.7734 6.0234 11.363 9.4336 23.734 9.4336 36.707-0.003906 54.73-59.008 99.238-131.55 99.238zm516.93 0c-72.527 0-131.53-44.508-131.53-99.238 0-12.984 3.4062-25.344 9.4453-36.719 0.5625-0.88672 1.0195-1.8242 1.4766-2.7617 20.27-35.125 66.684-59.746 120.61-59.746 72.527 0 131.54 44.508 131.54 99.227-0.003906 54.73-59.02 99.238-131.55 99.238z"/>
+</g></svg>

godot/Assets/icons/noun-history-101708.svg

@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="1200pt" height="1200pt" version="1.1" viewBox="0 0 1200 1200" xmlns="http://www.w3.org/2000/svg">
+ <g fill="#ffffff">
+  <path d="m600 300c-16.801 0-30 13.199-30 30v270c0 16.801 13.199 30 30 30h150c16.801 0 30-13.199 30-30s-13.199-30-30-30h-120v-240c0-16.801-13.199-30-30-30z"/>
+  <path d="m188.4 681.6c6 6 13.199 8.3984 21.602 8.3984 8.3984 0 15.602-2.3984 21.602-8.3984l120-120c12-12 12-31.199 0-42-12-12-31.199-12-42 0l-69.602 67.199c7.1992-192 165.6-346.8 360-346.8 198 0 360 162 360 360s-162 360-360 360c-16.801 0-30 13.199-30 30s13.199 30 30 30c231.6 0 420-188.4 420-420s-188.4-420-420-420c-228 0-412.8 182.4-420 408l-69.602-69.602c-12-12-31.199-12-42 0-12 12-12 31.199 0 42z"/>
+ </g>
+</svg>

godot/Assets/icons/noun-input-field-104354.svg

@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="1200pt" height="1200pt" version="1.1" viewBox="0 0 1200 1200" xmlns="http://www.w3.org/2000/svg">
+ <g fill="#ffffff">
+  <path d="m1110 270h-1020c-16.801 0-30 13.199-30 30v600c0 16.801 13.199 30 30 30h1020c16.801 0 30-13.199 30-30v-600c0-16.801-13.199-30-30-30zm-30 600h-960v-540h960z"/>
+  <path d="m210 750c-16.801 0-30 13.199-30 30s13.199 30 30 30h180c16.801 0 30-13.199 30-30s-13.199-30-30-30h-60v-300h60c16.801 0 30-13.199 30-30s-13.199-30-30-30h-180c-16.801 0-30 13.199-30 30s13.199 30 30 30h60v300z"/>
+ </g>
+</svg>

godot/Assets/icons/noun-manual-241665.svg

@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="1200pt" height="1200pt" version="1.1" viewBox="0 0 1200 1200" xmlns="http://www.w3.org/2000/svg">
+ <g fill="#ffffff">
+  <path d="m806.25 225h-337.5c-20.625 0-37.5 16.875-37.5 37.5v131.25c0 20.625 16.875 37.5 37.5 37.5h337.5c20.625 0 37.5-16.875 37.5-37.5v-131.25c0-20.625-16.875-37.5-37.5-37.5zm0 150c0 11.25-7.5 18.75-18.75 18.75h-300c-11.25 0-18.75-7.5-18.75-18.75v-93.75c0-11.25 7.5-18.75 18.75-18.75h300c11.25 0 18.75 7.5 18.75 18.75z"/>
+  <path d="m993.75 0h-787.5c-41.25 0-75 33.75-75 75v918.75c0 41.25 33.75 75 75 75h56.25c11.25 0 18.75-7.5 18.75-18.75s-7.5-18.75-18.75-18.75h-56.25c-20.625 0-37.5-16.875-37.5-37.5v-37.5h862.5v37.5c0 20.625-16.875 37.5-37.5 37.5h-506.25c-11.25 0-18.75 7.5-18.75 18.75s7.5 18.75 18.75 18.75h506.25c41.25 0 75-33.75 75-75v-918.75c0-41.25-33.75-75-75-75zm-825 918.75v-843.75c0-20.625 16.875-37.5 37.5-37.5h787.5c20.625 0 37.5 16.875 37.5 37.5v843.75z"/>
+  <path d="m412.5 993.75c-11.25 0-18.75 7.5-18.75 18.75v131.25c0 11.25-7.5 18.75-18.75 18.75s-18.75-7.5-18.75-18.75v-131.25c0-11.25-7.5-18.75-18.75-18.75s-18.75 7.5-18.75 18.75v150c0 20.625 16.875 37.5 37.5 37.5h37.5c20.625 0 37.5-16.875 37.5-37.5v-150c0-11.25-7.5-18.75-18.75-18.75z"/>
+  <path d="m225 75c-11.25 0-18.75 7.5-18.75 18.75v768.75c0 11.25 7.5 18.75 18.75 18.75s18.75-7.5 18.75-18.75v-768.75c0-11.25-7.5-18.75-18.75-18.75z"/>
+ </g>
+</svg>

godot/Assets/icons/noun-message-92639.svg

@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="1200pt" height="1200pt" version="1.1" viewBox="0 0 1200 1200" xmlns="http://www.w3.org/2000/svg">
+ <g fill="#ffffff">
+  <path d="m990 300h-780c-16.801 0-30 13.199-30 30v540c0 16.801 13.199 30 30 30h60v120c0 13.199 9.6016 25.199 21.602 28.801 2.3984 1.1992 4.8008 1.1992 8.3984 1.1992 10.801 0 20.398-4.8008 25.199-14.398l81.602-135.6h583.2c16.801 0 30-13.199 30-30v-540c0-16.801-13.199-30-30-30zm-30 540h-570c-10.801 0-20.398 6-25.199 14.398l-34.801 57.602v-42c0-16.801-13.199-30-30-30h-60v-480h720z"/>
+  <path d="m660 600c0 33.137-26.863 60-60 60s-60-26.863-60-60 26.863-60 60-60 60 26.863 60 60"/>
+  <path d="m810 600c0 33.137-26.863 60-60 60s-60-26.863-60-60 26.863-60 60-60 60 26.863 60 60"/>
+  <path d="m510 600c0 33.137-26.863 60-60 60s-60-26.863-60-60 26.863-60 60-60 60 26.863 60 60"/>
+ </g>
+</svg>

godot/Assets/icons/noun-power-101711.svg

@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="1200pt" height="1200pt" version="1.1" viewBox="0 0 1200 1200" xmlns="http://www.w3.org/2000/svg">
+ <g fill="#ffffff">
+  <path d="m600 630c49.199 0 90-40.801 90-90v-390c0-49.199-40.801-90-90-90s-90 40.801-90 90v390c0 49.199 40.801 90 90 90zm-30-480c0-16.801 13.199-30 30-30s30 13.199 30 30v390c0 16.801-13.199 30-30 30s-30-13.199-30-30z"/>
+  <path d="m600 1140c265.2 0 480-214.8 480-480 0-148.8-67.199-286.8-184.8-378-15.602-12-36-19.199-55.199-19.199-27.602 0-54 12-70.801 34.801-14.398 19.199-21.602 42-18 66 2.3984 24 14.398 45.602 33.602 60 73.199 57.602 115.2 144 115.2 236.4 0 165.6-134.4 300-300 300s-300-134.4-300-300c0-92.398 42-178.8 115.2-236.4 19.199-14.398 31.199-36 33.602-60 2.3984-24-3.6016-48-18-66-16.801-21.602-43.199-34.801-70.801-34.801-20.398 0-39.602 7.1992-55.199 19.199-117.6 91.199-184.8 229.2-184.8 378 0 265.2 214.8 480 480 480zm-258-811.2c7.1992-4.8008 13.199-6 18-6 9.6016 0 18 4.8008 24 12 4.8008 6 7.1992 14.398 6 21.602-1.1992 8.3984-4.8008 15.602-10.801 20.398-88.801 68.398-139.2 171.6-139.2 283.2 0 198 162 360 360 360s360-162 360-360c0-111.6-50.398-214.8-138-283.2-6-4.8008-10.801-12-10.801-20.398-1.1992-8.3984 1.1992-15.602 6-21.602 6-7.1992 14.398-12 24-12 4.8008 0 12 1.1992 18 6 102 80.398 160.8 201.6 160.8 331.2 0 231.6-188.4 420-420 420s-420-188.4-420-420c0-129.6 58.801-250.8 162-331.2z"/>
+ </g>
+</svg>

godot/Assets/icons/noun-press-104313.svg

@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="1200pt" height="1200pt" version="1.1" viewBox="0 0 1200 1200" xmlns="http://www.w3.org/2000/svg">
+ <g fill="#ffffff">
+  <path d="m160.8 868.8c0 151.2 193.2 268.8 439.2 268.8s439.2-117.6 439.2-268.8-193.2-268.8-439.2-268.8-439.2 117.6-439.2 268.8zm439.2-208.8c136.8 0 253.2 62.398 253.2 135.6 0 73.199-116.4 134.4-253.2 134.4s-253.2-62.398-253.2-135.6c0-73.199 116.4-134.4 253.2-134.4zm-302.4 85.199c-6 15.602-9.6016 32.398-9.6016 50.398 0 109.2 138 195.6 313.2 195.6s313.2-85.199 313.2-195.6c0-18-3.6016-34.801-9.6016-50.398 48 34.801 76.801 78 76.801 123.6 0 112.8-174 208.8-379.2 208.8-205.2 0-379.2-96-379.2-208.8-2.3984-45.602 26.402-88.801 74.402-123.6z"/>
+  <path d="m600 60c-16.801 0-30 13.199-30 30v348l-128.4-129.6c-12-12-31.199-12-42 0-12 12-12 31.199 0 42l180 180c6 6 13.199 8.3984 21.602 8.3984 8.3984 0 15.602-2.3984 21.602-8.3984l180-180c12-12 12-31.199 0-42-12-12-31.199-12-42 0l-130.8 129.6v-348c0-16.801-13.199-30-30-30z"/>
+ </g>
+</svg>

godot/Assets/icons/noun-settings-56313.svg

@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="1200pt" height="1200pt" version="1.1" viewBox="0 0 1200 1200" xmlns="http://www.w3.org/2000/svg">
+ <g fill="#ffffff">
+  <path d="m570 1017v93.023c0 16.57 13.43 30 30 30s30-13.43 30-30v-93.023c68.375-13.945 120-74.531 120-146.98s-51.625-133.03-120-146.98v-633.02c0-16.57-13.43-30-30-30s-30 13.43-30 30v633.02c-68.375 13.945-120 74.531-120 146.98s51.625 133.03 120 146.98zm30-236.98c49.633 0 90 40.367 90 90s-40.367 90-90 90-90-40.367-90-90 40.367-90 90-90z"/>
+  <path d="m210 446.98v663.02c0 16.57 13.43 30 30 30s30-13.43 30-30v-663.02c68.375-13.945 120-74.531 120-146.98s-51.625-133.03-120-146.98v-63.023c0-16.57-13.43-30-30-30s-30 13.43-30 30v63.023c-68.375 13.945-120 74.531-120 146.98s51.625 133.03 120 146.98zm30-236.98c49.633 0 90 40.367 90 90s-40.367 90-90 90-90-40.367-90-90 40.367-90 90-90z"/>
+  <path d="m930 656.98v453.02c0 16.57 13.43 30 30 30s30-13.43 30-30v-453.02c68.375-13.945 120-74.531 120-146.98s-51.625-133.03-120-146.98v-273.02c0-16.57-13.43-30-30-30s-30 13.43-30 30v273.02c-68.375 13.945-120 74.531-120 146.98s51.625 133.03 120 146.98zm30-236.98c49.633 0 90 40.367 90 90s-40.367 90-90 90-90-40.367-90-90 40.367-90 90-90z"/>
+ </g>
+</svg>

godot/Assets/icons/noun-upgrade-104308.svg

@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="1200pt" height="1200pt" version="1.1" viewBox="0 0 1200 1200" xmlns="http://www.w3.org/2000/svg">
+ <g fill="#ffffff">
+  <path d="m600 540c16.801 0 30-13.199 30-30v-348l128.4 128.4c6 6 13.199 8.3984 21.602 8.3984 8.3984 0 15.602-2.3984 21.602-8.3984 12-12 12-31.199 0-42l-180-180c-12-12-31.199-12-42 0l-180 180c-12 12-12 31.199 0 42 12 12 31.199 12 42 0l128.4-128.4v348c0 16.801 13.199 30 30 30z"/>
+  <path d="m180 1140h840c16.801 0 30-13.199 30-30v-600c0-16.801-13.199-30-30-30h-240c-16.801 0-30 13.199-30 30s13.199 30 30 30h210v540h-780v-540h210c16.801 0 30-13.199 30-30s-13.199-30-30-30h-240c-16.801 0-30 13.199-30 30v600c0 16.801 13.199 30 30 30z"/>
+ </g>
+</svg>

godot/EditScreen.gd

@@ -1,20 +1,31 @@
 extends CanvasLayer
 
-onready var gi = $"/root/GlobalInts"
-onready var global_ints = gi
-onready var main_window = $"../../AppWindow"
+# Time Sampling Form
 
-func _ready():
-	pass # Replace with function body.
+# Copyright (C) 2022-present Jaap Marsman
+
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU Affero General Public License for more details.
+
+# You should have received a copy of the GNU Affero General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+@onready var main_window = $"../../AppWindow"
 
 
-func _on_CancelButton_pressed():
+func _on_CancelButton_pressed() -> void:
 	main_window.refresh_descriptors()
 	$"%EditScreen".visible = false
 
 
-func _on_OKButton_pressed():
-	
+func _on_OKButton_pressed() -> void:
 	global_ints.one_acronym = $"%1AcronymE".text
 	global_ints.two_acronym = $"%2AcronymE".text
 	global_ints.three_acronym = $"%3AcronymE".text
@@ -33,12 +44,12 @@ func _on_OKButton_pressed():
 	global_ints.four_explanation = $"%4ExplanationE".text
 	global_ints.five_explanation = $"%5ExplanationE".text
 		
-	$"%EditScreen".visible = false
+	$"%EditScreen".hide()
 	
 	main_window.refresh_descriptors()
 
 
-func _on_ClearAll_pressed():
+func _on_ClearAll_pressed() -> void:
 	$"%1AcronymE".text = ""
 	$"%1ItemE".text = ""
 	$"%1ExplanationE".text = ""

godot/EditScreen.gd.uid

@@ -0,0 +1 @@
+uid://psov4nxn77wr

godot/NameChangePanel.gd

@@ -1,16 +0,0 @@
-extends Panel
-
-
-onready var global_ints = $"/root/GlobalInts"
-
-
-func _on_OkButton_pressed():
-	if $"%NameLine".text and $"NameContainer/ObserverLine".text and $"NameContainer/ObservedActivity".text != "":
-		$"%InstructionPanel".visible = true
-		$"%NameChangePanel".visible = false
-		global_ints.observed_person_name = $"%NameLine".text
-		global_ints.observer_person_name = $"NameContainer/ObserverLine".text
-		global_ints.observed_activity = $"NameContainer/ObservedActivity".text
-	else:
-		$"%ObservedNameLabel".visible = false
-		$"%WarningLabel".visible = true

godot/ObservationWindow.gd

@@ -1,29 +1,89 @@
 extends CanvasLayer
 
+# Time Sampling Form
 
-onready var global_ints = $"/root/GlobalInts"
+# Copyright (C) 2022-present Jaap Marsman
 
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU Affero General Public License for more details.
+
+# You should have received a copy of the GNU Affero General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 var time_lefts : int
 var toggle_observation : bool = false
 var observation_button_pressed : bool = false
 
+var sound_scored = preload("res://Assets/audio/scored.ogg")
+var sound_time_to_score = preload("res://Assets/audio/time_to_score.ogg")
+var sound_no_score = preload("res://Assets/audio/no_score.ogg")
 
-func _ready():
-	$"Panel/BehaviourButtons".visible = false
-	pass
+@onready var styleBox_highlight : StyleBoxFlat = $"%OneInstrPanel".get_theme_stylebox("panel").duplicate()
+@onready var styleBox_orig : StyleBoxFlat = $"%TwoNamesPanel".get_theme_stylebox("panel").duplicate()
 
 
-func _process(_delta):
+func set_all_boxes_to_normal() -> void:
+	$"%OneInstrPanel".add_theme_stylebox_override("panel", styleBox_orig)
+	$"%TwoNamesPanel".add_theme_stylebox_override("panel", styleBox_orig)
+	$"%ThreeConfigPanel".add_theme_stylebox_override("panel", styleBox_orig)
+	$"%FourObservePanel".add_theme_stylebox_override("panel", styleBox_orig)
+	$"%FiveResultsPanel".add_theme_stylebox_override("panel", styleBox_orig)
+
+
+func state_changed_check() -> void:
+	styleBox_highlight.set("bg_color", Color.html("#F2CC8F"))
+
+	if $"%InstructionScreen".visible == true:
+		global_ints.app_state = 1
+		set_all_boxes_to_normal()
+		$"%OneInstrPanel".add_theme_stylebox_override("panel", styleBox_highlight)
+
+	if $"%NameChangePanel".visible == true:
+		global_ints.app_state = 2
+		set_all_boxes_to_normal()
+		$"%TwoNamesPanel".add_theme_stylebox_override("panel", styleBox_highlight)
+		
+	if $"%InstructionPanel".visible == true:
+		global_ints.app_state = 3
+		set_all_boxes_to_normal()
+		$"%ThreeConfigPanel".add_theme_stylebox_override("panel", styleBox_highlight)
+
+	if $"%ObservationWindow".visible == true:
+		global_ints.app_state = 4
+		set_all_boxes_to_normal()
+		$"%FourObservePanel".add_theme_stylebox_override("panel", styleBox_highlight)
+
+	if $"%Results".visible == true:
+		global_ints.app_state = 5
+		set_all_boxes_to_normal()
+		$"%FiveResultsPanel".add_theme_stylebox_override("panel", styleBox_highlight)
+
+
+func _ready() -> void:
+	$"Panel/BehaviourButtons".hide()
+	$TwentySecondTimer.set_wait_time(global_ints.timer_duration)
+
+
+func _process(_delta) -> void:
 	time_lefts = $"TwentySecondTimer".time_left
 	$"Panel/TimeRemaining".text = str(time_lefts)
 	if time_lefts == 5 && toggle_observation == false:
 		print("We're at the five second mark!")
 		toggle_observation = true
-		$"Panel/BehaviourButtons".visible = true
+		$"Panel/BehaviourButtons".show()
+		$AudioPlayer.stream = sound_time_to_score
+		$AudioPlayer.play()
 
 
-func calculate_percentages():
+func calculate_percentages() -> void:
+		@warning_ignore("integer_division")
 		global_ints.total_observed_time = global_ints.total_behaviours / 3
 
 		global_ints.one_behaviour_percent = int((float(global_ints.one_behaviour_score) / global_ints.total_behaviours) * 100)
@@ -36,18 +96,20 @@ func calculate_percentages():
 
 		global_ints.five_behaviour_percent = int((float(global_ints.five_behaviour_score) / global_ints.total_behaviours) * 100)
 
-func on_interval_moment():
+func on_interval_moment() -> void:
 	print("Timer reaches 0 - Let's check if buttons have been pressed and count something")
 	toggle_observation = false
 	# Otherwise - a 6 is registered (nothing selected)
 	# Buttons are to become visible again
 	global_ints.locked_observations_intervals_remaining -= 1
 	global_ints.locked_observations_completed += 1
-	$"Panel/BehaviourButtons".visible = false
+	$"Panel/BehaviourButtons".hide()
 	
 	if observation_button_pressed == false:
 		global_ints.six_behaviour_score += 1
 		global_ints.total_behaviours += 1
+		$AudioPlayer.stream = sound_no_score
+		$AudioPlayer.play()
 	
 	observation_button_pressed = false
 	
@@ -55,13 +117,13 @@ func on_interval_moment():
 	$"Panel/DescriptorBox/ObservationsRemaining".text = str(global_ints.locked_observations_intervals_remaining)
 
 
-func _on_TwentySecondTimer_timeout():
+func _on_TwentySecondTimer_timeout() -> void:
 	if global_ints.locked_observations_intervals_remaining == 1:
 		on_interval_moment()
 		print("We're completely done - no intervals remain")
 		# So I should end the observation and move to the Results window.
 		
-		var obs_date_time = OS.get_time()
+		var obs_date_time = Time.get_datetime_dict_from_system()
 		if obs_date_time.minute < 10:
 			global_ints.observation_end_time = str(obs_date_time.hour, ":0", obs_date_time.minute)
 		if obs_date_time.minute >= 10:
@@ -71,49 +133,59 @@ func _on_TwentySecondTimer_timeout():
 		$"TwentySecondTimer".stop()
 		global_ints.generate_results = true
 		calculate_percentages()
-		$"../Results".visible = true
+		$"../Results".show()
 	
 	if global_ints.locked_observations_intervals_remaining > 1:
 		on_interval_moment()
 
 
-func _on_BehaviourOne_pressed():
+func _on_BehaviourOne_pressed() -> void:
 	global_ints.one_behaviour_score += 1
 	global_ints.total_behaviours += 1
 	observation_button_pressed = true
-	$"Panel/BehaviourButtons".visible = false
+	$AudioPlayer.stream = sound_scored
+	$AudioPlayer.play()
+	$"Panel/BehaviourButtons".hide()
 	print(str(global_ints.one_behaviour_score))
 
 
-func _on_BehaviourTwo_pressed():
+func _on_BehaviourTwo_pressed() -> void:
 	global_ints.two_behaviour_score += 1
 	global_ints.total_behaviours += 1
 	observation_button_pressed = true
-	$"Panel/BehaviourButtons".visible = false
+	$AudioPlayer.stream = sound_scored
+	$AudioPlayer.play()
+	$"Panel/BehaviourButtons".hide()
 
 
-func _on_BehaviourThree_pressed():
+func _on_BehaviourThree_pressed() -> void:
 	global_ints.three_behaviour_score += 1
 	global_ints.total_behaviours += 1
 	observation_button_pressed = true
-	$"Panel/BehaviourButtons".visible = false
+	$AudioPlayer.stream = sound_scored
+	$AudioPlayer.play()
+	$"Panel/BehaviourButtons".hide()
 
 
-func _on_BehaviourFour_pressed():
+func _on_BehaviourFour_pressed() -> void:
 	global_ints.four_behaviour_score += 1
 	global_ints.total_behaviours += 1
 	observation_button_pressed = true
-	$"Panel/BehaviourButtons".visible = false
+	$AudioPlayer.stream = sound_scored
+	$AudioPlayer.play()
+	$"Panel/BehaviourButtons".hide()
 
 
-func _on_BehaviourFive_pressed():
+func _on_BehaviourFive_pressed() -> void:
 	global_ints.five_behaviour_score += 1
 	global_ints.total_behaviours += 1
 	observation_button_pressed = true
-	$"Panel/BehaviourButtons".visible = false
+	$AudioPlayer.stream = sound_scored
+	$AudioPlayer.play()
+	$"Panel/BehaviourButtons".hide()
 
 
-func _on_Button_pressed():
+func _on_Button_pressed() -> void:
 	on_interval_moment()
 	print("We're aborting, so deal with as completely done - no intervals remain")
 	
@@ -121,7 +193,7 @@ func _on_Button_pressed():
 	global_ints.locked_observation_intervals = global_ints.locked_observations_completed
 	# So I should end the observation and move to the Results window.
 	
-	var obs_date_time = OS.get_time()
+	var obs_date_time = Time.get_datetime_dict_from_system()
 	if obs_date_time.minute < 10:
 		global_ints.observation_end_time = str(obs_date_time.hour, ":0", obs_date_time.minute)
 	if obs_date_time.minute >= 10:
@@ -130,4 +202,29 @@ func _on_Button_pressed():
 	$"TwentySecondTimer".stop()
 	global_ints.generate_results = true
 	calculate_percentages()
-	$"../Results".visible = true
+	$"%ObservationWindow".hide()
+	$"../Results".show()
+	state_changed_check()
+
+
+func _input(event) -> void:
+	if event.is_action_pressed("BehaviourOne"):
+		print("One")
+		if toggle_observation == true:
+			_on_BehaviourOne_pressed()
+	if event.is_action_pressed("BehaviourTwo"):
+		print("Two")
+		if toggle_observation == true:
+			_on_BehaviourTwo_pressed()
+	if event.is_action_pressed("BehaviourThree"):
+		print("Three")
+		if toggle_observation == true:
+			_on_BehaviourThree_pressed()
+	if event.is_action_pressed("BehaviourFour"):
+		print("Four")
+		if toggle_observation == true:
+			_on_BehaviourFour_pressed()
+	if event.is_action_pressed("BehaviourFive"):
+		print("Five")
+		if toggle_observation == true:
+			_on_BehaviourFive_pressed()

godot/ObservationWindow.gd.uid

@@ -0,0 +1 @@
+uid://hff4wu52flpd

godot/ProgressBar.gd

@@ -1,13 +1,22 @@
 extends ProgressBar
 
+# Time Sampling Form
 
-onready var global_ints = $"/root/GlobalInts"
+# Copyright (C) 2022-present Jaap Marsman
 
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
 
-func _ready():
-	pass # Replace with function body.
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU Affero General Public License for more details.
 
+# You should have received a copy of the GNU Affero General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-func _process(_delta):
+func _process(_delta) -> void:
 	value = global_ints.locked_observations_intervals_remaining
 	max_value = global_ints.locked_observation_intervals

godot/ProgressBar.gd.uid

@@ -0,0 +1 @@
+uid://t1pvqg6e78j

godot/Results.gd

@@ -1,22 +1,35 @@
 extends CanvasLayer
 
+# Time Sampling Form
 
-onready var global_ints = $"/root/GlobalInts"
+# Copyright (C) 2022-present Jaap Marsman
+
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU Affero General Public License for more details.
+
+# You should have received a copy of the GNU Affero General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-var js_callback = JavaScript.create_callback(self, "load_handler");
 var js_interface;
 var image : Image
 var fileName : String = "results.png"
 
-func _ready():
-	if OS.get_name() == "HTML5" and OS.has_feature('JavaScript'):
+func _ready() -> void:
+	if OS.get_name() == "Web":
 		_define_js()
-		js_interface = JavaScript.get_interface("_HTML5FileExchange");
+		js_interface = JavaScriptBridge.get_interface("_HTML5FileExchange");
 
 
 func _define_js()->void:
-	#Define JS script
-	JavaScript.eval("""
+#Define JS script
+	JavaScriptBridge.eval("""
 	var _HTML5FileExchange = {};
 	_HTML5FileExchange.upload = function(gd_callback) {
 		canceled = true;
@@ -43,65 +56,64 @@ func _define_js()->void:
 	""", true)
 
 
-func _process(_delta):
-#	$"%SaveReport".visible = true
-#	$"%BackMainMenu".visible = true
-	pass
+func take_screenshot() -> void:
+	image = get_viewport().get_texture().get_image()
 
-func _on_SaveReport_pressed():
-	$"%SaveReport".visible = false
-	$"%BackMainMenu".visible = false
-
-	print("I've disabled the buttons")
-	print("That means the screenshot SHOULD be button free")
-
-	image = get_viewport().get_texture().get_data()
-	image.flip_y()
-
-	if OS.get_name() == "HTML5" or OS.has_feature('JavaScript'):
-		# We're on the web
+	if OS.get_name() == "Web" or OS.has_feature('JavaScript'):
 		print("We're on the web")
-	
+		# We're on the web
+		
 		image.clear_mipmaps()
+		
 		var buffer = image.save_png_to_buffer()
-		JavaScript.download_buffer(buffer, fileName)
+		JavaScriptBridge.download_buffer(buffer, fileName)
 
-	if OS.get_name() != "HTML5" or !OS.has_feature('JavaScript'):
+	if OS.get_name() != "Web" or !OS.has_feature('JavaScript'):
 		# We're not on the web
 		print("We're not on the web")
 		
-		var title = str("user://results",global_ints.observed_person_name, global_ints.observation_minutes,".png")
+		var docs = OS.get_environment("HOME") + "/Documents"
+		
+		var title = str(docs + "/results",global_ints.observed_person_name, global_ints.observation_minutes,".png")
 		
 		print(title)
 		
 		var _saveimage = image.save_png(title)
 		
-		var folder = OS.get_user_data_dir()
-		
 		if OS.get_name() != "OSX":
 			print("We're not on MacOS")
-			var _openfolder = OS.shell_open(folder)
+			var _openfolder = OS.shell_open(docs)
 		
 		if OS.get_name() == "OSX":
 			print("We're on MacOS")
 			
-			var _openfolder = OS.shell_open("file://" + folder)
-		
-	$"%SaveReport".visible = true
-	$"%BackMainMenu".visible = true
+			var _openfolder = OS.shell_open("file://" + docs)
 
-func _on_BackMainMenu_pressed():
+
+func _on_SaveReport_pressed() -> void:
+	await get_tree().process_frame
+	$"%ResultMenu".hide()
+	$"%TopMenuBar".hide()
+	await get_tree().process_frame
+	
+	take_screenshot()
+	
+	$"%ResultMenu".show()
+	$"%TopMenuBar".show()
+
+
+func _on_BackMainMenu_pressed() -> void:
 	global_ints.reset_all_vars()
 	var _ignore = get_tree().reload_current_scene()
 
 
-func _on_Results_visibility_changed():
+func _on_Results_visibility_changed() -> void:
 	if global_ints.generate_results == true:
 		global_ints.generate_results = false
-
+		
 		var result_text : String
-
-		result_text = str("Date: " , global_ints.ddmmyyyy , "\nTime: ", global_ints.observation_start_time , " to " , global_ints.observation_end_time , "\n \nThis Time Sampling Form (TSF) observation was completed by " , global_ints.observer_person_name , ". " , global_ints.observed_person_name , " was observed for " ,  global_ints.total_observed_time , " minute(s) during " , global_ints.observed_activity , ". \n \nDuring the observation, The ", global_ints.one_behaviour," behaviour was observed ", global_ints.one_behaviour_score, " out of ",global_ints.total_behaviours," times, resulting in ",global_ints.one_behaviour_percent,"%. The ",global_ints.two_behaviour," behaviour was observed ",global_ints.two_behaviour_score," out of ",global_ints.total_behaviours," times, resulting in ",global_ints.two_behaviour_percent,"%. The ",global_ints.three_behaviour," behaviour was observed ",global_ints.three_behaviour_score," out of ",global_ints.total_behaviours," times, resulting in ",global_ints.three_behaviour_percent,"%. The ", global_ints.four_behaviour," behaviour was observed ",global_ints.four_behaviour_score," out of ",global_ints.total_behaviours," times, resulting in ",global_ints.four_behaviour_percent,"%. The  ",global_ints.five_behaviour," behaviour was observed ",global_ints.five_behaviour_score," out of ",global_ints.total_behaviours," times, resulting in ",global_ints.five_behaviour_percent,"%. ",global_ints.six_behaviour_score," intervals were not scored.")
+		
+		result_text = str("Observed: " , global_ints.observed_person_name , "\nDate: " , global_ints.ddmmyyyy , "\nTime: ", global_ints.observation_start_time , " to " , global_ints.observation_end_time , "\n \nThis Time Sampling Form (TSF) observation was completed by " , global_ints.observer_person_name , ". " , global_ints.observed_person_name , " was observed for " ,  global_ints.total_observed_time , " minute(s) during " , global_ints.observed_activity , ". \n \nDuring the observation, The ", global_ints.one_behaviour," behaviour was observed ", global_ints.one_behaviour_score, " out of ",global_ints.total_behaviours," times, resulting in ",global_ints.one_behaviour_percent,"%. The ",global_ints.two_behaviour," behaviour was observed ",global_ints.two_behaviour_score," out of ",global_ints.total_behaviours," times, resulting in ",global_ints.two_behaviour_percent,"%. The ",global_ints.three_behaviour," behaviour was observed ",global_ints.three_behaviour_score," out of ",global_ints.total_behaviours," times, resulting in ",global_ints.three_behaviour_percent,"%. The ", global_ints.four_behaviour," behaviour was observed ",global_ints.four_behaviour_score," out of ",global_ints.total_behaviours," times, resulting in ",global_ints.four_behaviour_percent,"%. The  ",global_ints.five_behaviour," behaviour was observed ",global_ints.five_behaviour_score," out of ",global_ints.total_behaviours," times, resulting in ",global_ints.five_behaviour_percent,"%. ",global_ints.six_behaviour_score," intervals were not scored.")
 		$"%FullResult".text = result_text
 		
 		# This is where we generate the bars

godot/Results.gd.uid

@@ -0,0 +1 @@
+uid://dhhlom5skgqeq

godot/TimerBar.gd

@@ -1,14 +1,25 @@
 extends ProgressBar
 
+# Time Sampling Form
 
-onready var global_ints = $"/root/GlobalInts"
+# Copyright (C) 2022-present Jaap Marsman
+
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU Affero General Public License for more details.
+
+# You should have received a copy of the GNU Affero General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 var time_lefts : int
 
-func _ready():
-	pass
 
-
-func _process(_delta):
+func _process(_delta) -> void:
 	time_lefts = $"%TwentySecondTimer".time_left
 	value = time_lefts

godot/TimerBar.gd.uid

@@ -0,0 +1 @@
+uid://dflvmgvxwqrrf

godot/addons/HTML5FileExchange/HTML5FileExchange.gd

@@ -1,80 +0,0 @@
-extends Node
-
-signal read_completed
-signal load_completed(image)
-
-var js_callback = JavaScript.create_callback(self, "load_handler");
-var js_interface;
-
-func _ready():
-	if OS.get_name() == "HTML5" and OS.has_feature('JavaScript'):
-		_define_js()
-		js_interface = JavaScript.get_interface("_HTML5FileExchange");
-
-func _define_js()->void:
-	#Define JS script
-	JavaScript.eval("""
-	var _HTML5FileExchange = {};
-	_HTML5FileExchange.upload = function(gd_callback) {
-		canceled = true;
-		var input = document.createElement('INPUT'); 
-		input.setAttribute("type", "file");
-		input.setAttribute("accept", "image/png, image/jpeg, image/webp");
-		input.click();
-		input.addEventListener('change', event => {
-			if (event.target.files.length > 0){
-				canceled = false;}
-			var file = event.target.files[0];
-			var reader = new FileReader();
-			this.fileType = file.type;
-			// var fileName = file.name;
-			reader.readAsArrayBuffer(file);
-			reader.onloadend = (evt) => { // Since here's it's arrow function, "this" still refers to _HTML5FileExchange
-				if (evt.target.readyState == FileReader.DONE) {
-					this.result = evt.target.result;
-					gd_callback(); // It's hard to retrieve value from callback argument, so it's just for notification
-				}
-			}
-		  });
-	}
-	""", true)
-
-func load_handler(_args):
-	emit_signal("read_completed")
-	
-func load_image():
-	if OS.get_name() != "HTML5" or !OS.has_feature('JavaScript'):
-		return
-
-	js_interface.upload(js_callback);
-
-	yield(self, "read_completed")
-	
-	var imageType = js_interface.fileType;
-	var imageData = JavaScript.eval("_HTML5FileExchange.result", true) # interface doesn't work as expected for some reason
-	
-	var image = Image.new()
-	var image_error
-	match imageType:
-		"image/png":
-			image_error = image.load_png_from_buffer(imageData)
-		"image/jpeg":
-			image_error = image.load_jpg_from_buffer(imageData)
-		"image/webp":
-			image_error = image.load_webp_from_buffer(imageData)
-		var invalidType:
-			print("Unsupported file format - %s." % invalidType)
-			return
-	
-	if image_error:
-		print("An error occurred while trying to display the image.")
-	
-	emit_signal("load_completed", image)
-
-func save_image(image:Image, fileName:String = "export.png")->void:
-	if OS.get_name() != "HTML5" or !OS.has_feature('JavaScript'):
-		return
-	
-	image.clear_mipmaps()
-	var buffer = image.save_png_to_buffer()
-	JavaScript.download_buffer(buffer, fileName)

godot/addons/HTML5FileExchange/plugin.cfg

@@ -1,15 +0,0 @@
-[plugin]
-
-name="HTML5 File Exchange"
-description="Open/Import and Save/Export files in HTML5 environment.
-Supported input - *.png, *.jpeg, *.webp
-Supported output - *.png
-
-Usage:
-Get file from User -
-var image:Image = yield(HTML5File.get_image(),  \"completed\")
-Send file to User -
-HTML5File.save_image(image:Image, fileName:String = \"export\")"
-author="laame"
-version="0.1.1"
-script="plugin.gd"

godot/addons/HTML5FileExchange/plugin.gd

@@ -1,10 +0,0 @@
-tool
-extends EditorPlugin
-
-
-func _enter_tree():
-	add_autoload_singleton("HTML5File", "res://addons/HTML5FileExchange/HTML5FileExchange.gd")
-
-
-func _exit_tree():
-	remove_autoload_singleton("HTML5File")

godot/default_env.tres

@@ -1,7 +0,0 @@
-[gd_resource type="Environment" load_steps=2 format=2]
-
-[sub_resource type="ProceduralSky" id=1]
-
-[resource]
-background_mode = 2
-background_sky = SubResource( 1 )

godot/global_ints.gd

@@ -1,14 +1,19 @@
 extends Node
 
-var date
-var ddmmyyyy
+var date = {}
+var ddmmyyyy : String
 
-var web_release_version = 0.10
-var release_version = 0.10
+# 1 = Instruction, 2 = Names, 3 = Config, 4 = Observe, 5 = Results
+var app_state : int
+
+var update_text : String
+
+var web_release_version : float
+var release_version = 0.2
 
 var total_observed_time : int
 
-var timer_duration : int = 20
+var timer_duration : float = 20.0
 
 var observation_minutes : int = 10
 
@@ -17,6 +22,8 @@ var observation_end_time : String
 
 var generate_results : bool = false
 
+var manual_url : String
+
 var observed_person_name : String
 var observer_person_name : String
 var observed_activity : String
@@ -26,26 +33,26 @@ var locked_observation_intervals : int
 var locked_observations_intervals_remaining : int
 var locked_observations_completed : int
 
-var one_acronym = "OnT"
-var two_acronym = "Loo"
-var three_acronym = "Dis"
-var four_acronym = "Wal"
-var five_acronym = "Oth"
-var six_acronym = "Emp"
+var one_acronym : String = "OnT"
+var two_acronym : String = "Loo"
+var three_acronym : String = "Dis"
+var four_acronym : String = "Wal"
+var five_acronym : String = "Oth"
+var six_acronym : String = "Emp"
 
-var one_behaviour = "On Task"
-var two_behaviour = "Looking"
-var three_behaviour = "Distracting"
-var four_behaviour = "Walking"
-var five_behaviour = "Other"
-var six_behaviour = "Empty"
+var one_behaviour : String = "On Task"
+var two_behaviour : String = "Looking"
+var three_behaviour : String = "Distracting"
+var four_behaviour : String = "Walking"
+var five_behaviour : String = "Other"
+var six_behaviour : String = "Empty"
 
-var one_explanation = "The pupil is on task"
-var two_explanation = "The pupil is looking around in a distracted manner or is staring into the distance"
-var three_explanation = "The pupil is distracting other pupils or talking to them"
-var four_explanation = "The pupil is walking through the class"
-var five_explanation = "The pupil is otherwise distracted and not on task"
-var six_explanation = "No answer was selected for this round"
+var one_explanation : String = "The pupil is on task"
+var two_explanation : String = "The pupil is looking around in a distracted manner or is staring into the distance"
+var three_explanation : String = "The pupil is distracting other pupils or talking to them"
+var four_explanation : String = "The pupil is walking through the class"
+var five_explanation : String = "The pupil is otherwise distracted and not on task"
+var six_explanation : String = "No answer was selected for this round"
 
 var total_behaviours : int
 var one_behaviour_score : int
@@ -61,8 +68,8 @@ var three_behaviour_percent : float
 var four_behaviour_percent : float
 var five_behaviour_percent : float
 
-func reset_all_vars():
-	observation_minutes = 15
+func reset_all_vars() -> void:
+	observation_minutes = 10
 
 	generate_results = false
 
@@ -118,3 +125,5 @@ func reset_all_vars():
 	ddmmyyyy = ""
 
 	total_observed_time = 0
+	
+	timer_duration = 20.0

godot/global_ints.gd.uid

@@ -0,0 +1 @@
+uid://d05vnomx2cg07

godot/main_screen.gd

@@ -1,48 +1,65 @@
 extends CanvasLayer
 
+# Time Sampling Form
+
+# Copyright (C) 2022-present Jaap Marsman
+
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU Affero General Public License for more details.
+
+# You should have received a copy of the GNU Affero General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-var date_time
 var check_time_var : int
-var ddmmyyyy : String
-var date
-var csv_url = "https://raw.githubusercontent.com/hobbesjaap/time-sampling-form/main/version_info.csv"
+var csv_url = "https://raw.githubusercontent.com/hobbesjaap/time-sampling-form/main/updater/version_info.csv"
 var update_text_url = "https://raw.githubusercontent.com/hobbesjaap/time-sampling-form/main/updater/update_text.md"
 var update_text : String
+var text_buffer : String
+var os_list : Array = ["Linux", "Windows", "macOS", "OSX", "UWP", "X11", "FreeBSD", "NetBSD", "OpenBSD", "BSD"]
+
+var test_sound = preload("res://Assets/audio/time_to_score.ogg")
+
+@onready var minute_label = $"StartScreen/InstructionPanel/MinuteBox/MinuteLabel"
+@onready var styleBox_highlight : StyleBoxFlat = $"%OneInstrPanel".get_theme_stylebox("panel").duplicate()
+@onready var styleBox_orig : StyleBoxFlat = $"%TwoNamesPanel".get_theme_stylebox("panel").duplicate()
 
 
-onready var date_time_display = $"%CurrentTime"
-onready var global_ints = $"/root/GlobalInts"
-onready var minute_label = $"StartScreen/InstructionPanel/MinuteBox/MinuteLabel"
-
-
-func check_for_updates():
-	var os_check : String
-	os_check = OS.get_name()
-	print(os_check)
-	if os_check == "X11" and "Windows" and "OSX":
-		print("We're on desktop. So let's check for updates!")
+func check_for_updates() -> void:
+	if os_list.has(OS.get_name()):
+#		print("We're on desktop. So let's check for updates!")
 		$"%HTTPRequest".request(csv_url)
 		$"%HTTPRequest2".request(update_text_url)
 
 
-func _on_HTTPRequest_request_completed(_result, _response_code, _headers, body):
-	var json = JSON.parse(body.get_string_from_utf8())
-	global_ints.web_release_version = json.result
+func _on_HTTPRequest_request_completed(_result, _response_code, _headers, body) -> void:
+	var test_json_conv = JSON.new()
+	test_json_conv.parse(body.get_string_from_utf8())
+	var json = test_json_conv.get_data()
+	global_ints.web_release_version = json
 	if global_ints.web_release_version > global_ints.release_version:
 			print("There's an update!")
 			$"%UpdatePanel".visible = true
 			$"%UpdateText".text = str(update_text)
 			$"%UpdateIntro".text = str("You are currently using version ",global_ints.release_version,". The latest version available is ",global_ints.web_release_version,".")
+	if global_ints.web_release_version <= global_ints.release_version:
+		print("No update available!")
 
 
-func _on_HTTPRequest2_request_completed(_result, _response_code, _headers, _body):
-#	Need to find a way to load .txt file contents from a URL into a label. This to show what the update changes are.
-#	var json = JSON.parse(body.get_string_from_utf8())
-#	update_text = str(json.result)
-	pass
+func _on_HTTPRequest2_request_completed(_result, _response_code, _headers, body) -> void:
+	var test_json_conv = JSON.new()
+	test_json_conv.parse(body.get_string_from_utf8())
+	var json = test_json_conv.get_data()
+	global_ints.update_text = str(json)
 
 
-func refresh_descriptors():
+func refresh_descriptors() -> void:
 	$"%1Acronym".text = global_ints.one_acronym
 	$"%1AcronymE".text = $"%1Acronym".text
 	$"%2Acronym".text = global_ints.two_acronym
@@ -74,62 +91,130 @@ func refresh_descriptors():
 	$"%5Explanation".text = global_ints.five_explanation
 	$"%5ExplanationE".text = $"%5Explanation".text
 
-func _ready():
+
+func set_language() -> void:
+	print(TranslationServer.get_locale())
+	if TranslationServer.get_locale() != "nl":
+		print("We're not Dutch")
+		global_ints.manual_url = "https://docs.jaapmarsman.com/tsf.html"
+	if TranslationServer.get_locale() == "nl":
+		print("We're Dutch")
+		global_ints.manual_url = "https://www.lerenleukermaken.nl/"
+
+
+func update_date() -> void:
+	global_ints.date = Time.get_datetime_dict_from_system()
+	global_ints.ddmmyyyy = str(global_ints.date.day, "-", global_ints.date.month, "-", global_ints.date.year)
+
+
+func set_app_window_size() -> void:
+	var desktop_x : int = DisplayServer.screen_get_size(DisplayServer.window_get_current_screen()).x
+	var desktop_y : int = DisplayServer.screen_get_size(DisplayServer.window_get_current_screen()).y
+	
+	@warning_ignore("narrowing_conversion")
+	var app_window_x : int = desktop_x * 0.7
+	@warning_ignore("narrowing_conversion")
+	var app_window_y : int = desktop_y * 0.7
+	var app_window_size = Vector2i(app_window_x, app_window_y)
+	
+	DisplayServer.window_set_min_size(Vector2i(app_window_x, app_window_y))
+	get_window().size = app_window_size
+	@warning_ignore("integer_division")
+	DisplayServer.window_set_position(Vector2i(int(desktop_x/6), int(desktop_y/6)))
+
+
+func _ready() -> void:
+	#DisplayServer.window_set_min_size(Vector2i(1280, 720))
+	if os_list.has(OS.get_name()):
+		set_app_window_size()
 	minute_label.text = str(global_ints.observation_minutes)
 	global_ints.observed_person_name = ""
 	refresh_descriptors()
-	$"StartScreen".visible = true
-	$"%NameChangePanel".visible = true
-	$"%InstructionScreen".visible = true
-	$"%WarningLabel".visible = false
-	$"ObservationWindow".visible = false
-	$"Results".visible = false
-	$"EditScreen".visible = false
-	$"%UpdatePanel".visible = false
-	
-	global_ints.date = OS.get_date()
-	global_ints.ddmmyyyy = str(global_ints.date.day, "-", global_ints.date.month, "-", global_ints.date.year)
-	
+	$"StartScreen".show()
+	$"%NameChangePanel".hide()
+	$"%InstructionScreen".show()
+	$"%WarningLabel".hide()
+	$"ObservationWindow".hide()
+	$"Results".hide()
+	$"EditScreen".hide()
+	$"%UpdatePanel".hide()
+	state_changed_check()
+	update_date()
+#	set_language()
 	check_for_updates()
 
-func _process(_delta):
-	check_time_var += 1
-	
-	if check_time_var == 10:
-		check_time_var = 0
-		date_time = OS.get_time()
-		if date_time.minute < 10:
-			date_time_display.text = str(date_time.hour, ":0", date_time.minute)
-		if date_time.minute >= 10:
-			date_time_display.text = str(date_time.hour, ":", date_time.minute)
+
+func set_all_boxes_to_normal() -> void:
+	$"%OneInstrPanel".add_theme_stylebox_override("panel", styleBox_orig)
+	$"%TwoNamesPanel".add_theme_stylebox_override("panel", styleBox_orig)
+	$"%ThreeConfigPanel".add_theme_stylebox_override("panel", styleBox_orig)
+	$"%FourObservePanel".add_theme_stylebox_override("panel", styleBox_orig)
+	$"%FiveResultsPanel".add_theme_stylebox_override("panel", styleBox_orig)
 
 
-func _on_MinuteMinus_pressed():
+func state_changed_check() -> void:
+	styleBox_highlight.set("bg_color", Color.html("#F2CC8F"))
+
+	if $"%InstructionScreen".visible == true:
+		global_ints.app_state = 1
+		set_all_boxes_to_normal()
+		$"%OneInstrPanel".add_theme_stylebox_override("panel", styleBox_highlight)
+
+	if $"%NameChangePanel".visible == true:
+		global_ints.app_state = 2
+		set_all_boxes_to_normal()
+		$"%TwoNamesPanel".add_theme_stylebox_override("panel", styleBox_highlight)
+		
+	if $"%InstructionPanel".visible == true:
+		global_ints.app_state = 3
+		set_all_boxes_to_normal()
+		$"%ThreeConfigPanel".add_theme_stylebox_override("panel", styleBox_highlight)
+
+	if $"%ObservationWindow".visible == true:
+		global_ints.app_state = 4
+		set_all_boxes_to_normal()
+		$"%FourObservePanel".add_theme_stylebox_override("panel", styleBox_highlight)
+
+	if $"%Results".visible == true:
+		global_ints.app_state = 5
+		set_all_boxes_to_normal()
+		$"%FiveResultsPanel".add_theme_stylebox_override("panel", styleBox_highlight)
+
+
+func _process(_delta) -> void:
+	# When I refactor, this should move OUT of the process-delta bit
+	# state_changed_check()
+	pass
+
+
+func _on_MinuteMinus_pressed() -> void:
 	if global_ints.observation_minutes >= 2:
 		global_ints.observation_minutes -= 1
 		minute_label.text = str(global_ints.observation_minutes)
 
 
-func _on_MinutePlus_pressed():
+func _on_MinutePlus_pressed() -> void:
 	if global_ints.observation_minutes < 60:
 		global_ints.observation_minutes += 1
 		minute_label.text = str(global_ints.observation_minutes)
 
 
-func _on_Manual_pressed():
-	var _error = OS.shell_open("https://www.internationalsengroup.org/resources/time-sampling-form/")
+func _on_Manual_pressed() -> void:
+	var _error = OS.shell_open(global_ints.manual_url)
 
 
-func _on_PupilName_pressed():
+func _on_PupilName_pressed() -> void:
 	$"%NameLine".text = global_ints.observed_person_name
-	$"%InstructionPanel".visible = false
-	$"%NameChangePanel".visible = true
+	$"%InstructionPanel".hide()
+	$"%NameChangePanel".show()
+	state_changed_check()
 
 
-func _on_Start_pressed():
+func _on_Start_pressed() -> void:
 	$"StartScreen".visible = false
 	refresh_descriptors()
-	$"ObservationWindow".visible = true
+	$"ObservationWindow".show()
+	state_changed_check()
 	$"%BehaviourOne".text = global_ints.one_acronym
 	$"%BehaviourTwo".text = global_ints.two_acronym
 	$"%BehaviourThree".text = global_ints.three_acronym
@@ -153,7 +238,7 @@ func _on_Start_pressed():
 	$"%ObservationsTotal".text = str(global_ints.locked_observation_intervals)
 	$"%ObservationsRemaining".text = str(global_ints.locked_observations_intervals_remaining)
 
-	var obs_date_time = OS.get_time()
+	var obs_date_time = Time.get_datetime_dict_from_system()
 	if obs_date_time.minute < 10:
 		global_ints.observation_start_time = str(obs_date_time.hour, ":0", obs_date_time.minute)
 	if obs_date_time.minute >= 10:
@@ -162,24 +247,85 @@ func _on_Start_pressed():
 	$"%TwentySecondTimer".start(global_ints.timer_duration)
 
 
-func _on_ChangeItems_pressed():
-	$"EditScreen".visible = true
+func _on_ChangeItems_pressed() -> void:
+	$"EditScreen".show()
+	state_changed_check()
+
+func _on_InsOkButton_pressed() -> void:
+	$"%InstructionScreen".hide()
+	$"%NameChangePanel".show()
+	state_changed_check()
 
 
-func _on_InsOkButton_pressed():
-	$"%InstructionScreen".visible = false
-
-
-func _on_MinuteMinus_button_down():
+func _on_MinuteMinus_button_down() -> void:
+# Holding it down makes it work too - not yet
 #	if global_ints.observation_minutes >= 2:
 #		global_ints.observation_minutes -= 1
 #		minute_label.text = str(global_ints.observation_minutes)
 	pass
 
 
-func _on_GoToUpdate_pressed():
+func _on_minute_plus_button_down() -> void:
+	pass # Replace with function body.
+
+
+func _on_GoToUpdate_pressed() -> void:
 	var _error = OS.shell_open("https://github.com/hobbesjaap/time-sampling-form/releases")
 
 
-func _on_IgnoreUpdate_pressed():
-	$"%UpdatePanel".visible = false
+func _on_IgnoreUpdate_pressed() -> void:
+	$"%UpdatePanel".hide()
+
+
+func _on_ok_button_pressed() -> void:
+	if $"%NameLine".text and $"%ObserverLine".text and $"%ObservedActivity".text != "":
+		$"%InstructionPanel".show()
+		$"%NameChangePanel".hide()
+		state_changed_check()
+		global_ints.observed_person_name = $"%NameLine".text
+		global_ints.observer_person_name = $"%ObserverLine".text
+		global_ints.observed_activity = $"%ObservedActivity".text
+		
+		$"%TopOverview".text = str("Time Sampling Observation of " , global_ints.observed_person_name, ", observed by ", global_ints.observer_person_name , ", during " , global_ints.observed_activity , ".")
+		$"%TopOverview".show()
+	else:
+		$"%ObservedNameLabel".hide()
+		$"%WarningLabel".show()
+
+
+func _on_edit_report_pressed() -> void:
+	$"%EditResult".text = $"%FullResult".text
+	$"%ResultMenu".hide()
+	$"%EditPanel".show()
+	$"%EditResult".show()
+	$"%EditMenu".show()
+
+
+func _on_cancel_edit_pressed() -> void:
+	$"%ResultMenu".show()
+	$"%EditPanel".hide()
+	$"%EditResult".hide()
+	$"%EditMenu".hide()
+
+
+func _on_save_edit_pressed() -> void:
+	$"%FullResult".text = $"%EditResult".text
+	$"%ResultMenu".show()
+	$"%EditPanel".hide()
+	$"%EditResult".hide()
+	$"%EditMenu".hide()
+
+
+func _on_test_menu_id_pressed(id: int) -> void:
+	# At some point, I'd like to add shortcuts such as Command-R or Command-Q
+	# https://github.com/godotengine/godot/issues/82854
+	if id == 0:
+		global_ints.reset_all_vars()
+		var _ignore = get_tree().reload_current_scene()
+	if id == 1:
+		get_tree().quit()
+
+
+func _on_test_sound_pressed() -> void:
+	$StartScreen/AudioPlay.stream = test_sound
+	$StartScreen/AudioPlay.play()

godot/main_screen.gd.uid

@@ -0,0 +1 @@
+uid://rbmcgn3hetrs

godot/project.godot

@@ -6,43 +6,84 @@
 ;   [section] ; section goes between []
 ;   param=value ; assign values to parameters
 
-config_version=4
+config_version=5
 
 [application]
 
 config/name="Time Sampling Form"
+config/name_localized={
+"nl": "Tijdsteekproef Formulier"
+}
 run/main_scene="res://main_screen.tscn"
+config/features=PackedStringArray("4.4")
 run/low_processor_mode=true
+boot_splash/bg_color=Color(0.952941, 0.933333, 0.847059, 1)
+boot_splash/image="res://Assets/icons/main_icon.png"
 config/icon="res://Assets/icons/main_icon.png"
 config/macos_native_icon="res://Assets/icons/main_icon.icns"
+config/windows_native_icon="res://Assets/icons/icon.ico"
 
 [autoload]
 
-GlobalInts="*res://global_ints.gd"
-HTML5File="*res://addons/HTML5FileExchange/HTML5FileExchange.gd"
+global_ints="*res://global_ints.gd"
 
 [display]
 
-window/size/width=1280
-window/size/height=720
-window/stretch/mode="2d"
-window/stretch/aspect="keep"
+window/size/viewport_width=1280
+window/size/viewport_height=720
+window/stretch/mode="canvas_items"
+window/stretch/aspect="expand"
 
-[editor_plugins]
+[filesystem]
 
-enabled=PoolStringArray( "res://addons/HTML5FileExchange/plugin.cfg" )
+import/blender/enabled=false
+import/fbx/enabled=false
 
 [gui]
 
 common/drop_mouse_on_gui_input_disabled=true
 
+[input]
+
+BehaviourOne={
+"deadzone": 0.2,
+"events": [Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":-1,"window_id":0,"alt_pressed":false,"shift_pressed":false,"ctrl_pressed":false,"meta_pressed":false,"pressed":false,"keycode":0,"physical_keycode":49,"key_label":0,"unicode":49,"location":0,"echo":false,"script":null)
+]
+}
+BehaviourTwo={
+"deadzone": 0.2,
+"events": [Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":-1,"window_id":0,"alt_pressed":false,"shift_pressed":false,"ctrl_pressed":false,"meta_pressed":false,"pressed":false,"keycode":0,"physical_keycode":50,"key_label":0,"unicode":50,"location":0,"echo":false,"script":null)
+]
+}
+BehaviourThree={
+"deadzone": 0.2,
+"events": [Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":-1,"window_id":0,"alt_pressed":false,"shift_pressed":false,"ctrl_pressed":false,"meta_pressed":false,"pressed":false,"keycode":0,"physical_keycode":51,"key_label":0,"unicode":51,"location":0,"echo":false,"script":null)
+]
+}
+BehaviourFour={
+"deadzone": 0.2,
+"events": [Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":-1,"window_id":0,"alt_pressed":false,"shift_pressed":false,"ctrl_pressed":false,"meta_pressed":false,"pressed":false,"keycode":0,"physical_keycode":52,"key_label":0,"unicode":52,"location":0,"echo":false,"script":null)
+]
+}
+BehaviourFive={
+"deadzone": 0.2,
+"events": [Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":-1,"window_id":0,"alt_pressed":false,"shift_pressed":false,"ctrl_pressed":false,"meta_pressed":false,"pressed":false,"keycode":0,"physical_keycode":53,"key_label":0,"unicode":53,"location":0,"echo":false,"script":null)
+]
+}
+
+[internationalization]
+
+locale/translations=PackedStringArray("res://translation.en.translation", "res://translation.nl.translation")
+locale/test="en_GB"
+
 [physics]
 
 common/enable_pause_aware_picking=true
 
 [rendering]
 
+renderer/rendering_method="mobile"
+textures/vram_compression/import_etc2_astc=true
 quality/intended_usage/framebuffer_allocation=0
 quality/intended_usage/framebuffer_allocation.mobile=0
 2d/snapping/use_gpu_pixel_snap=true
-environment/default_environment="res://default_env.tres"

godot/translation.csv

@@ -0,0 +1,37 @@
+keys,en,nl
+INSTRUC,"The [b]Time Sampling Form[/b] is a guided observation tool. You set the length of your observation in minutes. Every 20 seconds, you click the button that corresponds with the behaviour you observe at that time. \n\nThe buttons to select the observed behaviour will be visible in the final 5 seconds of each 20 second interval. \n\nFor first time users: It is recommended to do a one-minute trial to gain familiarity with the system. I hope you find this tool useful!",Het [b]Tijdsteekproef Formulier[/b].
+TITLE,Time Sampling Form,Tijdsteekproef Formulier
+WHO,Who are you observing? (First name),Wie
+COMPLETE,You must complete all fields below!,Compleet
+YOU,What is your name?,Jij bent
+LESSON,What Activity/Lesson are you observing?,Les
+INSTR_OBS,How long will you observe for? (in minutes),x
+OBS_ITEMS,Observation Items,x
+ACR,Acronym,x
+DESC,Descriptor,x
+EXP,Explanation,x
+BUT_MAN,Manual,x
+BUT_EDIT_ITM,Edit Items,x
+BUT_EDIT_NM,Edit Names,x
+BUT_EDIT_RESULT,Edit Report,x
+BUT_STRT,Start,x
+BUT_CANCEL_EDIT,Cancel,x
+BUT_SAVE_EDIT,Save,x
+UPD_TITLE,An Update is available!,x
+UPD_TEXT,You are currently using version XX. The latest version available is XX. Version changes are:,x
+UPD_TEXT2,text,x
+BUT_DWNLD,Go to Download Page,x
+BUT_IGN,Ignore Update,x
+BUT_CLEAR,Clear All,x
+BUT_CANCEL,Cancel,x
+INT_REM,intervals remaining,x
+BUT_STOPEAR,Stop Early,x
+SEC_REM,Seconds remaining,x
+BUT_RESTART,Restart,x
+BUT_SAVEPNG,Save Report as PNG,x
+LAB_INSTR,Instructions,x
+LAB_NAMES,Names,x
+LAB_CONFIG,Configure,x
+LAB_OBS,Observe,x
+LAB_RESULTS,Results,x
+BUT_TEST_SND,Test Audio,

updater/update_text.md

@@ -1,5 +1,11 @@
-"This text is just a placeholder.
+April 2025 - Version 0.2 released
 
-- But I want to test if it works.
-- Like this.
-- Or this."
+It's been a while! A new version of the Time Sampling Form is now available for your usage. Please let me know via info@jaapmarsman.com if you run into any issues.
+
+As I'm picking up development on this app again, I've created a long list of improvements, but as you've seen, development can be a bit slow as this is strictly a hobby.
+
+New features for this release:
+
+- Updated the user interface to be a bit more modern. Not completely happy with it yet, but it's a start.
+- Added an "Edit Report" button once the scoring is completed, so you can modify the report.
+- Began with under the hood work for a multilingual version.