diff options
author | Pablo Moleri <pmoleri@PABLOMOLERI-PC.(none)> | 2010-03-17 02:56:36 (GMT) |
---|---|---|
committer | Pablo Moleri <pmoleri@PABLOMOLERI-PC.(none)> | 2010-03-17 02:56:36 (GMT) |
commit | cc1e19538279f3dd785782a0ad256e84b13292a3 (patch) | |
tree | 547b118caf716cb5f4af26cb07031dd69febfac2 | |
parent | dab600114942f1deed9348dce0f391218507ded7 (diff) |
-rw-r--r-- | COPYING | 674 | ||||
-rw-r--r-- | Quinteti.activity/MANIFEST | 6 | ||||
-rw-r--r-- | Quinteti.activity/NEWS | 4 | ||||
-rw-r--r-- | Quinteti.activity/TODO | 4 | ||||
-rw-r--r-- | Quinteti.activity/activity.py | 15 | ||||
-rw-r--r-- | Quinteti.activity/activity/activity-quin-te-ti.svg | 20 | ||||
-rw-r--r-- | Quinteti.activity/activity/activity-quinteti.svg | 70 | ||||
-rw-r--r-- | Quinteti.activity/activity/activity.info | 4 | ||||
-rw-r--r-- | Quinteti.activity/gui/button.py | 2 | ||||
-rw-r--r-- | Quinteti.activity/gui/instructions.png | bin | 130342 -> 121734 bytes | |||
-rw-r--r-- | Quinteti.activity/gui/instructions.svg | 248 | ||||
-rw-r--r-- | Quinteti.activity/setup.py | 2 | ||||
-rw-r--r-- | resources/icon.png | bin | 0 -> 4068 bytes | |||
-rw-r--r-- | resources/instructions.svg | 78 |
14 files changed, 804 insertions, 323 deletions
@@ -0,0 +1,674 @@ + GNU GENERAL PUBLIC LICENSE + Version 3, 29 June 2007 + + Copyright (C) 2007 Free Software Foundation, Inc. <http://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 <http://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 +<http://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 +<http://www.gnu.org/philosophy/why-not-lgpl.html>. diff --git a/Quinteti.activity/MANIFEST b/Quinteti.activity/MANIFEST index d2bee1a..426c149 100644 --- a/Quinteti.activity/MANIFEST +++ b/Quinteti.activity/MANIFEST @@ -10,12 +10,11 @@ gui/2selected.png gui/1.png gui/1selected.png gui/board.py -gui/instructions.svg gui/4selected.png gui/5.png gui/instructions.png +gui/man-vs-man.png gui/9.png -gui/jupeee.mp3 gui/button.py gui/player_win.png gui/standardcursor_mask.xbm @@ -34,12 +33,13 @@ gui/3selected.png gui/quinteti-new.png gui/3.png gui/8selected.png +gui/man-vs-computer.png gui/6selected.png gui/6.png gui/jupeee.ogg gui/7.png -activity/activity-quin-te-ti.svg activity/activity.info +activity/activity-quinteti.svg olpcgames/COPYING olpcgames/_cairoimage.py olpcgames/_gtkmain.py diff --git a/Quinteti.activity/NEWS b/Quinteti.activity/NEWS index 1985d92..ae5f0de 100644 --- a/Quinteti.activity/NEWS +++ b/Quinteti.activity/NEWS @@ -1,3 +1,7 @@ +Version 3: +- Se agrega modalidad para jugar contra la computadora. +- Se cambia el ícono. + Version 2: - Se agrega el cursor estándar de Sugar. - Al hacer puntos agrega un sonido. diff --git a/Quinteti.activity/TODO b/Quinteti.activity/TODO index 263c0af..8c4e165 100644 --- a/Quinteti.activity/TODO +++ b/Quinteti.activity/TODO @@ -1,6 +1,6 @@ Algunas mejoras que serían interesantes: - Restaurar un juego -- Jugar por red mesh +- Jugar por red (modo colaborativo) - Temas (skins) intercambiables (definidas en archivos externos). -- Al terminar el juego marcar las líneas que ganó cada jugador (usando distintos colores) +- Al terminar el juego marcar las líneas que ganó cada jugador (usando distintos colores). diff --git a/Quinteti.activity/activity.py b/Quinteti.activity/activity.py index 63106a1..d740780 100644 --- a/Quinteti.activity/activity.py +++ b/Quinteti.activity/activity.py @@ -23,9 +23,10 @@ This Activity is based on olpcgames.PyGameActivity. The activity attributa game_name is the module name that has the main() function.""" -from sugar.activity.activity import ActivityToolbox +from sugar.activity.activity import ActivityToolbox, ActivityToolbar from olpcgames import activity from gettext import gettext as _ +import gtk # PyGameActivity: http://www.vrplumber.com/sugar-docs/olpcgames.activity.html class Quinteti(activity.PyGameActivity): @@ -33,3 +34,15 @@ class Quinteti(activity.PyGameActivity): game_name = 'main' # Module name with main() function. game_title = _('QuinTeTi') game_size = None + + def build_toolbar(self): + """ + Overrides to remove collaboration button + """ + toolbar = ActivityToolbar(self) + toolbar.share.hide() # Oculta el combo de share + toolbar.show() + self.set_toolbox(toolbar) + + toolbar.title.unset_flags(gtk.CAN_FOCUS) + return toolbar diff --git a/Quinteti.activity/activity/activity-quin-te-ti.svg b/Quinteti.activity/activity/activity-quin-te-ti.svg deleted file mode 100644 index 7e6ea7a..0000000 --- a/Quinteti.activity/activity/activity-quin-te-ti.svg +++ /dev/null @@ -1,20 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" [ - <!ENTITY ns_svg "http://www.w3.org/2000/svg"> - <!ENTITY ns_xlink "http://www.w3.org/1999/xlink"> - <!ENTITY stroke_color "#020202"> - <!ENTITY fill_color "#666666"> -]> -<svg version="1.1" id="Icon" xmlns="&ns_svg;" xmlns:xlink="&ns_xlink;" width="48.92" height="43.846" viewBox="0 0 48.92 43.846" - overflow="visible" enable-background="new 0 0 48.92 43.846" xml:space="preserve"> -<rect x="5" y="5" fill="&fill_color;" stroke="&stroke_color;" stroke-width="0" width="30" height="30"/> -<!--<path fill="&fill_color;" stroke="&stroke_color;" stroke-width="3.5" d="M 5,0 L 5,40"/>--> -<path fill="&fill_color;" stroke="&stroke_color;" stroke-width="3.5" d="M 11,0 L 15,40"/> -<path fill="&fill_color;" stroke="&stroke_color;" stroke-width="3.5" d="M 22,0 L 25,40"/> -<!--<path fill="&fill_color;" stroke="&stroke_color;" stroke-width="3.5" d="M 35,0 L 35,40"/>--> -<!--<path fill="&fill_color;" stroke="&stroke_color;" stroke-width="3.5" d="M 0,5 L 40,5"/>--> -<path fill="&fill_color;" stroke="&stroke_color;" stroke-width="3.5" d="M 0,11 L 40,15"/> -<path fill="&fill_color;" stroke="&stroke_color;" stroke-width="3.5" d="M 0,22 L 40,25"/> -<!--<path fill="&fill_color;" stroke="&stroke_color;" stroke-width="3.5" d="M 0,35 L 40,35"/>--> -</svg> - diff --git a/Quinteti.activity/activity/activity-quinteti.svg b/Quinteti.activity/activity/activity-quinteti.svg new file mode 100644 index 0000000..8544375 --- /dev/null +++ b/Quinteti.activity/activity/activity-quinteti.svg @@ -0,0 +1,70 @@ +<?xml version="1.0" encoding="UTF-8" standalone="no"?> +<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" [ + <!ENTITY stroke_color "#666666"> + <!ENTITY fill_color "#FFFFFF"> +]> +<svg + xmlns:svg="http://www.w3.org/2000/svg" + xmlns="http://www.w3.org/2000/svg" + version="1.0" + width="64" + height="64" + id="svg2"> + <defs + id="defs4" /> + <g + id="layer1"> + <g> + <path + d="M 311.42857,239.50504 A 121.42857,121.42857 0 1 1 68.571426,239.50504 A 121.42857,121.42857 0 1 1 311.42857,239.50504 z" + transform="matrix(0.1150798,0,0,0.1191177,-5.2916369,-12.923748)" + id="path2383" + style="opacity:0.75;fill:&fill_color;;fill-opacity:1;stroke:none;stroke-width:6;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" /> + <text + x="10.689248" + y="22.166576" + id="text3164" + xml:space="preserve" + style="font-size:18px;font-style:normal;font-weight:normal;fill:&stroke_color;;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;font-family:Bitstream Vera Sans"><tspan + x="10.689248" + y="22.166576" + id="tspan3166">1</tspan></text> + </g> + <g> + <path + d="M 311.42857,239.50504 A 121.42857,121.42857 0 1 1 68.571426,239.50504 A 121.42857,121.42857 0 1 1 311.42857,239.50504 z" + transform="matrix(0.1150798,0,0,0.1191177,-5.2916369,19.219109)" + id="path2393" + style="opacity:0.75;fill:&fill_color;;fill-opacity:1;stroke:none;stroke-width:6;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" /> + <text + x="10.939736" + y="54.181992" + id="text3168" + xml:space="preserve" + style="font-size:18px;font-style:normal;font-weight:normal;fill:&stroke_color;;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;font-family:Bitstream Vera Sans"><tspan + x="10.939736" + y="54.181992" + id="tspan3170">5</tspan></text> + </g> + <g + transform="matrix(1.0090105,0,0,1.0090105,19.394277,1.8596993)" + id="terron"> + <path + d="M 38.822128,44.108722 C 38.822128,44.108722 38.445765,44.108722 38.092819,44.108722 C 38.092819,42.747378 38.097001,38.459638 38.097001,37.325183 C 38.097001,37.325183 38.097001,37.325183 38.097001,37.323527 L 38.097001,24.562988 L 38.089474,16.811436 C 38.086128,15.932855 37.361837,15.224857 36.48031,15.228997 C 36.052928,15.228997 35.648965,15.396267 35.347873,15.696856 C 35.045946,15.999101 34.882019,16.399058 34.883691,16.823857 C 34.883691,16.863604 34.885364,19.358576 34.887873,21.45773 L 22.071438,21.45773 C 20.330965,21.45773 18.920019,22.854682 18.920019,24.575409 L 18.920019,26.300276 L 13.265364,26.303588 C 12.377982,26.309384 11.663728,27.024008 11.667074,27.896793 C 11.668746,28.321592 11.837691,28.719892 12.141291,29.017998 C 12.446565,29.316931 12.850528,29.479232 13.277073,29.477576 C 13.326419,29.477576 16.696965,29.47592 18.919182,29.474263 L 18.919182,37.014658 C 18.919182,37.02625 18.915837,37.036187 18.915837,37.046952 C 18.915837,37.104917 18.919182,42.545329 18.919182,44.107894 C 18.567073,44.107894 18.189873,44.107894 18.189873,44.107894 C 17.285765,44.125284 16.584055,44.849844 16.59911,45.724285 C 16.61751,46.601209 17.351837,47.296787 18.234201,47.279397 L 20.537546,47.277741 C 21.439146,47.26118 22.145037,46.535792 22.126637,45.661352 L 22.123292,40.442034 L 34.887873,40.442034 L 34.882019,45.661352 C 34.865292,46.53662 35.571182,47.262009 36.472783,47.277741 L 38.774455,47.279397 C 39.661,47.296787 40.393656,46.601209 40.411219,45.724285 C 40.428782,44.849844 39.723728,44.126112 38.822128,44.108722 z M 30.604855,25.673428 C 31.197837,25.590621 31.748164,25.999687 31.832637,26.587615 C 31.917946,27.174716 31.50311,27.720413 30.910128,27.804876 C 30.3138,27.887683 29.76431,27.476962 29.680673,26.890689 C 29.595365,26.301932 30.010201,25.756235 30.604855,25.673428 z M 24.950201,26.467545 C 25.542346,26.384739 26.09351,26.793805 26.177147,27.381734 C 26.262455,27.97049 25.847619,28.513703 25.255473,28.598995 C 24.659146,28.683458 24.109656,28.272735 24.026019,27.684807 C 23.941546,27.096049 24.353874,26.552009 24.950201,26.467545 z M 26.384565,35.548148 C 25.364201,34.827728 23.744165,32.814693 24.326273,31.447552 C 24.532019,30.966443 24.984492,31.265376 25.47711,31.509657 C 26.653037,32.10421 28.05311,32.180392 29.308492,31.805277 C 29.946637,31.614821 30.491946,31.305951 31.012165,30.893574 C 31.328309,30.641012 32.191437,29.636565 32.666491,30.090346 C 33.037837,30.445588 33.101401,30.886121 33.101401,30.890261 C 33.634164,34.258844 29.418891,37.688706 26.384565,35.548148 z" + id="cuerpo" + style="fill:&stroke_color;" /> + <path + d="M 17.233073,11.642631 C 18.971874,8.6971904 24.424965,8.6756607 25.411873,12.233044 C 25.743073,13.428775 25.717147,16.000757 24.39151,16.697991 C 23.925655,16.943099 23.764237,16.42804 23.540092,15.929543 C 23.003146,14.736296 21.969401,13.79975 20.755837,13.307049 C 20.139437,13.055317 19.519691,12.950152 18.853946,12.946839 C 18.446637,12.943527 17.137728,13.184495 17.060783,12.532805 C 17.000564,12.027683 17.233073,11.644287 17.233073,11.642631 z" + id="pelo_oscuro" + style="fill:&stroke_color;" /> + <g + transform="matrix(0.8363636,0,0,0.8280687,4.3773279,7.643887)" + id="pelo_claro"> + <path + d="M 30.514,13.666 C 25.959,9.955 27.36,0.759 33.675,0.043 C 35.799,-0.198 40.171,0.537 41.006,2.954 C 41.299,3.802 40.382,3.936 39.473,4.18 C 37.299,4.765 35.434,6.261 34.273,8.172 C 33.681,9.144 33.342,10.161 33.16,11.281 C 33.047,11.964 33.108,14.236 31.982,14.194 C 31.107,14.162 30.516,13.668 30.514,13.666 z" + id="path2674" + style="fill:&stroke_color;" /> + </g> + </g> + </g> +</svg> diff --git a/Quinteti.activity/activity/activity.info b/Quinteti.activity/activity/activity.info index fb0e304..c280080 100644 --- a/Quinteti.activity/activity/activity.info +++ b/Quinteti.activity/activity/activity.info @@ -2,6 +2,6 @@ name = Quinteti service_name = org.ceibaljam.Quinteti class = activity.Quinteti -icon = activity-quin-te-ti -activity_version = 2 +icon = activity-quinteti +activity_version = 3 show_launcher = yes diff --git a/Quinteti.activity/gui/button.py b/Quinteti.activity/gui/button.py index 82e17c2..4dfed4c 100644 --- a/Quinteti.activity/gui/button.py +++ b/Quinteti.activity/gui/button.py @@ -57,5 +57,5 @@ class Button(pygame.sprite.Sprite): rect = self.image.get_rect() dash = pygame.Rect(rect.left, rect.bottom-3, rect.width, 3) - black = pygame.Color(0, 0, 0, 192) + black = pygame.Color("0x000000F8") self.image.fill(black, dash) diff --git a/Quinteti.activity/gui/instructions.png b/Quinteti.activity/gui/instructions.png Binary files differindex 5c55db4..a69cd8f 100644 --- a/Quinteti.activity/gui/instructions.png +++ b/Quinteti.activity/gui/instructions.png diff --git a/Quinteti.activity/gui/instructions.svg b/Quinteti.activity/gui/instructions.svg deleted file mode 100644 index b56222a..0000000 --- a/Quinteti.activity/gui/instructions.svg +++ /dev/null @@ -1,248 +0,0 @@ -<?xml version="1.0" encoding="UTF-8" standalone="no"?> -<!-- Created with Inkscape (http://www.inkscape.org/) --> -<svg - xmlns:dc="http://purl.org/dc/elements/1.1/" - xmlns:cc="http://creativecommons.org/ns#" - xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" - xmlns:svg="http://www.w3.org/2000/svg" - xmlns="http://www.w3.org/2000/svg" - xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" - xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" - width="800" - height="500" - id="svg3656" - sodipodi:version="0.32" - inkscape:version="0.46" - version="1.0" - sodipodi:docname="instructions.svg" - inkscape:output_extension="org.inkscape.output.svg.inkscape" - inkscape:export-filename="/home/pmoleri/quinteti/Quinteti.activity/gui/instructions.png" - inkscape:export-xdpi="90" - inkscape:export-ydpi="90"> - <defs - id="defs3658"> - <inkscape:perspective - sodipodi:type="inkscape:persp3d" - inkscape:vp_x="0 : 526.18109 : 1" - inkscape:vp_y="0 : 1000 : 0" - inkscape:vp_z="744.09448 : 526.18109 : 1" - inkscape:persp3d-origin="372.04724 : 350.78739 : 1" - id="perspective3664" /> - </defs> - <sodipodi:namedview - id="base" - pagecolor="#ffffff" - bordercolor="#666666" - borderopacity="1.0" - gridtolerance="10000" - guidetolerance="10" - objecttolerance="10" - inkscape:pageopacity="0.0" - inkscape:pageshadow="2" - inkscape:zoom="0.79" - inkscape:cx="415.98232" - inkscape:cy="208.49925" - inkscape:document-units="px" - inkscape:current-layer="layer1" - showgrid="false" - inkscape:window-width="1219" - inkscape:window-height="728" - inkscape:window-x="51" - inkscape:window-y="25" /> - <metadata - id="metadata3661"> - <rdf:RDF> - <cc:Work - rdf:about=""> - <dc:format>image/svg+xml</dc:format> - <dc:type - rdf:resource="http://purl.org/dc/dcmitype/StillImage" /> - </cc:Work> - </rdf:RDF> - </metadata> - <g - inkscape:label="Layer 1" - inkscape:groupmode="layer" - id="layer1"> - <path - d="M 66.466056,2.9999985 C 31.471654,2.9999985 3.0000001,20.712973 3.0000001,42.48634 L 3.0000001,457.51364 C 3.0000001,479.287 31.469936,497 66.466056,497 L 733.53565,497 C 768.53178,497 796.99999,479.287 796.99999,457.51364 L 796.99999,42.48634 C 796.99999,20.71405 768.53178,2.9999985 733.53565,2.9999985 L 66.466056,2.9999985 z" - id="path892" - style="fill:#f8601f;fill-opacity:1;stroke:#000000;stroke-width:6;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" /> - <text - xml:space="preserve" - style="font-size:18px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;fill:#fdfdfd;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;font-family:Metal;-inkscape-font-specification:Metal" - x="62.300049" - y="111.77754" - id="text4967"><tspan - sodipodi:role="line" - x="62.300049" - y="111.77754" - id="tspan2441">El objetivo del juego es ubicar las fichas en</tspan><tspan - sodipodi:role="line" - x="62.300049" - y="111.77754" - id="tspan2445">el tablero de forma de sumar 15 tanto en</tspan><tspan - sodipodi:role="line" - x="62.300049" - y="134.27754" - id="tspan4989">filas como en columnas.</tspan><tspan - sodipodi:role="line" - x="62.300049" - y="156.77754" - id="tspan4991" /><tspan - sodipodi:role="line" - x="62.300049" - y="179.27754" - id="tspan4993">El juego es para dos participantes y se inicia</tspan><tspan - sodipodi:role="line" - x="62.300049" - y="201.77754" - id="tspan4995">con el tablero vacío y los números afuera.</tspan><tspan - sodipodi:role="line" - x="62.300049" - y="224.27754" - id="tspan5009">Éstos van alternando sus turnos, jugando</tspan><tspan - sodipodi:role="line" - x="62.300049" - y="246.77754" - id="tspan2425">en cada caso el participante que aparece</tspan><tspan - sodipodi:role="line" - x="62.300049" - y="269.27753" - id="tspan5075">resaltado en la pantalla.</tspan><tspan - sodipodi:role="line" - x="62.300049" - y="291.77753" - id="tspan5093" /><tspan - sodipodi:role="line" - x="62.300049" - y="314.27753" - id="tspan5015">Cuando un jugador ubica una ficha que</tspan><tspan - sodipodi:role="line" - x="62.300049" - y="336.77753" - id="tspan5017">suma 15 en cualquiera de las dos direcciones,</tspan><tspan - sodipodi:role="line" - x="62.300049" - y="359.27753" - id="tspan5019">éste gana un punto. Si logra sumar quince</tspan><tspan - sodipodi:role="line" - x="62.300049" - y="381.77753" - id="tspan5021">en ambas direcciones a la vez, gana 2 puntos.</tspan><tspan - sodipodi:role="line" - x="62.300049" - y="404.27753" - id="tspan6414" /><tspan - sodipodi:role="line" - x="62.300049" - y="426.77753" - id="tspan6416">Los jugadores deben usar la misma computadora</tspan><tspan - sodipodi:role="line" - x="62.300049" - y="449.27753" - id="tspan6418">ya que aún no está habilitado el juego por red.</tspan></text> - <path - style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:5.00000048;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" - d="M 519.30061,22.86701 L 519.30061,473.05054" - id="path5023" /> - <text - xml:space="preserve" - style="font-size:16px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;font-family:Metal;-inkscape-font-specification:Metal" - x="556.71631" - y="51.842243" - id="text5029" - inkscape:export-xdpi="90" - inkscape:export-ydpi="90"><tspan - sodipodi:role="line" - x="556.71631" - y="51.842243" - id="tspan5059">QuinTeTi v2 fue desarrollado</tspan><tspan - sodipodi:role="line" - x="556.71631" - y="71.842239" - id="tspan6422">en ceibalJAM</tspan><tspan - sodipodi:role="line" - x="556.71631" - y="91.842239" - id="tspan5061">www.ceibaljam.org</tspan><tspan - sodipodi:role="line" - x="556.71631" - y="111.84224" - id="tspan5063" /><tspan - sodipodi:role="line" - x="556.71631" - y="131.84224" - id="tspan5057">Propuesta:</tspan><tspan - sodipodi:role="line" - x="556.71631" - y="151.84224" - id="tspan6410"> Caryl Bigenho</tspan><tspan - sodipodi:role="line" - x="556.71631" - y="171.84224" - id="tspan5039" /><tspan - sodipodi:role="line" - x="556.71631" - y="191.84224" - id="tspan5041">Autor:</tspan><tspan - sodipodi:role="line" - x="556.71631" - y="211.84224" - id="tspan6412"> Pablo Moleri</tspan><tspan - sodipodi:role="line" - x="556.71631" - y="231.84224" - id="tspan5055" /><tspan - sodipodi:role="line" - x="556.71631" - y="251.84224" - id="tspan5121">Diseño gráfico:</tspan><tspan - sodipodi:role="line" - x="556.71631" - y="271.84225" - id="tspan5071"> Magdalena Sayagués</tspan><tspan - sodipodi:role="line" - x="556.71631" - y="291.84225" - id="tspan5047" /><tspan - sodipodi:role="line" - x="556.71631" - y="311.84225" - id="tspan2446">Colaboración:</tspan><tspan - sodipodi:role="line" - x="556.71631" - y="331.84225" - id="tspan2448"> Juan Manuel Picerno</tspan><tspan - sodipodi:role="line" - x="556.71631" - y="351.84225" - id="tspan2450"> Leonardo Val</tspan><tspan - sodipodi:role="line" - x="556.71631" - y="371.84225" - id="tspan2452"> Pablo Garin</tspan><tspan - sodipodi:role="line" - x="556.71631" - y="391.84225" - id="tspan2454" /><tspan - sodipodi:role="line" - x="556.71631" - y="411.84225" - id="tspan5049">Consultas y sugerencias:</tspan><tspan - sodipodi:role="line" - x="556.71631" - y="431.84225" - id="tspan5051"> pmoleri@gmail.com</tspan></text> - <text - xml:space="preserve" - style="font-size:22;font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;font-family:Metal;-inkscape-font-specification:Metal Bold" - x="59.980049" - y="64.556961" - id="text5111"><tspan - sodipodi:role="line" - id="tspan5113" - x="59.980049" - y="64.556961">Instrucciones</tspan></text> - </g> -</svg> diff --git a/Quinteti.activity/setup.py b/Quinteti.activity/setup.py index 2258644..530f97c 100644 --- a/Quinteti.activity/setup.py +++ b/Quinteti.activity/setup.py @@ -18,4 +18,4 @@ from sugar.activity import bundlebuilder -bundlebuilder.start('Quinteti') +bundlebuilder.start() diff --git a/resources/icon.png b/resources/icon.png Binary files differnew file mode 100644 index 0000000..5de21b5 --- /dev/null +++ b/resources/icon.png diff --git a/resources/instructions.svg b/resources/instructions.svg index 5cd917a..5fbabe8 100644 --- a/resources/instructions.svg +++ b/resources/instructions.svg @@ -16,7 +16,7 @@ version="1.0" sodipodi:docname="instructions.svg" inkscape:output_extension="org.inkscape.output.svg.inkscape" - inkscape:export-filename="/home/pmoleri/quin-te-ti.activity/src/gui/instructions.png" + inkscape:export-filename="/home/pmoleri/quinteti/Quinteti.activity/gui/instructions.png" inkscape:export-xdpi="90" inkscape:export-ydpi="90"> <defs @@ -80,68 +80,60 @@ id="tspan2441">El objetivo del juego es ubicar las fichas en</tspan><tspan sodipodi:role="line" x="62.300049" - y="111.77754" - id="tspan2445">el tablero de forma de sumar 15 tanto en</tspan><tspan - sodipodi:role="line" - x="62.300049" y="134.27754" - id="tspan4989">filas como en columnas.</tspan><tspan + id="tspan2445">el tablero de forma de sumar 15 tanto en</tspan><tspan sodipodi:role="line" x="62.300049" y="156.77754" - id="tspan4991" /><tspan + id="tspan4989">filas como en columnas.</tspan><tspan sodipodi:role="line" x="62.300049" y="179.27754" - id="tspan4993">El juego es para dos participantes y se inicia</tspan><tspan + id="tspan4991" /><tspan sodipodi:role="line" x="62.300049" y="201.77754" - id="tspan4995">con el tablero vacío y los números afuera.</tspan><tspan + id="tspan2448">Se puede jugar contra la computadora o de</tspan><tspan sodipodi:role="line" x="62.300049" y="224.27754" - id="tspan5009">Éstos van alternando sus turnos, jugando</tspan><tspan + id="tspan4995">a dos participantes. El juego se inicia con el</tspan><tspan sodipodi:role="line" x="62.300049" y="246.77754" - id="tspan2425">en cada caso el participante que aparece</tspan><tspan + id="tspan5075">tablero vacío y los números afuera. Los turnos</tspan><tspan sodipodi:role="line" x="62.300049" y="269.27753" - id="tspan5075">resaltado en la pantalla.</tspan><tspan + id="tspan2486">se van alternando, jugando en cada caso el</tspan><tspan sodipodi:role="line" x="62.300049" y="291.77753" - id="tspan5093" /><tspan + id="tspan2502">participante que aparece resaltado en la pantalla.</tspan><tspan sodipodi:role="line" x="62.300049" y="314.27753" - id="tspan5015">Cuando un jugador ubica una ficha que</tspan><tspan + id="tspan5093" /><tspan sodipodi:role="line" x="62.300049" y="336.77753" - id="tspan5017">suma 15 en cualquiera de las dos direcciones,</tspan><tspan + id="tspan5015">Cuando un jugador ubica una ficha que</tspan><tspan sodipodi:role="line" x="62.300049" y="359.27753" - id="tspan5019">éste gana un punto. Si logra sumar quince</tspan><tspan + id="tspan5017">suma 15 en cualquiera de las dos direcciones,</tspan><tspan sodipodi:role="line" x="62.300049" y="381.77753" - id="tspan5021">en ambas direcciones a la vez, gana 2 puntos.</tspan><tspan + id="tspan5019">éste gana un punto. Si logra sumar quince</tspan><tspan sodipodi:role="line" x="62.300049" y="404.27753" - id="tspan6414" /><tspan + id="tspan5021">en ambas direcciones a la vez, gana 2 puntos.</tspan><tspan sodipodi:role="line" x="62.300049" y="426.77753" - id="tspan6416">Los jugadores deben usar la misma computadora</tspan><tspan - sodipodi:role="line" - x="62.300049" - y="449.27753" - id="tspan6418">ya que aún no está habilitado el juego por red.</tspan></text> + id="tspan6418" /></text> <path style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:5.00000048;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" d="M 519.30061,22.86701 L 519.30061,473.05054" @@ -157,11 +149,11 @@ sodipodi:role="line" x="556.71631" y="51.842243" - id="tspan5059">Quin-te-ti 0.1 fue desarrollada</tspan><tspan + id="tspan5059">QuinTeTi v3 fue desarrollado</tspan><tspan sodipodi:role="line" x="556.71631" y="71.842239" - id="tspan6422">en Ceibal JAM</tspan><tspan + id="tspan6422">en ceibalJAM!</tspan><tspan sodipodi:role="line" x="556.71631" y="91.842239" @@ -169,74 +161,70 @@ sodipodi:role="line" x="556.71631" y="111.84224" - id="tspan5063" /><tspan + id="tspan5039" /><tspan sodipodi:role="line" x="556.71631" y="131.84224" - id="tspan5057">Propuesta:</tspan><tspan + id="tspan5041">Autor:</tspan><tspan sodipodi:role="line" x="556.71631" y="151.84224" - id="tspan6410"> Caryl Bigenho</tspan><tspan + id="tspan6412"> Pablo Moleri</tspan><tspan sodipodi:role="line" x="556.71631" y="171.84224" - id="tspan5039" /><tspan + id="tspan5055" /><tspan sodipodi:role="line" x="556.71631" y="191.84224" - id="tspan5041">Desarrollo:</tspan><tspan + id="tspan5121">Diseño gráfico:</tspan><tspan sodipodi:role="line" x="556.71631" y="211.84224" - id="tspan5033"> Pablo Moleri</tspan><tspan + id="tspan5123"> Magdalena Sayagués</tspan><tspan sodipodi:role="line" x="556.71631" y="231.84224" - id="tspan5035"> Juan Manuel Picerno</tspan><tspan + id="tspan5125" /><tspan sodipodi:role="line" x="556.71631" y="251.84224" - id="tspan5053"> Leonardo Val</tspan><tspan + id="tspan5069">Colaboración:</tspan><tspan sodipodi:role="line" x="556.71631" y="271.84225" - id="tspan6412"> Pablo Garin</tspan><tspan + id="tspan5071"> Juan Manuel Picerno</tspan><tspan sodipodi:role="line" x="556.71631" y="291.84225" - id="tspan5055" /><tspan + id="tspan2438"> Leonardo Val</tspan><tspan sodipodi:role="line" x="556.71631" y="311.84225" - id="tspan5121">Diseño gráfico:</tspan><tspan + id="tspan2440"> Pablo Garin</tspan><tspan sodipodi:role="line" x="556.71631" y="331.84225" - id="tspan5123"> Magdalena Sayagués</tspan><tspan + id="tspan5047" /><tspan sodipodi:role="line" x="556.71631" y="351.84225" - id="tspan5125" /><tspan + id="tspan2478">Propuesta original:</tspan><tspan sodipodi:role="line" x="556.71631" y="371.84225" - id="tspan5069">Colaboración:</tspan><tspan + id="tspan2480"> Caryl Bigenho</tspan><tspan sodipodi:role="line" x="556.71631" y="391.84225" - id="tspan5071"> Silvio Sisto</tspan><tspan + id="tspan2482" /><tspan sodipodi:role="line" x="556.71631" y="411.84225" - id="tspan5047" /><tspan - sodipodi:role="line" - x="556.71631" - y="431.84225" id="tspan5049">Consultas y sugerencias:</tspan><tspan sodipodi:role="line" x="556.71631" - y="451.84225" + y="431.84225" id="tspan5051"> pmoleri@gmail.com</tspan></text> <text xml:space="preserve" |