aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLionel <lionel.miquel46@gmail.com>2018-12-15 23:13:34 +0100
committerLionel <lionel.miquel46@gmail.com>2018-12-15 23:13:34 +0100
commit45708bbaa27a630ad3ef9615ccbdbc81e8dd28a2 (patch)
tree8b91f0938e3ba8af94f020c2bb2b93d1340594dd
parent2526a9844de7765069429a97478e63f067da4766 (diff)
downloadaneatocli-45708bbaa27a630ad3ef9615ccbdbc81e8dd28a2.tar.gz
aneatocli-45708bbaa27a630ad3ef9615ccbdbc81e8dd28a2.zip
Grand update. Basic functionnality as well as displaying of robot info is present.
-rw-r--r--LICENSE674
-rw-r--r--aneatocli.py211
-rw-r--r--botvac.py318
-rw-r--r--botvac.ui393
-rw-r--r--globals.py5
-rw-r--r--robotCreds.json1
-rw-r--r--robotstate.json1
-rw-r--r--rsc_rc.py876
8 files changed, 2065 insertions, 414 deletions
diff --git a/LICENSE b/LICENSE
new file mode 100644
index 0000000..f288702
--- /dev/null
+++ b/LICENSE
@@ -0,0 +1,674 @@
+ GNU GENERAL PUBLIC LICENSE
+ Version 3, 29 June 2007
+
+ Copyright (C) 2007 Free Software Foundation, Inc. <https://fsf.org/>
+ 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.
+
+ <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 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 <https://www.gnu.org/licenses/>.
+
+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:
+
+ <program> Copyright (C) <year> <name of author>
+ 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
+<https://www.gnu.org/licenses/>.
+
+ 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
+<https://www.gnu.org/licenses/why-not-lgpl.html>.
diff --git a/aneatocli.py b/aneatocli.py
index f6cac4f..1137828 100644
--- a/aneatocli.py
+++ b/aneatocli.py
@@ -1,15 +1,16 @@
+#!/usr/bin/env python
"""
aneatocli : a Neato Robot command and state querying cli.
Usage:
- aneatocli.py --go | --start-cleaning
- aneatocli.py --stp | --stop-cleaning
- aneatocli.py --pse | --pause-cleaning
- aneatocli.py --res | --resume-cleaning
- aneatocli.py --base |--send-to-base
- aneatocli.py --gc | --get-commands
- aneatocli.py --lsec | --load-secrets
- aneatocli.py --acc | -account
+ aneatocli.py (--gc | --get-commands) <robotname>
+ aneatocli.py [--go | --start-cleaning ] <robotname>
+ aneatocli.py [--stp | --stop-cleaning ] <robotname>
+ aneatocli.py [--pse | --pause-cleaning ] <robotname>
+ aneatocli.py [--res | --resume-cleaning] <robotname>
+ aneatocli.py [--base | --send-to-base ] <robotname>
+ aneatocli.py [--gi |--get-infos ] <robotname>
+ aneatocli.py (--lgsc | --log-secrets) <mail>
aneatocli.py -h | --help
aneatocli.py -v | --version
@@ -18,109 +19,149 @@ Options:
-v , --version Show version.
--go , --start-cleaning Tell the robot to start cleaning.
--stp , --stop-cleaning Tell the robot to stop cleaning.
- --pse , --pause-cleaning Tell the robot to pause cleaning.
- --res , --resume-cleaning Tell the robot to resume cleaning.
- --base ,--sendtobase Tell the robot to go back to its dock.
+ --pse , --pause-cleaning Tell the robot to pause cleaning.
+ --res , --resume-cleaning Tell the robot to resume cleaning.
+ --base ,--send-to-base Tell the robot to go back to its dock.
--gc , --get-commands Get the available commands.
- --lsec , --load-secrets Get the Serial Number and the secret. You will be prompted for login.
+ --lgsc , --log-secrets Log the credentials into the json file.
"""
from sys import exit
from os.path import exists as chkf
from pprint import pprint
+from getpass import getpass as getp
import json
-global robot
-def loadCreds()
+try:
+ from pybotvac import Robot
+ from pybotvac import Account
+except:
+ print("pybotvac package is not installed.\n\nPlease run 'pip install pybotvac' from your command prompt\n")
+ exit()
+
+try:
+ from docopt import docopt
+except:
+ print("docopt package is not installed.\n\nPlease run 'pip install docopt==0.6.2' from your command prompt\n")
+ exit()
+
+
+def logCreds():
try:
- with open("robotCreds.json","r") as json_file:
- creds=json.load(json_file)
- print("Your serial number is "+creds["serialID"]
- +". \n Your secret is "+creds["secretID"]
- +".\n Your robot "+creds["name"]+" have the following traits"+creds["traits"])
- robot = Robot(creds["serialID"],creds["secretID"],creds["traits"],creds["name"])
+ mail=arguments["<mail>"]
+ passwd=getp("Password:")
+ acc=Account(mail,passwd)
except:
- print("Cannot log your robot(s) with the provided infos.")
+ print("Cannot login. Please try again.")
+ raise
+
+ try:
+ for robot in acc.robots:
+ json_data="{\"serialID\": \""+robot.serial+"\" ,\"secretID\": \""+robot.secret+"\" ,\"traits\": \""+robot.traits[0]+"\" ,\"name\": \""+robot.name+"\"}"
+ json_filename=robot.name+".json"
+ with open(json_filename,"w") as json_file:
+ json_file.write(json_data)
+ json_file.close()
+ except:
+ print("Cannot write robot creds.")
+ raise
+
+def initRobot():
+ json_filename=arguments["<robotname>"]+".json"
+ try:
+ with open(json_filename,"r") as json_file:
+ creds=json.load(json_file)
+ except:
+ print("File doesn't exist.")
+ exit()
+
+ try:
+ robot = Robot(creds["serialID"],creds["secretID"],creds["traits"],creds["name"])
+ return robot
+ except:
+ print("Cannot init the robot "+arguments["<robotname>"])
+ raise
+
def getCmds():
- cmds=robot.state["availableCommands"]
+ rob=initRobot()
+ getInfos()
+ # get the available commands
try:
- with open("robotstate.json", "w") as json_file:
- json.dump(cmds, json_file)
- print("File robotstate.json created")
+ cmds = rob.state["availableCommands"]
except:
+ print("HTTP Error or Network failure.")
raise
exit()
-
-def startC():
- if robot.state["availableCommands"]["start"]:
-d robot.start_cleaning()
- else:
- print("Cannot start the robot.")
-
-def stopC():
- if robot.state["availableCommands"]["stop"]:
- robot.stop_cleaning()
- else:
- print("Cannot stop the robot.")
-
-
-def pauseC():
- if robot.state["availableCommands"]["pause"]:
- robot.pause_cleaning()
- else:
- print("Cannot pause the robot.")
-
-def resumeC():
- if robot.state["availableCommands"]["resume"]:
- robot.resume_cleaning()
- else:
- print("Cannot resume the robot.")
-
-def go2B():
- if robot.state["availableCommands"]["goToBase"]:
- robot.send_to_base()
- else:
- print("Cannot send the robot to base.")
-
+ # write available cmds to file
+ try:
+ json_state_file=arguments["<robotname>"]+"-robotcommands.json"
+ with open(json_state_file, "w") as json_file:
+ json.dump(cmds, json_file)
+ print("File "+json_state_file+" created")
+ except:
+ raise
+ exit()
-
-def funCall(simpleArg, verboseArg, func, *args):
+
+def getInfos():
+ rob=initRobot()
+ try:
+ json_info_file=arguments["<robotname>"]+"-robotinfos.json"
+ with open(json_info_file, "w") as info_file:
+ json.dump(rob.state,info_file, indent=4)
+ json.dump(rob.get_general_info().json(),info_file, indent=4)
+ json.dump(rob.get_robot_info().json(),info_file, indent=4)
+ print("File "+json_info_file+" created")
+ except:
+ print("Cannot retrieve infos.")
+ raise
+ exit()
+
+
+
+def funCallFromArgs(simpleArg, verboseArg, func, *args):
if arguments[simpleArg] or arguments[verboseArg]:
func( *args )
-
-
-getSecrets()
-
-try:
- from pybotvac import Robot
-except:
- print("pybotvac package is not installed.\n\nPlease run 'pip install pybotvac' from your command prompt\n")
- exit()
-
-try:
- from docopt import docopt
+def actC(act):
+ rob=initRobot()
+
+ def checkActRun(robofunc):
+
+ try:
+ if rob.state["availableCommands"][act]:
+ robofunc()
+ except:
+ print("Cannot "+act+" the robot.")
+
+ if "start" in act:
+ checkActRun(rob.start_cleaning)
+ elif "stop" in act:
+ checkActRun(rob.stop_cleaning)
+ elif "pause" in act:
+ checkActRun(rob.pause_cleaning)
+ elif "resume" in act:
+ checkActRun(rob.resume_cleaning)
+ elif "goToBase" in act:
+ checkActRun(rob.send_to_base)
-except:
- print("docopt package is not installed.\n\nPlease run 'pip install docopt==0.6.2' from your command prompt\n")
- exit()
-
if __name__ == '__main__':
arguments = docopt(__doc__, version='aneatocli 0.1')
#nts:useful pour debugging
- pprint(arguments)
-
+ #pprint(arguments)
+
+
+funCallFromArgs("--go","--start-cleaning",actC,"start")
+funCallFromArgs("--stp","--stop-cleaning",actC,"stop")
+funCallFromArgs("--pse","--pause-cleaning",actC,"pause")
+funCallFromArgs("--res","--resume-cleaning",actC,"resume")
+funCallFromArgs("--base","--send-to-base",actC,"goToBase")
+funCallFromArgs("--gc","--get-commands",getCmds)
+funCallFromArgs("--gi","--get-infos",getInfos)
+funCallFromArgs("--lgsc","--log-secrets",logCreds)
-
-funCall("--go","--start-cleaning",startC)
-funCall("--stp","--stop-cleaning",stopC)
-funCall("--pse","--pause-cleaning",pauseC)
-funCall("--res","--resume-cleaning",resumeC)
-funCall("--base","--send-to-base",go2B)
-funCall("--gc","--get-commands",getCmds)
-funCall("--lsec","--load-secrets",loadCreds)
diff --git a/botvac.py b/botvac.py
index 9731d36..2721334 100644
--- a/botvac.py
+++ b/botvac.py
@@ -1,5 +1,5 @@
-#!/usr/bin/env python
# -*- coding: utf-8 -*-
+
# Form implementation generated from reading ui file 'botvac.ui'
#
# Created by: PyQt4 UI code generator 4.12.1
@@ -7,15 +7,11 @@
# WARNING! All changes made in this file will be lost!
from PyQt4 import QtCore, QtGui
-#!/usr/bin/env python
from subprocess import call as run
-from subprocess import check_output
-from os.path import exists as chkf
-import sys
-import json
+from webbrowser import open_new_tab as webnt
+import globals,json
+
-reload(sys)
-sys.setdefaultencoding('utf8')
try:
_fromUtf8 = QtCore.QString.fromUtf8
except AttributeError:
@@ -33,12 +29,16 @@ except AttributeError:
class Ui_MainWindow(object):
def setupUi(self, MainWindow):
MainWindow.setObjectName(_fromUtf8("MainWindow"))
- MainWindow.resize(472, 323)
+ MainWindow.resize(653, 375)
+ icon = QtGui.QIcon()
+ icon.addPixmap(QtGui.QPixmap(_fromUtf8(":/neato")), QtGui.QIcon.Normal, QtGui.QIcon.Off)
+ MainWindow.setWindowIcon(icon)
self.centralwidget = QtGui.QWidget(MainWindow)
self.centralwidget.setObjectName(_fromUtf8("centralwidget"))
self.verticalLayout = QtGui.QVBoxLayout(self.centralwidget)
self.verticalLayout.setObjectName(_fromUtf8("verticalLayout"))
self.tabWidget = QtGui.QTabWidget(self.centralwidget)
+ self.tabWidget.setIconSize(QtCore.QSize(24, 20))
self.tabWidget.setObjectName(_fromUtf8("tabWidget"))
self.tab = QtGui.QWidget()
self.tab.setObjectName(_fromUtf8("tab"))
@@ -46,127 +46,311 @@ class Ui_MainWindow(object):
self.verticalLayout_2.setMargin(0)
self.verticalLayout_2.setObjectName(_fromUtf8("verticalLayout_2"))
self.startButton = QtGui.QPushButton(self.tab)
+ self.startButton.setEnabled(False)
sizePolicy = QtGui.QSizePolicy(QtGui.QSizePolicy.Minimum, QtGui.QSizePolicy.Expanding)
sizePolicy.setHorizontalStretch(0)
sizePolicy.setVerticalStretch(0)
sizePolicy.setHeightForWidth(self.startButton.sizePolicy().hasHeightForWidth())
self.startButton.setSizePolicy(sizePolicy)
+ self.startButton.setCursor(QtGui.QCursor(QtCore.Qt.PointingHandCursor))
+ icon1 = QtGui.QIcon()
+ icon1.addPixmap(QtGui.QPixmap(_fromUtf8(":/start")), QtGui.QIcon.Normal, QtGui.QIcon.Off)
+ self.startButton.setIcon(icon1)
+ self.startButton.setIconSize(QtCore.QSize(20, 20))
self.startButton.setObjectName(_fromUtf8("startButton"))
self.verticalLayout_2.addWidget(self.startButton)
+ self.stopButton = QtGui.QPushButton(self.tab)
+ self.stopButton.setEnabled(False)
+ sizePolicy = QtGui.QSizePolicy(QtGui.QSizePolicy.Minimum, QtGui.QSizePolicy.Expanding)
+ sizePolicy.setHorizontalStretch(0)
+ sizePolicy.setVerticalStretch(0)
+ sizePolicy.setHeightForWidth(self.stopButton.sizePolicy().hasHeightForWidth())
+ self.stopButton.setSizePolicy(sizePolicy)
+ self.stopButton.setCursor(QtGui.QCursor(QtCore.Qt.PointingHandCursor))
+ icon2 = QtGui.QIcon()
+ icon2.addPixmap(QtGui.QPixmap(_fromUtf8(":/stop")), QtGui.QIcon.Normal, QtGui.QIcon.Off)
+ self.stopButton.setIcon(icon2)
+ self.stopButton.setIconSize(QtCore.QSize(20, 20))
+ self.stopButton.setObjectName(_fromUtf8("stopButton"))
+ self.verticalLayout_2.addWidget(self.stopButton)
self.pauseButton = QtGui.QPushButton(self.tab)
+ self.pauseButton.setEnabled(False)
sizePolicy = QtGui.QSizePolicy(QtGui.QSizePolicy.Minimum, QtGui.QSizePolicy.Expanding)
sizePolicy.setHorizontalStretch(0)
sizePolicy.setVerticalStretch(0)
sizePolicy.setHeightForWidth(self.pauseButton.sizePolicy().hasHeightForWidth())
self.pauseButton.setSizePolicy(sizePolicy)
+ self.pauseButton.setCursor(QtGui.QCursor(QtCore.Qt.PointingHandCursor))
+ icon3 = QtGui.QIcon()
+ icon3.addPixmap(QtGui.QPixmap(_fromUtf8(":/pause")), QtGui.QIcon.Normal, QtGui.QIcon.Off)
+ self.pauseButton.setIcon(icon3)
+ self.pauseButton.setIconSize(QtCore.QSize(20, 20))
self.pauseButton.setObjectName(_fromUtf8("pauseButton"))
self.verticalLayout_2.addWidget(self.pauseButton)
self.resumeButton = QtGui.QPushButton(self.tab)
+ self.resumeButton.setEnabled(False)
sizePolicy = QtGui.QSizePolicy(QtGui.QSizePolicy.Minimum, QtGui.QSizePolicy.Expanding)
sizePolicy.setHorizontalStretch(0)
sizePolicy.setVerticalStretch(0)
sizePolicy.setHeightForWidth(self.resumeButton.sizePolicy().hasHeightForWidth())
self.resumeButton.setSizePolicy(sizePolicy)
+ self.resumeButton.setCursor(QtGui.QCursor(QtCore.Qt.PointingHandCursor))
+ icon4 = QtGui.QIcon()
+ icon4.addPixmap(QtGui.QPixmap(_fromUtf8(":/resume")), QtGui.QIcon.Normal, QtGui.QIcon.Off)
+ self.resumeButton.setIcon(icon4)
+ self.resumeButton.setIconSize(QtCore.QSize(20, 20))
self.resumeButton.setObjectName(_fromUtf8("resumeButton"))
self.verticalLayout_2.addWidget(self.resumeButton)
- self.stopButton = QtGui.QPushButton(self.tab)
- sizePolicy = QtGui.QSizePolicy(QtGui.QSizePolicy.Minimum, QtGui.QSizePolicy.Expanding)
- sizePolicy.setHorizontalStretch(0)
- sizePolicy.setVerticalStretch(0)
- sizePolicy.setHeightForWidth(self.stopButton.sizePolicy().hasHeightForWidth())
- self.stopButton.setSizePolicy(sizePolicy)
- self.stopButton.setObjectName(_fromUtf8("stopButton"))
- self.verticalLayout_2.addWidget(self.stopButton)
self.send2baseButton = QtGui.QPushButton(self.tab)
+ self.send2baseButton.setEnabled(False)
sizePolicy = QtGui.QSizePolicy(QtGui.QSizePolicy.Minimum, QtGui.QSizePolicy.Expanding)
sizePolicy.setHorizontalStretch(0)
sizePolicy.setVerticalStretch(0)
sizePolicy.setHeightForWidth(self.send2baseButton.sizePolicy().hasHeightForWidth())
self.send2baseButton.setSizePolicy(sizePolicy)
+ self.send2baseButton.setCursor(QtGui.QCursor(QtCore.Qt.PointingHandCursor))
+ icon5 = QtGui.QIcon()
+ icon5.addPixmap(QtGui.QPixmap(_fromUtf8(":/base")), QtGui.QIcon.Normal, QtGui.QIcon.Off)
+ self.send2baseButton.setIcon(icon5)
+ self.send2baseButton.setIconSize(QtCore.QSize(20, 20))
self.send2baseButton.setObjectName(_fromUtf8("send2baseButton"))
self.verticalLayout_2.addWidget(self.send2baseButton)
- self.tabWidget.addTab(self.tab, _fromUtf8(""))
+ icon6 = QtGui.QIcon()
+ icon6.addPixmap(QtGui.QPixmap(_fromUtf8(":/robot")), QtGui.QIcon.Normal, QtGui.QIcon.Off)
+ self.tabWidget.addTab(self.tab, icon6, _fromUtf8(""))
self.tab_2 = QtGui.QWidget()
self.tab_2.setObjectName(_fromUtf8("tab_2"))
self.verticalLayout_3 = QtGui.QVBoxLayout(self.tab_2)
self.verticalLayout_3.setMargin(0)
self.verticalLayout_3.setObjectName(_fromUtf8("verticalLayout_3"))
- self.textEdit = QtGui.QTextEdit(self.tab_2)
- self.textEdit.setReadOnly(True)
- self.textEdit.setObjectName(_fromUtf8("textEdit"))
- self.verticalLayout_3.addWidget(self.textEdit)
- self.tabWidget.addTab(self.tab_2, _fromUtf8(""))
+ self.refreshInfosButton = QtGui.QPushButton(self.tab_2)
+ self.refreshInfosButton.setEnabled(False)
+ icon7 = QtGui.QIcon()
+ icon7.addPixmap(QtGui.QPixmap(_fromUtf8(":/refresh")), QtGui.QIcon.Normal, QtGui.QIcon.Off)
+ self.refreshInfosButton.setIcon(icon7)
+ self.refreshInfosButton.setObjectName(_fromUtf8("refreshInfosButton"))
+ self.verticalLayout_3.addWidget(self.refreshInfosButton)
+ self.infoTextEdit = QtGui.QPlainTextEdit(self.tab_2)
+ self.infoTextEdit.setStyleSheet(_fromUtf8("border:2px inset grey;\n"
+"color:rgb(204, 136, 18)"))
+ self.infoTextEdit.setReadOnly(True)
+ self.infoTextEdit.setObjectName(_fromUtf8("infoTextEdit"))
+ self.verticalLayout_3.addWidget(self.infoTextEdit)
+ icon8 = QtGui.QIcon()
+ icon8.addPixmap(QtGui.QPixmap(_fromUtf8(":/cloudquest")), QtGui.QIcon.Normal, QtGui.QIcon.Off)
+ self.tabWidget.addTab(self.tab_2, icon8, _fromUtf8(""))
self.verticalLayout.addWidget(self.tabWidget)
MainWindow.setCentralWidget(self.centralwidget)
self.menubar = QtGui.QMenuBar(MainWindow)
- self.menubar.setGeometry(QtCore.QRect(0, 0, 472, 26))
+ self.menubar.setGeometry(QtCore.QRect(0, 0, 653, 26))
self.menubar.setObjectName(_fromUtf8("menubar"))
self.menuAbout = QtGui.QMenu(self.menubar)
self.menuAbout.setObjectName(_fromUtf8("menuAbout"))
+ self.menuHelp = QtGui.QMenu(self.menubar)
+ self.menuHelp.setObjectName(_fromUtf8("menuHelp"))
MainWindow.setMenuBar(self.menubar)
+ self.statusBar = QtGui.QStatusBar(MainWindow)
+ self.statusBar.setObjectName(_fromUtf8("statusBar"))
+ MainWindow.setStatusBar(self.statusBar)
self.actionNeato_Account = QtGui.QAction(MainWindow)
self.actionNeato_Account.setObjectName(_fromUtf8("actionNeato_Account"))
self.actionMy_robot = QtGui.QAction(MainWindow)
self.actionMy_robot.setObjectName(_fromUtf8("actionMy_robot"))
self.actionThis_software = QtGui.QAction(MainWindow)
self.actionThis_software.setObjectName(_fromUtf8("actionThis_software"))
- self.menuAbout.addAction(self.actionMy_robot)
+ self.actionLogin = QtGui.QAction(MainWindow)
+ self.actionLogin.setObjectName(_fromUtf8("actionLogin"))
+ self.actionRobot_s = QtGui.QAction(MainWindow)
+ self.actionRobot_s.setEnabled(False)
+ self.actionRobot_s.setObjectName(_fromUtf8("actionRobot_s"))
+ self.actionMap_s = QtGui.QAction(MainWindow)
+ self.actionMap_s.setObjectName(_fromUtf8("actionMap_s"))
+ self.actionWhat_it_this = QtGui.QAction(MainWindow)
+ icon9 = QtGui.QIcon()
+ icon9.addPixmap(QtGui.QPixmap(_fromUtf8(":/info")), QtGui.QIcon.Normal, QtGui.QIcon.Off)
+ self.actionWhat_it_this.setIcon(icon9)
+ self.actionWhat_it_this.setObjectName(_fromUtf8("actionWhat_it_this"))
+ self.actionAbout_Neato_Control = QtGui.QAction(MainWindow)
+ self.actionAbout_Neato_Control.setIcon(icon)
+ self.actionAbout_Neato_Control.setObjectName(_fromUtf8("actionAbout_Neato_Control"))
+ self.actionInfo = QtGui.QAction(MainWindow)
+ self.actionInfo.setObjectName(_fromUtf8("actionInfo"))
+ self.actionAdd_Robot = QtGui.QAction(MainWindow)
+ icon10 = QtGui.QIcon()
+ icon10.addPixmap(QtGui.QPixmap(_fromUtf8(":/impex")), QtGui.QIcon.Normal, QtGui.QIcon.Off)
+ self.actionAdd_Robot.setIcon(icon10)
+ self.actionAdd_Robot.setObjectName(_fromUtf8("actionAdd_Robot"))
+ self.actionInfos = QtGui.QAction(MainWindow)
+ self.actionInfos.setObjectName(_fromUtf8("actionInfos"))
+ self.actionReport_a_bug = QtGui.QAction(MainWindow)
+ icon11 = QtGui.QIcon()
+ icon11.addPixmap(QtGui.QPixmap(_fromUtf8(":/bugrep")), QtGui.QIcon.Normal, QtGui.QIcon.Off)
+ self.actionReport_a_bug.setIcon(icon11)
+ self.actionReport_a_bug.setObjectName(_fromUtf8("actionReport_a_bug"))
+ self.actionRefresh_Robot = QtGui.QAction(MainWindow)
+ self.actionRefresh_Robot.setEnabled(False)
+ self.actionRefresh_Robot.setIcon(icon7)
+ self.actionRefresh_Robot.setObjectName(_fromUtf8("actionRefresh_Robot"))
+ self.actionSecret_info = QtGui.QAction(MainWindow)
+ self.actionSecret_info.setEnabled(False)
+ icon12 = QtGui.QIcon()
+ icon12.addPixmap(QtGui.QPixmap(_fromUtf8(":/secrets")), QtGui.QIcon.Normal, QtGui.QIcon.Off)
+ self.actionSecret_info.setIcon(icon12)
+ self.actionSecret_info.setObjectName(_fromUtf8("actionSecret_info"))
+ self.menuAbout.addAction(self.actionAdd_Robot)
+ self.menuAbout.addAction(self.actionRefresh_Robot)
+ self.menuAbout.addAction(self.actionSecret_info)
+ self.menuHelp.addAction(self.actionWhat_it_this)
+ self.menuHelp.addAction(self.actionAbout_Neato_Control)
+ self.menuHelp.addAction(self.actionReport_a_bug)
self.menubar.addAction(self.menuAbout.menuAction())
-
+ self.menubar.addAction(self.menuHelp.menuAction())
+
+ # MAIN CODE HERE #
+
+
+ def readRobotJson(filename):
+ try:
+ with open(filename,"r") as json_file:
+ robotcreds=json.load(json_file)
+ globals.currentRobot=robotcreds["name"]
+ except:
+ print("Couldn't load the robot creds. Exiting")
+ raise
+ def importCreds(self):
+ globals.robFilename=QtGui.QFileDialog.getOpenFileName(MainWindow, 'Open file',"Robot credentials files (*.json)")
+ getAvailCmds()
+
+ def bugReport():
+ webnt("https://github.com/MIQUELLIONEL/neatocontrols/issues")
+
+ def whatitthis():
+ webnt("https://github.com/MIQUELLIONEL/neatocontrols/")
+
+ def robotSecretInfos():
+ try:
+ with open(globals.robFilename,"r") as json_file:
+ creds=json.load(json_file)
+ robsecMessBox = QtGui.QMessageBox()
+ robsecMessBox.setIcon(robsecMessBox.NoIcon)
+ robsecMessBox.setWindowIcon(QtGui.QIcon(":neato"))
+ robsecMessBox.setWindowTitle("Robot Secret Infos")
+ robsecMessBox.setText("""<p align='left'>
+ <strong>Robot name : </strong>"""+creds["name"]+"""<br/>
+ <strong>Serial ID : </strong>"""+creds["serialID"]+"""<br/>
+ <strong>Secret ID :</strong>"""+creds["secretID"]+"""<br/>
+ <strong>Traits : </strong>"""+creds["traits"]+"""<br/>
+ </p>""")
+ robsecMessBox.exec_()
+ robsecMessBox=""
+ except:
+ print("File doesn't exist.")
+ exit()
+
+ def aboutNeatoControls():
+ aboutNC_MsgBox = QtGui.QMessageBox()
+ aboutNC_MsgBox.setStyleSheet("img{"
+ "\ndisplay: block;"
+ "\nmargin-left: auto;"
+ "\nmargin-right: auto;"
+ "\nwidth: 50%;"
+ #for whatever reason the following line doesn't work lol. if anyone knows feel free to open an issue
+ #"\nborder: 1px solid black"
+ "\n}")
+ aboutNC_MsgBox.setIcon(aboutNC_MsgBox.NoIcon)
+ aboutNC_MsgBox.setWindowIcon(QtGui.QIcon(":neato"))
+ aboutNC_MsgBox.setWindowTitle("About Neato Control")
+ aboutNC_MsgBox.setText("<p align='center'><img src=':neato' alt='logo qtmangen'/><br />Neato Control - A Qt interface for controlling your Neato Robotics device.<br /><br />Made by <a href='mailto:lionel.miquel46@gmail.com'>Miquel Lionel</a>.<br /><br /><a href='https://github.com/MIQUELLIONEL/neatocontrols'>https://github.com/MIQUELLIONEL/neatocontrols</a><br /><br />2018.</p>")
+ aboutNC_MsgBox.exec_()
+ aboutNC_MsgBox=""
+ def getInfos():
+ globals.robinfoFilename=globals.currentRobot+"-robotinfos.json"
+ run(["python","aneatocli.py","--gi",globals.currentRobot])
+ try:
+ self.infoTextEdit.clear()
+ with open(globals.robinfoFilename,"r") as info_file:
+ infos=info_file.read().splitlines()
+ for line in infos:
+ self.infoTextEdit.appendPlainText(line)
+
+ except:
+ print("Couldn't load the info file"+globals.robinfoFilename+". Exiting")
+ raise
def getAvailCmds():
- run(["python","aneatocli.py","--gc"])
- with open("robotstate.json","r") as json_file:
- data=json.load(json_file)
+ readRobotJson(globals.robFilename)
+ run(["python","aneatocli.py","--gc",globals.currentRobot])
+ #we read the available current robot commands
+ try:
+ with open(globals.currentRobot+"-robotcommands.json","r") as json_file:
+ data=json.load(json_file)
- def setbuttonState(dictstr,obj):
- if data[dictstr]:
- obj.setEnabled(True)
- else:
- obj.setEnabled(False)
+ def setbuttonState(dictstr,obj):
+ if data[dictstr]:
+ obj.setEnabled(True)
+ else:
+ obj.setEnabled(False)
+ self.tabWidget.setTabText(self.tabWidget.indexOf(self.tab), _translate("MainWindow", globals.currentRobot, None))
+ self.actionRefresh_Robot.setEnabled(True)
+ self.actionSecret_info.setEnabled(True)
+ self.refreshInfosButton.setEnabled(True)
+ except:
+ self.actionRefresh_Robot.setEnabled(False)
+ self.actionSecret_info.setEnabled(False)
+ self.refreshInfosButton.setEnabled(False)
+ print "Error while opening the file"
+ raise
+
setbuttonState("start",self.startButton)
setbuttonState("stop",self.stopButton)
setbuttonState("pause",self.pauseButton)
setbuttonState("resume",self.resumeButton)
setbuttonState("goToBase",self.send2baseButton)
- getAvailCmds()
+
+
# Penser à râfraichir l'état du robot de manière moins dégueulasse avec UN thread (même si c'est chaud en python wlh. Au moins toutes les 10-15secondes
-
-
-
+ def __do(act):
+ getAvailCmds()
+ run(["python","aneatocli.py",act,globals.currentRobot])
+ getAvailCmds()
+
def __start(self):
- run(["python","aneatocli.py","--go"])
- getAvailCmds()
+ __do("--go")
def __stop(self):
- run(["python","aneatocli.py","--stp"])
- getAvailCmds()
-
- def __pause(self):
- run(["python","aneatocli.py","--pse"])
- getAvailCmds()
-
+ __do("--stp")
+ def __pause(self):
+ __do("--pse")
def __resume(self):
- run(["python","aneatocli.py","--res"])
- getAvailCmds()
-
-
+ __do("--res")
+
def __return(self):
- run(["python","aneatocli.py","--base"])
- getAvailCmds()
+ __do("--base")
+
self.startButton.clicked.connect(__start)
self.stopButton.clicked.connect(__stop)
self.pauseButton.clicked.connect(__pause)
self.resumeButton.clicked.connect(__resume)
self.send2baseButton.clicked.connect(__return)
+ self.refreshInfosButton.clicked.connect(getInfos)
+
+
+ self.actionAdd_Robot.triggered.connect(importCreds)
+ self.actionRefresh_Robot.triggered.connect(getAvailCmds)
+ self.actionReport_a_bug.triggered.connect(bugReport)
+ self.actionAbout_Neato_Control.triggered.connect(aboutNeatoControls)
+ self.actionWhat_it_this.triggered.connect(whatitthis)
+ self.actionSecret_info.triggered.connect(robotSecretInfos)
+ # END OF MAIN CODE #
+
self.retranslateUi(MainWindow)
@@ -176,17 +360,37 @@ class Ui_MainWindow(object):
def retranslateUi(self, MainWindow):
MainWindow.setWindowTitle(_translate("MainWindow", "Neato Control", None))
self.startButton.setText(_translate("MainWindow", "Start", None))
+ self.stopButton.setText(_translate("MainWindow", "Stop", None))
self.pauseButton.setText(_translate("MainWindow", "Pause", None))
self.resumeButton.setText(_translate("MainWindow", "Resume", None))
- self.stopButton.setText(_translate("MainWindow", "Stop", None))
self.send2baseButton.setText(_translate("MainWindow", "Send to base", None))
- self.tabWidget.setTabText(self.tabWidget.indexOf(self.tab), _translate("MainWindow", "Commands", None))
- self.tabWidget.setTabText(self.tabWidget.indexOf(self.tab_2), _translate("MainWindow", "Info", None))
- self.menuAbout.setTitle(_translate("MainWindow", "My robot", None))
+ self.tabWidget.setTabText(self.tabWidget.indexOf(self.tab), _translate("MainWindow", "robot1", None))
+ self.refreshInfosButton.setText(_translate("MainWindow", "Refresh", None))
+ self.tabWidget.setTabText(self.tabWidget.indexOf(self.tab_2), _translate("MainWindow", "Infos", None))
+ self.menuAbout.setTitle(_translate("MainWindow", "Robot", None))
+ self.menuHelp.setTitle(_translate("MainWindow", "Help", None))
self.actionNeato_Account.setText(_translate("MainWindow", "Neato Account", None))
self.actionMy_robot.setText(_translate("MainWindow", "Account Infos", None))
self.actionThis_software.setText(_translate("MainWindow", "This software", None))
+ self.actionLogin.setText(_translate("MainWindow", "Import credentials", None))
+ self.actionRobot_s.setText(_translate("MainWindow", "Available robot(s)", None))
+ self.actionMap_s.setText(_translate("MainWindow", "Map(s)", None))
+ self.actionWhat_it_this.setText(_translate("MainWindow", "What it this ?", None))
+ self.actionWhat_it_this.setShortcut(_translate("MainWindow", "F1", None))
+ self.actionAbout_Neato_Control.setText(_translate("MainWindow", "About Neato Control", None))
+ self.actionAbout_Neato_Control.setShortcut(_translate("MainWindow", "Alt+A", None))
+ self.actionInfo.setText(_translate("MainWindow", "Info", None))
+ self.actionAdd_Robot.setText(_translate("MainWindow", "Load a robot", None))
+ self.actionAdd_Robot.setShortcut(_translate("MainWindow", "Ctrl+O", None))
+ self.actionInfos.setText(_translate("MainWindow", "Infos", None))
+ self.actionReport_a_bug.setText(_translate("MainWindow", "Report a bug", None))
+ self.actionReport_a_bug.setShortcut(_translate("MainWindow", "Alt+B", None))
+ self.actionRefresh_Robot.setText(_translate("MainWindow", "Refresh state", None))
+ self.actionRefresh_Robot.setShortcut(_translate("MainWindow", "Ctrl+R", None))
+ self.actionSecret_info.setText(_translate("MainWindow", "Secret info", None))
+ self.actionSecret_info.setShortcut(_translate("MainWindow", "Ctrl+S", None))
+import rsc_rc
if __name__ == "__main__":
import sys
diff --git a/botvac.ui b/botvac.ui
index 37f616b..a889c13 100644
--- a/botvac.ui
+++ b/botvac.ui
@@ -6,65 +6,222 @@
<rect>
<x>0</x>
<y>0</y>
- <width>420</width>
- <height>336</height>
+ <width>653</width>
+ <height>375</height>
</rect>
</property>
<property name="windowTitle">
- <string>MainWindow</string>
+ <string>Neato Control</string>
+ </property>
+ <property name="windowIcon">
+ <iconset resource="rsc.qrc">
+ <normaloff>:/neato</normaloff>:/neato</iconset>
</property>
<widget class="QWidget" name="centralwidget">
<layout class="QVBoxLayout" name="verticalLayout">
<item>
- <widget class="QPushButton" name="pushButton">
- <property name="sizePolicy">
- <sizepolicy hsizetype="Minimum" vsizetype="Expanding">
- <horstretch>0</horstretch>
- <verstretch>0</verstretch>
- </sizepolicy>
+ <widget class="QTabWidget" name="tabWidget">
+ <property name="currentIndex">
+ <number>0</number>
</property>
- <property name="text">
- <string>Start</string>
- </property>
- </widget>
- </item>
- <item>
- <widget class="QPushButton" name="pushButton_4">
- <property name="sizePolicy">
- <sizepolicy hsizetype="Minimum" vsizetype="Expanding">
- <horstretch>0</horstretch>
- <verstretch>0</verstretch>
- </sizepolicy>
- </property>
- <property name="text">
- <string>Pause</string>
- </property>
- </widget>
- </item>
- <item>
- <widget class="QPushButton" name="pushButton_2">
- <property name="sizePolicy">
- <sizepolicy hsizetype="Minimum" vsizetype="Expanding">
- <horstretch>0</horstretch>
- <verstretch>0</verstretch>
- </sizepolicy>
- </property>
- <property name="text">
- <string>Stop</string>
- </property>
- </widget>
- </item>
- <item>
- <widget class="QPushButton" name="pushButton_3">
- <property name="sizePolicy">
- <sizepolicy hsizetype="Minimum" vsizetype="Expanding">
- <horstretch>0</horstretch>
- <verstretch>0</verstretch>
- </sizepolicy>
- </property>
- <property name="text">
- <string>Send to base</string>
+ <property name="iconSize">
+ <size>
+ <width>24</width>
+ <height>20</height>
+ </size>
</property>
+ <widget class="QWidget" name="tab">
+ <attribute name="icon">
+ <iconset resource="rsc.qrc">
+ <normaloff>:/robot</normaloff>:/robot</iconset>
+ </attribute>
+ <attribute name="title">
+ <string>robot1</string>
+ </attribute>
+ <layout class="QVBoxLayout" name="verticalLayout_2">
+ <item>
+ <widget class="QPushButton" name="startButton">
+ <property name="enabled">
+ <bool>false</bool>
+ </property>
+ <property name="sizePolicy">
+ <sizepolicy hsizetype="Minimum" vsizetype="Expanding">
+ <horstretch>0</horstretch>
+ <verstretch>0</verstretch>
+ </sizepolicy>
+ </property>
+ <property name="cursor">
+ <cursorShape>PointingHandCursor</cursorShape>
+ </property>
+ <property name="text">
+ <string>Start</string>
+ </property>
+ <property name="icon">
+ <iconset resource="rsc.qrc">
+ <normaloff>:/start</normaloff>:/start</iconset>
+ </property>
+ <property name="iconSize">
+ <size>
+ <width>20</width>
+ <height>20</height>
+ </size>
+ </property>
+ </widget>
+ </item>
+ <item>
+ <widget class="QPushButton" name="stopButton">
+ <property name="enabled">
+ <bool>false</bool>
+ </property>
+ <property name="sizePolicy">
+ <sizepolicy hsizetype="Minimum" vsizetype="Expanding">
+ <horstretch>0</horstretch>
+ <verstretch>0</verstretch>
+ </sizepolicy>
+ </property>
+ <property name="cursor">
+ <cursorShape>PointingHandCursor</cursorShape>
+ </property>
+ <property name="text">
+ <string>Stop</string>
+ </property>
+ <property name="icon">
+ <iconset resource="rsc.qrc">
+ <normaloff>:/stop</normaloff>:/stop</iconset>
+ </property>
+ <property name="iconSize">
+ <size>
+ <width>20</width>
+ <height>20</height>
+ </size>
+ </property>
+ </widget>
+ </item>
+ <item>
+ <widget class="QPushButton" name="pauseButton">
+ <property name="enabled">
+ <bool>false</bool>
+ </property>
+ <property name="sizePolicy">
+ <sizepolicy hsizetype="Minimum" vsizetype="Expanding">
+ <horstretch>0</horstretch>
+ <verstretch>0</verstretch>
+ </sizepolicy>
+ </property>
+ <property name="cursor">
+ <cursorShape>PointingHandCursor</cursorShape>
+ </property>
+ <property name="text">
+ <string>Pause</string>
+ </property>
+ <property name="icon">
+ <iconset resource="rsc.qrc">
+ <normaloff>:/pause</normaloff>:/pause</iconset>
+ </property>
+ <property name="iconSize">
+ <size>
+ <width>20</width>
+ <height>20</height>
+ </size>
+ </property>
+ </widget>
+ </item>
+ <item>
+ <widget class="QPushButton" name="resumeButton">
+ <property name="enabled">
+ <bool>false</bool>
+ </property>
+ <property name="sizePolicy">
+ <sizepolicy hsizetype="Minimum" vsizetype="Expanding">
+ <horstretch>0</horstretch>
+ <verstretch>0</verstretch>
+ </sizepolicy>
+ </property>
+ <property name="cursor">
+ <cursorShape>PointingHandCursor</cursorShape>
+ </property>
+ <property name="text">
+ <string>Resume</string>
+ </property>
+ <property name="icon">
+ <iconset resource="rsc.qrc">
+ <normaloff>:/resume</normaloff>:/resume</iconset>
+ </property>
+ <property name="iconSize">
+ <size>
+ <width>20</width>
+ <height>20</height>
+ </size>
+ </property>
+ </widget>
+ </item>
+ <item>
+ <widget class="QPushButton" name="send2baseButton">
+ <property name="enabled">
+ <bool>false</bool>
+ </property>
+ <property name="sizePolicy">
+ <sizepolicy hsizetype="Minimum" vsizetype="Expanding">
+ <horstretch>0</horstretch>
+ <verstretch>0</verstretch>
+ </sizepolicy>
+ </property>
+ <property name="cursor">
+ <cursorShape>PointingHandCursor</cursorShape>
+ </property>
+ <property name="text">
+ <string>Send to base</string>
+ </property>
+ <property name="icon">
+ <iconset resource="rsc.qrc">
+ <normaloff>:/base</normaloff>:/base</iconset>
+ </property>
+ <property name="iconSize">
+ <size>
+ <width>20</width>
+ <height>20</height>
+ </size>
+ </property>
+ </widget>
+ </item>
+ </layout>
+ </widget>
+ <widget class="QWidget" name="tab_2">
+ <attribute name="icon">
+ <iconset resource="rsc.qrc">
+ <normaloff>:/cloudquest</normaloff>:/cloudquest</iconset>
+ </attribute>
+ <attribute name="title">
+ <string>Infos</string>
+ </attribute>
+ <layout class="QVBoxLayout" name="verticalLayout_3">
+ <item>
+ <widget class="QPushButton" name="refreshInfosButton">
+ <property name="enabled">
+ <bool>false</bool>
+ </property>
+ <property name="text">
+ <string>Refresh</string>
+ </property>
+ <property name="icon">
+ <iconset resource="rsc.qrc">
+ <normaloff>:/refresh</normaloff>:/refresh</iconset>
+ </property>
+ </widget>
+ </item>
+ <item>
+ <widget class="QPlainTextEdit" name="infoTextEdit">
+ <property name="styleSheet">
+ <string notr="true">border:2px inset grey;
+color:rgb(204, 136, 18)</string>
+ </property>
+ <property name="readOnly">
+ <bool>true</bool>
+ </property>
+ </widget>
+ </item>
+ </layout>
+ </widget>
</widget>
</item>
</layout>
@@ -74,26 +231,30 @@
<rect>
<x>0</x>
<y>0</y>
- <width>420</width>
- <height>22</height>
+ <width>653</width>
+ <height>26</height>
</rect>
</property>
- <widget class="QMenu" name="menuAdd">
+ <widget class="QMenu" name="menuAbout">
<property name="title">
- <string>Add</string>
+ <string>Robot</string>
</property>
- <addaction name="actionNeato_Account"/>
+ <addaction name="actionAdd_Robot"/>
+ <addaction name="actionRefresh_Robot"/>
+ <addaction name="actionSecret_info"/>
</widget>
- <widget class="QMenu" name="menuAbout">
+ <widget class="QMenu" name="menuHelp">
<property name="title">
- <string>About</string>
+ <string>Help</string>
</property>
- <addaction name="actionMy_robot"/>
- <addaction name="actionThis_software"/>
+ <addaction name="actionWhat_it_this"/>
+ <addaction name="actionAbout_Neato_Control"/>
+ <addaction name="actionReport_a_bug"/>
</widget>
- <addaction name="menuAdd"/>
<addaction name="menuAbout"/>
+ <addaction name="menuHelp"/>
</widget>
+ <widget class="QStatusBar" name="statusBar"/>
<action name="actionNeato_Account">
<property name="text">
<string>Neato Account</string>
@@ -101,7 +262,7 @@
</action>
<action name="actionMy_robot">
<property name="text">
- <string>My robot</string>
+ <string>Account Infos</string>
</property>
</action>
<action name="actionThis_software">
@@ -109,7 +270,115 @@
<string>This software</string>
</property>
</action>
+ <action name="actionLogin">
+ <property name="text">
+ <string>Import credentials</string>
+ </property>
+ </action>
+ <action name="actionRobot_s">
+ <property name="enabled">
+ <bool>false</bool>
+ </property>
+ <property name="text">
+ <string>Available robot(s)</string>
+ </property>
+ </action>
+ <action name="actionMap_s">
+ <property name="text">
+ <string>Map(s)</string>
+ </property>
+ </action>
+ <action name="actionWhat_it_this">
+ <property name="icon">
+ <iconset resource="rsc.qrc">
+ <normaloff>:/info</normaloff>:/info</iconset>
+ </property>
+ <property name="text">
+ <string>What it this ?</string>
+ </property>
+ <property name="shortcut">
+ <string>F1</string>
+ </property>
+ </action>
+ <action name="actionAbout_Neato_Control">
+ <property name="icon">
+ <iconset resource="rsc.qrc">
+ <normaloff>:/neato</normaloff>:/neato</iconset>
+ </property>
+ <property name="text">
+ <string>About Neato Control</string>
+ </property>
+ <property name="shortcut">
+ <string>Alt+A</string>
+ </property>
+ </action>
+ <action name="actionInfo">
+ <property name="text">
+ <string>Info</string>
+ </property>
+ </action>
+ <action name="actionAdd_Robot">
+ <property name="icon">
+ <iconset resource="rsc.qrc">
+ <normaloff>:/impex</normaloff>:/impex</iconset>
+ </property>
+ <property name="text">
+ <string>Load a robot</string>
+ </property>
+ <property name="shortcut">
+ <string>Ctrl+O</string>
+ </property>
+ </action>
+ <action name="actionInfos">
+ <property name="text">
+ <string>Infos</string>
+ </property>
+ </action>
+ <action name="actionReport_a_bug">
+ <property name="icon">
+ <iconset resource="rsc.qrc">
+ <normaloff>:/bugrep</normaloff>:/bugrep</iconset>
+ </property>
+ <property name="text">
+ <string>Report a bug</string>
+ </property>
+ <property name="shortcut">
+ <string>Alt+B</string>
+ </property>
+ </action>
+ <action name="actionRefresh_Robot">
+ <property name="enabled">
+ <bool>false</bool>
+ </property>
+ <property name="icon">
+ <iconset resource="rsc.qrc">
+ <normaloff>:/refresh</normaloff>:/refresh</iconset>
+ </property>
+ <property name="text">
+ <string>Refresh state</string>
+ </property>
+ <property name="shortcut">
+ <string>Ctrl+R</string>
+ </property>
+ </action>
+ <action name="actionSecret_info">
+ <property name="enabled">
+ <bool>false</bool>
+ </property>
+ <property name="icon">
+ <iconset resource="rsc.qrc">
+ <normaloff>:/secrets</normaloff>:/secrets</iconset>
+ </property>
+ <property name="text">
+ <string>Secret info</string>
+ </property>
+ <property name="shortcut">
+ <string>Ctrl+S</string>
+ </property>
+ </action>
</widget>
- <resources/>
+ <resources>
+ <include location="rsc.qrc"/>
+ </resources>
<connections/>
</ui>
diff --git a/globals.py b/globals.py
new file mode 100644
index 0000000..45bb1db
--- /dev/null
+++ b/globals.py
@@ -0,0 +1,5 @@
+#!/usr/bin/env python
+# -*- coding: utf-8 -*-
+currentRobot=""
+robFilename=""
+robinfoFilename=""
diff --git a/robotCreds.json b/robotCreds.json
deleted file mode 100644
index aa5d934..0000000
--- a/robotCreds.json
+++ /dev/null
@@ -1 +0,0 @@
-{"serialID":"xxx","secretID":"xxx","traits":"xxx","name":"yourrobotname"}
diff --git a/robotstate.json b/robotstate.json
deleted file mode 100644
index 4f8c09d..0000000
--- a/robotstate.json
+++ /dev/null
@@ -1 +0,0 @@
-{"start": false, "goToBase": false, "pause": true, "stop": true, "resume": false} \ No newline at end of file
diff --git a/rsc_rc.py b/rsc_rc.py
index 4691e92..d015b2e 100644
--- a/rsc_rc.py
+++ b/rsc_rc.py
@@ -386,169 +386,445 @@ qt_resource_data = "\
\x23\x66\x66\x37\x64\x30\x30\x3b\x73\x74\x72\x6f\x6b\x65\x2d\x6f\
\x70\x61\x63\x69\x74\x79\x3a\x31\x22\x20\x2f\x3e\x0a\x3c\x2f\x73\
\x76\x67\x3e\x0a\
-\x00\x00\x02\x00\
+\x00\x00\x07\xf1\
\x3c\
-\x73\x76\x67\x20\x78\x6d\x6c\x6e\x73\x3d\x22\x68\x74\x74\x70\x3a\
-\x2f\x2f\x77\x77\x77\x2e\x77\x33\x2e\x6f\x72\x67\x2f\x32\x30\x30\
-\x30\x2f\x73\x76\x67\x22\x20\x77\x69\x64\x74\x68\x3d\x22\x32\x34\
-\x22\x20\x68\x65\x69\x67\x68\x74\x3d\x22\x32\x34\x22\x20\x76\x69\
-\x65\x77\x42\x6f\x78\x3d\x22\x30\x20\x30\x20\x32\x34\x20\x32\x34\
-\x22\x3e\x3c\x70\x61\x74\x68\x20\x64\x3d\x22\x4d\x30\x20\x30\x68\
-\x32\x34\x76\x32\x34\x48\x30\x7a\x22\x20\x66\x69\x6c\x6c\x3d\x22\
-\x6e\x6f\x6e\x65\x22\x2f\x3e\x3c\x70\x61\x74\x68\x20\x64\x3d\x22\
-\x4d\x32\x30\x20\x38\x68\x2d\x32\x2e\x38\x31\x63\x2d\x2e\x34\x35\
-\x2d\x2e\x37\x38\x2d\x31\x2e\x30\x37\x2d\x31\x2e\x34\x35\x2d\x31\
-\x2e\x38\x32\x2d\x31\x2e\x39\x36\x4c\x31\x37\x20\x34\x2e\x34\x31\
-\x20\x31\x35\x2e\x35\x39\x20\x33\x6c\x2d\x32\x2e\x31\x37\x20\x32\
-\x2e\x31\x37\x43\x31\x32\x2e\x39\x36\x20\x35\x2e\x30\x36\x20\x31\
-\x32\x2e\x34\x39\x20\x35\x20\x31\x32\x20\x35\x63\x2d\x2e\x34\x39\
-\x20\x30\x2d\x2e\x39\x36\x2e\x30\x36\x2d\x31\x2e\x34\x31\x2e\x31\
-\x37\x4c\x38\x2e\x34\x31\x20\x33\x20\x37\x20\x34\x2e\x34\x31\x6c\
-\x31\x2e\x36\x32\x20\x31\x2e\x36\x33\x43\x37\x2e\x38\x38\x20\x36\
-\x2e\x35\x35\x20\x37\x2e\x32\x36\x20\x37\x2e\x32\x32\x20\x36\x2e\
-\x38\x31\x20\x38\x48\x34\x76\x32\x68\x32\x2e\x30\x39\x63\x2d\x2e\
-\x30\x35\x2e\x33\x33\x2d\x2e\x30\x39\x2e\x36\x36\x2d\x2e\x30\x39\
-\x20\x31\x76\x31\x48\x34\x76\x32\x68\x32\x76\x31\x63\x30\x20\x2e\
-\x33\x34\x2e\x30\x34\x2e\x36\x37\x2e\x30\x39\x20\x31\x48\x34\x76\
-\x32\x68\x32\x2e\x38\x31\x63\x31\x2e\x30\x34\x20\x31\x2e\x37\x39\
-\x20\x32\x2e\x39\x37\x20\x33\x20\x35\x2e\x31\x39\x20\x33\x73\x34\
-\x2e\x31\x35\x2d\x31\x2e\x32\x31\x20\x35\x2e\x31\x39\x2d\x33\x48\
-\x32\x30\x76\x2d\x32\x68\x2d\x32\x2e\x30\x39\x63\x2e\x30\x35\x2d\
-\x2e\x33\x33\x2e\x30\x39\x2d\x2e\x36\x36\x2e\x30\x39\x2d\x31\x76\
-\x2d\x31\x68\x32\x76\x2d\x32\x68\x2d\x32\x76\x2d\x31\x63\x30\x2d\
-\x2e\x33\x34\x2d\x2e\x30\x34\x2d\x2e\x36\x37\x2d\x2e\x30\x39\x2d\
-\x31\x48\x32\x30\x56\x38\x7a\x6d\x2d\x36\x20\x38\x68\x2d\x34\x76\
-\x2d\x32\x68\x34\x76\x32\x7a\x6d\x30\x2d\x34\x68\x2d\x34\x76\x2d\
-\x32\x68\x34\x76\x32\x7a\x22\x2f\x3e\x3c\x2f\x73\x76\x67\x3e\
-\x00\x00\x00\xcf\
+\x3f\x78\x6d\x6c\x20\x76\x65\x72\x73\x69\x6f\x6e\x3d\x22\x31\x2e\
+\x30\x22\x20\x65\x6e\x63\x6f\x64\x69\x6e\x67\x3d\x22\x55\x54\x46\
+\x2d\x38\x22\x20\x73\x74\x61\x6e\x64\x61\x6c\x6f\x6e\x65\x3d\x22\
+\x6e\x6f\x22\x3f\x3e\x0a\x3c\x73\x76\x67\x0a\x20\x20\x20\x78\x6d\
+\x6c\x6e\x73\x3a\x64\x63\x3d\x22\x68\x74\x74\x70\x3a\x2f\x2f\x70\
+\x75\x72\x6c\x2e\x6f\x72\x67\x2f\x64\x63\x2f\x65\x6c\x65\x6d\x65\
+\x6e\x74\x73\x2f\x31\x2e\x31\x2f\x22\x0a\x20\x20\x20\x78\x6d\x6c\
+\x6e\x73\x3a\x63\x63\x3d\x22\x68\x74\x74\x70\x3a\x2f\x2f\x63\x72\
+\x65\x61\x74\x69\x76\x65\x63\x6f\x6d\x6d\x6f\x6e\x73\x2e\x6f\x72\
+\x67\x2f\x6e\x73\x23\x22\x0a\x20\x20\x20\x78\x6d\x6c\x6e\x73\x3a\
+\x72\x64\x66\x3d\x22\x68\x74\x74\x70\x3a\x2f\x2f\x77\x77\x77\x2e\
+\x77\x33\x2e\x6f\x72\x67\x2f\x31\x39\x39\x39\x2f\x30\x32\x2f\x32\
+\x32\x2d\x72\x64\x66\x2d\x73\x79\x6e\x74\x61\x78\x2d\x6e\x73\x23\
+\x22\x0a\x20\x20\x20\x78\x6d\x6c\x6e\x73\x3a\x73\x76\x67\x3d\x22\
+\x68\x74\x74\x70\x3a\x2f\x2f\x77\x77\x77\x2e\x77\x33\x2e\x6f\x72\
+\x67\x2f\x32\x30\x30\x30\x2f\x73\x76\x67\x22\x0a\x20\x20\x20\x78\
+\x6d\x6c\x6e\x73\x3d\x22\x68\x74\x74\x70\x3a\x2f\x2f\x77\x77\x77\
+\x2e\x77\x33\x2e\x6f\x72\x67\x2f\x32\x30\x30\x30\x2f\x73\x76\x67\
+\x22\x0a\x20\x20\x20\x78\x6d\x6c\x6e\x73\x3a\x73\x6f\x64\x69\x70\
+\x6f\x64\x69\x3d\x22\x68\x74\x74\x70\x3a\x2f\x2f\x73\x6f\x64\x69\
+\x70\x6f\x64\x69\x2e\x73\x6f\x75\x72\x63\x65\x66\x6f\x72\x67\x65\
+\x2e\x6e\x65\x74\x2f\x44\x54\x44\x2f\x73\x6f\x64\x69\x70\x6f\x64\
+\x69\x2d\x30\x2e\x64\x74\x64\x22\x0a\x20\x20\x20\x78\x6d\x6c\x6e\
+\x73\x3a\x69\x6e\x6b\x73\x63\x61\x70\x65\x3d\x22\x68\x74\x74\x70\
+\x3a\x2f\x2f\x77\x77\x77\x2e\x69\x6e\x6b\x73\x63\x61\x70\x65\x2e\
+\x6f\x72\x67\x2f\x6e\x61\x6d\x65\x73\x70\x61\x63\x65\x73\x2f\x69\
+\x6e\x6b\x73\x63\x61\x70\x65\x22\x0a\x20\x20\x20\x77\x69\x64\x74\
+\x68\x3d\x22\x32\x34\x22\x0a\x20\x20\x20\x68\x65\x69\x67\x68\x74\
+\x3d\x22\x32\x34\x22\x0a\x20\x20\x20\x76\x69\x65\x77\x42\x6f\x78\
+\x3d\x22\x30\x20\x30\x20\x32\x34\x20\x32\x34\x22\x0a\x20\x20\x20\
+\x76\x65\x72\x73\x69\x6f\x6e\x3d\x22\x31\x2e\x31\x22\x0a\x20\x20\
+\x20\x69\x64\x3d\x22\x73\x76\x67\x36\x22\x0a\x20\x20\x20\x73\x6f\
+\x64\x69\x70\x6f\x64\x69\x3a\x64\x6f\x63\x6e\x61\x6d\x65\x3d\x22\
+\x62\x75\x67\x5f\x72\x65\x70\x6f\x72\x74\x2d\x32\x34\x70\x78\x2e\
+\x73\x76\x67\x22\x0a\x20\x20\x20\x69\x6e\x6b\x73\x63\x61\x70\x65\
+\x3a\x76\x65\x72\x73\x69\x6f\x6e\x3d\x22\x30\x2e\x39\x32\x2e\x33\
+\x20\x28\x75\x6e\x6b\x6e\x6f\x77\x6e\x29\x22\x3e\x0a\x20\x20\x3c\
+\x6d\x65\x74\x61\x64\x61\x74\x61\x0a\x20\x20\x20\x20\x20\x69\x64\
+\x3d\x22\x6d\x65\x74\x61\x64\x61\x74\x61\x31\x32\x22\x3e\x0a\x20\
+\x20\x20\x20\x3c\x72\x64\x66\x3a\x52\x44\x46\x3e\x0a\x20\x20\x20\
+\x20\x20\x20\x3c\x63\x63\x3a\x57\x6f\x72\x6b\x0a\x20\x20\x20\x20\
+\x20\x20\x20\x20\x20\x72\x64\x66\x3a\x61\x62\x6f\x75\x74\x3d\x22\
+\x22\x3e\x0a\x20\x20\x20\x20\x20\x20\x20\x20\x3c\x64\x63\x3a\x66\
+\x6f\x72\x6d\x61\x74\x3e\x69\x6d\x61\x67\x65\x2f\x73\x76\x67\x2b\
+\x78\x6d\x6c\x3c\x2f\x64\x63\x3a\x66\x6f\x72\x6d\x61\x74\x3e\x0a\
+\x20\x20\x20\x20\x20\x20\x20\x20\x3c\x64\x63\x3a\x74\x79\x70\x65\
+\x0a\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x72\x64\x66\x3a\
+\x72\x65\x73\x6f\x75\x72\x63\x65\x3d\x22\x68\x74\x74\x70\x3a\x2f\
+\x2f\x70\x75\x72\x6c\x2e\x6f\x72\x67\x2f\x64\x63\x2f\x64\x63\x6d\
+\x69\x74\x79\x70\x65\x2f\x53\x74\x69\x6c\x6c\x49\x6d\x61\x67\x65\
+\x22\x20\x2f\x3e\x0a\x20\x20\x20\x20\x20\x20\x3c\x2f\x63\x63\x3a\
+\x57\x6f\x72\x6b\x3e\x0a\x20\x20\x20\x20\x3c\x2f\x72\x64\x66\x3a\
+\x52\x44\x46\x3e\x0a\x20\x20\x3c\x2f\x6d\x65\x74\x61\x64\x61\x74\
+\x61\x3e\x0a\x20\x20\x3c\x64\x65\x66\x73\x0a\x20\x20\x20\x20\x20\
+\x69\x64\x3d\x22\x64\x65\x66\x73\x31\x30\x22\x20\x2f\x3e\x0a\x20\
+\x20\x3c\x73\x6f\x64\x69\x70\x6f\x64\x69\x3a\x6e\x61\x6d\x65\x64\
+\x76\x69\x65\x77\x0a\x20\x20\x20\x20\x20\x70\x61\x67\x65\x63\x6f\
+\x6c\x6f\x72\x3d\x22\x23\x66\x66\x66\x66\x66\x66\x22\x0a\x20\x20\
+\x20\x20\x20\x62\x6f\x72\x64\x65\x72\x63\x6f\x6c\x6f\x72\x3d\x22\
+\x23\x36\x36\x36\x36\x36\x36\x22\x0a\x20\x20\x20\x20\x20\x62\x6f\
+\x72\x64\x65\x72\x6f\x70\x61\x63\x69\x74\x79\x3d\x22\x31\x22\x0a\
+\x20\x20\x20\x20\x20\x6f\x62\x6a\x65\x63\x74\x74\x6f\x6c\x65\x72\
+\x61\x6e\x63\x65\x3d\x22\x31\x30\x22\x0a\x20\x20\x20\x20\x20\x67\
+\x72\x69\x64\x74\x6f\x6c\x65\x72\x61\x6e\x63\x65\x3d\x22\x31\x30\
+\x22\x0a\x20\x20\x20\x20\x20\x67\x75\x69\x64\x65\x74\x6f\x6c\x65\
+\x72\x61\x6e\x63\x65\x3d\x22\x31\x30\x22\x0a\x20\x20\x20\x20\x20\
+\x69\x6e\x6b\x73\x63\x61\x70\x65\x3a\x70\x61\x67\x65\x6f\x70\x61\
+\x63\x69\x74\x79\x3d\x22\x30\x22\x0a\x20\x20\x20\x20\x20\x69\x6e\
+\x6b\x73\x63\x61\x70\x65\x3a\x70\x61\x67\x65\x73\x68\x61\x64\x6f\
+\x77\x3d\x22\x32\x22\x0a\x20\x20\x20\x20\x20\x69\x6e\x6b\x73\x63\
+\x61\x70\x65\x3a\x77\x69\x6e\x64\x6f\x77\x2d\x77\x69\x64\x74\x68\
+\x3d\x22\x31\x33\x30\x33\x22\x0a\x20\x20\x20\x20\x20\x69\x6e\x6b\
+\x73\x63\x61\x70\x65\x3a\x77\x69\x6e\x64\x6f\x77\x2d\x68\x65\x69\
+\x67\x68\x74\x3d\x22\x37\x32\x34\x22\x0a\x20\x20\x20\x20\x20\x69\
+\x64\x3d\x22\x6e\x61\x6d\x65\x64\x76\x69\x65\x77\x38\x22\x0a\x20\
+\x20\x20\x20\x20\x73\x68\x6f\x77\x67\x72\x69\x64\x3d\x22\x66\x61\
+\x6c\x73\x65\x22\x0a\x20\x20\x20\x20\x20\x69\x6e\x6b\x73\x63\x61\
+\x70\x65\x3a\x7a\x6f\x6f\x6d\x3d\x22\x39\x2e\x38\x33\x33\x33\x33\
+\x33\x33\x22\x0a\x20\x20\x20\x20\x20\x69\x6e\x6b\x73\x63\x61\x70\
+\x65\x3a\x63\x78\x3d\x22\x31\x32\x22\x0a\x20\x20\x20\x20\x20\x69\
+\x6e\x6b\x73\x63\x61\x70\x65\x3a\x63\x79\x3d\x22\x31\x33\x2e\x36\
+\x37\x39\x36\x30\x38\x22\x0a\x20\x20\x20\x20\x20\x69\x6e\x6b\x73\
+\x63\x61\x70\x65\x3a\x77\x69\x6e\x64\x6f\x77\x2d\x78\x3d\x22\x30\
+\x22\x0a\x20\x20\x20\x20\x20\x69\x6e\x6b\x73\x63\x61\x70\x65\x3a\
+\x77\x69\x6e\x64\x6f\x77\x2d\x79\x3d\x22\x30\x22\x0a\x20\x20\x20\
+\x20\x20\x69\x6e\x6b\x73\x63\x61\x70\x65\x3a\x77\x69\x6e\x64\x6f\
+\x77\x2d\x6d\x61\x78\x69\x6d\x69\x7a\x65\x64\x3d\x22\x31\x22\x0a\
+\x20\x20\x20\x20\x20\x69\x6e\x6b\x73\x63\x61\x70\x65\x3a\x63\x75\
+\x72\x72\x65\x6e\x74\x2d\x6c\x61\x79\x65\x72\x3d\x22\x73\x76\x67\
+\x36\x22\x20\x2f\x3e\x0a\x20\x20\x3c\x70\x61\x74\x68\x0a\x20\x20\
+\x20\x20\x20\x64\x3d\x22\x4d\x30\x20\x30\x68\x32\x34\x76\x32\x34\
+\x48\x30\x7a\x22\x0a\x20\x20\x20\x20\x20\x66\x69\x6c\x6c\x3d\x22\
+\x6e\x6f\x6e\x65\x22\x0a\x20\x20\x20\x20\x20\x69\x64\x3d\x22\x70\
+\x61\x74\x68\x32\x22\x20\x2f\x3e\x0a\x20\x20\x3c\x70\x61\x74\x68\
+\x0a\x20\x20\x20\x20\x20\x64\x3d\x22\x4d\x32\x30\x20\x38\x68\x2d\
+\x32\x2e\x38\x31\x63\x2d\x2e\x34\x35\x2d\x2e\x37\x38\x2d\x31\x2e\
+\x30\x37\x2d\x31\x2e\x34\x35\x2d\x31\x2e\x38\x32\x2d\x31\x2e\x39\
+\x36\x4c\x31\x37\x20\x34\x2e\x34\x31\x20\x31\x35\x2e\x35\x39\x20\
+\x33\x6c\x2d\x32\x2e\x31\x37\x20\x32\x2e\x31\x37\x43\x31\x32\x2e\
+\x39\x36\x20\x35\x2e\x30\x36\x20\x31\x32\x2e\x34\x39\x20\x35\x20\
+\x31\x32\x20\x35\x63\x2d\x2e\x34\x39\x20\x30\x2d\x2e\x39\x36\x2e\
+\x30\x36\x2d\x31\x2e\x34\x31\x2e\x31\x37\x4c\x38\x2e\x34\x31\x20\
+\x33\x20\x37\x20\x34\x2e\x34\x31\x6c\x31\x2e\x36\x32\x20\x31\x2e\
+\x36\x33\x43\x37\x2e\x38\x38\x20\x36\x2e\x35\x35\x20\x37\x2e\x32\
+\x36\x20\x37\x2e\x32\x32\x20\x36\x2e\x38\x31\x20\x38\x48\x34\x76\
+\x32\x68\x32\x2e\x30\x39\x63\x2d\x2e\x30\x35\x2e\x33\x33\x2d\x2e\
+\x30\x39\x2e\x36\x36\x2d\x2e\x30\x39\x20\x31\x76\x31\x48\x34\x76\
+\x32\x68\x32\x76\x31\x63\x30\x20\x2e\x33\x34\x2e\x30\x34\x2e\x36\
+\x37\x2e\x30\x39\x20\x31\x48\x34\x76\x32\x68\x32\x2e\x38\x31\x63\
+\x31\x2e\x30\x34\x20\x31\x2e\x37\x39\x20\x32\x2e\x39\x37\x20\x33\
+\x20\x35\x2e\x31\x39\x20\x33\x73\x34\x2e\x31\x35\x2d\x31\x2e\x32\
+\x31\x20\x35\x2e\x31\x39\x2d\x33\x48\x32\x30\x76\x2d\x32\x68\x2d\
+\x32\x2e\x30\x39\x63\x2e\x30\x35\x2d\x2e\x33\x33\x2e\x30\x39\x2d\
+\x2e\x36\x36\x2e\x30\x39\x2d\x31\x76\x2d\x31\x68\x32\x76\x2d\x32\
+\x68\x2d\x32\x76\x2d\x31\x63\x30\x2d\x2e\x33\x34\x2d\x2e\x30\x34\
+\x2d\x2e\x36\x37\x2d\x2e\x30\x39\x2d\x31\x48\x32\x30\x56\x38\x7a\
+\x6d\x2d\x36\x20\x38\x68\x2d\x34\x76\x2d\x32\x68\x34\x76\x32\x7a\
+\x6d\x30\x2d\x34\x68\x2d\x34\x76\x2d\x32\x68\x34\x76\x32\x7a\x22\
+\x0a\x20\x20\x20\x20\x20\x69\x64\x3d\x22\x70\x61\x74\x68\x34\x22\
+\x0a\x20\x20\x20\x20\x20\x73\x74\x79\x6c\x65\x3d\x22\x66\x69\x6c\
+\x6c\x3a\x23\x64\x34\x30\x30\x30\x30\x3b\x73\x74\x72\x6f\x6b\x65\
+\x3a\x23\x30\x30\x30\x30\x30\x30\x3b\x73\x74\x72\x6f\x6b\x65\x2d\
+\x6f\x70\x61\x63\x69\x74\x79\x3a\x31\x3b\x73\x74\x72\x6f\x6b\x65\
+\x2d\x77\x69\x64\x74\x68\x3a\x30\x2e\x33\x3b\x73\x74\x72\x6f\x6b\
+\x65\x2d\x6d\x69\x74\x65\x72\x6c\x69\x6d\x69\x74\x3a\x34\x3b\x73\
+\x74\x72\x6f\x6b\x65\x2d\x64\x61\x73\x68\x61\x72\x72\x61\x79\x3a\
+\x6e\x6f\x6e\x65\x22\x20\x2f\x3e\x0a\x3c\x2f\x73\x76\x67\x3e\x0a\
+\
+\x00\x00\x06\x6f\
\x3c\
-\x73\x76\x67\x20\x78\x6d\x6c\x6e\x73\x3d\x22\x68\x74\x74\x70\x3a\
-\x2f\x2f\x77\x77\x77\x2e\x77\x33\x2e\x6f\x72\x67\x2f\x32\x30\x30\
-\x30\x2f\x73\x76\x67\x22\x20\x77\x69\x64\x74\x68\x3d\x22\x32\x34\
-\x22\x20\x68\x65\x69\x67\x68\x74\x3d\x22\x32\x34\x22\x20\x76\x69\
-\x65\x77\x42\x6f\x78\x3d\x22\x30\x20\x30\x20\x32\x34\x20\x32\x34\
-\x22\x3e\x3c\x70\x61\x74\x68\x20\x64\x3d\x22\x4d\x39\x20\x33\x4c\
-\x35\x20\x36\x2e\x39\x39\x68\x33\x56\x31\x34\x68\x32\x56\x36\x2e\
-\x39\x39\x68\x33\x4c\x39\x20\x33\x7a\x6d\x37\x20\x31\x34\x2e\x30\
-\x31\x56\x31\x30\x68\x2d\x32\x76\x37\x2e\x30\x31\x68\x2d\x33\x4c\
-\x31\x35\x20\x32\x31\x6c\x34\x2d\x33\x2e\x39\x39\x68\x2d\x33\x7a\
-\x22\x2f\x3e\x3c\x70\x61\x74\x68\x20\x64\x3d\x22\x4d\x30\x20\x30\
-\x68\x32\x34\x76\x32\x34\x48\x30\x7a\x22\x20\x66\x69\x6c\x6c\x3d\
-\x22\x6e\x6f\x6e\x65\x22\x2f\x3e\x3c\x2f\x73\x76\x67\x3e\
-\x00\x00\x06\xf3\
+\x3f\x78\x6d\x6c\x20\x76\x65\x72\x73\x69\x6f\x6e\x3d\x22\x31\x2e\
+\x30\x22\x20\x65\x6e\x63\x6f\x64\x69\x6e\x67\x3d\x22\x55\x54\x46\
+\x2d\x38\x22\x20\x73\x74\x61\x6e\x64\x61\x6c\x6f\x6e\x65\x3d\x22\
+\x6e\x6f\x22\x3f\x3e\x0a\x3c\x73\x76\x67\x0a\x20\x20\x20\x78\x6d\
+\x6c\x6e\x73\x3a\x64\x63\x3d\x22\x68\x74\x74\x70\x3a\x2f\x2f\x70\
+\x75\x72\x6c\x2e\x6f\x72\x67\x2f\x64\x63\x2f\x65\x6c\x65\x6d\x65\
+\x6e\x74\x73\x2f\x31\x2e\x31\x2f\x22\x0a\x20\x20\x20\x78\x6d\x6c\
+\x6e\x73\x3a\x63\x63\x3d\x22\x68\x74\x74\x70\x3a\x2f\x2f\x63\x72\
+\x65\x61\x74\x69\x76\x65\x63\x6f\x6d\x6d\x6f\x6e\x73\x2e\x6f\x72\
+\x67\x2f\x6e\x73\x23\x22\x0a\x20\x20\x20\x78\x6d\x6c\x6e\x73\x3a\
+\x72\x64\x66\x3d\x22\x68\x74\x74\x70\x3a\x2f\x2f\x77\x77\x77\x2e\
+\x77\x33\x2e\x6f\x72\x67\x2f\x31\x39\x39\x39\x2f\x30\x32\x2f\x32\
+\x32\x2d\x72\x64\x66\x2d\x73\x79\x6e\x74\x61\x78\x2d\x6e\x73\x23\
+\x22\x0a\x20\x20\x20\x78\x6d\x6c\x6e\x73\x3a\x73\x76\x67\x3d\x22\
+\x68\x74\x74\x70\x3a\x2f\x2f\x77\x77\x77\x2e\x77\x33\x2e\x6f\x72\
+\x67\x2f\x32\x30\x30\x30\x2f\x73\x76\x67\x22\x0a\x20\x20\x20\x78\
+\x6d\x6c\x6e\x73\x3d\x22\x68\x74\x74\x70\x3a\x2f\x2f\x77\x77\x77\
+\x2e\x77\x33\x2e\x6f\x72\x67\x2f\x32\x30\x30\x30\x2f\x73\x76\x67\
+\x22\x0a\x20\x20\x20\x78\x6d\x6c\x6e\x73\x3a\x73\x6f\x64\x69\x70\
+\x6f\x64\x69\x3d\x22\x68\x74\x74\x70\x3a\x2f\x2f\x73\x6f\x64\x69\
+\x70\x6f\x64\x69\x2e\x73\x6f\x75\x72\x63\x65\x66\x6f\x72\x67\x65\
+\x2e\x6e\x65\x74\x2f\x44\x54\x44\x2f\x73\x6f\x64\x69\x70\x6f\x64\
+\x69\x2d\x30\x2e\x64\x74\x64\x22\x0a\x20\x20\x20\x78\x6d\x6c\x6e\
+\x73\x3a\x69\x6e\x6b\x73\x63\x61\x70\x65\x3d\x22\x68\x74\x74\x70\
+\x3a\x2f\x2f\x77\x77\x77\x2e\x69\x6e\x6b\x73\x63\x61\x70\x65\x2e\
+\x6f\x72\x67\x2f\x6e\x61\x6d\x65\x73\x70\x61\x63\x65\x73\x2f\x69\
+\x6e\x6b\x73\x63\x61\x70\x65\x22\x0a\x20\x20\x20\x77\x69\x64\x74\
+\x68\x3d\x22\x32\x34\x22\x0a\x20\x20\x20\x68\x65\x69\x67\x68\x74\
+\x3d\x22\x32\x34\x22\x0a\x20\x20\x20\x76\x69\x65\x77\x42\x6f\x78\
+\x3d\x22\x30\x20\x30\x20\x32\x34\x20\x32\x34\x22\x0a\x20\x20\x20\
+\x76\x65\x72\x73\x69\x6f\x6e\x3d\x22\x31\x2e\x31\x22\x0a\x20\x20\
+\x20\x69\x64\x3d\x22\x73\x76\x67\x36\x22\x0a\x20\x20\x20\x73\x6f\
+\x64\x69\x70\x6f\x64\x69\x3a\x64\x6f\x63\x6e\x61\x6d\x65\x3d\x22\
+\x69\x6d\x70\x6f\x72\x74\x5f\x65\x78\x70\x6f\x72\x74\x2d\x32\x34\
+\x70\x78\x2e\x73\x76\x67\x22\x0a\x20\x20\x20\x69\x6e\x6b\x73\x63\
+\x61\x70\x65\x3a\x76\x65\x72\x73\x69\x6f\x6e\x3d\x22\x30\x2e\x39\
+\x32\x2e\x33\x20\x28\x75\x6e\x6b\x6e\x6f\x77\x6e\x29\x22\x3e\x0a\
+\x20\x20\x3c\x6d\x65\x74\x61\x64\x61\x74\x61\x0a\x20\x20\x20\x20\
+\x20\x69\x64\x3d\x22\x6d\x65\x74\x61\x64\x61\x74\x61\x31\x32\x22\
+\x3e\x0a\x20\x20\x20\x20\x3c\x72\x64\x66\x3a\x52\x44\x46\x3e\x0a\
+\x20\x20\x20\x20\x20\x20\x3c\x63\x63\x3a\x57\x6f\x72\x6b\x0a\x20\
+\x20\x20\x20\x20\x20\x20\x20\x20\x72\x64\x66\x3a\x61\x62\x6f\x75\
+\x74\x3d\x22\x22\x3e\x0a\x20\x20\x20\x20\x20\x20\x20\x20\x3c\x64\
+\x63\x3a\x66\x6f\x72\x6d\x61\x74\x3e\x69\x6d\x61\x67\x65\x2f\x73\
+\x76\x67\x2b\x78\x6d\x6c\x3c\x2f\x64\x63\x3a\x66\x6f\x72\x6d\x61\
+\x74\x3e\x0a\x20\x20\x20\x20\x20\x20\x20\x20\x3c\x64\x63\x3a\x74\
+\x79\x70\x65\x0a\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x72\
+\x64\x66\x3a\x72\x65\x73\x6f\x75\x72\x63\x65\x3d\x22\x68\x74\x74\
+\x70\x3a\x2f\x2f\x70\x75\x72\x6c\x2e\x6f\x72\x67\x2f\x64\x63\x2f\
+\x64\x63\x6d\x69\x74\x79\x70\x65\x2f\x53\x74\x69\x6c\x6c\x49\x6d\
+\x61\x67\x65\x22\x20\x2f\x3e\x0a\x20\x20\x20\x20\x20\x20\x3c\x2f\
+\x63\x63\x3a\x57\x6f\x72\x6b\x3e\x0a\x20\x20\x20\x20\x3c\x2f\x72\
+\x64\x66\x3a\x52\x44\x46\x3e\x0a\x20\x20\x3c\x2f\x6d\x65\x74\x61\
+\x64\x61\x74\x61\x3e\x0a\x20\x20\x3c\x64\x65\x66\x73\x0a\x20\x20\
+\x20\x20\x20\x69\x64\x3d\x22\x64\x65\x66\x73\x31\x30\x22\x20\x2f\
+\x3e\x0a\x20\x20\x3c\x73\x6f\x64\x69\x70\x6f\x64\x69\x3a\x6e\x61\
+\x6d\x65\x64\x76\x69\x65\x77\x0a\x20\x20\x20\x20\x20\x70\x61\x67\
+\x65\x63\x6f\x6c\x6f\x72\x3d\x22\x23\x66\x66\x66\x66\x66\x66\x22\
+\x0a\x20\x20\x20\x20\x20\x62\x6f\x72\x64\x65\x72\x63\x6f\x6c\x6f\
+\x72\x3d\x22\x23\x36\x36\x36\x36\x36\x36\x22\x0a\x20\x20\x20\x20\
+\x20\x62\x6f\x72\x64\x65\x72\x6f\x70\x61\x63\x69\x74\x79\x3d\x22\
+\x31\x22\x0a\x20\x20\x20\x20\x20\x6f\x62\x6a\x65\x63\x74\x74\x6f\
+\x6c\x65\x72\x61\x6e\x63\x65\x3d\x22\x31\x30\x22\x0a\x20\x20\x20\
+\x20\x20\x67\x72\x69\x64\x74\x6f\x6c\x65\x72\x61\x6e\x63\x65\x3d\
+\x22\x31\x30\x22\x0a\x20\x20\x20\x20\x20\x67\x75\x69\x64\x65\x74\
+\x6f\x6c\x65\x72\x61\x6e\x63\x65\x3d\x22\x31\x30\x22\x0a\x20\x20\
+\x20\x20\x20\x69\x6e\x6b\x73\x63\x61\x70\x65\x3a\x70\x61\x67\x65\
+\x6f\x70\x61\x63\x69\x74\x79\x3d\x22\x30\x22\x0a\x20\x20\x20\x20\
+\x20\x69\x6e\x6b\x73\x63\x61\x70\x65\x3a\x70\x61\x67\x65\x73\x68\
+\x61\x64\x6f\x77\x3d\x22\x32\x22\x0a\x20\x20\x20\x20\x20\x69\x6e\
+\x6b\x73\x63\x61\x70\x65\x3a\x77\x69\x6e\x64\x6f\x77\x2d\x77\x69\
+\x64\x74\x68\x3d\x22\x37\x38\x38\x22\x0a\x20\x20\x20\x20\x20\x69\
+\x6e\x6b\x73\x63\x61\x70\x65\x3a\x77\x69\x6e\x64\x6f\x77\x2d\x68\
+\x65\x69\x67\x68\x74\x3d\x22\x34\x38\x30\x22\x0a\x20\x20\x20\x20\
+\x20\x69\x64\x3d\x22\x6e\x61\x6d\x65\x64\x76\x69\x65\x77\x38\x22\
+\x0a\x20\x20\x20\x20\x20\x73\x68\x6f\x77\x67\x72\x69\x64\x3d\x22\
+\x66\x61\x6c\x73\x65\x22\x0a\x20\x20\x20\x20\x20\x69\x6e\x6b\x73\
+\x63\x61\x70\x65\x3a\x7a\x6f\x6f\x6d\x3d\x22\x39\x2e\x38\x33\x33\
+\x33\x33\x33\x33\x22\x0a\x20\x20\x20\x20\x20\x69\x6e\x6b\x73\x63\
+\x61\x70\x65\x3a\x63\x78\x3d\x22\x31\x32\x22\x0a\x20\x20\x20\x20\
+\x20\x69\x6e\x6b\x73\x63\x61\x70\x65\x3a\x63\x79\x3d\x22\x31\x32\
+\x22\x0a\x20\x20\x20\x20\x20\x69\x6e\x6b\x73\x63\x61\x70\x65\x3a\
+\x77\x69\x6e\x64\x6f\x77\x2d\x78\x3d\x22\x30\x22\x0a\x20\x20\x20\
+\x20\x20\x69\x6e\x6b\x73\x63\x61\x70\x65\x3a\x77\x69\x6e\x64\x6f\
+\x77\x2d\x79\x3d\x22\x30\x22\x0a\x20\x20\x20\x20\x20\x69\x6e\x6b\
+\x73\x63\x61\x70\x65\x3a\x77\x69\x6e\x64\x6f\x77\x2d\x6d\x61\x78\
+\x69\x6d\x69\x7a\x65\x64\x3d\x22\x30\x22\x0a\x20\x20\x20\x20\x20\
+\x69\x6e\x6b\x73\x63\x61\x70\x65\x3a\x63\x75\x72\x72\x65\x6e\x74\
+\x2d\x6c\x61\x79\x65\x72\x3d\x22\x73\x76\x67\x36\x22\x20\x2f\x3e\
+\x0a\x20\x20\x3c\x70\x61\x74\x68\x0a\x20\x20\x20\x20\x20\x64\x3d\
+\x22\x4d\x39\x20\x33\x4c\x35\x20\x36\x2e\x39\x39\x68\x33\x56\x31\
+\x34\x68\x32\x56\x36\x2e\x39\x39\x68\x33\x4c\x39\x20\x33\x7a\x6d\
+\x37\x20\x31\x34\x2e\x30\x31\x56\x31\x30\x68\x2d\x32\x76\x37\x2e\
+\x30\x31\x68\x2d\x33\x4c\x31\x35\x20\x32\x31\x6c\x34\x2d\x33\x2e\
+\x39\x39\x68\x2d\x33\x7a\x22\x0a\x20\x20\x20\x20\x20\x69\x64\x3d\
+\x22\x70\x61\x74\x68\x32\x22\x0a\x20\x20\x20\x20\x20\x73\x74\x79\
+\x6c\x65\x3d\x22\x66\x69\x6c\x6c\x3a\x23\x30\x39\x66\x64\x36\x63\
+\x3b\x66\x69\x6c\x6c\x2d\x6f\x70\x61\x63\x69\x74\x79\x3a\x31\x22\
+\x20\x2f\x3e\x0a\x20\x20\x3c\x70\x61\x74\x68\x0a\x20\x20\x20\x20\
+\x20\x64\x3d\x22\x4d\x30\x20\x30\x68\x32\x34\x76\x32\x34\x48\x30\
+\x7a\x22\x0a\x20\x20\x20\x20\x20\x66\x69\x6c\x6c\x3d\x22\x6e\x6f\
+\x6e\x65\x22\x0a\x20\x20\x20\x20\x20\x69\x64\x3d\x22\x70\x61\x74\
+\x68\x34\x22\x20\x2f\x3e\x0a\x3c\x2f\x73\x76\x67\x3e\x0a\
+\x00\x00\x0c\x98\
\x3c\
-\x73\x76\x67\x20\x78\x6d\x6c\x6e\x73\x3d\x22\x68\x74\x74\x70\x3a\
-\x2f\x2f\x77\x77\x77\x2e\x77\x33\x2e\x6f\x72\x67\x2f\x32\x30\x30\
-\x30\x2f\x73\x76\x67\x22\x20\x77\x69\x64\x74\x68\x3d\x22\x32\x34\
-\x22\x20\x68\x65\x69\x67\x68\x74\x3d\x22\x32\x34\x22\x20\x76\x69\
-\x65\x77\x42\x6f\x78\x3d\x22\x30\x20\x30\x20\x32\x34\x20\x32\x34\
-\x22\x3e\x3c\x70\x61\x74\x68\x20\x64\x3d\x22\x4d\x31\x37\x2e\x38\
-\x31\x20\x34\x2e\x34\x37\x63\x2d\x2e\x30\x38\x20\x30\x2d\x2e\x31\
-\x36\x2d\x2e\x30\x32\x2d\x2e\x32\x33\x2d\x2e\x30\x36\x43\x31\x35\
-\x2e\x36\x36\x20\x33\x2e\x34\x32\x20\x31\x34\x20\x33\x20\x31\x32\
-\x2e\x30\x31\x20\x33\x63\x2d\x31\x2e\x39\x38\x20\x30\x2d\x33\x2e\
-\x38\x36\x2e\x34\x37\x2d\x35\x2e\x35\x37\x20\x31\x2e\x34\x31\x2d\
-\x2e\x32\x34\x2e\x31\x33\x2d\x2e\x35\x34\x2e\x30\x34\x2d\x2e\x36\
-\x38\x2d\x2e\x32\x2d\x2e\x31\x33\x2d\x2e\x32\x34\x2d\x2e\x30\x34\
-\x2d\x2e\x35\x35\x2e\x32\x2d\x2e\x36\x38\x43\x37\x2e\x38\x32\x20\
-\x32\x2e\x35\x32\x20\x39\x2e\x38\x36\x20\x32\x20\x31\x32\x2e\x30\
-\x31\x20\x32\x63\x32\x2e\x31\x33\x20\x30\x20\x33\x2e\x39\x39\x2e\
-\x34\x37\x20\x36\x2e\x30\x33\x20\x31\x2e\x35\x32\x2e\x32\x35\x2e\
-\x31\x33\x2e\x33\x34\x2e\x34\x33\x2e\x32\x31\x2e\x36\x37\x2d\x2e\
-\x30\x39\x2e\x31\x38\x2d\x2e\x32\x36\x2e\x32\x38\x2d\x2e\x34\x34\
-\x2e\x32\x38\x7a\x4d\x33\x2e\x35\x20\x39\x2e\x37\x32\x63\x2d\x2e\
-\x31\x20\x30\x2d\x2e\x32\x2d\x2e\x30\x33\x2d\x2e\x32\x39\x2d\x2e\
-\x30\x39\x2d\x2e\x32\x33\x2d\x2e\x31\x36\x2d\x2e\x32\x38\x2d\x2e\
-\x34\x37\x2d\x2e\x31\x32\x2d\x2e\x37\x2e\x39\x39\x2d\x31\x2e\x34\
-\x20\x32\x2e\x32\x35\x2d\x32\x2e\x35\x20\x33\x2e\x37\x35\x2d\x33\
-\x2e\x32\x37\x43\x39\x2e\x39\x38\x20\x34\x2e\x30\x34\x20\x31\x34\
-\x20\x34\x2e\x30\x33\x20\x31\x37\x2e\x31\x35\x20\x35\x2e\x36\x35\
-\x63\x31\x2e\x35\x2e\x37\x37\x20\x32\x2e\x37\x36\x20\x31\x2e\x38\
-\x36\x20\x33\x2e\x37\x35\x20\x33\x2e\x32\x35\x2e\x31\x36\x2e\x32\
-\x32\x2e\x31\x31\x2e\x35\x34\x2d\x2e\x31\x32\x2e\x37\x2d\x2e\x32\
-\x33\x2e\x31\x36\x2d\x2e\x35\x34\x2e\x31\x31\x2d\x2e\x37\x2d\x2e\
-\x31\x32\x2d\x2e\x39\x2d\x31\x2e\x32\x36\x2d\x32\x2e\x30\x34\x2d\
-\x32\x2e\x32\x35\x2d\x33\x2e\x33\x39\x2d\x32\x2e\x39\x34\x2d\x32\
-\x2e\x38\x37\x2d\x31\x2e\x34\x37\x2d\x36\x2e\x35\x34\x2d\x31\x2e\
-\x34\x37\x2d\x39\x2e\x34\x2e\x30\x31\x2d\x31\x2e\x33\x36\x2e\x37\
-\x2d\x32\x2e\x35\x20\x31\x2e\x37\x2d\x33\x2e\x34\x20\x32\x2e\x39\
-\x36\x2d\x2e\x30\x38\x2e\x31\x34\x2d\x2e\x32\x33\x2e\x32\x31\x2d\
-\x2e\x33\x39\x2e\x32\x31\x7a\x6d\x36\x2e\x32\x35\x20\x31\x32\x2e\
-\x30\x37\x63\x2d\x2e\x31\x33\x20\x30\x2d\x2e\x32\x36\x2d\x2e\x30\
-\x35\x2d\x2e\x33\x35\x2d\x2e\x31\x35\x2d\x2e\x38\x37\x2d\x2e\x38\
-\x37\x2d\x31\x2e\x33\x34\x2d\x31\x2e\x34\x33\x2d\x32\x2e\x30\x31\
-\x2d\x32\x2e\x36\x34\x2d\x2e\x36\x39\x2d\x31\x2e\x32\x33\x2d\x31\
-\x2e\x30\x35\x2d\x32\x2e\x37\x33\x2d\x31\x2e\x30\x35\x2d\x34\x2e\
-\x33\x34\x20\x30\x2d\x32\x2e\x39\x37\x20\x32\x2e\x35\x34\x2d\x35\
-\x2e\x33\x39\x20\x35\x2e\x36\x36\x2d\x35\x2e\x33\x39\x73\x35\x2e\
-\x36\x36\x20\x32\x2e\x34\x32\x20\x35\x2e\x36\x36\x20\x35\x2e\x33\
-\x39\x63\x30\x20\x2e\x32\x38\x2d\x2e\x32\x32\x2e\x35\x2d\x2e\x35\
-\x2e\x35\x73\x2d\x2e\x35\x2d\x2e\x32\x32\x2d\x2e\x35\x2d\x2e\x35\
-\x63\x30\x2d\x32\x2e\x34\x32\x2d\x32\x2e\x30\x39\x2d\x34\x2e\x33\
-\x39\x2d\x34\x2e\x36\x36\x2d\x34\x2e\x33\x39\x2d\x32\x2e\x35\x37\
-\x20\x30\x2d\x34\x2e\x36\x36\x20\x31\x2e\x39\x37\x2d\x34\x2e\x36\
-\x36\x20\x34\x2e\x33\x39\x20\x30\x20\x31\x2e\x34\x34\x2e\x33\x32\
-\x20\x32\x2e\x37\x37\x2e\x39\x33\x20\x33\x2e\x38\x35\x2e\x36\x34\
-\x20\x31\x2e\x31\x35\x20\x31\x2e\x30\x38\x20\x31\x2e\x36\x34\x20\
-\x31\x2e\x38\x35\x20\x32\x2e\x34\x32\x2e\x31\x39\x2e\x32\x2e\x31\
-\x39\x2e\x35\x31\x20\x30\x20\x2e\x37\x31\x2d\x2e\x31\x31\x2e\x31\
-\x2d\x2e\x32\x34\x2e\x31\x35\x2d\x2e\x33\x37\x2e\x31\x35\x7a\x6d\
-\x37\x2e\x31\x37\x2d\x31\x2e\x38\x35\x63\x2d\x31\x2e\x31\x39\x20\
-\x30\x2d\x32\x2e\x32\x34\x2d\x2e\x33\x2d\x33\x2e\x31\x2d\x2e\x38\
-\x39\x2d\x31\x2e\x34\x39\x2d\x31\x2e\x30\x31\x2d\x32\x2e\x33\x38\
-\x2d\x32\x2e\x36\x35\x2d\x32\x2e\x33\x38\x2d\x34\x2e\x33\x39\x20\
-\x30\x2d\x2e\x32\x38\x2e\x32\x32\x2d\x2e\x35\x2e\x35\x2d\x2e\x35\
-\x73\x2e\x35\x2e\x32\x32\x2e\x35\x2e\x35\x63\x30\x20\x31\x2e\x34\
-\x31\x2e\x37\x32\x20\x32\x2e\x37\x34\x20\x31\x2e\x39\x34\x20\x33\
-\x2e\x35\x36\x2e\x37\x31\x2e\x34\x38\x20\x31\x2e\x35\x34\x2e\x37\
-\x31\x20\x32\x2e\x35\x34\x2e\x37\x31\x2e\x32\x34\x20\x30\x20\x2e\
-\x36\x34\x2d\x2e\x30\x33\x20\x31\x2e\x30\x34\x2d\x2e\x31\x2e\x32\
-\x37\x2d\x2e\x30\x35\x2e\x35\x33\x2e\x31\x33\x2e\x35\x38\x2e\x34\
-\x31\x2e\x30\x35\x2e\x32\x37\x2d\x2e\x31\x33\x2e\x35\x33\x2d\x2e\
-\x34\x31\x2e\x35\x38\x2d\x2e\x35\x37\x2e\x31\x31\x2d\x31\x2e\x30\
-\x37\x2e\x31\x32\x2d\x31\x2e\x32\x31\x2e\x31\x32\x7a\x4d\x31\x34\
-\x2e\x39\x31\x20\x32\x32\x63\x2d\x2e\x30\x34\x20\x30\x2d\x2e\x30\
-\x39\x2d\x2e\x30\x31\x2d\x2e\x31\x33\x2d\x2e\x30\x32\x2d\x31\x2e\
-\x35\x39\x2d\x2e\x34\x34\x2d\x32\x2e\x36\x33\x2d\x31\x2e\x30\x33\
-\x2d\x33\x2e\x37\x32\x2d\x32\x2e\x31\x2d\x31\x2e\x34\x2d\x31\x2e\
-\x33\x39\x2d\x32\x2e\x31\x37\x2d\x33\x2e\x32\x34\x2d\x32\x2e\x31\
-\x37\x2d\x35\x2e\x32\x32\x20\x30\x2d\x31\x2e\x36\x32\x20\x31\x2e\
-\x33\x38\x2d\x32\x2e\x39\x34\x20\x33\x2e\x30\x38\x2d\x32\x2e\x39\
-\x34\x20\x31\x2e\x37\x20\x30\x20\x33\x2e\x30\x38\x20\x31\x2e\x33\
-\x32\x20\x33\x2e\x30\x38\x20\x32\x2e\x39\x34\x20\x30\x20\x31\x2e\
-\x30\x37\x2e\x39\x33\x20\x31\x2e\x39\x34\x20\x32\x2e\x30\x38\x20\
-\x31\x2e\x39\x34\x73\x32\x2e\x30\x38\x2d\x2e\x38\x37\x20\x32\x2e\
-\x30\x38\x2d\x31\x2e\x39\x34\x63\x30\x2d\x33\x2e\x37\x37\x2d\x33\
-\x2e\x32\x35\x2d\x36\x2e\x38\x33\x2d\x37\x2e\x32\x35\x2d\x36\x2e\
-\x38\x33\x2d\x32\x2e\x38\x34\x20\x30\x2d\x35\x2e\x34\x34\x20\x31\
-\x2e\x35\x38\x2d\x36\x2e\x36\x31\x20\x34\x2e\x30\x33\x2d\x2e\x33\
-\x39\x2e\x38\x31\x2d\x2e\x35\x39\x20\x31\x2e\x37\x36\x2d\x2e\x35\
-\x39\x20\x32\x2e\x38\x20\x30\x20\x2e\x37\x38\x2e\x30\x37\x20\x32\
-\x2e\x30\x31\x2e\x36\x37\x20\x33\x2e\x36\x31\x2e\x31\x2e\x32\x36\
-\x2d\x2e\x30\x33\x2e\x35\x35\x2d\x2e\x32\x39\x2e\x36\x34\x2d\x2e\
-\x32\x36\x2e\x31\x2d\x2e\x35\x35\x2d\x2e\x30\x34\x2d\x2e\x36\x34\
-\x2d\x2e\x32\x39\x2d\x2e\x34\x39\x2d\x31\x2e\x33\x31\x2d\x2e\x37\
-\x33\x2d\x32\x2e\x36\x31\x2d\x2e\x37\x33\x2d\x33\x2e\x39\x36\x20\
-\x30\x2d\x31\x2e\x32\x2e\x32\x33\x2d\x32\x2e\x32\x39\x2e\x36\x38\
-\x2d\x33\x2e\x32\x34\x20\x31\x2e\x33\x33\x2d\x32\x2e\x37\x39\x20\
-\x34\x2e\x32\x38\x2d\x34\x2e\x36\x20\x37\x2e\x35\x31\x2d\x34\x2e\
-\x36\x20\x34\x2e\x35\x35\x20\x30\x20\x38\x2e\x32\x35\x20\x33\x2e\
-\x35\x31\x20\x38\x2e\x32\x35\x20\x37\x2e\x38\x33\x20\x30\x20\x31\
-\x2e\x36\x32\x2d\x31\x2e\x33\x38\x20\x32\x2e\x39\x34\x2d\x33\x2e\
-\x30\x38\x20\x32\x2e\x39\x34\x73\x2d\x33\x2e\x30\x38\x2d\x31\x2e\
-\x33\x32\x2d\x33\x2e\x30\x38\x2d\x32\x2e\x39\x34\x63\x30\x2d\x31\
-\x2e\x30\x37\x2d\x2e\x39\x33\x2d\x31\x2e\x39\x34\x2d\x32\x2e\x30\
-\x38\x2d\x31\x2e\x39\x34\x73\x2d\x32\x2e\x30\x38\x2e\x38\x37\x2d\
-\x32\x2e\x30\x38\x20\x31\x2e\x39\x34\x63\x30\x20\x31\x2e\x37\x31\
-\x2e\x36\x36\x20\x33\x2e\x33\x31\x20\x31\x2e\x38\x37\x20\x34\x2e\
-\x35\x31\x2e\x39\x35\x2e\x39\x34\x20\x31\x2e\x38\x36\x20\x31\x2e\
-\x34\x36\x20\x33\x2e\x32\x37\x20\x31\x2e\x38\x35\x2e\x32\x37\x2e\
-\x30\x37\x2e\x34\x32\x2e\x33\x35\x2e\x33\x35\x2e\x36\x31\x2d\x2e\
-\x30\x35\x2e\x32\x33\x2d\x2e\x32\x36\x2e\x33\x38\x2d\x2e\x34\x37\
-\x2e\x33\x38\x7a\x22\x2f\x3e\x3c\x70\x61\x74\x68\x20\x66\x69\x6c\
-\x6c\x3d\x22\x6e\x6f\x6e\x65\x22\x20\x64\x3d\x22\x4d\x30\x20\x30\
-\x68\x32\x34\x76\x32\x34\x48\x30\x7a\x22\x2f\x3e\x3c\x2f\x73\x76\
-\x67\x3e\
+\x3f\x78\x6d\x6c\x20\x76\x65\x72\x73\x69\x6f\x6e\x3d\x22\x31\x2e\
+\x30\x22\x20\x65\x6e\x63\x6f\x64\x69\x6e\x67\x3d\x22\x55\x54\x46\
+\x2d\x38\x22\x20\x73\x74\x61\x6e\x64\x61\x6c\x6f\x6e\x65\x3d\x22\
+\x6e\x6f\x22\x3f\x3e\x0a\x3c\x73\x76\x67\x0a\x20\x20\x20\x78\x6d\
+\x6c\x6e\x73\x3a\x64\x63\x3d\x22\x68\x74\x74\x70\x3a\x2f\x2f\x70\
+\x75\x72\x6c\x2e\x6f\x72\x67\x2f\x64\x63\x2f\x65\x6c\x65\x6d\x65\
+\x6e\x74\x73\x2f\x31\x2e\x31\x2f\x22\x0a\x20\x20\x20\x78\x6d\x6c\
+\x6e\x73\x3a\x63\x63\x3d\x22\x68\x74\x74\x70\x3a\x2f\x2f\x63\x72\
+\x65\x61\x74\x69\x76\x65\x63\x6f\x6d\x6d\x6f\x6e\x73\x2e\x6f\x72\
+\x67\x2f\x6e\x73\x23\x22\x0a\x20\x20\x20\x78\x6d\x6c\x6e\x73\x3a\
+\x72\x64\x66\x3d\x22\x68\x74\x74\x70\x3a\x2f\x2f\x77\x77\x77\x2e\
+\x77\x33\x2e\x6f\x72\x67\x2f\x31\x39\x39\x39\x2f\x30\x32\x2f\x32\
+\x32\x2d\x72\x64\x66\x2d\x73\x79\x6e\x74\x61\x78\x2d\x6e\x73\x23\
+\x22\x0a\x20\x20\x20\x78\x6d\x6c\x6e\x73\x3a\x73\x76\x67\x3d\x22\
+\x68\x74\x74\x70\x3a\x2f\x2f\x77\x77\x77\x2e\x77\x33\x2e\x6f\x72\
+\x67\x2f\x32\x30\x30\x30\x2f\x73\x76\x67\x22\x0a\x20\x20\x20\x78\
+\x6d\x6c\x6e\x73\x3d\x22\x68\x74\x74\x70\x3a\x2f\x2f\x77\x77\x77\
+\x2e\x77\x33\x2e\x6f\x72\x67\x2f\x32\x30\x30\x30\x2f\x73\x76\x67\
+\x22\x0a\x20\x20\x20\x78\x6d\x6c\x6e\x73\x3a\x73\x6f\x64\x69\x70\
+\x6f\x64\x69\x3d\x22\x68\x74\x74\x70\x3a\x2f\x2f\x73\x6f\x64\x69\
+\x70\x6f\x64\x69\x2e\x73\x6f\x75\x72\x63\x65\x66\x6f\x72\x67\x65\
+\x2e\x6e\x65\x74\x2f\x44\x54\x44\x2f\x73\x6f\x64\x69\x70\x6f\x64\
+\x69\x2d\x30\x2e\x64\x74\x64\x22\x0a\x20\x20\x20\x78\x6d\x6c\x6e\
+\x73\x3a\x69\x6e\x6b\x73\x63\x61\x70\x65\x3d\x22\x68\x74\x74\x70\
+\x3a\x2f\x2f\x77\x77\x77\x2e\x69\x6e\x6b\x73\x63\x61\x70\x65\x2e\
+\x6f\x72\x67\x2f\x6e\x61\x6d\x65\x73\x70\x61\x63\x65\x73\x2f\x69\
+\x6e\x6b\x73\x63\x61\x70\x65\x22\x0a\x20\x20\x20\x77\x69\x64\x74\
+\x68\x3d\x22\x32\x34\x22\x0a\x20\x20\x20\x68\x65\x69\x67\x68\x74\
+\x3d\x22\x32\x34\x22\x0a\x20\x20\x20\x76\x69\x65\x77\x42\x6f\x78\
+\x3d\x22\x30\x20\x30\x20\x32\x34\x20\x32\x34\x22\x0a\x20\x20\x20\
+\x76\x65\x72\x73\x69\x6f\x6e\x3d\x22\x31\x2e\x31\x22\x0a\x20\x20\
+\x20\x69\x64\x3d\x22\x73\x76\x67\x36\x22\x0a\x20\x20\x20\x73\x6f\
+\x64\x69\x70\x6f\x64\x69\x3a\x64\x6f\x63\x6e\x61\x6d\x65\x3d\x22\
+\x66\x69\x6e\x67\x65\x72\x70\x72\x69\x6e\x74\x2d\x32\x34\x70\x78\
+\x2e\x73\x76\x67\x22\x0a\x20\x20\x20\x69\x6e\x6b\x73\x63\x61\x70\
+\x65\x3a\x76\x65\x72\x73\x69\x6f\x6e\x3d\x22\x30\x2e\x39\x32\x2e\
+\x33\x20\x28\x75\x6e\x6b\x6e\x6f\x77\x6e\x29\x22\x3e\x0a\x20\x20\
+\x3c\x6d\x65\x74\x61\x64\x61\x74\x61\x0a\x20\x20\x20\x20\x20\x69\
+\x64\x3d\x22\x6d\x65\x74\x61\x64\x61\x74\x61\x31\x32\x22\x3e\x0a\
+\x20\x20\x20\x20\x3c\x72\x64\x66\x3a\x52\x44\x46\x3e\x0a\x20\x20\
+\x20\x20\x20\x20\x3c\x63\x63\x3a\x57\x6f\x72\x6b\x0a\x20\x20\x20\
+\x20\x20\x20\x20\x20\x20\x72\x64\x66\x3a\x61\x62\x6f\x75\x74\x3d\
+\x22\x22\x3e\x0a\x20\x20\x20\x20\x20\x20\x20\x20\x3c\x64\x63\x3a\
+\x66\x6f\x72\x6d\x61\x74\x3e\x69\x6d\x61\x67\x65\x2f\x73\x76\x67\
+\x2b\x78\x6d\x6c\x3c\x2f\x64\x63\x3a\x66\x6f\x72\x6d\x61\x74\x3e\
+\x0a\x20\x20\x20\x20\x20\x20\x20\x20\x3c\x64\x63\x3a\x74\x79\x70\
+\x65\x0a\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x72\x64\x66\
+\x3a\x72\x65\x73\x6f\x75\x72\x63\x65\x3d\x22\x68\x74\x74\x70\x3a\
+\x2f\x2f\x70\x75\x72\x6c\x2e\x6f\x72\x67\x2f\x64\x63\x2f\x64\x63\
+\x6d\x69\x74\x79\x70\x65\x2f\x53\x74\x69\x6c\x6c\x49\x6d\x61\x67\
+\x65\x22\x20\x2f\x3e\x0a\x20\x20\x20\x20\x20\x20\x3c\x2f\x63\x63\
+\x3a\x57\x6f\x72\x6b\x3e\x0a\x20\x20\x20\x20\x3c\x2f\x72\x64\x66\
+\x3a\x52\x44\x46\x3e\x0a\x20\x20\x3c\x2f\x6d\x65\x74\x61\x64\x61\
+\x74\x61\x3e\x0a\x20\x20\x3c\x64\x65\x66\x73\x0a\x20\x20\x20\x20\
+\x20\x69\x64\x3d\x22\x64\x65\x66\x73\x31\x30\x22\x20\x2f\x3e\x0a\
+\x20\x20\x3c\x73\x6f\x64\x69\x70\x6f\x64\x69\x3a\x6e\x61\x6d\x65\
+\x64\x76\x69\x65\x77\x0a\x20\x20\x20\x20\x20\x70\x61\x67\x65\x63\
+\x6f\x6c\x6f\x72\x3d\x22\x23\x66\x66\x66\x66\x66\x66\x22\x0a\x20\
+\x20\x20\x20\x20\x62\x6f\x72\x64\x65\x72\x63\x6f\x6c\x6f\x72\x3d\
+\x22\x23\x36\x36\x36\x36\x36\x36\x22\x0a\x20\x20\x20\x20\x20\x62\
+\x6f\x72\x64\x65\x72\x6f\x70\x61\x63\x69\x74\x79\x3d\x22\x31\x22\
+\x0a\x20\x20\x20\x20\x20\x6f\x62\x6a\x65\x63\x74\x74\x6f\x6c\x65\
+\x72\x61\x6e\x63\x65\x3d\x22\x31\x30\x22\x0a\x20\x20\x20\x20\x20\
+\x67\x72\x69\x64\x74\x6f\x6c\x65\x72\x61\x6e\x63\x65\x3d\x22\x31\
+\x30\x22\x0a\x20\x20\x20\x20\x20\x67\x75\x69\x64\x65\x74\x6f\x6c\
+\x65\x72\x61\x6e\x63\x65\x3d\x22\x31\x30\x22\x0a\x20\x20\x20\x20\
+\x20\x69\x6e\x6b\x73\x63\x61\x70\x65\x3a\x70\x61\x67\x65\x6f\x70\
+\x61\x63\x69\x74\x79\x3d\x22\x30\x22\x0a\x20\x20\x20\x20\x20\x69\
+\x6e\x6b\x73\x63\x61\x70\x65\x3a\x70\x61\x67\x65\x73\x68\x61\x64\
+\x6f\x77\x3d\x22\x32\x22\x0a\x20\x20\x20\x20\x20\x69\x6e\x6b\x73\
+\x63\x61\x70\x65\x3a\x77\x69\x6e\x64\x6f\x77\x2d\x77\x69\x64\x74\
+\x68\x3d\x22\x39\x35\x38\x22\x0a\x20\x20\x20\x20\x20\x69\x6e\x6b\
+\x73\x63\x61\x70\x65\x3a\x77\x69\x6e\x64\x6f\x77\x2d\x68\x65\x69\
+\x67\x68\x74\x3d\x22\x35\x35\x31\x22\x0a\x20\x20\x20\x20\x20\x69\
+\x64\x3d\x22\x6e\x61\x6d\x65\x64\x76\x69\x65\x77\x38\x22\x0a\x20\
+\x20\x20\x20\x20\x73\x68\x6f\x77\x67\x72\x69\x64\x3d\x22\x66\x61\
+\x6c\x73\x65\x22\x0a\x20\x20\x20\x20\x20\x69\x6e\x6b\x73\x63\x61\
+\x70\x65\x3a\x7a\x6f\x6f\x6d\x3d\x22\x39\x2e\x38\x33\x33\x33\x33\
+\x33\x33\x22\x0a\x20\x20\x20\x20\x20\x69\x6e\x6b\x73\x63\x61\x70\
+\x65\x3a\x63\x78\x3d\x22\x31\x32\x22\x0a\x20\x20\x20\x20\x20\x69\
+\x6e\x6b\x73\x63\x61\x70\x65\x3a\x63\x79\x3d\x22\x31\x32\x2e\x31\
+\x33\x38\x33\x31\x36\x22\x0a\x20\x20\x20\x20\x20\x69\x6e\x6b\x73\
+\x63\x61\x70\x65\x3a\x77\x69\x6e\x64\x6f\x77\x2d\x78\x3d\x22\x30\
+\x22\x0a\x20\x20\x20\x20\x20\x69\x6e\x6b\x73\x63\x61\x70\x65\x3a\
+\x77\x69\x6e\x64\x6f\x77\x2d\x79\x3d\x22\x30\x22\x0a\x20\x20\x20\
+\x20\x20\x69\x6e\x6b\x73\x63\x61\x70\x65\x3a\x77\x69\x6e\x64\x6f\
+\x77\x2d\x6d\x61\x78\x69\x6d\x69\x7a\x65\x64\x3d\x22\x30\x22\x0a\
+\x20\x20\x20\x20\x20\x69\x6e\x6b\x73\x63\x61\x70\x65\x3a\x63\x75\
+\x72\x72\x65\x6e\x74\x2d\x6c\x61\x79\x65\x72\x3d\x22\x73\x76\x67\
+\x36\x22\x20\x2f\x3e\x0a\x20\x20\x3c\x70\x61\x74\x68\x0a\x20\x20\
+\x20\x20\x20\x64\x3d\x22\x4d\x31\x37\x2e\x38\x31\x20\x34\x2e\x34\
+\x37\x63\x2d\x2e\x30\x38\x20\x30\x2d\x2e\x31\x36\x2d\x2e\x30\x32\
+\x2d\x2e\x32\x33\x2d\x2e\x30\x36\x43\x31\x35\x2e\x36\x36\x20\x33\
+\x2e\x34\x32\x20\x31\x34\x20\x33\x20\x31\x32\x2e\x30\x31\x20\x33\
+\x63\x2d\x31\x2e\x39\x38\x20\x30\x2d\x33\x2e\x38\x36\x2e\x34\x37\
+\x2d\x35\x2e\x35\x37\x20\x31\x2e\x34\x31\x2d\x2e\x32\x34\x2e\x31\
+\x33\x2d\x2e\x35\x34\x2e\x30\x34\x2d\x2e\x36\x38\x2d\x2e\x32\x2d\
+\x2e\x31\x33\x2d\x2e\x32\x34\x2d\x2e\x30\x34\x2d\x2e\x35\x35\x2e\
+\x32\x2d\x2e\x36\x38\x43\x37\x2e\x38\x32\x20\x32\x2e\x35\x32\x20\
+\x39\x2e\x38\x36\x20\x32\x20\x31\x32\x2e\x30\x31\x20\x32\x63\x32\
+\x2e\x31\x33\x20\x30\x20\x33\x2e\x39\x39\x2e\x34\x37\x20\x36\x2e\
+\x30\x33\x20\x31\x2e\x35\x32\x2e\x32\x35\x2e\x31\x33\x2e\x33\x34\
+\x2e\x34\x33\x2e\x32\x31\x2e\x36\x37\x2d\x2e\x30\x39\x2e\x31\x38\
+\x2d\x2e\x32\x36\x2e\x32\x38\x2d\x2e\x34\x34\x2e\x32\x38\x7a\x4d\
+\x33\x2e\x35\x20\x39\x2e\x37\x32\x63\x2d\x2e\x31\x20\x30\x2d\x2e\
+\x32\x2d\x2e\x30\x33\x2d\x2e\x32\x39\x2d\x2e\x30\x39\x2d\x2e\x32\
+\x33\x2d\x2e\x31\x36\x2d\x2e\x32\x38\x2d\x2e\x34\x37\x2d\x2e\x31\
+\x32\x2d\x2e\x37\x2e\x39\x39\x2d\x31\x2e\x34\x20\x32\x2e\x32\x35\
+\x2d\x32\x2e\x35\x20\x33\x2e\x37\x35\x2d\x33\x2e\x32\x37\x43\x39\
+\x2e\x39\x38\x20\x34\x2e\x30\x34\x20\x31\x34\x20\x34\x2e\x30\x33\
+\x20\x31\x37\x2e\x31\x35\x20\x35\x2e\x36\x35\x63\x31\x2e\x35\x2e\
+\x37\x37\x20\x32\x2e\x37\x36\x20\x31\x2e\x38\x36\x20\x33\x2e\x37\
+\x35\x20\x33\x2e\x32\x35\x2e\x31\x36\x2e\x32\x32\x2e\x31\x31\x2e\
+\x35\x34\x2d\x2e\x31\x32\x2e\x37\x2d\x2e\x32\x33\x2e\x31\x36\x2d\
+\x2e\x35\x34\x2e\x31\x31\x2d\x2e\x37\x2d\x2e\x31\x32\x2d\x2e\x39\
+\x2d\x31\x2e\x32\x36\x2d\x32\x2e\x30\x34\x2d\x32\x2e\x32\x35\x2d\
+\x33\x2e\x33\x39\x2d\x32\x2e\x39\x34\x2d\x32\x2e\x38\x37\x2d\x31\
+\x2e\x34\x37\x2d\x36\x2e\x35\x34\x2d\x31\x2e\x34\x37\x2d\x39\x2e\
+\x34\x2e\x30\x31\x2d\x31\x2e\x33\x36\x2e\x37\x2d\x32\x2e\x35\x20\
+\x31\x2e\x37\x2d\x33\x2e\x34\x20\x32\x2e\x39\x36\x2d\x2e\x30\x38\
+\x2e\x31\x34\x2d\x2e\x32\x33\x2e\x32\x31\x2d\x2e\x33\x39\x2e\x32\
+\x31\x7a\x6d\x36\x2e\x32\x35\x20\x31\x32\x2e\x30\x37\x63\x2d\x2e\
+\x31\x33\x20\x30\x2d\x2e\x32\x36\x2d\x2e\x30\x35\x2d\x2e\x33\x35\
+\x2d\x2e\x31\x35\x2d\x2e\x38\x37\x2d\x2e\x38\x37\x2d\x31\x2e\x33\
+\x34\x2d\x31\x2e\x34\x33\x2d\x32\x2e\x30\x31\x2d\x32\x2e\x36\x34\
+\x2d\x2e\x36\x39\x2d\x31\x2e\x32\x33\x2d\x31\x2e\x30\x35\x2d\x32\
+\x2e\x37\x33\x2d\x31\x2e\x30\x35\x2d\x34\x2e\x33\x34\x20\x30\x2d\
+\x32\x2e\x39\x37\x20\x32\x2e\x35\x34\x2d\x35\x2e\x33\x39\x20\x35\
+\x2e\x36\x36\x2d\x35\x2e\x33\x39\x73\x35\x2e\x36\x36\x20\x32\x2e\
+\x34\x32\x20\x35\x2e\x36\x36\x20\x35\x2e\x33\x39\x63\x30\x20\x2e\
+\x32\x38\x2d\x2e\x32\x32\x2e\x35\x2d\x2e\x35\x2e\x35\x73\x2d\x2e\
+\x35\x2d\x2e\x32\x32\x2d\x2e\x35\x2d\x2e\x35\x63\x30\x2d\x32\x2e\
+\x34\x32\x2d\x32\x2e\x30\x39\x2d\x34\x2e\x33\x39\x2d\x34\x2e\x36\
+\x36\x2d\x34\x2e\x33\x39\x2d\x32\x2e\x35\x37\x20\x30\x2d\x34\x2e\
+\x36\x36\x20\x31\x2e\x39\x37\x2d\x34\x2e\x36\x36\x20\x34\x2e\x33\
+\x39\x20\x30\x20\x31\x2e\x34\x34\x2e\x33\x32\x20\x32\x2e\x37\x37\
+\x2e\x39\x33\x20\x33\x2e\x38\x35\x2e\x36\x34\x20\x31\x2e\x31\x35\
+\x20\x31\x2e\x30\x38\x20\x31\x2e\x36\x34\x20\x31\x2e\x38\x35\x20\
+\x32\x2e\x34\x32\x2e\x31\x39\x2e\x32\x2e\x31\x39\x2e\x35\x31\x20\
+\x30\x20\x2e\x37\x31\x2d\x2e\x31\x31\x2e\x31\x2d\x2e\x32\x34\x2e\
+\x31\x35\x2d\x2e\x33\x37\x2e\x31\x35\x7a\x6d\x37\x2e\x31\x37\x2d\
+\x31\x2e\x38\x35\x63\x2d\x31\x2e\x31\x39\x20\x30\x2d\x32\x2e\x32\
+\x34\x2d\x2e\x33\x2d\x33\x2e\x31\x2d\x2e\x38\x39\x2d\x31\x2e\x34\
+\x39\x2d\x31\x2e\x30\x31\x2d\x32\x2e\x33\x38\x2d\x32\x2e\x36\x35\
+\x2d\x32\x2e\x33\x38\x2d\x34\x2e\x33\x39\x20\x30\x2d\x2e\x32\x38\
+\x2e\x32\x32\x2d\x2e\x35\x2e\x35\x2d\x2e\x35\x73\x2e\x35\x2e\x32\
+\x32\x2e\x35\x2e\x35\x63\x30\x20\x31\x2e\x34\x31\x2e\x37\x32\x20\
+\x32\x2e\x37\x34\x20\x31\x2e\x39\x34\x20\x33\x2e\x35\x36\x2e\x37\
+\x31\x2e\x34\x38\x20\x31\x2e\x35\x34\x2e\x37\x31\x20\x32\x2e\x35\
+\x34\x2e\x37\x31\x2e\x32\x34\x20\x30\x20\x2e\x36\x34\x2d\x2e\x30\
+\x33\x20\x31\x2e\x30\x34\x2d\x2e\x31\x2e\x32\x37\x2d\x2e\x30\x35\
+\x2e\x35\x33\x2e\x31\x33\x2e\x35\x38\x2e\x34\x31\x2e\x30\x35\x2e\
+\x32\x37\x2d\x2e\x31\x33\x2e\x35\x33\x2d\x2e\x34\x31\x2e\x35\x38\
+\x2d\x2e\x35\x37\x2e\x31\x31\x2d\x31\x2e\x30\x37\x2e\x31\x32\x2d\
+\x31\x2e\x32\x31\x2e\x31\x32\x7a\x4d\x31\x34\x2e\x39\x31\x20\x32\
+\x32\x63\x2d\x2e\x30\x34\x20\x30\x2d\x2e\x30\x39\x2d\x2e\x30\x31\
+\x2d\x2e\x31\x33\x2d\x2e\x30\x32\x2d\x31\x2e\x35\x39\x2d\x2e\x34\
+\x34\x2d\x32\x2e\x36\x33\x2d\x31\x2e\x30\x33\x2d\x33\x2e\x37\x32\
+\x2d\x32\x2e\x31\x2d\x31\x2e\x34\x2d\x31\x2e\x33\x39\x2d\x32\x2e\
+\x31\x37\x2d\x33\x2e\x32\x34\x2d\x32\x2e\x31\x37\x2d\x35\x2e\x32\
+\x32\x20\x30\x2d\x31\x2e\x36\x32\x20\x31\x2e\x33\x38\x2d\x32\x2e\
+\x39\x34\x20\x33\x2e\x30\x38\x2d\x32\x2e\x39\x34\x20\x31\x2e\x37\
+\x20\x30\x20\x33\x2e\x30\x38\x20\x31\x2e\x33\x32\x20\x33\x2e\x30\
+\x38\x20\x32\x2e\x39\x34\x20\x30\x20\x31\x2e\x30\x37\x2e\x39\x33\
+\x20\x31\x2e\x39\x34\x20\x32\x2e\x30\x38\x20\x31\x2e\x39\x34\x73\
+\x32\x2e\x30\x38\x2d\x2e\x38\x37\x20\x32\x2e\x30\x38\x2d\x31\x2e\
+\x39\x34\x63\x30\x2d\x33\x2e\x37\x37\x2d\x33\x2e\x32\x35\x2d\x36\
+\x2e\x38\x33\x2d\x37\x2e\x32\x35\x2d\x36\x2e\x38\x33\x2d\x32\x2e\
+\x38\x34\x20\x30\x2d\x35\x2e\x34\x34\x20\x31\x2e\x35\x38\x2d\x36\
+\x2e\x36\x31\x20\x34\x2e\x30\x33\x2d\x2e\x33\x39\x2e\x38\x31\x2d\
+\x2e\x35\x39\x20\x31\x2e\x37\x36\x2d\x2e\x35\x39\x20\x32\x2e\x38\
+\x20\x30\x20\x2e\x37\x38\x2e\x30\x37\x20\x32\x2e\x30\x31\x2e\x36\
+\x37\x20\x33\x2e\x36\x31\x2e\x31\x2e\x32\x36\x2d\x2e\x30\x33\x2e\
+\x35\x35\x2d\x2e\x32\x39\x2e\x36\x34\x2d\x2e\x32\x36\x2e\x31\x2d\
+\x2e\x35\x35\x2d\x2e\x30\x34\x2d\x2e\x36\x34\x2d\x2e\x32\x39\x2d\
+\x2e\x34\x39\x2d\x31\x2e\x33\x31\x2d\x2e\x37\x33\x2d\x32\x2e\x36\
+\x31\x2d\x2e\x37\x33\x2d\x33\x2e\x39\x36\x20\x30\x2d\x31\x2e\x32\
+\x2e\x32\x33\x2d\x32\x2e\x32\x39\x2e\x36\x38\x2d\x33\x2e\x32\x34\
+\x20\x31\x2e\x33\x33\x2d\x32\x2e\x37\x39\x20\x34\x2e\x32\x38\x2d\
+\x34\x2e\x36\x20\x37\x2e\x35\x31\x2d\x34\x2e\x36\x20\x34\x2e\x35\
+\x35\x20\x30\x20\x38\x2e\x32\x35\x20\x33\x2e\x35\x31\x20\x38\x2e\
+\x32\x35\x20\x37\x2e\x38\x33\x20\x30\x20\x31\x2e\x36\x32\x2d\x31\
+\x2e\x33\x38\x20\x32\x2e\x39\x34\x2d\x33\x2e\x30\x38\x20\x32\x2e\
+\x39\x34\x73\x2d\x33\x2e\x30\x38\x2d\x31\x2e\x33\x32\x2d\x33\x2e\
+\x30\x38\x2d\x32\x2e\x39\x34\x63\x30\x2d\x31\x2e\x30\x37\x2d\x2e\
+\x39\x33\x2d\x31\x2e\x39\x34\x2d\x32\x2e\x30\x38\x2d\x31\x2e\x39\
+\x34\x73\x2d\x32\x2e\x30\x38\x2e\x38\x37\x2d\x32\x2e\x30\x38\x20\
+\x31\x2e\x39\x34\x63\x30\x20\x31\x2e\x37\x31\x2e\x36\x36\x20\x33\
+\x2e\x33\x31\x20\x31\x2e\x38\x37\x20\x34\x2e\x35\x31\x2e\x39\x35\
+\x2e\x39\x34\x20\x31\x2e\x38\x36\x20\x31\x2e\x34\x36\x20\x33\x2e\
+\x32\x37\x20\x31\x2e\x38\x35\x2e\x32\x37\x2e\x30\x37\x2e\x34\x32\
+\x2e\x33\x35\x2e\x33\x35\x2e\x36\x31\x2d\x2e\x30\x35\x2e\x32\x33\
+\x2d\x2e\x32\x36\x2e\x33\x38\x2d\x2e\x34\x37\x2e\x33\x38\x7a\x22\
+\x0a\x20\x20\x20\x20\x20\x69\x64\x3d\x22\x70\x61\x74\x68\x32\x22\
+\x0a\x20\x20\x20\x20\x20\x73\x74\x79\x6c\x65\x3d\x22\x66\x69\x6c\
+\x6c\x3a\x23\x34\x65\x34\x64\x61\x61\x3b\x66\x69\x6c\x6c\x2d\x6f\
+\x70\x61\x63\x69\x74\x79\x3a\x31\x22\x20\x2f\x3e\x0a\x20\x20\x3c\
+\x70\x61\x74\x68\x0a\x20\x20\x20\x20\x20\x66\x69\x6c\x6c\x3d\x22\
+\x6e\x6f\x6e\x65\x22\x0a\x20\x20\x20\x20\x20\x64\x3d\x22\x4d\x30\
+\x20\x30\x68\x32\x34\x76\x32\x34\x48\x30\x7a\x22\x0a\x20\x20\x20\
+\x20\x20\x69\x64\x3d\x22\x70\x61\x74\x68\x34\x22\x20\x2f\x3e\x0a\
+\x3c\x2f\x73\x76\x67\x3e\x0a\
\x00\x00\x08\x13\
\x3c\
\x3f\x78\x6d\x6c\x20\x76\x65\x72\x73\x69\x6f\x6e\x3d\x22\x31\x2e\
@@ -681,47 +957,231 @@ qt_resource_data = "\
\x20\x20\x20\x73\x74\x79\x6c\x65\x3d\x22\x66\x69\x6c\x6c\x3a\x23\
\x30\x30\x66\x66\x30\x30\x22\x20\x2f\x3e\x0a\x3c\x2f\x73\x76\x67\
\x3e\x0a\
-\x00\x00\x00\xea\
+\x00\x00\x06\xdd\
\x3c\
-\x73\x76\x67\x20\x78\x6d\x6c\x6e\x73\x3d\x22\x68\x74\x74\x70\x3a\
-\x2f\x2f\x77\x77\x77\x2e\x77\x33\x2e\x6f\x72\x67\x2f\x32\x30\x30\
-\x30\x2f\x73\x76\x67\x22\x20\x77\x69\x64\x74\x68\x3d\x22\x32\x34\
-\x22\x20\x68\x65\x69\x67\x68\x74\x3d\x22\x32\x34\x22\x20\x76\x69\
-\x65\x77\x42\x6f\x78\x3d\x22\x30\x20\x30\x20\x32\x34\x20\x32\x34\
-\x22\x3e\x3c\x70\x61\x74\x68\x20\x64\x3d\x22\x4d\x30\x20\x30\x68\
-\x32\x34\x76\x32\x34\x48\x30\x7a\x22\x20\x66\x69\x6c\x6c\x3d\x22\
-\x6e\x6f\x6e\x65\x22\x2f\x3e\x3c\x70\x61\x74\x68\x20\x64\x3d\x22\
-\x4d\x31\x32\x20\x32\x43\x36\x2e\x34\x38\x20\x32\x20\x32\x20\x36\
-\x2e\x34\x38\x20\x32\x20\x31\x32\x73\x34\x2e\x34\x38\x20\x31\x30\
-\x20\x31\x30\x20\x31\x30\x20\x31\x30\x2d\x34\x2e\x34\x38\x20\x31\
-\x30\x2d\x31\x30\x53\x31\x37\x2e\x35\x32\x20\x32\x20\x31\x32\x20\
-\x32\x7a\x6d\x31\x20\x31\x35\x68\x2d\x32\x76\x2d\x36\x68\x32\x76\
-\x36\x7a\x6d\x30\x2d\x38\x68\x2d\x32\x56\x37\x68\x32\x76\x32\x7a\
-\x22\x2f\x3e\x3c\x2f\x73\x76\x67\x3e\
-\x00\x00\x01\x54\
+\x3f\x78\x6d\x6c\x20\x76\x65\x72\x73\x69\x6f\x6e\x3d\x22\x31\x2e\
+\x30\x22\x20\x65\x6e\x63\x6f\x64\x69\x6e\x67\x3d\x22\x55\x54\x46\
+\x2d\x38\x22\x20\x73\x74\x61\x6e\x64\x61\x6c\x6f\x6e\x65\x3d\x22\
+\x6e\x6f\x22\x3f\x3e\x0a\x3c\x73\x76\x67\x0a\x20\x20\x20\x78\x6d\
+\x6c\x6e\x73\x3a\x64\x63\x3d\x22\x68\x74\x74\x70\x3a\x2f\x2f\x70\
+\x75\x72\x6c\x2e\x6f\x72\x67\x2f\x64\x63\x2f\x65\x6c\x65\x6d\x65\
+\x6e\x74\x73\x2f\x31\x2e\x31\x2f\x22\x0a\x20\x20\x20\x78\x6d\x6c\
+\x6e\x73\x3a\x63\x63\x3d\x22\x68\x74\x74\x70\x3a\x2f\x2f\x63\x72\
+\x65\x61\x74\x69\x76\x65\x63\x6f\x6d\x6d\x6f\x6e\x73\x2e\x6f\x72\
+\x67\x2f\x6e\x73\x23\x22\x0a\x20\x20\x20\x78\x6d\x6c\x6e\x73\x3a\
+\x72\x64\x66\x3d\x22\x68\x74\x74\x70\x3a\x2f\x2f\x77\x77\x77\x2e\
+\x77\x33\x2e\x6f\x72\x67\x2f\x31\x39\x39\x39\x2f\x30\x32\x2f\x32\
+\x32\x2d\x72\x64\x66\x2d\x73\x79\x6e\x74\x61\x78\x2d\x6e\x73\x23\
+\x22\x0a\x20\x20\x20\x78\x6d\x6c\x6e\x73\x3a\x73\x76\x67\x3d\x22\
+\x68\x74\x74\x70\x3a\x2f\x2f\x77\x77\x77\x2e\x77\x33\x2e\x6f\x72\
+\x67\x2f\x32\x30\x30\x30\x2f\x73\x76\x67\x22\x0a\x20\x20\x20\x78\
+\x6d\x6c\x6e\x73\x3d\x22\x68\x74\x74\x70\x3a\x2f\x2f\x77\x77\x77\
+\x2e\x77\x33\x2e\x6f\x72\x67\x2f\x32\x30\x30\x30\x2f\x73\x76\x67\
+\x22\x0a\x20\x20\x20\x78\x6d\x6c\x6e\x73\x3a\x73\x6f\x64\x69\x70\
+\x6f\x64\x69\x3d\x22\x68\x74\x74\x70\x3a\x2f\x2f\x73\x6f\x64\x69\
+\x70\x6f\x64\x69\x2e\x73\x6f\x75\x72\x63\x65\x66\x6f\x72\x67\x65\
+\x2e\x6e\x65\x74\x2f\x44\x54\x44\x2f\x73\x6f\x64\x69\x70\x6f\x64\
+\x69\x2d\x30\x2e\x64\x74\x64\x22\x0a\x20\x20\x20\x78\x6d\x6c\x6e\
+\x73\x3a\x69\x6e\x6b\x73\x63\x61\x70\x65\x3d\x22\x68\x74\x74\x70\
+\x3a\x2f\x2f\x77\x77\x77\x2e\x69\x6e\x6b\x73\x63\x61\x70\x65\x2e\
+\x6f\x72\x67\x2f\x6e\x61\x6d\x65\x73\x70\x61\x63\x65\x73\x2f\x69\
+\x6e\x6b\x73\x63\x61\x70\x65\x22\x0a\x20\x20\x20\x77\x69\x64\x74\
+\x68\x3d\x22\x32\x34\x22\x0a\x20\x20\x20\x68\x65\x69\x67\x68\x74\
+\x3d\x22\x32\x34\x22\x0a\x20\x20\x20\x76\x69\x65\x77\x42\x6f\x78\
+\x3d\x22\x30\x20\x30\x20\x32\x34\x20\x32\x34\x22\x0a\x20\x20\x20\
+\x76\x65\x72\x73\x69\x6f\x6e\x3d\x22\x31\x2e\x31\x22\x0a\x20\x20\
+\x20\x69\x64\x3d\x22\x73\x76\x67\x36\x22\x0a\x20\x20\x20\x73\x6f\
+\x64\x69\x70\x6f\x64\x69\x3a\x64\x6f\x63\x6e\x61\x6d\x65\x3d\x22\
+\x69\x6e\x66\x6f\x2d\x32\x34\x70\x78\x2e\x73\x76\x67\x22\x0a\x20\
+\x20\x20\x69\x6e\x6b\x73\x63\x61\x70\x65\x3a\x76\x65\x72\x73\x69\
+\x6f\x6e\x3d\x22\x30\x2e\x39\x32\x2e\x33\x20\x28\x75\x6e\x6b\x6e\
+\x6f\x77\x6e\x29\x22\x3e\x0a\x20\x20\x3c\x6d\x65\x74\x61\x64\x61\
+\x74\x61\x0a\x20\x20\x20\x20\x20\x69\x64\x3d\x22\x6d\x65\x74\x61\
+\x64\x61\x74\x61\x31\x32\x22\x3e\x0a\x20\x20\x20\x20\x3c\x72\x64\
+\x66\x3a\x52\x44\x46\x3e\x0a\x20\x20\x20\x20\x20\x20\x3c\x63\x63\
+\x3a\x57\x6f\x72\x6b\x0a\x20\x20\x20\x20\x20\x20\x20\x20\x20\x72\
+\x64\x66\x3a\x61\x62\x6f\x75\x74\x3d\x22\x22\x3e\x0a\x20\x20\x20\
+\x20\x20\x20\x20\x20\x3c\x64\x63\x3a\x66\x6f\x72\x6d\x61\x74\x3e\
+\x69\x6d\x61\x67\x65\x2f\x73\x76\x67\x2b\x78\x6d\x6c\x3c\x2f\x64\
+\x63\x3a\x66\x6f\x72\x6d\x61\x74\x3e\x0a\x20\x20\x20\x20\x20\x20\
+\x20\x20\x3c\x64\x63\x3a\x74\x79\x70\x65\x0a\x20\x20\x20\x20\x20\
+\x20\x20\x20\x20\x20\x20\x72\x64\x66\x3a\x72\x65\x73\x6f\x75\x72\
+\x63\x65\x3d\x22\x68\x74\x74\x70\x3a\x2f\x2f\x70\x75\x72\x6c\x2e\
+\x6f\x72\x67\x2f\x64\x63\x2f\x64\x63\x6d\x69\x74\x79\x70\x65\x2f\
+\x53\x74\x69\x6c\x6c\x49\x6d\x61\x67\x65\x22\x20\x2f\x3e\x0a\x20\
+\x20\x20\x20\x20\x20\x3c\x2f\x63\x63\x3a\x57\x6f\x72\x6b\x3e\x0a\
+\x20\x20\x20\x20\x3c\x2f\x72\x64\x66\x3a\x52\x44\x46\x3e\x0a\x20\
+\x20\x3c\x2f\x6d\x65\x74\x61\x64\x61\x74\x61\x3e\x0a\x20\x20\x3c\
+\x64\x65\x66\x73\x0a\x20\x20\x20\x20\x20\x69\x64\x3d\x22\x64\x65\
+\x66\x73\x31\x30\x22\x20\x2f\x3e\x0a\x20\x20\x3c\x73\x6f\x64\x69\
+\x70\x6f\x64\x69\x3a\x6e\x61\x6d\x65\x64\x76\x69\x65\x77\x0a\x20\
+\x20\x20\x20\x20\x70\x61\x67\x65\x63\x6f\x6c\x6f\x72\x3d\x22\x23\
+\x66\x66\x66\x66\x66\x66\x22\x0a\x20\x20\x20\x20\x20\x62\x6f\x72\
+\x64\x65\x72\x63\x6f\x6c\x6f\x72\x3d\x22\x23\x36\x36\x36\x36\x36\
+\x36\x22\x0a\x20\x20\x20\x20\x20\x62\x6f\x72\x64\x65\x72\x6f\x70\
+\x61\x63\x69\x74\x79\x3d\x22\x31\x22\x0a\x20\x20\x20\x20\x20\x6f\
+\x62\x6a\x65\x63\x74\x74\x6f\x6c\x65\x72\x61\x6e\x63\x65\x3d\x22\
+\x31\x30\x22\x0a\x20\x20\x20\x20\x20\x67\x72\x69\x64\x74\x6f\x6c\
+\x65\x72\x61\x6e\x63\x65\x3d\x22\x31\x30\x22\x0a\x20\x20\x20\x20\
+\x20\x67\x75\x69\x64\x65\x74\x6f\x6c\x65\x72\x61\x6e\x63\x65\x3d\
+\x22\x31\x30\x22\x0a\x20\x20\x20\x20\x20\x69\x6e\x6b\x73\x63\x61\
+\x70\x65\x3a\x70\x61\x67\x65\x6f\x70\x61\x63\x69\x74\x79\x3d\x22\
+\x30\x22\x0a\x20\x20\x20\x20\x20\x69\x6e\x6b\x73\x63\x61\x70\x65\
+\x3a\x70\x61\x67\x65\x73\x68\x61\x64\x6f\x77\x3d\x22\x32\x22\x0a\
+\x20\x20\x20\x20\x20\x69\x6e\x6b\x73\x63\x61\x70\x65\x3a\x77\x69\
+\x6e\x64\x6f\x77\x2d\x77\x69\x64\x74\x68\x3d\x22\x31\x30\x34\x30\
+\x22\x0a\x20\x20\x20\x20\x20\x69\x6e\x6b\x73\x63\x61\x70\x65\x3a\
+\x77\x69\x6e\x64\x6f\x77\x2d\x68\x65\x69\x67\x68\x74\x3d\x22\x36\
+\x33\x35\x22\x0a\x20\x20\x20\x20\x20\x69\x64\x3d\x22\x6e\x61\x6d\
+\x65\x64\x76\x69\x65\x77\x38\x22\x0a\x20\x20\x20\x20\x20\x73\x68\
+\x6f\x77\x67\x72\x69\x64\x3d\x22\x66\x61\x6c\x73\x65\x22\x0a\x20\
+\x20\x20\x20\x20\x69\x6e\x6b\x73\x63\x61\x70\x65\x3a\x7a\x6f\x6f\
+\x6d\x3d\x22\x39\x2e\x38\x33\x33\x33\x33\x33\x33\x22\x0a\x20\x20\
+\x20\x20\x20\x69\x6e\x6b\x73\x63\x61\x70\x65\x3a\x63\x78\x3d\x22\
+\x31\x32\x22\x0a\x20\x20\x20\x20\x20\x69\x6e\x6b\x73\x63\x61\x70\
+\x65\x3a\x63\x79\x3d\x22\x31\x32\x22\x0a\x20\x20\x20\x20\x20\x69\
+\x6e\x6b\x73\x63\x61\x70\x65\x3a\x77\x69\x6e\x64\x6f\x77\x2d\x78\
+\x3d\x22\x30\x22\x0a\x20\x20\x20\x20\x20\x69\x6e\x6b\x73\x63\x61\
+\x70\x65\x3a\x77\x69\x6e\x64\x6f\x77\x2d\x79\x3d\x22\x30\x22\x0a\
+\x20\x20\x20\x20\x20\x69\x6e\x6b\x73\x63\x61\x70\x65\x3a\x77\x69\
+\x6e\x64\x6f\x77\x2d\x6d\x61\x78\x69\x6d\x69\x7a\x65\x64\x3d\x22\
+\x30\x22\x0a\x20\x20\x20\x20\x20\x69\x6e\x6b\x73\x63\x61\x70\x65\
+\x3a\x63\x75\x72\x72\x65\x6e\x74\x2d\x6c\x61\x79\x65\x72\x3d\x22\
+\x73\x76\x67\x36\x22\x20\x2f\x3e\x0a\x20\x20\x3c\x70\x61\x74\x68\
+\x0a\x20\x20\x20\x20\x20\x64\x3d\x22\x4d\x30\x20\x30\x68\x32\x34\
+\x76\x32\x34\x48\x30\x7a\x22\x0a\x20\x20\x20\x20\x20\x66\x69\x6c\
+\x6c\x3d\x22\x6e\x6f\x6e\x65\x22\x0a\x20\x20\x20\x20\x20\x69\x64\
+\x3d\x22\x70\x61\x74\x68\x32\x22\x20\x2f\x3e\x0a\x20\x20\x3c\x70\
+\x61\x74\x68\x0a\x20\x20\x20\x20\x20\x64\x3d\x22\x4d\x31\x32\x20\
+\x32\x43\x36\x2e\x34\x38\x20\x32\x20\x32\x20\x36\x2e\x34\x38\x20\
+\x32\x20\x31\x32\x73\x34\x2e\x34\x38\x20\x31\x30\x20\x31\x30\x20\
+\x31\x30\x20\x31\x30\x2d\x34\x2e\x34\x38\x20\x31\x30\x2d\x31\x30\
+\x53\x31\x37\x2e\x35\x32\x20\x32\x20\x31\x32\x20\x32\x7a\x6d\x31\
+\x20\x31\x35\x68\x2d\x32\x76\x2d\x36\x68\x32\x76\x36\x7a\x6d\x30\
+\x2d\x38\x68\x2d\x32\x56\x37\x68\x32\x76\x32\x7a\x22\x0a\x20\x20\
+\x20\x20\x20\x69\x64\x3d\x22\x70\x61\x74\x68\x34\x22\x0a\x20\x20\
+\x20\x20\x20\x73\x74\x79\x6c\x65\x3d\x22\x73\x74\x72\x6f\x6b\x65\
+\x3a\x23\x30\x30\x30\x30\x30\x30\x3b\x73\x74\x72\x6f\x6b\x65\x2d\
+\x6f\x70\x61\x63\x69\x74\x79\x3a\x31\x3b\x73\x74\x72\x6f\x6b\x65\
+\x2d\x77\x69\x64\x74\x68\x3a\x30\x2e\x34\x3b\x73\x74\x72\x6f\x6b\
+\x65\x2d\x6d\x69\x74\x65\x72\x6c\x69\x6d\x69\x74\x3a\x34\x3b\x73\
+\x74\x72\x6f\x6b\x65\x2d\x64\x61\x73\x68\x61\x72\x72\x61\x79\x3a\
+\x6e\x6f\x6e\x65\x3b\x66\x69\x6c\x6c\x3a\x23\x33\x61\x37\x38\x66\
+\x66\x3b\x66\x69\x6c\x6c\x2d\x6f\x70\x61\x63\x69\x74\x79\x3a\x31\
+\x22\x20\x2f\x3e\x0a\x3c\x2f\x73\x76\x67\x3e\x0a\
+\x00\x00\x06\xe3\
\x3c\
-\x73\x76\x67\x20\x78\x6d\x6c\x6e\x73\x3d\x22\x68\x74\x74\x70\x3a\
-\x2f\x2f\x77\x77\x77\x2e\x77\x33\x2e\x6f\x72\x67\x2f\x32\x30\x30\
-\x30\x2f\x73\x76\x67\x22\x20\x77\x69\x64\x74\x68\x3d\x22\x32\x34\
-\x22\x20\x68\x65\x69\x67\x68\x74\x3d\x22\x32\x34\x22\x20\x76\x69\
-\x65\x77\x42\x6f\x78\x3d\x22\x30\x20\x30\x20\x32\x34\x20\x32\x34\
-\x22\x3e\x3c\x70\x61\x74\x68\x20\x64\x3d\x22\x4d\x31\x37\x2e\x36\
-\x35\x20\x36\x2e\x33\x35\x43\x31\x36\x2e\x32\x20\x34\x2e\x39\x20\
-\x31\x34\x2e\x32\x31\x20\x34\x20\x31\x32\x20\x34\x63\x2d\x34\x2e\
-\x34\x32\x20\x30\x2d\x37\x2e\x39\x39\x20\x33\x2e\x35\x38\x2d\x37\
-\x2e\x39\x39\x20\x38\x73\x33\x2e\x35\x37\x20\x38\x20\x37\x2e\x39\
-\x39\x20\x38\x63\x33\x2e\x37\x33\x20\x30\x20\x36\x2e\x38\x34\x2d\
-\x32\x2e\x35\x35\x20\x37\x2e\x37\x33\x2d\x36\x68\x2d\x32\x2e\x30\
-\x38\x63\x2d\x2e\x38\x32\x20\x32\x2e\x33\x33\x2d\x33\x2e\x30\x34\
-\x20\x34\x2d\x35\x2e\x36\x35\x20\x34\x2d\x33\x2e\x33\x31\x20\x30\
-\x2d\x36\x2d\x32\x2e\x36\x39\x2d\x36\x2d\x36\x73\x32\x2e\x36\x39\
-\x2d\x36\x20\x36\x2d\x36\x63\x31\x2e\x36\x36\x20\x30\x20\x33\x2e\
-\x31\x34\x2e\x36\x39\x20\x34\x2e\x32\x32\x20\x31\x2e\x37\x38\x4c\
-\x31\x33\x20\x31\x31\x68\x37\x56\x34\x6c\x2d\x32\x2e\x33\x35\x20\
-\x32\x2e\x33\x35\x7a\x22\x2f\x3e\x3c\x70\x61\x74\x68\x20\x64\x3d\
-\x22\x4d\x30\x20\x30\x68\x32\x34\x76\x32\x34\x48\x30\x7a\x22\x20\
-\x66\x69\x6c\x6c\x3d\x22\x6e\x6f\x6e\x65\x22\x2f\x3e\x3c\x2f\x73\
-\x76\x67\x3e\
+\x3f\x78\x6d\x6c\x20\x76\x65\x72\x73\x69\x6f\x6e\x3d\x22\x31\x2e\
+\x30\x22\x20\x65\x6e\x63\x6f\x64\x69\x6e\x67\x3d\x22\x55\x54\x46\
+\x2d\x38\x22\x20\x73\x74\x61\x6e\x64\x61\x6c\x6f\x6e\x65\x3d\x22\
+\x6e\x6f\x22\x3f\x3e\x0a\x3c\x73\x76\x67\x0a\x20\x20\x20\x78\x6d\
+\x6c\x6e\x73\x3a\x64\x63\x3d\x22\x68\x74\x74\x70\x3a\x2f\x2f\x70\
+\x75\x72\x6c\x2e\x6f\x72\x67\x2f\x64\x63\x2f\x65\x6c\x65\x6d\x65\
+\x6e\x74\x73\x2f\x31\x2e\x31\x2f\x22\x0a\x20\x20\x20\x78\x6d\x6c\
+\x6e\x73\x3a\x63\x63\x3d\x22\x68\x74\x74\x70\x3a\x2f\x2f\x63\x72\
+\x65\x61\x74\x69\x76\x65\x63\x6f\x6d\x6d\x6f\x6e\x73\x2e\x6f\x72\
+\x67\x2f\x6e\x73\x23\x22\x0a\x20\x20\x20\x78\x6d\x6c\x6e\x73\x3a\
+\x72\x64\x66\x3d\x22\x68\x74\x74\x70\x3a\x2f\x2f\x77\x77\x77\x2e\
+\x77\x33\x2e\x6f\x72\x67\x2f\x31\x39\x39\x39\x2f\x30\x32\x2f\x32\
+\x32\x2d\x72\x64\x66\x2d\x73\x79\x6e\x74\x61\x78\x2d\x6e\x73\x23\
+\x22\x0a\x20\x20\x20\x78\x6d\x6c\x6e\x73\x3a\x73\x76\x67\x3d\x22\
+\x68\x74\x74\x70\x3a\x2f\x2f\x77\x77\x77\x2e\x77\x33\x2e\x6f\x72\
+\x67\x2f\x32\x30\x30\x30\x2f\x73\x76\x67\x22\x0a\x20\x20\x20\x78\
+\x6d\x6c\x6e\x73\x3d\x22\x68\x74\x74\x70\x3a\x2f\x2f\x77\x77\x77\
+\x2e\x77\x33\x2e\x6f\x72\x67\x2f\x32\x30\x30\x30\x2f\x73\x76\x67\
+\x22\x0a\x20\x20\x20\x78\x6d\x6c\x6e\x73\x3a\x73\x6f\x64\x69\x70\
+\x6f\x64\x69\x3d\x22\x68\x74\x74\x70\x3a\x2f\x2f\x73\x6f\x64\x69\
+\x70\x6f\x64\x69\x2e\x73\x6f\x75\x72\x63\x65\x66\x6f\x72\x67\x65\
+\x2e\x6e\x65\x74\x2f\x44\x54\x44\x2f\x73\x6f\x64\x69\x70\x6f\x64\
+\x69\x2d\x30\x2e\x64\x74\x64\x22\x0a\x20\x20\x20\x78\x6d\x6c\x6e\
+\x73\x3a\x69\x6e\x6b\x73\x63\x61\x70\x65\x3d\x22\x68\x74\x74\x70\
+\x3a\x2f\x2f\x77\x77\x77\x2e\x69\x6e\x6b\x73\x63\x61\x70\x65\x2e\
+\x6f\x72\x67\x2f\x6e\x61\x6d\x65\x73\x70\x61\x63\x65\x73\x2f\x69\
+\x6e\x6b\x73\x63\x61\x70\x65\x22\x0a\x20\x20\x20\x77\x69\x64\x74\
+\x68\x3d\x22\x32\x34\x22\x0a\x20\x20\x20\x68\x65\x69\x67\x68\x74\
+\x3d\x22\x32\x34\x22\x0a\x20\x20\x20\x76\x69\x65\x77\x42\x6f\x78\
+\x3d\x22\x30\x20\x30\x20\x32\x34\x20\x32\x34\x22\x0a\x20\x20\x20\
+\x76\x65\x72\x73\x69\x6f\x6e\x3d\x22\x31\x2e\x31\x22\x0a\x20\x20\
+\x20\x69\x64\x3d\x22\x73\x76\x67\x36\x22\x0a\x20\x20\x20\x73\x6f\
+\x64\x69\x70\x6f\x64\x69\x3a\x64\x6f\x63\x6e\x61\x6d\x65\x3d\x22\
+\x72\x65\x66\x72\x65\x73\x68\x2d\x32\x34\x70\x78\x2e\x73\x76\x67\
+\x22\x0a\x20\x20\x20\x69\x6e\x6b\x73\x63\x61\x70\x65\x3a\x76\x65\
+\x72\x73\x69\x6f\x6e\x3d\x22\x30\x2e\x39\x32\x2e\x33\x20\x28\x75\
+\x6e\x6b\x6e\x6f\x77\x6e\x29\x22\x3e\x0a\x20\x20\x3c\x6d\x65\x74\
+\x61\x64\x61\x74\x61\x0a\x20\x20\x20\x20\x20\x69\x64\x3d\x22\x6d\
+\x65\x74\x61\x64\x61\x74\x61\x31\x32\x22\x3e\x0a\x20\x20\x20\x20\
+\x3c\x72\x64\x66\x3a\x52\x44\x46\x3e\x0a\x20\x20\x20\x20\x20\x20\
+\x3c\x63\x63\x3a\x57\x6f\x72\x6b\x0a\x20\x20\x20\x20\x20\x20\x20\
+\x20\x20\x72\x64\x66\x3a\x61\x62\x6f\x75\x74\x3d\x22\x22\x3e\x0a\
+\x20\x20\x20\x20\x20\x20\x20\x20\x3c\x64\x63\x3a\x66\x6f\x72\x6d\
+\x61\x74\x3e\x69\x6d\x61\x67\x65\x2f\x73\x76\x67\x2b\x78\x6d\x6c\
+\x3c\x2f\x64\x63\x3a\x66\x6f\x72\x6d\x61\x74\x3e\x0a\x20\x20\x20\
+\x20\x20\x20\x20\x20\x3c\x64\x63\x3a\x74\x79\x70\x65\x0a\x20\x20\
+\x20\x20\x20\x20\x20\x20\x20\x20\x20\x72\x64\x66\x3a\x72\x65\x73\
+\x6f\x75\x72\x63\x65\x3d\x22\x68\x74\x74\x70\x3a\x2f\x2f\x70\x75\
+\x72\x6c\x2e\x6f\x72\x67\x2f\x64\x63\x2f\x64\x63\x6d\x69\x74\x79\
+\x70\x65\x2f\x53\x74\x69\x6c\x6c\x49\x6d\x61\x67\x65\x22\x20\x2f\
+\x3e\x0a\x20\x20\x20\x20\x20\x20\x3c\x2f\x63\x63\x3a\x57\x6f\x72\
+\x6b\x3e\x0a\x20\x20\x20\x20\x3c\x2f\x72\x64\x66\x3a\x52\x44\x46\
+\x3e\x0a\x20\x20\x3c\x2f\x6d\x65\x74\x61\x64\x61\x74\x61\x3e\x0a\
+\x20\x20\x3c\x64\x65\x66\x73\x0a\x20\x20\x20\x20\x20\x69\x64\x3d\
+\x22\x64\x65\x66\x73\x31\x30\x22\x20\x2f\x3e\x0a\x20\x20\x3c\x73\
+\x6f\x64\x69\x70\x6f\x64\x69\x3a\x6e\x61\x6d\x65\x64\x76\x69\x65\
+\x77\x0a\x20\x20\x20\x20\x20\x70\x61\x67\x65\x63\x6f\x6c\x6f\x72\
+\x3d\x22\x23\x66\x66\x66\x66\x66\x66\x22\x0a\x20\x20\x20\x20\x20\
+\x62\x6f\x72\x64\x65\x72\x63\x6f\x6c\x6f\x72\x3d\x22\x23\x36\x36\
+\x36\x36\x36\x36\x22\x0a\x20\x20\x20\x20\x20\x62\x6f\x72\x64\x65\
+\x72\x6f\x70\x61\x63\x69\x74\x79\x3d\x22\x31\x22\x0a\x20\x20\x20\
+\x20\x20\x6f\x62\x6a\x65\x63\x74\x74\x6f\x6c\x65\x72\x61\x6e\x63\
+\x65\x3d\x22\x31\x30\x22\x0a\x20\x20\x20\x20\x20\x67\x72\x69\x64\
+\x74\x6f\x6c\x65\x72\x61\x6e\x63\x65\x3d\x22\x31\x30\x22\x0a\x20\
+\x20\x20\x20\x20\x67\x75\x69\x64\x65\x74\x6f\x6c\x65\x72\x61\x6e\
+\x63\x65\x3d\x22\x31\x30\x22\x0a\x20\x20\x20\x20\x20\x69\x6e\x6b\
+\x73\x63\x61\x70\x65\x3a\x70\x61\x67\x65\x6f\x70\x61\x63\x69\x74\
+\x79\x3d\x22\x30\x22\x0a\x20\x20\x20\x20\x20\x69\x6e\x6b\x73\x63\
+\x61\x70\x65\x3a\x70\x61\x67\x65\x73\x68\x61\x64\x6f\x77\x3d\x22\
+\x32\x22\x0a\x20\x20\x20\x20\x20\x69\x6e\x6b\x73\x63\x61\x70\x65\
+\x3a\x77\x69\x6e\x64\x6f\x77\x2d\x77\x69\x64\x74\x68\x3d\x22\x37\
+\x38\x38\x22\x0a\x20\x20\x20\x20\x20\x69\x6e\x6b\x73\x63\x61\x70\
+\x65\x3a\x77\x69\x6e\x64\x6f\x77\x2d\x68\x65\x69\x67\x68\x74\x3d\
+\x22\x34\x38\x30\x22\x0a\x20\x20\x20\x20\x20\x69\x64\x3d\x22\x6e\
+\x61\x6d\x65\x64\x76\x69\x65\x77\x38\x22\x0a\x20\x20\x20\x20\x20\
+\x73\x68\x6f\x77\x67\x72\x69\x64\x3d\x22\x66\x61\x6c\x73\x65\x22\
+\x0a\x20\x20\x20\x20\x20\x69\x6e\x6b\x73\x63\x61\x70\x65\x3a\x7a\
+\x6f\x6f\x6d\x3d\x22\x39\x2e\x38\x33\x33\x33\x33\x33\x33\x22\x0a\
+\x20\x20\x20\x20\x20\x69\x6e\x6b\x73\x63\x61\x70\x65\x3a\x63\x78\
+\x3d\x22\x31\x32\x22\x0a\x20\x20\x20\x20\x20\x69\x6e\x6b\x73\x63\
+\x61\x70\x65\x3a\x63\x79\x3d\x22\x31\x32\x22\x0a\x20\x20\x20\x20\
+\x20\x69\x6e\x6b\x73\x63\x61\x70\x65\x3a\x77\x69\x6e\x64\x6f\x77\
+\x2d\x78\x3d\x22\x34\x33\x35\x22\x0a\x20\x20\x20\x20\x20\x69\x6e\
+\x6b\x73\x63\x61\x70\x65\x3a\x77\x69\x6e\x64\x6f\x77\x2d\x79\x3d\
+\x22\x31\x35\x37\x22\x0a\x20\x20\x20\x20\x20\x69\x6e\x6b\x73\x63\
+\x61\x70\x65\x3a\x77\x69\x6e\x64\x6f\x77\x2d\x6d\x61\x78\x69\x6d\
+\x69\x7a\x65\x64\x3d\x22\x30\x22\x0a\x20\x20\x20\x20\x20\x69\x6e\
+\x6b\x73\x63\x61\x70\x65\x3a\x63\x75\x72\x72\x65\x6e\x74\x2d\x6c\
+\x61\x79\x65\x72\x3d\x22\x73\x76\x67\x36\x22\x20\x2f\x3e\x0a\x20\
+\x20\x3c\x70\x61\x74\x68\x0a\x20\x20\x20\x20\x20\x64\x3d\x22\x4d\
+\x31\x37\x2e\x36\x35\x20\x36\x2e\x33\x35\x43\x31\x36\x2e\x32\x20\
+\x34\x2e\x39\x20\x31\x34\x2e\x32\x31\x20\x34\x20\x31\x32\x20\x34\
+\x63\x2d\x34\x2e\x34\x32\x20\x30\x2d\x37\x2e\x39\x39\x20\x33\x2e\
+\x35\x38\x2d\x37\x2e\x39\x39\x20\x38\x73\x33\x2e\x35\x37\x20\x38\
+\x20\x37\x2e\x39\x39\x20\x38\x63\x33\x2e\x37\x33\x20\x30\x20\x36\
+\x2e\x38\x34\x2d\x32\x2e\x35\x35\x20\x37\x2e\x37\x33\x2d\x36\x68\
+\x2d\x32\x2e\x30\x38\x63\x2d\x2e\x38\x32\x20\x32\x2e\x33\x33\x2d\
+\x33\x2e\x30\x34\x20\x34\x2d\x35\x2e\x36\x35\x20\x34\x2d\x33\x2e\
+\x33\x31\x20\x30\x2d\x36\x2d\x32\x2e\x36\x39\x2d\x36\x2d\x36\x73\
+\x32\x2e\x36\x39\x2d\x36\x20\x36\x2d\x36\x63\x31\x2e\x36\x36\x20\
+\x30\x20\x33\x2e\x31\x34\x2e\x36\x39\x20\x34\x2e\x32\x32\x20\x31\
+\x2e\x37\x38\x4c\x31\x33\x20\x31\x31\x68\x37\x56\x34\x6c\x2d\x32\
+\x2e\x33\x35\x20\x32\x2e\x33\x35\x7a\x22\x0a\x20\x20\x20\x20\x20\
+\x69\x64\x3d\x22\x70\x61\x74\x68\x32\x22\x0a\x20\x20\x20\x20\x20\
+\x73\x74\x79\x6c\x65\x3d\x22\x66\x69\x6c\x6c\x3a\x23\x30\x30\x38\
+\x30\x38\x30\x22\x20\x2f\x3e\x0a\x20\x20\x3c\x70\x61\x74\x68\x0a\
+\x20\x20\x20\x20\x20\x64\x3d\x22\x4d\x30\x20\x30\x68\x32\x34\x76\
+\x32\x34\x48\x30\x7a\x22\x0a\x20\x20\x20\x20\x20\x66\x69\x6c\x6c\
+\x3d\x22\x6e\x6f\x6e\x65\x22\x0a\x20\x20\x20\x20\x20\x69\x64\x3d\
+\x22\x70\x61\x74\x68\x34\x22\x20\x2f\x3e\x0a\x3c\x2f\x73\x76\x67\
+\x3e\x0a\
\x00\x00\x09\x15\
\x3c\
\x3f\x78\x6d\x6c\x20\x76\x65\x72\x73\x69\x6f\x6e\x3d\x22\x31\x2e\
@@ -1737,18 +2197,18 @@ qt_resource_name = "\
qt_resource_struct = "\
\x00\x00\x00\x00\x00\x02\x00\x00\x00\x0d\x00\x00\x00\x01\
\x00\x00\x00\x0e\x00\x00\x00\x00\x00\x01\x00\x00\x08\x69\
-\x00\x00\x00\x72\x00\x00\x00\x00\x00\x01\x00\x00\x28\xff\
+\x00\x00\x00\x72\x00\x00\x00\x00\x00\x01\x00\x00\x3a\x35\
\x00\x00\x00\x00\x00\x00\x00\x00\x00\x01\x00\x00\x00\x00\
-\x00\x00\x00\x3e\x00\x00\x00\x00\x00\x01\x00\x00\x19\x1e\
-\x00\x00\x00\xc0\x00\x00\x00\x00\x00\x01\x00\x00\x3b\x7e\
-\x00\x00\x00\xd0\x00\x00\x00\x00\x00\x01\x00\x00\x60\x03\
+\x00\x00\x00\x3e\x00\x00\x00\x00\x00\x01\x00\x00\x1f\x0f\
+\x00\x00\x00\xc0\x00\x00\x00\x00\x00\x01\x00\x00\x58\x36\
+\x00\x00\x00\xd0\x00\x00\x00\x00\x00\x01\x00\x00\x7c\xbb\
\x00\x00\x00\x1c\x00\x00\x00\x00\x00\x01\x00\x00\x0f\x51\
-\x00\x00\x00\x62\x00\x00\x00\x00\x00\x01\x00\x00\x20\xe8\
+\x00\x00\x00\x62\x00\x00\x00\x00\x00\x01\x00\x00\x32\x1e\
\x00\x00\x00\x2c\x00\x00\x00\x00\x00\x01\x00\x00\x17\x1a\
-\x00\x00\x00\xae\x00\x00\x00\x00\x00\x01\x00\x00\x34\x5e\
-\x00\x00\x00\x80\x00\x00\x00\x00\x00\x01\x00\x00\x29\xed\
-\x00\x00\x00\x4e\x00\x00\x00\x00\x00\x01\x00\x00\x19\xf1\
-\x00\x00\x00\x94\x00\x00\x00\x00\x00\x01\x00\x00\x2b\x45\
+\x00\x00\x00\xae\x00\x00\x00\x00\x00\x01\x00\x00\x51\x16\
+\x00\x00\x00\x80\x00\x00\x00\x00\x00\x01\x00\x00\x41\x16\
+\x00\x00\x00\x4e\x00\x00\x00\x00\x00\x01\x00\x00\x25\x82\
+\x00\x00\x00\x94\x00\x00\x00\x00\x00\x01\x00\x00\x47\xfd\
"
def qInitResources():