diff --git a/LICENSE b/LICENSE new file mode 100644 index 0000000..44ef5e6 --- /dev/null +++ b/LICENSE @@ -0,0 +1,674 @@ + GNU GENERAL PUBLIC LICENSE + Version 3, 29 June 2007 + + Copyright (C) 2007 Free Software Foundation, Inc. + Everyone is permitted to copy and distribute verbatim copies + of this license document, but changing it is not allowed. + + Preamble + + The GNU General Public License is a free, copyleft license for +software and other kinds of works. + + The licenses for most software and other practical works are designed +to take away your freedom to share and change the works. By contrast, +the GNU General Public License is 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. We, the Free Software Foundation, use the +GNU General Public License for most of our software; it applies also to +any other work released this way by its authors. You can apply it to +your programs, too. + + 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. + + To protect your rights, we need to prevent others from denying you +these rights or asking you to surrender the rights. Therefore, you have +certain responsibilities if you distribute copies of the software, or if +you modify it: responsibilities to respect the freedom of others. + + For example, if you distribute copies of such a program, whether +gratis or for a fee, you must pass on to the recipients the same +freedoms that you received. You must make sure that they, too, receive +or can get the source code. And you must show them these terms so they +know their rights. + + Developers that use the GNU GPL protect your rights with two steps: +(1) assert copyright on the software, and (2) offer you this License +giving you legal permission to copy, distribute and/or modify it. + + For the developers' and authors' protection, the GPL clearly explains +that there is no warranty for this free software. For both users' and +authors' sake, the GPL requires that modified versions be marked as +changed, so that their problems will not be attributed erroneously to +authors of previous versions. + + Some devices are designed to deny users access to install or run +modified versions of the software inside them, although the manufacturer +can do so. This is fundamentally incompatible with the aim of +protecting users' freedom to change the software. The systematic +pattern of such abuse occurs in the area of products for individuals to +use, which is precisely where it is most unacceptable. Therefore, we +have designed this version of the GPL to prohibit the practice for those +products. If such problems arise substantially in other domains, we +stand ready to extend this provision to those domains in future versions +of the GPL, as needed to protect the freedom of users. + + Finally, every program is threatened constantly by software patents. +States should not allow patents to restrict development and use of +software on general-purpose computers, but in those that do, we wish to +avoid the special danger that patents applied to a free program could +make it effectively proprietary. To prevent this, the GPL assures that +patents cannot be used to render the program non-free. + + 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 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. Use with the GNU Affero General Public License. + + 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 Affero 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 special requirements of the GNU Affero General Public License, +section 13, concerning interaction through a network will apply to the +combination as such. + + 14. Revised Versions of this License. + + The Free Software Foundation may publish revised and/or new versions of +the GNU 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 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 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 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. + + ScStw shared libraries + Copyright (C) 2020 Itsblue development + + This program is free software: you can redistribute it and/or modify + it under the terms of the GNU 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 General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program. If not, see . + +Also add information on how to contact you by electronic and paper mail. + + If the program does terminal interaction, make it output a short +notice like this when it starts in an interactive mode: + + shared libraries Copyright (C) 2020 Speed climbing stopwatch + This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'. + This is free software, and you are welcome to redistribute it + under certain conditions; type `show c' for details. + +The hypothetical commands `show w' and `show c' should show the appropriate +parts of the General Public License. Of course, your program's commands +might be different; for a GUI interface, you would use an "about box". + + 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 GPL, see +. + + The GNU General Public License does not permit incorporating your program +into proprietary programs. If your program is a subroutine library, you +may consider it more useful to permit linking proprietary applications with +the library. If this is what you want to do, use the GNU Lesser General +Public License instead of this License. But first, please read +. diff --git a/ScStwLibraries/headers/ScStw.hpp b/ScStwLibraries/headers/ScStw.hpp index 0dfbaaa..195b750 100644 --- a/ScStwLibraries/headers/ScStw.hpp +++ b/ScStwLibraries/headers/ScStw.hpp @@ -1,3 +1,21 @@ +/**************************************************************************** + ** ScStw Libraries + ** Copyright (C) 2020 Itsblue development + ** + ** This program is free software: you can redistribute it and/or modify + ** it under the terms of the GNU 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 General Public License for more details. + ** + ** You should have received a copy of the GNU General Public License + ** along with this program. If not, see . + ****************************************************************************/ + #ifndef SCSTW_HPP #define SCSTW_HPP diff --git a/ScStwLibraries/headers/ScStwLibraries_global.h b/ScStwLibraries/headers/ScStwLibraries_global.h index 55f84e2..e6cdff2 100644 --- a/ScStwLibraries/headers/ScStwLibraries_global.h +++ b/ScStwLibraries/headers/ScStwLibraries_global.h @@ -1,3 +1,21 @@ +/**************************************************************************** + ** ScStw Libraries + ** Copyright (C) 2020 Itsblue development + ** + ** This program is free software: you can redistribute it and/or modify + ** it under the terms of the GNU 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 General Public License for more details. + ** + ** You should have received a copy of the GNU General Public License + ** along with this program. If not, see . + ****************************************************************************/ + #ifndef SCSTWLIBRARIES_GLOBAL_H #define SCSTWLIBRARIES_GLOBAL_H diff --git a/ScStwLibraries/headers/scstwclient.h b/ScStwLibraries/headers/scstwclient.h index ca3410a..390ea14 100644 --- a/ScStwLibraries/headers/scstwclient.h +++ b/ScStwLibraries/headers/scstwclient.h @@ -1,3 +1,21 @@ +/**************************************************************************** + ** ScStw Libraries + ** Copyright (C) 2020 Itsblue development + ** + ** This program is free software: you can redistribute it and/or modify + ** it under the terms of the GNU 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 General Public License for more details. + ** + ** You should have received a copy of the GNU General Public License + ** along with this program. If not, see . + ****************************************************************************/ + #ifndef SCSTWCLIENT_H #define SCSTWCLIENT_H diff --git a/ScStwLibraries/headers/scstwlibraries.h b/ScStwLibraries/headers/scstwlibraries.h index 3a4f4ab..df9f878 100644 --- a/ScStwLibraries/headers/scstwlibraries.h +++ b/ScStwLibraries/headers/scstwlibraries.h @@ -1,3 +1,21 @@ +/**************************************************************************** + ** ScStw Libraries + ** Copyright (C) 2020 Itsblue development + ** + ** This program is free software: you can redistribute it and/or modify + ** it under the terms of the GNU 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 General Public License for more details. + ** + ** You should have received a copy of the GNU General Public License + ** along with this program. If not, see . + ****************************************************************************/ + #ifndef SCSTWLIBRARIES_H #define SCSTWLIBRARIES_H diff --git a/ScStwLibraries/headers/scstwrace.h b/ScStwLibraries/headers/scstwrace.h index 62ab2ed..206a457 100644 --- a/ScStwLibraries/headers/scstwrace.h +++ b/ScStwLibraries/headers/scstwrace.h @@ -1,3 +1,21 @@ +/**************************************************************************** + ** ScStw Libraries + ** Copyright (C) 2020 Itsblue development + ** + ** This program is free software: you can redistribute it and/or modify + ** it under the terms of the GNU 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 General Public License for more details. + ** + ** You should have received a copy of the GNU General Public License + ** along with this program. If not, see . + ****************************************************************************/ + #ifndef SCSTWRACE_H #define SCSTWRACE_H diff --git a/ScStwLibraries/headers/scstwremotemonitorrace.h b/ScStwLibraries/headers/scstwremotemonitorrace.h index 95e87e5..c36db54 100644 --- a/ScStwLibraries/headers/scstwremotemonitorrace.h +++ b/ScStwLibraries/headers/scstwremotemonitorrace.h @@ -1,3 +1,21 @@ +/**************************************************************************** + ** ScStw Libraries + ** Copyright (C) 2020 Itsblue development + ** + ** This program is free software: you can redistribute it and/or modify + ** it under the terms of the GNU 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 General Public License for more details. + ** + ** You should have received a copy of the GNU General Public License + ** along with this program. If not, see . + ****************************************************************************/ + #ifndef SCSTWREMOTEMONITORRACE_H #define SCSTWREMOTEMONITORRACE_H diff --git a/ScStwLibraries/headers/scstwsoundplayer.h b/ScStwLibraries/headers/scstwsoundplayer.h index bfb7447..91c17cb 100644 --- a/ScStwLibraries/headers/scstwsoundplayer.h +++ b/ScStwLibraries/headers/scstwsoundplayer.h @@ -1,3 +1,21 @@ +/**************************************************************************** + ** ScStw Libraries + ** Copyright (C) 2020 Itsblue development + ** + ** This program is free software: you can redistribute it and/or modify + ** it under the terms of the GNU 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 General Public License for more details. + ** + ** You should have received a copy of the GNU General Public License + ** along with this program. If not, see . + ****************************************************************************/ + #ifndef SCSTWSTARTSOUNDPLAYER_H #define SCSTWSTARTSOUNDPLAYER_H diff --git a/ScStwLibraries/headers/scstwtimer.h b/ScStwLibraries/headers/scstwtimer.h index 8bdf412..e1aac72 100644 --- a/ScStwLibraries/headers/scstwtimer.h +++ b/ScStwLibraries/headers/scstwtimer.h @@ -1,3 +1,21 @@ +/**************************************************************************** + ** ScStw Libraries + ** Copyright (C) 2020 Itsblue development + ** + ** This program is free software: you can redistribute it and/or modify + ** it under the terms of the GNU 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 General Public License for more details. + ** + ** You should have received a copy of the GNU General Public License + ** along with this program. If not, see . + ****************************************************************************/ + #ifndef SCSTWTIMER_H #define SCSTWTIMER_H @@ -48,8 +66,9 @@ public: * \brief ScStwTimer constructor * \param parent the parent object * \param directControlEnabled Defines if protected properties (startTimer, stopTime, reactionTime and state) can be directly set from outside. + * \param letter the letter of the timer (only first char will be used!) */ - explicit ScStwTimer(QObject *parent = nullptr, bool directControlEnabled = false); + explicit ScStwTimer(QObject *parent = nullptr, bool directControlEnabled = false, QString letter = "" ); /*! * \brief The TimerState enum contains all state the timer can be in @@ -103,6 +122,11 @@ protected: */ bool directControlEnabled; + /*! + * \brief The letter (eg. "A" or "B") of the Timer (only one char) + */ + QString letter; + public slots: /*! @@ -200,6 +224,12 @@ public slots: */ QString getText(); + /*! + * \brief Function to get the letter of the timer + * \return The letter of the timer or "" + */ + QString getLetter(); + /*! * \brief Function to set if the timer is supposed to be disabled * @@ -254,6 +284,16 @@ public slots: */ bool setReactionTime(double rectionTime); + /*! + * \brief Function to dircetly change the letter + * + * Only works when directControlEnabled is set to true! + * + * \param newLetter the letter to change to + * \return false when directControlEnabled is set to false and the letter was therefore not modified, true otherwise + */ + bool setLetter(QString newLetter); + protected slots: /*! diff --git a/ScStwLibraries/sources/ScStw.cpp b/ScStwLibraries/sources/ScStw.cpp index 68a97ba..f01abb2 100644 --- a/ScStwLibraries/sources/ScStw.cpp +++ b/ScStwLibraries/sources/ScStw.cpp @@ -1,3 +1,21 @@ +/**************************************************************************** + ** ScStw Libraries + ** Copyright (C) 2020 Itsblue development + ** + ** This program is free software: you can redistribute it and/or modify + ** it under the terms of the GNU 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 General Public License for more details. + ** + ** You should have received a copy of the GNU General Public License + ** along with this program. If not, see . + ****************************************************************************/ + #include "../headers/ScStw.hpp" const char *ScStw::SOCKET_MESSAGE_START_KEY = ""; diff --git a/ScStwLibraries/sources/scstwclient.cpp b/ScStwLibraries/sources/scstwclient.cpp index 068524f..476b6f1 100644 --- a/ScStwLibraries/sources/scstwclient.cpp +++ b/ScStwLibraries/sources/scstwclient.cpp @@ -1,3 +1,21 @@ +/**************************************************************************** + ** ScStw Libraries + ** Copyright (C) 2020 Itsblue development + ** + ** This program is free software: you can redistribute it and/or modify + ** it under the terms of the GNU 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 General Public License for more details. + ** + ** You should have received a copy of the GNU General Public License + ** along with this program. If not, see . + ****************************************************************************/ + #include "../headers/scstwclient.h" ScStwClient * pGlobalScStwClient = nullptr; diff --git a/ScStwLibraries/sources/scstwlibraries.cpp b/ScStwLibraries/sources/scstwlibraries.cpp index 439a636..95a56da 100644 --- a/ScStwLibraries/sources/scstwlibraries.cpp +++ b/ScStwLibraries/sources/scstwlibraries.cpp @@ -1,3 +1,21 @@ +/**************************************************************************** + ** ScStw Libraries + ** Copyright (C) 2020 Itsblue development + ** + ** This program is free software: you can redistribute it and/or modify + ** it under the terms of the GNU 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 General Public License for more details. + ** + ** You should have received a copy of the GNU General Public License + ** along with this program. If not, see . + ****************************************************************************/ + #include "../headers/scstwlibraries.h" ScStwLibraries::ScStwLibraries(QObject *parent) : QObject(parent) diff --git a/ScStwLibraries/sources/scstwrace.cpp b/ScStwLibraries/sources/scstwrace.cpp index 7acce31..5998f13 100644 --- a/ScStwLibraries/sources/scstwrace.cpp +++ b/ScStwLibraries/sources/scstwrace.cpp @@ -1,3 +1,21 @@ +/**************************************************************************** + ** ScStw Libraries + ** Copyright (C) 2020 Itsblue development + ** + ** This program is free software: you can redistribute it and/or modify + ** it under the terms of the GNU 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 General Public License for more details. + ** + ** You should have received a copy of the GNU General Public License + ** along with this program. If not, see . + ****************************************************************************/ + #include "../headers/scstwrace.h" ScStwRace::ScStwRace(QObject *parent) : QObject(parent) @@ -379,6 +397,7 @@ QVariantList ScStwRace::getTimerDetailList() { tmpTimer.insert("currentTime", timer->getCurrentTime()); tmpTimer.insert("reactionTime", timer->getReactionTime()); tmpTimer.insert("text", timer->getText()); + tmpTimer.insert("letter", timer->getLetter()); tmpTimers.append(tmpTimer); } diff --git a/ScStwLibraries/sources/scstwremotemonitorrace.cpp b/ScStwLibraries/sources/scstwremotemonitorrace.cpp index 8c769da..56d6f4e 100644 --- a/ScStwLibraries/sources/scstwremotemonitorrace.cpp +++ b/ScStwLibraries/sources/scstwremotemonitorrace.cpp @@ -1,3 +1,21 @@ +/**************************************************************************** + ** ScStw Libraries + ** Copyright (C) 2020 Itsblue development + ** + ** This program is free software: you can redistribute it and/or modify + ** it under the terms of the GNU 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 General Public License for more details. + ** + ** You should have received a copy of the GNU General Public License + ** along with this program. If not, see . + ****************************************************************************/ + #include "../headers/scstwremotemonitorrace.h" ScStwRemoteMonitorRace::ScStwRemoteMonitorRace(ScStwClient *monitorClient, QObject *parent) : ScStwRace(parent) @@ -189,6 +207,8 @@ bool ScStwRemoteMonitorRace::refreshRemoteTimers(QVariantList remoteTimers) { this->timers[currId]->setReactionTime(remoteTimer.toMap()["reactionTime"].toDouble()); this->timers[currId]->setState(newState, true); + + this->timers[currId]->setLetter(remoteTimer.toMap()["letter"].toString()); } return true; diff --git a/ScStwLibraries/sources/scstwsoundplayer.cpp b/ScStwLibraries/sources/scstwsoundplayer.cpp index 4cf768d..be5473c 100644 --- a/ScStwLibraries/sources/scstwsoundplayer.cpp +++ b/ScStwLibraries/sources/scstwsoundplayer.cpp @@ -1,3 +1,21 @@ +/**************************************************************************** + ** ScStw Libraries + ** Copyright (C) 2020 Itsblue development + ** + ** This program is free software: you can redistribute it and/or modify + ** it under the terms of the GNU 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 General Public License for more details. + ** + ** You should have received a copy of the GNU General Public License + ** along with this program. If not, see . + ****************************************************************************/ + #include "../headers/scstwsoundplayer.h" ScStwSoundPlayer::ScStwSoundPlayer(QObject *parent) : QObject(parent) diff --git a/ScStwLibraries/sources/scstwtimer.cpp b/ScStwLibraries/sources/scstwtimer.cpp index 5d05881..11950e5 100644 --- a/ScStwLibraries/sources/scstwtimer.cpp +++ b/ScStwLibraries/sources/scstwtimer.cpp @@ -1,8 +1,32 @@ +/**************************************************************************** + ** ScStw Libraries + ** Copyright (C) 2020 Itsblue development + ** + ** This program is free software: you can redistribute it and/or modify + ** it under the terms of the GNU 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 General Public License for more details. + ** + ** You should have received a copy of the GNU General Public License + ** along with this program. If not, see . + ****************************************************************************/ + #include "../headers/scstwtimer.h" -ScStwTimer::ScStwTimer(QObject *parent, bool directControlEnabled) : QObject(parent) +ScStwTimer::ScStwTimer(QObject *parent, bool directControlEnabled, QString letter) : QObject(parent) { this->directControlEnabled = directControlEnabled; + + if(letter.length() > 1) + this->letter = letter[0]; + else + this->letter = letter; + this->startTime = 0; this->stopTime = 0; this->reactionTime = 0; @@ -28,10 +52,6 @@ bool ScStwTimer::start(double timeOfStart) { if(this->state == STARTING) this->setState(RUNNING); }); - QTimer::singleShot(timeOfStart - QDateTime::currentMSecsSinceEpoch() - 1000, [=](){ - //this->handleClimberStart(QDateTime::currentMSecsSinceEpoch()); - }); - } else this->setState(RUNNING); @@ -184,6 +204,14 @@ void ScStwTimer::setState(TimerState newState){ } } +bool ScStwTimer::setLetter(QString newLetter) { + if(!this->directControlEnabled) + return false; + + this->letter = newLetter; + return true; +} + ScStwTimer::TimerState ScStwTimer::getState() { return this->state; } @@ -194,7 +222,7 @@ double ScStwTimer::getCurrentTime() { return QDateTime::currentMSecsSinceEpoch() - this->startTime; default: { if(this->state == WAITING || this->state == WON || this->state == LOST) - return this->stopTime - this->startTime; + return abs(this->stopTime - this->startTime); else return -1; } @@ -205,27 +233,32 @@ double ScStwTimer::getReactionTime() { return this->reactionTime; } +QString ScStwTimer::getLetter() { + return this->letter; +} + QString ScStwTimer::getText() { - //qDebug() << this->getState(); - QString newText; + + QString newText = ""; + int newTime = 0; switch (this->state) { case ScStwTimer::IDLE: - newText = "0.000 sec"; + newTime = 0; break; case ScStwTimer::STARTING: - newText = "0.000 sec"; + newTime = 0; break; case ScStwTimer::WAITING: newText = "please wait..."; break; case ScStwTimer::RUNNING: - newText = QString::number( this->getCurrentTime() / 1000.0, 'f', 3 ) + " sec"; + newTime = this->getCurrentTime(); break; case ScStwTimer::WON: - newText = QString::number( this->getCurrentTime() / 1000.0, 'f', 3 ) + " sec"; + newTime = this->getCurrentTime(); break; case ScStwTimer::LOST: - newText = QString::number( this->getCurrentTime() / 1000.0, 'f', 3 ) + " sec"; + newTime = this->getCurrentTime(); break; case ScStwTimer::FAILED: newText = "false start"; @@ -238,6 +271,9 @@ QString ScStwTimer::getText() { break; } + if(newText == "") + newText = QString::number( newTime / 1000.0, 'f', 3 ).rightJustified(6, '0'); + return newText; } diff --git a/ScStwStyling/ScStwStyling.pro b/ScStwStyling/ScStwStyling.pro index 5ccc3de..5e3704e 100644 --- a/ScStwStyling/ScStwStyling.pro +++ b/ScStwStyling/ScStwStyling.pro @@ -38,5 +38,5 @@ CONFIG(release, debug|release): { } # Default rules for deployment. -target.path = $$GLOBAL_TARGET_PATH/lib +target.path = /usr/local/lib !isEmpty(target.path): INSTALLS += target diff --git a/ScStwStyling/headers/scstwapptheme.h b/ScStwStyling/headers/scstwapptheme.h index d0f7ba7..e9d5c56 100644 --- a/ScStwStyling/headers/scstwapptheme.h +++ b/ScStwStyling/headers/scstwapptheme.h @@ -1,3 +1,21 @@ +/**************************************************************************** + ** ScStw Styling + ** Copyright (C) 2020 Itsblue development + ** + ** This program is free software: you can redistribute it and/or modify + ** it under the terms of the GNU 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 General Public License for more details. + ** + ** You should have received a copy of the GNU General Public License + ** along with this program. If not, see . + ****************************************************************************/ + #ifndef APPTHEME_H #define APPTHEME_H diff --git a/ScStwStyling/headers/scstwappthememanager.h b/ScStwStyling/headers/scstwappthememanager.h index fd74d9a..bec5135 100644 --- a/ScStwStyling/headers/scstwappthememanager.h +++ b/ScStwStyling/headers/scstwappthememanager.h @@ -1,3 +1,21 @@ +/**************************************************************************** + ** ScStw Styling + ** Copyright (C) 2020 Itsblue development + ** + ** This program is free software: you can redistribute it and/or modify + ** it under the terms of the GNU 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 General Public License for more details. + ** + ** You should have received a copy of the GNU General Public License + ** along with this program. If not, see . + ****************************************************************************/ + #ifndef SCSTWAPPTHEMEMANAGER_H #define SCSTWAPPTHEMEMANAGER_H diff --git a/ScStwStyling/headers/scstwstyling.h b/ScStwStyling/headers/scstwstyling.h index 174bb89..1902e0a 100644 --- a/ScStwStyling/headers/scstwstyling.h +++ b/ScStwStyling/headers/scstwstyling.h @@ -1,3 +1,21 @@ +/**************************************************************************** + ** ScStw Styling + ** Copyright (C) 2020 Itsblue development + ** + ** This program is free software: you can redistribute it and/or modify + ** it under the terms of the GNU 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 General Public License for more details. + ** + ** You should have received a copy of the GNU General Public License + ** along with this program. If not, see . + ****************************************************************************/ + #ifndef SCSTWSTYLING_H #define SCSTWSTYLING_H diff --git a/ScStwStyling/resources/qml/lib/de/itsblue/ScStw/Styling/Components/BusyIndicator.qml b/ScStwStyling/resources/qml/lib/de/itsblue/ScStw/Styling/Components/BusyIndicator.qml index a911dac..ffeaf10 100644 --- a/ScStwStyling/resources/qml/lib/de/itsblue/ScStw/Styling/Components/BusyIndicator.qml +++ b/ScStwStyling/resources/qml/lib/de/itsblue/ScStw/Styling/Components/BusyIndicator.qml @@ -1,3 +1,21 @@ +/**************************************************************************** + ** ScStw Styling + ** Copyright (C) 2020 Itsblue development + ** + ** This program is free software: you can redistribute it and/or modify + ** it under the terms of the GNU 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 General Public License for more details. + ** + ** You should have received a copy of the GNU General Public License + ** along with this program. If not, see . + ****************************************************************************/ + import QtQuick 2.0 import QtQuick.Templates 2.0 as T import QtQuick.Controls 2.0 @@ -5,16 +23,16 @@ import QtQuick.Controls 2.0 T.BusyIndicator { id: control - implicitWidth: Math.max(implicitBackgroundWidth + leftInset + rightInset, - implicitContentWidth + leftPadding + rightPadding) - implicitHeight: Math.max(implicitBackgroundHeight + topInset + bottomInset, - implicitContentHeight + topPadding + bottomPadding) + property var image: "qrc:/images/SpeedHoldBlack.png" + + implicitWidth: leftPadding + rightPadding + implicitHeight: topPadding + bottomPadding contentItem: Item { Image { id: holdImage anchors.fill: parent - source: "qrc:/images/SpeedHold.png" + source: control.image fillMode: Image.PreserveAspectFit } diff --git a/ScStwStyling/resources/qml/lib/de/itsblue/ScStw/Styling/Components/FadeAnimation.qml b/ScStwStyling/resources/qml/lib/de/itsblue/ScStw/Styling/Components/FadeAnimation.qml index df750b1..dac6920 100644 --- a/ScStwStyling/resources/qml/lib/de/itsblue/ScStw/Styling/Components/FadeAnimation.qml +++ b/ScStwStyling/resources/qml/lib/de/itsblue/ScStw/Styling/Components/FadeAnimation.qml @@ -1,19 +1,20 @@ -/* - Speed Climbing Stopwatch - Simple Stopwatch for Climbers - Copyright (C) 2018 Itsblue Development - Dorian Zeder - - 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, version 3 of the License. - - 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 . -*/ +/**************************************************************************** + ** ScStw Styling + ** Copyright (C) 2020 Itsblue development + ** + ** This program is free software: you can redistribute it and/or modify + ** it under the terms of the GNU 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 General Public License for more details. + ** + ** You should have received a copy of the GNU General Public License + ** along with this program. If not, see . + ****************************************************************************/ import QtQuick 2.0 diff --git a/ScStwStyling/resources/qml/lib/de/itsblue/ScStw/Styling/Components/Icon.qml b/ScStwStyling/resources/qml/lib/de/itsblue/ScStw/Styling/Components/Icon.qml index 7d038c8..6322994 100644 --- a/ScStwStyling/resources/qml/lib/de/itsblue/ScStw/Styling/Components/Icon.qml +++ b/ScStwStyling/resources/qml/lib/de/itsblue/ScStw/Styling/Components/Icon.qml @@ -1,3 +1,21 @@ +/**************************************************************************** + ** ScStw Styling + ** Copyright (C) 2020 Itsblue development + ** + ** This program is free software: you can redistribute it and/or modify + ** it under the terms of the GNU 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 General Public License for more details. + ** + ** You should have received a copy of the GNU General Public License + ** along with this program. If not, see . + ****************************************************************************/ + import QtQuick 2.0 import QtQuick.Controls 2.0 diff --git a/ScStwStyling/resources/qml/lib/de/itsblue/ScStw/Styling/Components/Test.qml b/ScStwStyling/resources/qml/lib/de/itsblue/ScStw/Styling/Components/Test.qml index dc79e1f..29b2562 100644 --- a/ScStwStyling/resources/qml/lib/de/itsblue/ScStw/Styling/Components/Test.qml +++ b/ScStwStyling/resources/qml/lib/de/itsblue/ScStw/Styling/Components/Test.qml @@ -1,3 +1,21 @@ +/**************************************************************************** + ** ScStw Styling + ** Copyright (C) 2020 Itsblue development + ** + ** This program is free software: you can redistribute it and/or modify + ** it under the terms of the GNU 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 General Public License for more details. + ** + ** You should have received a copy of the GNU General Public License + ** along with this program. If not, see . + ****************************************************************************/ + import QtQuick 2.12 Item { diff --git a/ScStwStyling/resources/qml/lib/de/itsblue/ScStw/Styling/Components/TimerColumn.qml b/ScStwStyling/resources/qml/lib/de/itsblue/ScStw/Styling/Components/TimerColumn.qml index 1170504..5150516 100644 --- a/ScStwStyling/resources/qml/lib/de/itsblue/ScStw/Styling/Components/TimerColumn.qml +++ b/ScStwStyling/resources/qml/lib/de/itsblue/ScStw/Styling/Components/TimerColumn.qml @@ -1,7 +1,24 @@ +/**************************************************************************** + ** ScStw Styling + ** Copyright (C) 2020 Itsblue development + ** + ** This program is free software: you can redistribute it and/or modify + ** it under the terms of the GNU 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 General Public License for more details. + ** + ** You should have received a copy of the GNU General Public License + ** along with this program. If not, see . + ****************************************************************************/ + import QtQuick 2.0 import QtQuick.Controls 2.0 import de.itsblue.ScStw 2.0 -import de.itsblue.ScStwMonitor 2.0 Column { id: control @@ -9,26 +26,16 @@ Column { property var timers property var colors property var fontName - - opacity: backend.scStwClient.state === ScStwClient.CONNECTED ? 1:0 + property bool showSecLabel: false + property bool showTimerLetter: true + property double textScale: 1 spacing: 0 Repeater { id: timerRep - property var clearedTimers: removeDisabledTimers(control.timers) - - function removeDisabledTimers(timers) { - var ret = [] - for(var i = 0; i < timers.length; i++) { - if(timers[i]["state"] !== ScStwTimer.DISABLED) - ret.push(timers[i]) - } - return ret - } - - model: clearedTimers.length + model: control.timers.length delegate: Item { id: timerDel @@ -36,15 +43,16 @@ Column { width: parent.width height: control.height / timerRep.model - Label { - id: laneNameLa + Text { + id: timerLetterLa + + enabled: control.showTimerLetter && text !== "" anchors { left: parent.left + leftMargin: parent.width * 0.03 } - leftPadding: parent.width * 0.03 - width: parent.width * 0.15 height: parent.height * 0.5 @@ -53,45 +61,54 @@ Column { verticalAlignment: Text.AlignVCenter horizontalAlignment: Text.AlignLeft - text: ""//index === 0 ? "A":"B" + opacity: enabled ? 1:0 - color: control.colors.text + text: control.timers[index]["letter"] + + color: control.colors.accent font.pixelSize: height font.styleName: control.fontName + + Behavior on opacity { + NumberAnimation { + duration: 200 + } + } } - Label { + Text { id: timerTextLa anchors.centerIn: parent - anchors.horizontalCenterOffset: laneNameLa.text !== "" ? parent.width * 0.06:0 + anchors.horizontalCenterOffset: timerLetterLa.enabled ? parent.width * 0.06:0 anchors.verticalCenterOffset: -(parent.height * 0.04 * reactTimeLa.opacity) width: parent.width * 0.8 height: parent.height * 0.8 - elide: "ElideRight" - color: ([ScStwTimer.WON].indexOf(timerRep.clearedTimers[index]["state"]) >= 0 ? control.colors.success : - [ScStwTimer.FAILED,ScStwTimer.LOST].indexOf(timerRep.clearedTimers[index]["state"]) >= 0 ? control.colors.error: + color: ([ScStwTimer.WON].indexOf(control.timers[index]["state"]) >= 0 ? control.colors.success : + [ScStwTimer.FAILED,ScStwTimer.LOST].indexOf(control.timers[index]["state"]) >= 0 ? control.colors.error: control.colors.text) - text: timerRep.clearedTimers[index]["text"] + enabled: control.timers[index]["state"] !== ScStwTimer.DISABLED + + text: control.timers[index]["text"] fontSizeMode: Text.Fit verticalAlignment: Text.AlignVCenter horizontalAlignment: Text.AlignHCenter - font.pixelSize: height + font.pixelSize: height * control.textScale font.styleName: control.fontName minimumPixelSize: 1 } - Label { + Text { id: reactTimeLa - property int rtime: timerRep.clearedTimers[index]["reactionTime"] + property int rtime: control.timers[index]["reactionTime"] anchors { centerIn: parent @@ -105,7 +122,7 @@ Column { scale: enabled ? 1:0.9 opacity: enabled ? 1:0 - enabled: timerRep.clearedTimers[index]["state"] >= ScStwTimer.STARTING && rtime !== 0 + enabled: control.timers[index]["state"] >= ScStwTimer.STARTING && rtime !== 0 fontSizeMode: Text.Fit @@ -116,7 +133,7 @@ Column { color: control.colors.text - font.pixelSize: timerTextLa.font.pixelSize * 0.5 + font.pixelSize: timerTextLa.font.pixelSize * control.textScale font.styleName: control.fontName minimumPixelSize: 1 diff --git a/ScStwStyling/resources/shared/ScStwStylingShared.qrc b/ScStwStyling/resources/shared/ScStwStylingShared.qrc index 875e9cb..cce3696 100644 --- a/ScStwStyling/resources/shared/ScStwStylingShared.qrc +++ b/ScStwStyling/resources/shared/ScStwStylingShared.qrc @@ -3,7 +3,8 @@ fonts/fa5solid.woff images/BaseStationBlack.png images/BaseStationWhite.png - images/SpeedHold.png fonts/PTMono-Regular.ttf + images/SpeedHoldBlack.png + images/SpeedHoldWhite.png diff --git a/ScStwStyling/resources/shared/images/SpeedHold.png b/ScStwStyling/resources/shared/images/SpeedHoldBlack.png similarity index 100% rename from ScStwStyling/resources/shared/images/SpeedHold.png rename to ScStwStyling/resources/shared/images/SpeedHoldBlack.png diff --git a/ScStwStyling/resources/shared/images/SpeedHoldWhite.png b/ScStwStyling/resources/shared/images/SpeedHoldWhite.png new file mode 100644 index 0000000..11dd41b Binary files /dev/null and b/ScStwStyling/resources/shared/images/SpeedHoldWhite.png differ diff --git a/ScStwStyling/sources/scstwapptheme.cpp b/ScStwStyling/sources/scstwapptheme.cpp index cb9a770..2e30539 100644 --- a/ScStwStyling/sources/scstwapptheme.cpp +++ b/ScStwStyling/sources/scstwapptheme.cpp @@ -1,3 +1,21 @@ +/**************************************************************************** + ** ScStw Styling + ** Copyright (C) 2020 Itsblue development + ** + ** This program is free software: you can redistribute it and/or modify + ** it under the terms of the GNU 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 General Public License for more details. + ** + ** You should have received a copy of the GNU General Public License + ** along with this program. If not, see . + ****************************************************************************/ + #include "headers/scstwapptheme.h" ScStwAppTheme::ScStwAppTheme(QString name, QVariantMap colors, QVariantMap icons, QVariantMap fonts, QVariantMap images, QObject *parent) : QObject(parent) diff --git a/ScStwStyling/sources/scstwappthememanager.cpp b/ScStwStyling/sources/scstwappthememanager.cpp index c6d18e9..00fef82 100644 --- a/ScStwStyling/sources/scstwappthememanager.cpp +++ b/ScStwStyling/sources/scstwappthememanager.cpp @@ -1,3 +1,21 @@ +/**************************************************************************** + ** ScStw Styling + ** Copyright (C) 2020 Itsblue development + ** + ** This program is free software: you can redistribute it and/or modify + ** it under the terms of the GNU 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 General Public License for more details. + ** + ** You should have received a copy of the GNU General Public License + ** along with this program. If not, see . + ****************************************************************************/ + #include "../headers/scstwappthememanager.h" ScStwAppThemeManager::ScStwAppThemeManager(QObject *parent) : QObject(parent) @@ -64,7 +82,8 @@ ScStwAppThemeManager::ScStwAppThemeManager(QObject *parent) : QObject(parent) {"startpadIcon", "qrc:/graphics/icons/startpad_black.png"}, {"baseStationIcon", "qrc:/images/BaseStationBlack.png"}, {"profilesIcon", "qrc:/graphics/icons/user_black.png"}, - {"confirmIcon", "qrc:/graphics/icons/ok_black.png"} + {"confirmIcon", "qrc:/graphics/icons/ok_black.png"}, + {"SpeedHold", "qrc:/images/SpeedHoldBlack.png"} }); ScStwAppTheme *darkTheme = new ScStwAppTheme( @@ -112,7 +131,8 @@ ScStwAppThemeManager::ScStwAppThemeManager(QObject *parent) : QObject(parent) {"startpadIcon", "qrc:/graphics/icons/startpad.png"}, {"baseStationIcon", "qrc:/images/BaseStationWhite.png"}, {"profilesIcon", "qrc:/graphics/icons/user.png"}, - {"confirmIcon", "qrc:/graphics/icons/ok.png"} + {"confirmIcon", "qrc:/graphics/icons/ok.png"}, + {"SpeedHold", "qrc:/images/SpeedHoldWhite.png"} } ); diff --git a/ScStwStyling/sources/scstwstyling.cpp b/ScStwStyling/sources/scstwstyling.cpp index f996d09..05dff74 100644 --- a/ScStwStyling/sources/scstwstyling.cpp +++ b/ScStwStyling/sources/scstwstyling.cpp @@ -1,3 +1,21 @@ +/**************************************************************************** + ** ScStw Styling + ** Copyright (C) 2020 Itsblue development + ** + ** This program is free software: you can redistribute it and/or modify + ** it under the terms of the GNU 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 General Public License for more details. + ** + ** You should have received a copy of the GNU General Public License + ** along with this program. If not, see . + ****************************************************************************/ + #include "../headers/scstwstyling.h" ScStwStyling::ScStwStyling(QObject *parent) : QObject(parent) diff --git a/docs/.gitignore b/docs/.gitignore index facb6f8..e47c0cb 100644 --- a/docs/.gitignore +++ b/docs/.gitignore @@ -1,3 +1,4 @@ /html/ /latex/ /xml/ +/m.css/ diff --git a/release/debian/DEBIAN/control b/release/debian/DEBIAN/control index 028668a..d02e8bb 100644 --- a/release/debian/DEBIAN/control +++ b/release/debian/DEBIAN/control @@ -1,5 +1,5 @@ Package: libScStwSharedLibraries -Version: 1.0.0 +Version: 1.1.0 Section: base Priority: optional Architecture: armhf diff --git a/release/debian/usr/local/lib/libScStwLibraries.so.1.0.0 b/release/debian/usr/local/lib/libScStwLibraries.so.1.0.0 index cfe029b..a04d0ce 100755 Binary files a/release/debian/usr/local/lib/libScStwLibraries.so.1.0.0 and b/release/debian/usr/local/lib/libScStwLibraries.so.1.0.0 differ diff --git a/release/debian/usr/local/lib/libScStwStyling.so b/release/debian/usr/local/lib/libScStwStyling.so new file mode 120000 index 0000000..c42ad2d --- /dev/null +++ b/release/debian/usr/local/lib/libScStwStyling.so @@ -0,0 +1 @@ +libScStwStyling.so.1.0.0 \ No newline at end of file diff --git a/release/debian/usr/local/lib/libScStwStyling.so.1 b/release/debian/usr/local/lib/libScStwStyling.so.1 new file mode 120000 index 0000000..c42ad2d --- /dev/null +++ b/release/debian/usr/local/lib/libScStwStyling.so.1 @@ -0,0 +1 @@ +libScStwStyling.so.1.0.0 \ No newline at end of file diff --git a/release/debian/usr/local/lib/libScStwStyling.so.1.0 b/release/debian/usr/local/lib/libScStwStyling.so.1.0 new file mode 120000 index 0000000..c42ad2d --- /dev/null +++ b/release/debian/usr/local/lib/libScStwStyling.so.1.0 @@ -0,0 +1 @@ +libScStwStyling.so.1.0.0 \ No newline at end of file diff --git a/release/debian/usr/local/lib/libScStwStyling.so.1.0.0 b/release/debian/usr/local/lib/libScStwStyling.so.1.0.0 new file mode 100755 index 0000000..e9c474f Binary files /dev/null and b/release/debian/usr/local/lib/libScStwStyling.so.1.0.0 differ diff --git a/release/libScStwSharedLibraries.deb b/release/libScStwSharedLibraries.deb index 2d36372..1771d9b 100644 Binary files a/release/libScStwSharedLibraries.deb and b/release/libScStwSharedLibraries.deb differ diff --git a/release/libScStwSharedLibraries_1.0.0.deb b/release/libScStwSharedLibraries_1.0.0.deb new file mode 100644 index 0000000..2d36372 Binary files /dev/null and b/release/libScStwSharedLibraries_1.0.0.deb differ