From 7b6b6ee8210263f346b84fc01c1c60c101166d7d Mon Sep 17 00:00:00 2001 From: Ignacio Rodríguez Date: Tue, 27 Nov 2012 16:39:04 +0000 Subject: Reuploaded --- diff --git a/COPYING b/COPYING deleted file mode 100644 index 10926e8..0000000 --- a/COPYING +++ /dev/null @@ -1,675 +0,0 @@ - GNU GENERAL PUBLIC LICENSE - Version 3, 29 June 2007 - - Copyright (C) 2007 Free Software Foundation, Inc. - Everyone is permitted to copy and distribute verbatim copies - of this license document, but changing it is not allowed. - - Preamble - - The GNU General Public License is a free, copyleft license for -software and other kinds of works. - - The licenses for most software and other practical works are designed -to take away your freedom to share and change the works. By contrast, -the GNU General Public License is intended to guarantee your freedom to -share and change all versions of a program--to make sure it remains free -software for all its users. We, the Free Software Foundation, use the -GNU General Public License for most of our software; it applies also to -any other work released this way by its authors. You can apply it to -your programs, too. - - When we speak of free software, we are referring to freedom, not -price. Our General Public Licenses are designed to make sure that you -have the freedom to distribute copies of free software (and charge for -them if you wish), that you receive source code or can get it if you -want it, that you can change the software or use pieces of it in new -free programs, and that you know you can do these things. - - To protect your rights, we need to prevent others from denying you -these rights or asking you to surrender the rights. Therefore, you have -certain responsibilities if you distribute copies of the software, or if -you modify it: responsibilities to respect the freedom of others. - - For example, if you distribute copies of such a program, whether -gratis or for a fee, you must pass on to the recipients the same -freedoms that you received. You must make sure that they, too, receive -or can get the source code. And you must show them these terms so they -know their rights. - - Developers that use the GNU GPL protect your rights with two steps: -(1) assert copyright on the software, and (2) offer you this License -giving you legal permission to copy, distribute and/or modify it. - - For the developers' and authors' protection, the GPL clearly explains -that there is no warranty for this free software. For both users' and -authors' sake, the GPL requires that modified versions be marked as -changed, so that their problems will not be attributed erroneously to -authors of previous versions. - - Some devices are designed to deny users access to install or run -modified versions of the software inside them, although the manufacturer -can do so. This is fundamentally incompatible with the aim of -protecting users' freedom to change the software. The systematic -pattern of such abuse occurs in the area of products for individuals to -use, which is precisely where it is most unacceptable. Therefore, we -have designed this version of the GPL to prohibit the practice for those -products. If such problems arise substantially in other domains, we -stand ready to extend this provision to those domains in future versions -of the GPL, as needed to protect the freedom of users. - - Finally, every program is threatened constantly by software patents. -States should not allow patents to restrict development and use of -software on general-purpose computers, but in those that do, we wish to -avoid the special danger that patents applied to a free program could -make it effectively proprietary. To prevent this, the GPL assures that -patents cannot be used to render the program non-free. - - The precise terms and conditions for copying, distribution and -modification follow. - - TERMS AND CONDITIONS - - 0. Definitions. - - "This License" refers to version 3 of the GNU General Public License. - - "Copyright" also means copyright-like laws that apply to other kinds of -works, such as semiconductor masks. - - "The Program" refers to any copyrightable work licensed under this -License. Each licensee is addressed as "you". "Licensees" and -"recipients" may be individuals or organizations. - - To "modify" a work means to copy from or adapt all or part of the work -in a fashion requiring copyright permission, other than the making of an -exact copy. The resulting work is called a "modified version" of the -earlier work or a work "based on" the earlier work. - - A "covered work" means either the unmodified Program or a work based -on the Program. - - To "propagate" a work means to do anything with it that, without -permission, would make you directly or secondarily liable for -infringement under applicable copyright law, except executing it on a -computer or modifying a private copy. Propagation includes copying, -distribution (with or without modification), making available to the -public, and in some countries other activities as well. - - To "convey" a work means any kind of propagation that enables other -parties to make or receive copies. Mere interaction with a user through -a computer network, with no transfer of a copy, is not conveying. - - An interactive user interface displays "Appropriate Legal Notices" -to the extent that it includes a convenient and prominently visible -feature that (1) displays an appropriate copyright notice, and (2) -tells the user that there is no warranty for the work (except to the -extent that warranties are provided), that licensees may convey the -work under this License, and how to view a copy of this License. If -the interface presents a list of user commands or options, such as a -menu, a prominent item in the list meets this criterion. - - 1. Source Code. - - The "source code" for a work means the preferred form of the work -for making modifications to it. "Object code" means any non-source -form of a work. - - A "Standard Interface" means an interface that either is an official -standard defined by a recognized standards body, or, in the case of -interfaces specified for a particular programming language, one that -is widely used among developers working in that language. - - The "System Libraries" of an executable work include anything, other -than the work as a whole, that (a) is included in the normal form of -packaging a Major Component, but which is not part of that Major -Component, and (b) serves only to enable use of the work with that -Major Component, or to implement a Standard Interface for which an -implementation is available to the public in source code form. A -"Major Component", in this context, means a major essential component -(kernel, window system, and so on) of the specific operating system -(if any) on which the executable work runs, or a compiler used to -produce the work, or an object code interpreter used to run it. - - The "Corresponding Source" for a work in object code form means all -the source code needed to generate, install, and (for an executable -work) run the object code and to modify the work, including scripts to -control those activities. However, it does not include the work's -System Libraries, or general-purpose tools or generally available free -programs which are used unmodified in performing those activities but -which are not part of the work. For example, Corresponding Source -includes interface definition files associated with source files for -the work, and the source code for shared libraries and dynamically -linked subprograms that the work is specifically designed to require, -such as by intimate data communication or control flow between those -subprograms and other parts of the work. - - The Corresponding Source need not include anything that users -can regenerate automatically from other parts of the Corresponding -Source. - - The Corresponding Source for a work in source code form is that -same work. - - 2. Basic Permissions. - - All rights granted under this License are granted for the term of -copyright on the Program, and are irrevocable provided the stated -conditions are met. This License explicitly affirms your unlimited -permission to run the unmodified Program. The output from running a -covered work is covered by this License only if the output, given its -content, constitutes a covered work. This License acknowledges your -rights of fair use or other equivalent, as provided by copyright law. - - You may make, run and propagate covered works that you do not -convey, without conditions so long as your license otherwise remains -in force. You may convey covered works to others for the sole purpose -of having them make modifications exclusively for you, or provide you -with facilities for running those works, provided that you comply with -the terms of this License in conveying all material for which you do -not control copyright. Those thus making or running the covered works -for you must do so exclusively on your behalf, under your direction -and control, on terms that prohibit them from making any copies of -your copyrighted material outside their relationship with you. - - Conveying under any other circumstances is permitted solely under -the conditions stated below. Sublicensing is not allowed; section 10 -makes it unnecessary. - - 3. Protecting Users' Legal Rights From Anti-Circumvention Law. - - No covered work shall be deemed part of an effective technological -measure under any applicable law fulfilling obligations under article -11 of the WIPO copyright treaty adopted on 20 December 1996, or -similar laws prohibiting or restricting circumvention of such -measures. - - When you convey a covered work, you waive any legal power to forbid -circumvention of technological measures to the extent such circumvention -is effected by exercising rights under this License with respect to -the covered work, and you disclaim any intention to limit operation or -modification of the work as a means of enforcing, against the work's -users, your or third parties' legal rights to forbid circumvention of -technological measures. - - 4. Conveying Verbatim Copies. - - You may convey verbatim copies of the Program's source code as you -receive it, in any medium, provided that you conspicuously and -appropriately publish on each copy an appropriate copyright notice; -keep intact all notices stating that this License and any -non-permissive terms added in accord with section 7 apply to the code; -keep intact all notices of the absence of any warranty; and give all -recipients a copy of this License along with the Program. - - You may charge any price or no price for each copy that you convey, -and you may offer support or warranty protection for a fee. - - 5. Conveying Modified Source Versions. - - You may convey a work based on the Program, or the modifications to -produce it from the Program, in the form of source code under the -terms of section 4, provided that you also meet all of these conditions: - - a) The work must carry prominent notices stating that you modified - it, and giving a relevant date. - - b) The work must carry prominent notices stating that it is - released under this License and any conditions added under section - 7. This requirement modifies the requirement in section 4 to - "keep intact all notices". - - c) You must license the entire work, as a whole, under this - License to anyone who comes into possession of a copy. This - License will therefore apply, along with any applicable section 7 - additional terms, to the whole of the work, and all its parts, - regardless of how they are packaged. This License gives no - permission to license the work in any other way, but it does not - invalidate such permission if you have separately received it. - - d) If the work has interactive user interfaces, each must display - Appropriate Legal Notices; however, if the Program has interactive - interfaces that do not display Appropriate Legal Notices, your - work need not make them do so. - - A compilation of a covered work with other separate and independent -works, which are not by their nature extensions of the covered work, -and which are not combined with it such as to form a larger program, -in or on a volume of a storage or distribution medium, is called an -"aggregate" if the compilation and its resulting copyright are not -used to limit the access or legal rights of the compilation's users -beyond what the individual works permit. Inclusion of a covered work -in an aggregate does not cause this License to apply to the other -parts of the aggregate. - - 6. Conveying Non-Source Forms. - - You may convey a covered work in object code form under the terms -of sections 4 and 5, provided that you also convey the -machine-readable Corresponding Source under the terms of this License, -in one of these ways: - - a) Convey the object code in, or embodied in, a physical product - (including a physical distribution medium), accompanied by the - Corresponding Source fixed on a durable physical medium - customarily used for software interchange. - - b) Convey the object code in, or embodied in, a physical product - (including a physical distribution medium), accompanied by a - written offer, valid for at least three years and valid for as - long as you offer spare parts or customer support for that product - model, to give anyone who possesses the object code either (1) a - copy of the Corresponding Source for all the software in the - product that is covered by this License, on a durable physical - medium customarily used for software interchange, for a price no - more than your reasonable cost of physically performing this - conveying of source, or (2) access to copy the - Corresponding Source from a network server at no charge. - - c) Convey individual copies of the object code with a copy of the - written offer to provide the Corresponding Source. This - alternative is allowed only occasionally and noncommercially, and - only if you received the object code with such an offer, in accord - with subsection 6b. - - d) Convey the object code by offering access from a designated - place (gratis or for a charge), and offer equivalent access to the - Corresponding Source in the same way through the same place at no - further charge. You need not require recipients to copy the - Corresponding Source along with the object code. If the place to - copy the object code is a network server, the Corresponding Source - may be on a different server (operated by you or a third party) - that supports equivalent copying facilities, provided you maintain - clear directions next to the object code saying where to find the - Corresponding Source. Regardless of what server hosts the - Corresponding Source, you remain obligated to ensure that it is - available for as long as needed to satisfy these requirements. - - e) Convey the object code using peer-to-peer transmission, provided - you inform other peers where the object code and Corresponding - Source of the work are being offered to the general public at no - charge under subsection 6d. - - A separable portion of the object code, whose source code is excluded -from the Corresponding Source as a System Library, need not be -included in conveying the object code work. - - A "User Product" is either (1) a "consumer product", which means any -tangible personal property which is normally used for personal, family, -or household purposes, or (2) anything designed or sold for incorporation -into a dwelling. In determining whether a product is a consumer product, -doubtful cases shall be resolved in favor of coverage. For a particular -product received by a particular user, "normally used" refers to a -typical or common use of that class of product, regardless of the status -of the particular user or of the way in which the particular user -actually uses, or expects or is expected to use, the product. A product -is a consumer product regardless of whether the product has substantial -commercial, industrial or non-consumer uses, unless such uses represent -the only significant mode of use of the product. - - "Installation Information" for a User Product means any methods, -procedures, authorization keys, or other information required to install -and execute modified versions of a covered work in that User Product from -a modified version of its Corresponding Source. The information must -suffice to ensure that the continued functioning of the modified object -code is in no case prevented or interfered with solely because -modification has been made. - - If you convey an object code work under this section in, or with, or -specifically for use in, a User Product, and the conveying occurs as -part of a transaction in which the right of possession and use of the -User Product is transferred to the recipient in perpetuity or for a -fixed term (regardless of how the transaction is characterized), the -Corresponding Source conveyed under this section must be accompanied -by the Installation Information. But this requirement does not apply -if neither you nor any third party retains the ability to install -modified object code on the User Product (for example, the work has -been installed in ROM). - - The requirement to provide Installation Information does not include a -requirement to continue to provide support service, warranty, or updates -for a work that has been modified or installed by the recipient, or for -the User Product in which it has been modified or installed. Access to a -network may be denied when the modification itself materially and -adversely affects the operation of the network or violates the rules and -protocols for communication across the network. - - Corresponding Source conveyed, and Installation Information provided, -in accord with this section must be in a format that is publicly -documented (and with an implementation available to the public in -source code form), and must require no special password or key for -unpacking, reading or copying. - - 7. Additional Terms. - - "Additional permissions" are terms that supplement the terms of this -License by making exceptions from one or more of its conditions. -Additional permissions that are applicable to the entire Program shall -be treated as though they were included in this License, to the extent -that they are valid under applicable law. If additional permissions -apply only to part of the Program, that part may be used separately -under those permissions, but the entire Program remains governed by -this License without regard to the additional permissions. - - When you convey a copy of a covered work, you may at your option -remove any additional permissions from that copy, or from any part of -it. (Additional permissions may be written to require their own -removal in certain cases when you modify the work.) You may place -additional permissions on material, added by you to a covered work, -for which you have or can give appropriate copyright permission. - - Notwithstanding any other provision of this License, for material you -add to a covered work, you may (if authorized by the copyright holders of -that material) supplement the terms of this License with terms: - - a) Disclaiming warranty or limiting liability differently from the - terms of sections 15 and 16 of this License; or - - b) Requiring preservation of specified reasonable legal notices or - author attributions in that material or in the Appropriate Legal - Notices displayed by works containing it; or - - c) Prohibiting misrepresentation of the origin of that material, or - requiring that modified versions of such material be marked in - reasonable ways as different from the original version; or - - d) Limiting the use for publicity purposes of names of licensors or - authors of the material; or - - e) Declining to grant rights under trademark law for use of some - trade names, trademarks, or service marks; or - - f) Requiring indemnification of licensors and authors of that - material by anyone who conveys the material (or modified versions of - it) with contractual assumptions of liability to the recipient, for - any liability that these contractual assumptions directly impose on - those licensors and authors. - - All other non-permissive additional terms are considered "further -restrictions" within the meaning of section 10. If the Program as you -received it, or any part of it, contains a notice stating that it is -governed by this License along with a term that is a further -restriction, you may remove that term. If a license document contains -a further restriction but permits relicensing or conveying under this -License, you may add to a covered work material governed by the terms -of that license document, provided that the further restriction does -not survive such relicensing or conveying. - - If you add terms to a covered work in accord with this section, you -must place, in the relevant source files, a statement of the -additional terms that apply to those files, or a notice indicating -where to find the applicable terms. - - Additional terms, permissive or non-permissive, may be stated in the -form of a separately written license, or stated as exceptions; -the above requirements apply either way. - - 8. Termination. - - You may not propagate or modify a covered work except as expressly -provided under this License. Any attempt otherwise to propagate or -modify it is void, and will automatically terminate your rights under -this License (including any patent licenses granted under the third -paragraph of section 11). - - However, if you cease all violation of this License, then your -license from a particular copyright holder is reinstated (a) -provisionally, unless and until the copyright holder explicitly and -finally terminates your license, and (b) permanently, if the copyright -holder fails to notify you of the violation by some reasonable means -prior to 60 days after the cessation. - - Moreover, your license from a particular copyright holder is -reinstated permanently if the copyright holder notifies you of the -violation by some reasonable means, this is the first time you have -received notice of violation of this License (for any work) from that -copyright holder, and you cure the violation prior to 30 days after -your receipt of the notice. - - Termination of your rights under this section does not terminate the -licenses of parties who have received copies or rights from you under -this License. If your rights have been terminated and not permanently -reinstated, you do not qualify to receive new licenses for the same -material under section 10. - - 9. Acceptance Not Required for Having Copies. - - You are not required to accept this License in order to receive or -run a copy of the Program. Ancillary propagation of a covered work -occurring solely as a consequence of using peer-to-peer transmission -to receive a copy likewise does not require acceptance. However, -nothing other than this License grants you permission to propagate or -modify any covered work. These actions infringe copyright if you do -not accept this License. Therefore, by modifying or propagating a -covered work, you indicate your acceptance of this License to do so. - - 10. Automatic Licensing of Downstream Recipients. - - Each time you convey a covered work, the recipient automatically -receives a license from the original licensors, to run, modify and -propagate that work, subject to this License. You are not responsible -for enforcing compliance by third parties with this License. - - An "entity transaction" is a transaction transferring control of an -organization, or substantially all assets of one, or subdividing an -organization, or merging organizations. If propagation of a covered -work results from an entity transaction, each party to that -transaction who receives a copy of the work also receives whatever -licenses to the work the party's predecessor in interest had or could -give under the previous paragraph, plus a right to possession of the -Corresponding Source of the work from the predecessor in interest, if -the predecessor has it or can get it with reasonable efforts. - - You may not impose any further restrictions on the exercise of the -rights granted or affirmed under this License. For example, you may -not impose a license fee, royalty, or other charge for exercise of -rights granted under this License, and you may not initiate litigation -(including a cross-claim or counterclaim in a lawsuit) alleging that -any patent claim is infringed by making, using, selling, offering for -sale, or importing the Program or any portion of it. - - 11. Patents. - - A "contributor" is a copyright holder who authorizes use under this -License of the Program or a work on which the Program is based. The -work thus licensed is called the contributor's "contributor version". - - A contributor's "essential patent claims" are all patent claims -owned or controlled by the contributor, whether already acquired or -hereafter acquired, that would be infringed by some manner, permitted -by this License, of making, using, or selling its contributor version, -but do not include claims that would be infringed only as a -consequence of further modification of the contributor version. For -purposes of this definition, "control" includes the right to grant -patent sublicenses in a manner consistent with the requirements of -this License. - - Each contributor grants you a non-exclusive, worldwide, royalty-free -patent license under the contributor's essential patent claims, to -make, use, sell, offer for sale, import and otherwise run, modify and -propagate the contents of its contributor version. - - In the following three paragraphs, a "patent license" is any express -agreement or commitment, however denominated, not to enforce a patent -(such as an express permission to practice a patent or covenant not to -sue for patent infringement). To "grant" such a patent license to a -party means to make such an agreement or commitment not to enforce a -patent against the party. - - If you convey a covered work, knowingly relying on a patent license, -and the Corresponding Source of the work is not available for anyone -to copy, free of charge and under the terms of this License, through a -publicly available network server or other readily accessible means, -then you must either (1) cause the Corresponding Source to be so -available, or (2) arrange to deprive yourself of the benefit of the -patent license for this particular work, or (3) arrange, in a manner -consistent with the requirements of this License, to extend the patent -license to downstream recipients. "Knowingly relying" means you have -actual knowledge that, but for the patent license, your conveying the -covered work in a country, or your recipient's use of the covered work -in a country, would infringe one or more identifiable patents in that -country that you have reason to believe are valid. - - If, pursuant to or in connection with a single transaction or -arrangement, you convey, or propagate by procuring conveyance of, a -covered work, and grant a patent license to some of the parties -receiving the covered work authorizing them to use, propagate, modify -or convey a specific copy of the covered work, then the patent license -you grant is automatically extended to all recipients of the covered -work and works based on it. - - A patent license is "discriminatory" if it does not include within -the scope of its coverage, prohibits the exercise of, or is -conditioned on the non-exercise of one or more of the rights that are -specifically granted under this License. You may not convey a covered -work if you are a party to an arrangement with a third party that is -in the business of distributing software, under which you make payment -to the third party based on the extent of your activity of conveying -the work, and under which the third party grants, to any of the -parties who would receive the covered work from you, a discriminatory -patent license (a) in connection with copies of the covered work -conveyed by you (or copies made from those copies), or (b) primarily -for and in connection with specific products or compilations that -contain the covered work, unless you entered into that arrangement, -or that patent license was granted, prior to 28 March 2007. - - Nothing in this License shall be construed as excluding or limiting -any implied license or other defenses to infringement that may -otherwise be available to you under applicable patent law. - - 12. No Surrender of Others' Freedom. - - If conditions are imposed on you (whether by court order, agreement or -otherwise) that contradict the conditions of this License, they do not -excuse you from the conditions of this License. If you cannot convey a -covered work so as to satisfy simultaneously your obligations under this -License and any other pertinent obligations, then as a consequence you may -not convey it at all. For example, if you agree to terms that obligate you -to collect a royalty for further conveying from those to whom you convey -the Program, the only way you could satisfy both those terms and this -License would be to refrain entirely from conveying the Program. - - 13. Use with the GNU Affero General Public License. - - Notwithstanding any other provision of this License, you have -permission to link or combine any covered work with a work licensed -under version 3 of the GNU Affero General Public License into a single -combined work, and to convey the resulting work. The terms of this -License will continue to apply to the part which is the covered work, -but the special requirements of the GNU Affero General Public License, -section 13, concerning interaction through a network will apply to the -combination as such. - - 14. Revised Versions of this License. - - The Free Software Foundation may publish revised and/or new versions of -the GNU General Public License from time to time. Such new versions will -be similar in spirit to the present version, but may differ in detail to -address new problems or concerns. - - Each version is given a distinguishing version number. If the -Program specifies that a certain numbered version of the GNU General -Public License "or any later version" applies to it, you have the -option of following the terms and conditions either of that numbered -version or of any later version published by the Free Software -Foundation. If the Program does not specify a version number of the -GNU General Public License, you may choose any version ever published -by the Free Software Foundation. - - If the Program specifies that a proxy can decide which future -versions of the GNU General Public License can be used, that proxy's -public statement of acceptance of a version permanently authorizes you -to choose that version for the Program. - - Later license versions may give you additional or different -permissions. However, no additional obligations are imposed on any -author or copyright holder as a result of your choosing to follow a -later version. - - 15. Disclaimer of Warranty. - - THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY -APPLICABLE LAW. EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT -HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY -OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, -THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR -PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM -IS WITH YOU. SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF -ALL NECESSARY SERVICING, REPAIR OR CORRECTION. - - 16. Limitation of Liability. - - IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING -WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS -THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY -GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE -USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF -DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD -PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS), -EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF -SUCH DAMAGES. - - 17. Interpretation of Sections 15 and 16. - - If the disclaimer of warranty and limitation of liability provided -above cannot be given local legal effect according to their terms, -reviewing courts shall apply local law that most closely approximates -an absolute waiver of all civil liability in connection with the -Program, unless a warranty or assumption of liability accompanies a -copy of the Program in return for a fee. - - END OF TERMS AND CONDITIONS - - How to Apply These Terms to Your New Programs - - If you develop a new program, and you want it to be of the greatest -possible use to the public, the best way to achieve this is to make it -free software which everyone can redistribute and change under these terms. - - To do so, attach the following notices to the program. It is safest -to attach them to the start of each source file to most effectively -state the exclusion of warranty; and each file should have at least -the "copyright" line and a pointer to where the full notice is found. - - - Copyright (C) - - This program is free software: you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation, either version 3 of the License, or - (at your option) any later version. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - - You should have received a copy of the GNU General Public License - along with this program. If not, see . - -Also add information on how to contact you by electronic and paper mail. - - If the program does terminal interaction, make it output a short -notice like this when it starts in an interactive mode: - - Copyright (C) - This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'. - This is free software, and you are welcome to redistribute it - under certain conditions; type `show c' for details. - -The hypothetical commands `show w' and `show c' should show the appropriate -parts of the General Public License. Of course, your program's commands -might be different; for a GUI interface, you would use an "about box". - - You should also get your employer (if you work as a programmer) or school, -if any, to sign a "copyright disclaimer" for the program, if necessary. -For more information on this, and how to apply and follow the GNU GPL, see -. - - The GNU General Public License does not permit incorporating your program -into proprietary programs. If your program is a subroutine library, you -may consider it more useful to permit linking proprietary applications with -the library. If this is what you want to do, use the GNU Lesser General -Public License instead of this License. But first, please read -. - diff --git a/NEWS b/NEWS deleted file mode 100644 index 35b6225..0000000 --- a/NEWS +++ /dev/null @@ -1,53 +0,0 @@ -NEWS - -9 - -ENHANCEMENTS: -* Gtk3 port by Ignacio Rodríguez - -8 - -ENHANCEMENTS: -* Paint by dragging across dots -* Long press cycles through dots -* New translations - -7 - -ENHANCEMENTS: -* New translations - -6 - -ENHANCEMENTS: -* New translations - -5 - -ENHANCEMENTS: -* New translations - -4 - -ENHANCEMENTS: -* New translations - -3 - -ENHANCEMENTS: -* better feedback when "game over" -* robot partner - -2 - -ENHANCEMENTS: -* new bilateral symmetry game -* save/restore game state to Journal -* enable sharing - -BUG_FIX: -* cache dot shapes/colors - -1 - -* New project diff --git a/ReflectionActivity.py b/ReflectionActivity.py deleted file mode 100644 index 15598cd..0000000 --- a/ReflectionActivity.py +++ /dev/null @@ -1,340 +0,0 @@ -#Copyright (c) 2011 Walter Bender -#Copyright (c) 2012 Ignacio Rodriguez - -# 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. -# -# You should have received a copy of the GNU General Public License -# along with this library; if not, write to the Free Software -# Foundation, 51 Franklin Street, Suite 500 Boston, MA 02110-1335 USA - - -from gi.repository import Gtk,Gdk -from sugar3.activity import activity -from sugar3 import profile -try: - from sugar3.graphics.toolbarbox import ToolbarBox - _have_toolbox = True -except ImportError: - _have_toolbox = False - -if _have_toolbox: - from sugar3.activity.widgets import ActivityToolbarButton - from sugar3.activity.widgets import StopButton - -from toolbar_utils import button_factory, label_factory, separator_factory, \ - radio_factory -from utils import json_load, json_dump - -import telepathy -import dbus -from dbus.service import signal -from dbus.gobject_service import ExportedGObject -from sugar3.presence import presenceservice -from sugar3.presence.tubeconn import TubeConnection - -from gettext import gettext as _ - -from game import Game - -import logging -_logger = logging.getLogger('reflection-activity') - - -SERVICE = 'org.sugarlabs.ReflectionActivity' -IFACE = SERVICE -PATH = '/org/augarlabs/ReflectionActivity' - - -class ReflectionActivity(activity.Activity): - """ Reflection puzzle game """ - - def __init__(self, handle): - """ Initialize the toolbars and the game board """ - try: - super(ReflectionActivity, self).__init__(handle) - except dbus.exceptions.DBusException, e: - _logger.error(str(e)) - - self.nick = profile.get_nick_name() - if profile.get_color() is not None: - self.colors = profile.get_color().to_string().split(',') - else: - self.colors = ['#A0FFA0', '#FF8080'] - - self._setup_toolbars(_have_toolbox) - self._setup_dispatch_table() - - # Create a canvas - canvas = Gtk.DrawingArea() - canvas.set_size_request(Gdk.Screen.width(), \ - Gdk.Screen.height()) - self.set_canvas(canvas) - canvas.show() - self.show_all() - - self._game = Game(canvas, parent=self, colors=self.colors) - self._setup_presence_service() - - if 'dotlist' in self.metadata: - self._restore() - else: - self._game.new_game('horizontal') - - def _setup_toolbars(self, have_toolbox): - """ Setup the toolbars. """ - - self.max_participants = 4 - - if have_toolbox: - toolbox = ToolbarBox() - - # Activity toolbar - activity_button = ActivityToolbarButton(self) - - toolbox.toolbar.insert(activity_button, 0) - activity_button.show() - - self.set_toolbar_box(toolbox) - toolbox.show() - self.toolbar = toolbox.toolbar - - else: - # Use pre-0.86 toolbar design - games_toolbar = Gtk.Toolbar() - toolbox = activity.ActivityToolbox(self) - self.set_toolbox(toolbox) - toolbox.add_toolbar(_('Game'), games_toolbar) - toolbox.show() - toolbox.set_current_toolbar(1) - self.toolbar = games_toolbar - - my_colors = radio_factory( - 'my-colors', self.toolbar, self._my_colors_cb, group=None) - - radio_factory('toolbar-colors', self.toolbar, - self._roygbiv_colors_cb, group=my_colors) - - self._new_game_button_h = button_factory( - 'new-game-horizontal', self.toolbar, self._new_game_cb, - cb_arg='horizontal', - tooltip=_('Start a new horizontal-reflection game.')) - - self._new_game_button_v = button_factory( - 'new-game-vertical', self.toolbar, self._new_game_cb, - cb_arg='vertical', - tooltip=_('Start a new vertical-reflection game.')) - - self._new_game_button_b = button_factory( - 'new-game-bilateral', self.toolbar, self._new_game_cb, - cb_arg='bilateral', - tooltip=_('Start a new bilateral-reflection game.')) - - self.status = label_factory(self.toolbar, '') - - if _have_toolbox: - separator_factory(toolbox.toolbar, False, True) - - self.robot_button = button_factory( - 'robot-off', self.toolbar, self._robot_cb, - tooltip= _('Play with the robot.')) - - if _have_toolbox: - separator_factory(toolbox.toolbar, True, False) - - if _have_toolbox: - stop_button = StopButton(self) - stop_button.props.accelerator = 'q' - toolbox.toolbar.insert(stop_button, -1) - stop_button.show() - - def _my_colors_cb(self, button=None): - if hasattr(self, '_game'): - self._game.roygbiv = False - self._game.new_game() - - def _roygbiv_colors_cb(self, button=None): - if hasattr(self, '_game'): - self._game.roygbiv = True - self._game.new_game() - - def _new_game_cb(self, button=None, orientation='horizontal'): - ''' Start a new game. ''' - self._game.new_game(orientation) - - def _robot_cb(self, button=None): - ''' Play with the computer (or not). ''' - if not self._game.playing_with_robot: - self.set_robot_status(True, 'robot-on') - else: - self.set_robot_status(False, 'robot-off') - - def set_robot_status(self, status, icon): - ''' Reset robot icon and status ''' - self._game.playing_with_robot = status - self.robot_button.set_icon_name(icon) - - def write_file(self, file_path): - """ Write the grid status to the Journal """ - [dot_list, orientation] = self._game.save_game() - self.metadata['orientation'] = orientation - self.metadata['dotlist'] = '' - for dot in dot_list: - self.metadata['dotlist'] += str(dot) - if dot_list.index(dot) < len(dot_list) - 1: - self.metadata['dotlist'] += ' ' - - def _restore(self): - """ Restore the game state from metadata """ - if 'orientation' in self.metadata: - orientation = self.metadata['orientation'] - else: - orientation = 'horizontal' - - dot_list = [] - dots = self.metadata['dotlist'].split() - for dot in dots: - dot_list.append(int(dot)) - self._game.restore_game(dot_list, orientation) - - # Collaboration-related methods - - def _setup_presence_service(self): - """ Setup the Presence Service. """ - self.pservice = presenceservice.get_instance() - self.initiating = None # sharing (True) or joining (False) - - owner = self.pservice.get_owner() - self.owner = owner - self._share = "" - self.connect('shared', self._shared_cb) - self.connect('joined', self._joined_cb) - - def _shared_cb(self, activity): - """ Either set up initial share...""" - self._new_tube_common(True) - - def _joined_cb(self, activity): - """ ...or join an exisiting share. """ - self._new_tube_common(False) - - def _new_tube_common(self, sharer): - """ Joining and sharing are mostly the same... """ - if self._shared_activity is None: - _logger.debug("Error: Failed to share or join activity ... \ - _shared_activity is null in _shared_cb()") - return - - self.initiating = sharer - self.waiting_for_hand = not sharer - - self.conn = self._shared_activity.telepathy_conn - self.tubes_chan = self._shared_activity.telepathy_tubes_chan - self.text_chan = self._shared_activity.telepathy_text_chan - - self.tubes_chan[telepathy.CHANNEL_TYPE_TUBES].connect_to_signal( - 'NewTube', self._new_tube_cb) - - if sharer: - _logger.debug('This is my activity: making a tube...') - id = self.tubes_chan[telepathy.CHANNEL_TYPE_TUBES].OfferDBusTube( - SERVICE, {}) - else: - _logger.debug('I am joining an activity: waiting for a tube...') - self.tubes_chan[telepathy.CHANNEL_TYPE_TUBES].ListTubes( - reply_handler=self._list_tubes_reply_cb, - error_handler=self._list_tubes_error_cb) - self._game.set_sharing(True) - - def _list_tubes_reply_cb(self, tubes): - """ Reply to a list request. """ - for tube_info in tubes: - self._new_tube_cb(*tube_info) - - def _list_tubes_error_cb(self, e): - """ Log errors. """ - _logger.debug('Error: ListTubes() failed: %s' % (e)) - - def _new_tube_cb(self, id, initiator, type, service, params, state): - """ Create a new tube. """ - _logger.debug('New tube: ID=%d initator=%d type=%d service=%s \ -params=%r state=%d' % (id, initiator, type, service, params, state)) - - if (type == telepathy.TUBE_TYPE_DBUS and service == SERVICE): - if state == telepathy.TUBE_STATE_LOCAL_PENDING: - self.tubes_chan[ \ - telepathy.CHANNEL_TYPE_TUBES].AcceptDBusTube(id) - - tube_conn = TubeConnection(self.conn, - self.tubes_chan[telepathy.CHANNEL_TYPE_TUBES], id, \ - group_iface=self.text_chan[telepathy.CHANNEL_INTERFACE_GROUP]) - - self.chattube = ChatTube(tube_conn, self.initiating, \ - self.event_received_cb) - - def _setup_dispatch_table(self): - ''' Associate tokens with commands. ''' - self._processing_methods = { - 'n': [self._receive_new_game, 'get a new game grid'], - 'p': [self._receive_dot_click, 'get a dot click'], - } - - def event_received_cb(self, event_message): - ''' Data from a tube has arrived. ''' - if len(event_message) == 0: - return - try: - command, payload = event_message.split('|', 2) - except ValueError: - _logger.debug('Could not split event message %s' % (event_message)) - return - self._processing_methods[command][0](payload) - - def send_new_game(self): - ''' Send a new orientation, grid to all players ''' - self.send_event('n|%s' % (json_dump(self._game.save_game()))) - - def _receive_new_game(self, payload): - ''' Sharer can start a new game. ''' - [dot_list, orientation] = json_load(payload) - self._game.restore_game(dot_list, orientation) - - def send_dot_click(self, dot, color): - ''' Send a dot click to all the players ''' - self.send_event('p|%s' % (json_dump([dot, color]))) - - def _receive_dot_click(self, payload): - ''' When a dot is clicked, everyone should change its color. ''' - (dot, color) = json_load(payload) - self._game.remote_button_press(dot, color) - - def send_event(self, entry): - """ Send event through the tube. """ - if hasattr(self, 'chattube') and self.chattube is not None: - self.chattube.SendText(entry) - - -class ChatTube(ExportedGObject): - """ Class for setting up tube for sharing """ - - def __init__(self, tube, is_initiator, stack_received_cb): - super(ChatTube, self).__init__(tube, PATH) - self.tube = tube - self.is_initiator = is_initiator # Are we sharing or joining activity? - self.stack_received_cb = stack_received_cb - self.stack = '' - - self.tube.add_signal_receiver(self.send_stack_cb, 'SendText', IFACE, - path=PATH, sender_keyword='sender') - - def send_stack_cb(self, text, sender=None): - if sender == self.tube.get_unique_name(): - return - self.stack = text - self.stack_received_cb(text) - - @signal(dbus_interface=IFACE, signature='s') - def SendText(self, text): - self.stack = text diff --git a/activity/activity-reflection.svg b/activity/activity-reflection.svg deleted file mode 100644 index d601cfc..0000000 --- a/activity/activity-reflection.svg +++ /dev/null @@ -1,158 +0,0 @@ - - -]> - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/activity/activity.info b/activity/activity.info deleted file mode 100644 index 28c5acd..0000000 --- a/activity/activity.info +++ /dev/null @@ -1,10 +0,0 @@ -[Activity] -name = Reflection -activity_version = 9 -license = GPLv3 -bundle_id = org.sugarlabs.RelfectionActivity -exec = sugar-activity ReflectionActivity.ReflectionActivity -icon = activity-reflection -show_launcher = yes -summary = draw patterns of reflective symmetry - diff --git a/game.py b/game.py deleted file mode 100644 index c44296d..0000000 --- a/game.py +++ /dev/null @@ -1,436 +0,0 @@ -# -*- coding: utf-8 -*- -#Copyright (c) 2011-12 Walter Bender -#Copyright (c) 2012 Ignacio Rodríguez -# 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. -# -# You should have received a copy of the GNU General Public License -# along with this library; if not, write to the Free Software -# Foundation, 51 Franklin Street, Suite 500 Boston, MA 02110-1335 USA - - -from gi.repository import Gtk, GdkPixbuf, GObject, Gdk -import cairo - -from random import uniform - -from gettext import gettext as _ - -import logging -_logger = logging.getLogger('reflection-activity') - -try: - from sugar3.graphics import style - GRID_CELL_SIZE = style.GRID_CELL_SIZE -except ImportError: - GRID_CELL_SIZE = 0 - -from sprites import Sprites, Sprite - - -# Grid dimensions must be even -TEN = 10 -SIX = 6 -DOT_SIZE = 40 - - -class Game(): - - def __init__(self, canvas, parent=None, colors=['#A0FFA0', '#FF8080']): - self._activity = parent - self._colors = [colors[0]] - self._colors.append(colors[1]) - self._colors.append('#FFFFFF') - self._colors.append('#000000') - self._colors.append('#FF0000') - self._colors.append('#FF8000') - self._colors.append('#FFFF00') - self._colors.append('#00FF00') - self._colors.append('#00FFFF') - self._colors.append('#0000FF') - self._colors.append('#FF00FF') - - self._canvas = canvas - if parent is not None: - parent.show_all() - self._parent = parent - - self._canvas.add_events(Gdk.EventMask.BUTTON_PRESS_MASK) - self._canvas.add_events(Gdk.EventMask.BUTTON_RELEASE_MASK) - self._canvas.add_events(Gdk.EventMask.POINTER_MOTION_MASK) - self._canvas.connect("draw", self.__draw_cb) - self._canvas.connect("button-press-event", self._button_press_cb) - self._canvas.connect("button-release-event", self._button_release_cb) - self._canvas.connect("motion-notify-event", self._mouse_move_cb) - self._width = Gdk.Screen.width() - self._height = Gdk.Screen.height() - (GRID_CELL_SIZE * 1.5) - self._scale = self._width / (10 * DOT_SIZE * 1.2) - self._dot_size = int(DOT_SIZE * self._scale) - self._space = int(self._dot_size / 5.) - self._orientation = 'horizontal' - self.we_are_sharing = False - self.playing_with_robot = False - self._press = False - self.last_spr = None - self._timer = None - self.roygbiv = False - - # Generate the sprites we'll need... - self._sprites = Sprites(self._canvas) - self._dots = [] - for y in range(SIX): - for x in range(TEN): - xoffset = int((self._width - TEN * self._dot_size - \ - (TEN - 1) * self._space) / 2.) - self._dots.append( - Sprite(self._sprites, - xoffset + x * (self._dot_size + self._space), - y * (self._dot_size + self._space), - self._new_dot(self._colors[2]))) - self._dots[-1].type = 2 # not set - self._dots[-1].set_label_attributes(40) - - self.vline = Sprite(self._sprites, - int(self._width / 2.) - 1, - 0, self._line(vertical=True)) - n = SIX / 2. - self.hline = Sprite( - self._sprites, 0, - int(self._dot_size * n + self._space * (n - 0.5)) - 1, - self._line(vertical=False)) - self.hline.hide() - - # and initialize a few variables we'll need. - self._all_clear() - - def _all_clear(self): - ''' Things to reinitialize when starting up a new game. ''' - for dot in self._dots: - dot.type = 2 - dot.set_shape(self._new_dot(self._colors[2])) - dot.set_label('') - - self._set_orientation() - - def _set_orientation(self): - ''' Set bar and message for current orientation ''' - if self._orientation == 'horizontal': - self.hline.hide() - self.vline.set_layer(1000) - elif self._orientation == 'vertical': - self.hline.set_layer(1000) - self.vline.hide() - else: - self.hline.set_layer(1000) - self.vline.set_layer(1000) - - ''' - if self._orientation == 'horizontal': - self._set_label( - _('Click on the dots to make a horizontal reflection.')) - elif self._orientation == 'vertical': - self._set_label( - _('Click on the dots to make a vertical reflection.')) - else: - self._set_label( - _('Click on the dots to make a bilateral reflection.')) - ''' - - def _initiating(self): - return self._activity.initiating - - def new_game(self, orientation='horizontal'): - ''' Start a new game. ''' - self._orientation = orientation - - self._all_clear() - - # Fill in a few dots to start - for i in range(int(TEN * SIX / 2)): - n = int(uniform(0, TEN * SIX)) - if self.roygbiv: - self._dots[n].type = int(uniform(2, len(self._colors))) - else: - self._dots[n].type = int(uniform(0, 4)) - self._dots[n].set_shape(self._new_dot( - self._colors[self._dots[n].type])) - - if self.we_are_sharing: - _logger.debug('sending a new game') - self._parent.send_new_game() - - def restore_game(self, dot_list, orientation): - ''' Restore a game from the Journal or share ''' - for i, dot in enumerate(dot_list): - self._dots[i].type = dot - self._dots[i].set_shape(self._new_dot( - self._colors[self._dots[i].type])) - self._orientation = orientation - self._set_orientation() - - def save_game(self): - ''' Return dot list and orientation for saving to Journal or - sharing ''' - dot_list = [] - for dot in self._dots: - dot_list.append(dot.type) - return [dot_list, self._orientation] - - def _set_label(self, string): - ''' Set the label in the toolbar or the window frame. ''' - self._activity.status.set_label(string) - - def _button_press_cb(self, win, event): - win.grab_focus() - x, y = map(int, event.get_coords()) - self._press = True - - spr = self._sprites.find_sprite((x, y)) - if spr == None: - return True - - self.last_spr = spr - if spr.type is not None: - if not self._timer is None: - GObject.source_remove(self._timer) - self._increment_dot(spr) - return True - - def _button_release_cb(self, win, event): - self._press = False - if not self._timer is None: - GObject.source_remove(self._timer) - - def _increment_dot(self, spr): - spr.type += 1 - if self.roygbiv: - if spr.type >= len(self._colors): - spr.type = 2 - else: - spr.type %= 4 - spr.set_shape(self._new_dot(self._colors[spr.type])) - - if self.playing_with_robot: - self._robot_play(spr) - - self._test_game_over() - - if self.we_are_sharing: - _logger.debug('sending a click to the share') - self._parent.send_dot_click(self._dots.index(spr), spr.type) - - self._timer = GObject.timeout_add(1000, self._increment_dot, spr) - - def _mouse_move_cb(self, win, event): - """ Drag a tile with the mouse. """ - if not self._press: - return - x, y = map(int, event.get_coords()) - spr = self._sprites.find_sprite((x, y)) - if spr == self.last_spr: - return True - if spr is None: - return True - if spr.type is not None: - self.last_spr = spr - if not self._timer is None: - GObject.source_remove(self._timer) - self._increment_dot(spr) - - def _robot_play(self, dot): - ''' Robot reflects dot clicked. ''' - x, y = self._dot_to_grid(self._dots.index(dot)) - if self._orientation == 'horizontal': - x = TEN - x - 1 - i = self._grid_to_dot((x, y)) - self._dots[i].type = dot.type - self._dots[i].set_shape(self._new_dot(self._colors[dot.type])) - if self.we_are_sharing: - _logger.debug('sending a robot click to the share') - self._parent.send_dot_click(i, dot.type) - elif self._orientation == 'vertical': - y = SIX - y - 1 - i = self._grid_to_dot((x, y)) - self._dots[i].type = dot.type - self._dots[i].set_shape(self._new_dot(self._colors[dot.type])) - if self.we_are_sharing: - _logger.debug('sending a robot click to the share') - self._parent.send_dot_click(i, dot.type) - else: - x = TEN - x - 1 - i = self._grid_to_dot((x, y)) - self._dots[i].type = dot.type - self._dots[i].set_shape(self._new_dot(self._colors[dot.type])) - if self.we_are_sharing: - _logger.debug('sending a robot click to the share') - self._parent.send_dot_click(i, dot.type) - y = SIX - y - 1 - i = self._grid_to_dot((x, y)) - self._dots[i].type = dot.type - self._dots[i].set_shape(self._new_dot(self._colors[dot.type])) - if self.we_are_sharing: - _logger.debug('sending a robot click to the share') - self._parent.send_dot_click(i, dot.type) - x = TEN - x - 1 - i = self._grid_to_dot((x, y)) - self._dots[i].type = dot.type - self._dots[i].set_shape(self._new_dot(self._colors[dot.type])) - if self.we_are_sharing: - _logger.debug('sending a robot click to the share') - self._parent.send_dot_click(i, dot.type) - - def remote_button_press(self, dot, color): - ''' Receive a button press from a sharer ''' - self._dots[dot].type = color - self._dots[dot].set_shape(self._new_dot(self._colors[color])) - - def set_sharing(self, share=True): - _logger.debug('enabling sharing') - self.we_are_sharing = share - - def _smile(self): - for dot in self._dots: - dot.set_label(':)') - - def _test_game_over(self): - ''' Check to see if game is over ''' - if self._orientation == 'horizontal': - for y in range(SIX): - for x in range(SIX): - if self._dots[y * TEN + x].type != \ - self._dots[y * TEN + TEN - x - 1].type: - self._set_label(_('keep trying')) - return False - self._set_label(_('good work')) - self._smile() - return True - if self._orientation == 'vertical': - for y in range(int(SIX / 2)): - for x in range(TEN): - if self._dots[y * TEN + x].type != \ - self._dots[(SIX - y - 1) * TEN + x].type: - self._set_label(_('keep trying')) - return False - self._set_label(_('good work')) - else: - for y in range(SIX): - for x in range(SIX): - if self._dots[y * TEN + x].type != \ - self._dots[y * TEN + TEN - x - 1].type: - self._set_label(_('keep trying')) - return False - for y in range(int(SIX / 2)): - for x in range(TEN): - if self._dots[y * TEN + x].type != \ - self._dots[(SIX - y - 1) * TEN + x].type: - self._set_label(_('keep trying')) - return False - self._set_label(_('good work')) - self._smile() - return True - def __draw_cb(self,canvas,cr): - self._sprites.redraw_sprites(cr=cr) - def _grid_to_dot(self, pos): - ''' calculate the dot index from a column and row in the grid ''' - return pos[0] + pos[1] * TEN - - def _dot_to_grid(self, dot): - ''' calculate the grid column and row for a dot ''' - return [dot % TEN, int(dot / TEN)] - - def _expose_cb(self, win, event): - self.do_expose_event(event) - - def do_expose_event(self, event): - ''' Handle the expose-event by drawing ''' - # Restrict Cairo to the exposed area - cr = self._canvas.window.cairo_create() - cr.rectangle(event.area.x, event.area.y, - event.area.width, event.area.height) - cr.clip() - # Refresh sprite list - self._sprites.redraw_sprites(cr=cr) - - def _destroy_cb(self, win, event): - Gtk.main_quit() - - def _new_dot(self, color): - ''' generate a dot of a color color ''' - self._dot_cache = {} - if not color in self._dot_cache: - self._stroke = color - self._fill = color - self._svg_width = self._dot_size - self._svg_height = self._dot_size - pixbuf = svg_str_to_pixbuf( - self._header() + \ - self._circle(self._dot_size / 2., self._dot_size / 2., - self._dot_size / 2.) + \ - self._footer()) - - surface = cairo.ImageSurface(cairo.FORMAT_ARGB32, - self._svg_width, self._svg_height) - context = cairo.Context(surface) - Gdk.cairo_set_source_pixbuf(context, pixbuf, 0, 0) - context.rectangle(0, 0, self._svg_width, self._svg_height) - context.fill() - self._dot_cache[color] = surface - - return self._dot_cache[color] - - def _line(self, vertical=True): - ''' Generate a center line ''' - if vertical: - self._svg_width = 3 - self._svg_height = self._height - return svg_str_to_pixbuf( - self._header() + \ - self._rect(3, self._height, 0, 0) + \ - self._footer()) - else: - self._svg_width = self._width - self._svg_height = 3 - return svg_str_to_pixbuf( - self._header() + \ - self._rect(self._width, 3, 0, 0) + \ - self._footer()) - - def _header(self): - return '\n' - - def _rect(self, w, h, x, y): - svg_string = ' \n' - - def _footer(self): - return '\n' - - -def svg_str_to_pixbuf(svg_string): - try: - pl = GdkPixbuf.PixbufLoader.new_with_type('svg') - pl.write(svg_string) - pl.close() - pixbuf = pl.get_pixbuf() - return pixbuf - except: - print svg_string - return None diff --git a/icons/my-colors.svg b/icons/my-colors.svg deleted file mode 100644 index ff589f2..0000000 --- a/icons/my-colors.svg +++ /dev/null @@ -1,8 +0,0 @@ - - - - - - - - diff --git a/icons/new-game-bilateral.svg b/icons/new-game-bilateral.svg deleted file mode 100644 index be0d797..0000000 --- a/icons/new-game-bilateral.svg +++ /dev/null @@ -1,196 +0,0 @@ - - - - - - - - image/svg+xml - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/icons/new-game-horizontal.svg b/icons/new-game-horizontal.svg deleted file mode 100644 index bebfbff..0000000 --- a/icons/new-game-horizontal.svg +++ /dev/null @@ -1,185 +0,0 @@ - - - - - - - - image/svg+xml - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/icons/new-game-vertical.svg b/icons/new-game-vertical.svg deleted file mode 100644 index 4fb45ff..0000000 --- a/icons/new-game-vertical.svg +++ /dev/null @@ -1,189 +0,0 @@ - - - - - - - - image/svg+xml - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/icons/robot-off.svg b/icons/robot-off.svg deleted file mode 100644 index 549e5c7..0000000 --- a/icons/robot-off.svg +++ /dev/null @@ -1,60 +0,0 @@ - - - - - - - - - - - - - - diff --git a/icons/robot-on.svg b/icons/robot-on.svg deleted file mode 100644 index 85b9b19..0000000 --- a/icons/robot-on.svg +++ /dev/null @@ -1,80 +0,0 @@ - - - - - - - - - - - - - - - - - - - diff --git a/locale/da/LC_MESSAGES/org.sugarlabs.RelfectionActivity.mo b/locale/da/LC_MESSAGES/org.sugarlabs.RelfectionActivity.mo deleted file mode 100644 index 35d1fbf..0000000 --- a/locale/da/LC_MESSAGES/org.sugarlabs.RelfectionActivity.mo +++ /dev/null Binary files differ diff --git a/locale/da/activity.linfo b/locale/da/activity.linfo deleted file mode 100644 index 6d8dfce..0000000 --- a/locale/da/activity.linfo +++ /dev/null @@ -1,2 +0,0 @@ -[Activity] -name = Reflektion diff --git a/locale/en/LC_MESSAGES/org.sugarlabs.RelfectionActivity.mo b/locale/en/LC_MESSAGES/org.sugarlabs.RelfectionActivity.mo deleted file mode 100644 index eba2ac2..0000000 --- a/locale/en/LC_MESSAGES/org.sugarlabs.RelfectionActivity.mo +++ /dev/null Binary files differ diff --git a/locale/en/activity.linfo b/locale/en/activity.linfo deleted file mode 100644 index 8a2c1fd..0000000 --- a/locale/en/activity.linfo +++ /dev/null @@ -1,2 +0,0 @@ -[Activity] -name = Reflection diff --git a/locale/en_GB/LC_MESSAGES/org.sugarlabs.RelfectionActivity.mo b/locale/en_GB/LC_MESSAGES/org.sugarlabs.RelfectionActivity.mo deleted file mode 100644 index 284043a..0000000 --- a/locale/en_GB/LC_MESSAGES/org.sugarlabs.RelfectionActivity.mo +++ /dev/null Binary files differ diff --git a/locale/en_GB/activity.linfo b/locale/en_GB/activity.linfo deleted file mode 100644 index 8a2c1fd..0000000 --- a/locale/en_GB/activity.linfo +++ /dev/null @@ -1,2 +0,0 @@ -[Activity] -name = Reflection diff --git a/locale/en_US/LC_MESSAGES/org.sugarlabs.RelfectionActivity.mo b/locale/en_US/LC_MESSAGES/org.sugarlabs.RelfectionActivity.mo deleted file mode 100644 index c2a086e..0000000 --- a/locale/en_US/LC_MESSAGES/org.sugarlabs.RelfectionActivity.mo +++ /dev/null Binary files differ diff --git a/locale/en_US/activity.linfo b/locale/en_US/activity.linfo deleted file mode 100644 index 8a2c1fd..0000000 --- a/locale/en_US/activity.linfo +++ /dev/null @@ -1,2 +0,0 @@ -[Activity] -name = Reflection diff --git a/locale/es/LC_MESSAGES/org.sugarlabs.RelfectionActivity.mo b/locale/es/LC_MESSAGES/org.sugarlabs.RelfectionActivity.mo deleted file mode 100644 index fb5fd03..0000000 --- a/locale/es/LC_MESSAGES/org.sugarlabs.RelfectionActivity.mo +++ /dev/null Binary files differ diff --git a/locale/es/activity.linfo b/locale/es/activity.linfo deleted file mode 100644 index 3a675db..0000000 --- a/locale/es/activity.linfo +++ /dev/null @@ -1,2 +0,0 @@ -[Activity] -name = Reflexión diff --git a/locale/hy/LC_MESSAGES/org.sugarlabs.RelfectionActivity.mo b/locale/hy/LC_MESSAGES/org.sugarlabs.RelfectionActivity.mo deleted file mode 100644 index ec154a8..0000000 --- a/locale/hy/LC_MESSAGES/org.sugarlabs.RelfectionActivity.mo +++ /dev/null Binary files differ diff --git a/locale/hy/activity.linfo b/locale/hy/activity.linfo deleted file mode 100644 index 5aa9634..0000000 --- a/locale/hy/activity.linfo +++ /dev/null @@ -1,2 +0,0 @@ -[Activity] -name = Արտապատկեր diff --git a/locale/nl/LC_MESSAGES/org.sugarlabs.RelfectionActivity.mo b/locale/nl/LC_MESSAGES/org.sugarlabs.RelfectionActivity.mo deleted file mode 100644 index 9b8bfe8..0000000 --- a/locale/nl/LC_MESSAGES/org.sugarlabs.RelfectionActivity.mo +++ /dev/null Binary files differ diff --git a/locale/nl/activity.linfo b/locale/nl/activity.linfo deleted file mode 100644 index 969fa3a..0000000 --- a/locale/nl/activity.linfo +++ /dev/null @@ -1,2 +0,0 @@ -[Activity] -name = Weerspiegeling diff --git a/locale/pl/LC_MESSAGES/org.sugarlabs.RelfectionActivity.mo b/locale/pl/LC_MESSAGES/org.sugarlabs.RelfectionActivity.mo deleted file mode 100644 index c42e007..0000000 --- a/locale/pl/LC_MESSAGES/org.sugarlabs.RelfectionActivity.mo +++ /dev/null Binary files differ diff --git a/locale/pl/activity.linfo b/locale/pl/activity.linfo deleted file mode 100644 index 71b8da0..0000000 --- a/locale/pl/activity.linfo +++ /dev/null @@ -1,2 +0,0 @@ -[Activity] -name = Odbicie diff --git a/locale/pt/LC_MESSAGES/org.sugarlabs.RelfectionActivity.mo b/locale/pt/LC_MESSAGES/org.sugarlabs.RelfectionActivity.mo deleted file mode 100644 index 3376026..0000000 --- a/locale/pt/LC_MESSAGES/org.sugarlabs.RelfectionActivity.mo +++ /dev/null Binary files differ diff --git a/locale/pt/activity.linfo b/locale/pt/activity.linfo deleted file mode 100644 index bd6c0c7..0000000 --- a/locale/pt/activity.linfo +++ /dev/null @@ -1,2 +0,0 @@ -[Activity] -name = Reflexão diff --git a/locale/th/LC_MESSAGES/org.sugarlabs.RelfectionActivity.mo b/locale/th/LC_MESSAGES/org.sugarlabs.RelfectionActivity.mo deleted file mode 100644 index c33c3e3..0000000 --- a/locale/th/LC_MESSAGES/org.sugarlabs.RelfectionActivity.mo +++ /dev/null Binary files differ diff --git a/locale/th/activity.linfo b/locale/th/activity.linfo deleted file mode 100644 index 8a2c1fd..0000000 --- a/locale/th/activity.linfo +++ /dev/null @@ -1,2 +0,0 @@ -[Activity] -name = Reflection diff --git a/locale/zh_CN/LC_MESSAGES/org.sugarlabs.RelfectionActivity.mo b/locale/zh_CN/LC_MESSAGES/org.sugarlabs.RelfectionActivity.mo deleted file mode 100644 index 41f718f..0000000 --- a/locale/zh_CN/LC_MESSAGES/org.sugarlabs.RelfectionActivity.mo +++ /dev/null Binary files differ diff --git a/locale/zh_CN/activity.linfo b/locale/zh_CN/activity.linfo deleted file mode 100644 index 24e4f02..0000000 --- a/locale/zh_CN/activity.linfo +++ /dev/null @@ -1,2 +0,0 @@ -[Activity] -name = 反射 diff --git a/po/Reflection.pot b/po/Reflection.pot deleted file mode 100644 index 85b3ec9..0000000 --- a/po/Reflection.pot +++ /dev/null @@ -1,61 +0,0 @@ -# SOME DESCRIPTIVE TITLE. -# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER -# This file is distributed under the same license as the PACKAGE package. -# FIRST AUTHOR , YEAR. -# -#, fuzzy -msgid "" -msgstr "" -"Project-Id-Version: PACKAGE VERSION\n" -"Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2012-02-15 00:33-0500\n" -"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" -"Last-Translator: FULL NAME \n" -"Language-Team: LANGUAGE \n" -"MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=CHARSET\n" -"Content-Transfer-Encoding: 8bit\n" - -#: activity/activity.info:2 -msgid "Reflection" -msgstr "" - -#: ReflectionActivity.py:108 -msgid "Game" -msgstr "" - -#: ReflectionActivity.py:116 -msgid "Start a new horizontal-reflection game." -msgstr "" - -#: ReflectionActivity.py:121 -msgid "Start a new vertical-reflection game." -msgstr "" - -#: ReflectionActivity.py:126 -msgid "Start a new bilateral-reflection game." -msgstr "" - -#: ReflectionActivity.py:135 -msgid "Play with the robot." -msgstr "" - -#: game.py:118 -msgid "Click on the dots to make a horizontal reflection." -msgstr "" - -#: game.py:121 -msgid "Click on the dots to make a vertical reflection." -msgstr "" - -#: game.py:124 -msgid "Click on the dots to make a bilateral reflection." -msgstr "" - -#: game.py:253 game.py:263 game.py:271 game.py:277 -msgid "keep trying" -msgstr "" - -#: game.py:255 game.py:265 game.py:279 -msgid "good work" -msgstr "" diff --git a/po/da.po b/po/da.po deleted file mode 100644 index ee6678d..0000000 --- a/po/da.po +++ /dev/null @@ -1,65 +0,0 @@ -# SOME DESCRIPTIVE TITLE. -# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER -# This file is distributed under the same license as the PACKAGE package. -# FIRST AUTHOR , YEAR. -msgid "" -msgstr "" -"Project-Id-Version: PACKAGE VERSION\n" -"Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2012-02-15 00:33-0500\n" -"PO-Revision-Date: 2012-02-01 19:58+0200\n" -"Last-Translator: Aputsiaq Niels \n" -"Language-Team: LANGUAGE \n" -"Language: da\n" -"MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=UTF-8\n" -"Content-Transfer-Encoding: 8bit\n" -"Plural-Forms: nplurals=2; plural=(n != 1);\n" -"X-Generator: Pootle 2.0.5\n" - -#: activity/activity.info:2 -msgid "Reflection" -msgstr "Reflektion" - -#: ReflectionActivity.py:108 -msgid "Game" -msgstr "Spil" - -#: ReflectionActivity.py:116 -msgid "Start a new horizontal-reflection game." -msgstr "Start et nyt spil med vandret reflektion." - -#: ReflectionActivity.py:121 -msgid "Start a new vertical-reflection game." -msgstr "Start et nyt spil med lodret reflektion." - -#: ReflectionActivity.py:126 -msgid "Start a new bilateral-reflection game." -msgstr "Start et nyt spil med bilateral reflektion." - -#: ReflectionActivity.py:135 -msgid "Play with the robot." -msgstr "Leg med robotten." - -#: game.py:118 -msgid "Click on the dots to make a horizontal reflection." -msgstr "Klik på prikkerne for at foretage en vandret reflektion." - -#: game.py:121 -msgid "Click on the dots to make a vertical reflection." -msgstr "Klik på prikkerne for at foretage en lodret reflektion." - -#: game.py:124 -msgid "Click on the dots to make a bilateral reflection." -msgstr "Klik på prikkerne for at foretage en bilateral reflektion." - -#: game.py:253 game.py:263 game.py:271 game.py:277 -msgid "keep trying" -msgstr "bliv ved med at forsøge" - -#: game.py:255 game.py:265 game.py:279 -msgid "good work" -msgstr "godt arbejde" - -#~ msgid "Game over" -#~ msgstr "Spillet er slut" diff --git a/po/en.po b/po/en.po deleted file mode 100644 index 7d6917f..0000000 --- a/po/en.po +++ /dev/null @@ -1,65 +0,0 @@ -# SOME DESCRIPTIVE TITLE. -# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER -# This file is distributed under the same license as the PACKAGE package. -# FIRST AUTHOR , YEAR. -msgid "" -msgstr "" -"Project-Id-Version: PACKAGE VERSION\n" -"Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2012-02-15 00:33-0500\n" -"PO-Revision-Date: 2012-01-31 04:55+0200\n" -"Last-Translator: Chris \n" -"Language-Team: LANGUAGE \n" -"Language: \n" -"MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=UTF-8\n" -"Content-Transfer-Encoding: 8bit\n" -"Plural-Forms: nplurals=2; plural=(n != 1);\n" -"X-Generator: Pootle 2.0.5\n" - -#: activity/activity.info:2 -msgid "Reflection" -msgstr "Reflection" - -#: ReflectionActivity.py:108 -msgid "Game" -msgstr "Game" - -#: ReflectionActivity.py:116 -msgid "Start a new horizontal-reflection game." -msgstr "Start a new horizontal-reflection game." - -#: ReflectionActivity.py:121 -msgid "Start a new vertical-reflection game." -msgstr "Start a new vertical-reflection game." - -#: ReflectionActivity.py:126 -msgid "Start a new bilateral-reflection game." -msgstr "Start a new bilateral-reflection game." - -#: ReflectionActivity.py:135 -msgid "Play with the robot." -msgstr "Play with the robot." - -#: game.py:118 -msgid "Click on the dots to make a horizontal reflection." -msgstr "Click on the dots to make a horizontal reflection." - -#: game.py:121 -msgid "Click on the dots to make a vertical reflection." -msgstr "Click on the dots to make a vertical reflection." - -#: game.py:124 -msgid "Click on the dots to make a bilateral reflection." -msgstr "Click on the dots to make a bilateral reflection." - -#: game.py:253 game.py:263 game.py:271 game.py:277 -msgid "keep trying" -msgstr "keep trying" - -#: game.py:255 game.py:265 game.py:279 -msgid "good work" -msgstr "good work" - -#~ msgid "Game over" -#~ msgstr "Game over" diff --git a/po/en_GB.po b/po/en_GB.po deleted file mode 100644 index 270b399..0000000 --- a/po/en_GB.po +++ /dev/null @@ -1,65 +0,0 @@ -# SOME DESCRIPTIVE TITLE. -# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER -# This file is distributed under the same license as the PACKAGE package. -# FIRST AUTHOR , YEAR. -msgid "" -msgstr "" -"Project-Id-Version: PACKAGE VERSION\n" -"Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2012-02-15 00:33-0500\n" -"PO-Revision-Date: 2012-02-01 00:40+0200\n" -"Last-Translator: Chris \n" -"Language-Team: LANGUAGE \n" -"Language: en_GB\n" -"MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=UTF-8\n" -"Content-Transfer-Encoding: 8bit\n" -"Plural-Forms: nplurals=2; plural=(n != 1);\n" -"X-Generator: Pootle 2.0.5\n" - -#: activity/activity.info:2 -msgid "Reflection" -msgstr "Reflection" - -#: ReflectionActivity.py:108 -msgid "Game" -msgstr "Game" - -#: ReflectionActivity.py:116 -msgid "Start a new horizontal-reflection game." -msgstr "Start a new horizontal-reflection game." - -#: ReflectionActivity.py:121 -msgid "Start a new vertical-reflection game." -msgstr "Start a new vertical-reflection game." - -#: ReflectionActivity.py:126 -msgid "Start a new bilateral-reflection game." -msgstr "Start a new bilateral-reflection game." - -#: ReflectionActivity.py:135 -msgid "Play with the robot." -msgstr "Play with the robot." - -#: game.py:118 -msgid "Click on the dots to make a horizontal reflection." -msgstr "Click on the dots to make a horizontal reflection." - -#: game.py:121 -msgid "Click on the dots to make a vertical reflection." -msgstr "Click on the dots to make a vertical reflection." - -#: game.py:124 -msgid "Click on the dots to make a bilateral reflection." -msgstr "Click on the dots to make a bilateral reflection." - -#: game.py:253 game.py:263 game.py:271 game.py:277 -msgid "keep trying" -msgstr "keep trying" - -#: game.py:255 game.py:265 game.py:279 -msgid "good work" -msgstr "good work" - -#~ msgid "Game over" -#~ msgstr "Game over" diff --git a/po/en_US.po b/po/en_US.po deleted file mode 100644 index 032ca78..0000000 --- a/po/en_US.po +++ /dev/null @@ -1,65 +0,0 @@ -# SOME DESCRIPTIVE TITLE. -# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER -# This file is distributed under the same license as the PACKAGE package. -# FIRST AUTHOR , YEAR. -msgid "" -msgstr "" -"Project-Id-Version: PACKAGE VERSION\n" -"Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2012-02-15 00:33-0500\n" -"PO-Revision-Date: 2012-01-31 06:41+0200\n" -"Last-Translator: Chris \n" -"Language-Team: LANGUAGE \n" -"Language: en_US\n" -"MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=UTF-8\n" -"Content-Transfer-Encoding: 8bit\n" -"Plural-Forms: nplurals=2; plural=(n != 1);\n" -"X-Generator: Pootle 2.0.5\n" - -#: activity/activity.info:2 -msgid "Reflection" -msgstr "Reflection" - -#: ReflectionActivity.py:108 -msgid "Game" -msgstr "Game" - -#: ReflectionActivity.py:116 -msgid "Start a new horizontal-reflection game." -msgstr "Start a new horizontal-reflection game." - -#: ReflectionActivity.py:121 -msgid "Start a new vertical-reflection game." -msgstr "Start a new vertical-reflection game." - -#: ReflectionActivity.py:126 -msgid "Start a new bilateral-reflection game." -msgstr "Start a new bilateral-reflection game." - -#: ReflectionActivity.py:135 -msgid "Play with the robot." -msgstr "Play with the robot." - -#: game.py:118 -msgid "Click on the dots to make a horizontal reflection." -msgstr "Click on the dots to make a horizontal reflection." - -#: game.py:121 -msgid "Click on the dots to make a vertical reflection." -msgstr "Click on the dots to make a vertical reflection." - -#: game.py:124 -msgid "Click on the dots to make a bilateral reflection." -msgstr "Click on the dots to make a bilateral reflection." - -#: game.py:253 game.py:263 game.py:271 game.py:277 -msgid "keep trying" -msgstr "keep trying" - -#: game.py:255 game.py:265 game.py:279 -msgid "good work" -msgstr "good work" - -#~ msgid "Game over" -#~ msgstr "Game over" diff --git a/po/es.po b/po/es.po deleted file mode 100644 index a49d77b..0000000 --- a/po/es.po +++ /dev/null @@ -1,62 +0,0 @@ -# SOME DESCRIPTIVE TITLE. -# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER -# This file is distributed under the same license as the PACKAGE package. -# FIRST AUTHOR , YEAR. -msgid "" -msgstr "" -"Project-Id-Version: PACKAGE VERSION\n" -"Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2012-02-15 00:33-0500\n" -"PO-Revision-Date: 2012-10-07 22:26+0200\n" -"Last-Translator: Chris \n" -"Language-Team: LANGUAGE \n" -"Language: es\n" -"MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=UTF-8\n" -"Content-Transfer-Encoding: 8bit\n" -"Plural-Forms: nplurals=2; plural=(n != 1);\n" -"X-Generator: Pootle 2.0.5\n" - -#: activity/activity.info:2 -msgid "Reflection" -msgstr "Reflexión" - -#: ReflectionActivity.py:108 -msgid "Game" -msgstr "Juego" - -#: ReflectionActivity.py:116 -msgid "Start a new horizontal-reflection game." -msgstr "Iniciar un nuevo juego de reflexión horizontal." - -#: ReflectionActivity.py:121 -msgid "Start a new vertical-reflection game." -msgstr "Iniciar un nuevo juego de reflexión vertical." - -#: ReflectionActivity.py:126 -msgid "Start a new bilateral-reflection game." -msgstr "Iniciar un nuevo juego de reflexión bilateral." - -#: ReflectionActivity.py:135 -msgid "Play with the robot." -msgstr "Jugar con el robot." - -#: game.py:118 -msgid "Click on the dots to make a horizontal reflection." -msgstr "Haz clic en los puntos para hacer una reflexión horizontal." - -#: game.py:121 -msgid "Click on the dots to make a vertical reflection." -msgstr "Haz clic en los puntos para hacer una reflexión vertical." - -#: game.py:124 -msgid "Click on the dots to make a bilateral reflection." -msgstr "Haz clic en los puntos para crear una reflexión bilateral." - -#: game.py:253 game.py:263 game.py:271 game.py:277 -msgid "keep trying" -msgstr "sigue intentando" - -#: game.py:255 game.py:265 game.py:279 -msgid "good work" -msgstr "buen trabajo" diff --git a/po/hy.po b/po/hy.po deleted file mode 100644 index 69cc16e..0000000 --- a/po/hy.po +++ /dev/null @@ -1,65 +0,0 @@ -# SOME DESCRIPTIVE TITLE. -# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER -# This file is distributed under the same license as the PACKAGE package. -# FIRST AUTHOR , YEAR. -msgid "" -msgstr "" -"Project-Id-Version: PACKAGE VERSION\n" -"Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2012-02-15 00:33-0500\n" -"PO-Revision-Date: 2012-02-02 15:16+0200\n" -"Last-Translator: anush.mkrtchyan \n" -"Language-Team: LANGUAGE \n" -"Language: hy\n" -"MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=UTF-8\n" -"Content-Transfer-Encoding: 8bit\n" -"Plural-Forms: nplurals=2; plural=(n > 1);\n" -"X-Generator: Pootle 2.0.5\n" - -#: activity/activity.info:2 -msgid "Reflection" -msgstr "Արտապատկեր" - -#: ReflectionActivity.py:108 -msgid "Game" -msgstr "Խաղ" - -#: ReflectionActivity.py:116 -msgid "Start a new horizontal-reflection game." -msgstr "Սկսել նոր հորիզոնական-արտապատկերով խաղ" - -#: ReflectionActivity.py:121 -msgid "Start a new vertical-reflection game." -msgstr "Սկսել նոր ուղղահայաց-արտապատկերով խաղ" - -#: ReflectionActivity.py:126 -msgid "Start a new bilateral-reflection game." -msgstr "Սկսել նոր երկկողմանի-արտապատկերով խաղ" - -#: ReflectionActivity.py:135 -msgid "Play with the robot." -msgstr "Խաղալ ռոբոտի հետ:" - -#: game.py:118 -msgid "Click on the dots to make a horizontal reflection." -msgstr "Սեղմել կետերի վրա` հորիզոնական արտապատկեր ստեղծելու համար:" - -#: game.py:121 -msgid "Click on the dots to make a vertical reflection." -msgstr "Սեղմել կետերի վրա` ուղղահայաց արտապատկեր ստեղծելու համար:" - -#: game.py:124 -msgid "Click on the dots to make a bilateral reflection." -msgstr "Սեղմել կետերի վրա` երկկողմանի արտապատկեր ստեղծելու համար:" - -#: game.py:253 game.py:263 game.py:271 game.py:277 -msgid "keep trying" -msgstr "շարունակիր փորձել" - -#: game.py:255 game.py:265 game.py:279 -msgid "good work" -msgstr "լավ աշխատանք է" - -#~ msgid "Game over" -#~ msgstr "Խաղը ավարտվեց" diff --git a/po/nl.po b/po/nl.po deleted file mode 100644 index d04ea49..0000000 --- a/po/nl.po +++ /dev/null @@ -1,65 +0,0 @@ -# SOME DESCRIPTIVE TITLE. -# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER -# This file is distributed under the same license as the PACKAGE package. -# FIRST AUTHOR , YEAR. -msgid "" -msgstr "" -"Project-Id-Version: PACKAGE VERSION\n" -"Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2012-02-15 00:33-0500\n" -"PO-Revision-Date: 2012-08-20 22:39+0200\n" -"Last-Translator: whe \n" -"Language-Team: LANGUAGE \n" -"Language: nl\n" -"MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=UTF-8\n" -"Content-Transfer-Encoding: 8bit\n" -"Plural-Forms: nplurals=2; plural=(n != 1);\n" -"X-Generator: Pootle 2.0.5\n" - -#: activity/activity.info:2 -msgid "Reflection" -msgstr "Weerspiegeling" - -#: ReflectionActivity.py:108 -msgid "Game" -msgstr "Spel" - -#: ReflectionActivity.py:116 -msgid "Start a new horizontal-reflection game." -msgstr "Start een nieuw horizontaal-spiegelingsspel." - -#: ReflectionActivity.py:121 -msgid "Start a new vertical-reflection game." -msgstr "Start een nieuw verticaal-spiegelingsspel." - -#: ReflectionActivity.py:126 -msgid "Start a new bilateral-reflection game." -msgstr "Start een nieuw tweezijdig-spiegelingsspel." - -#: ReflectionActivity.py:135 -msgid "Play with the robot." -msgstr "Speel met de robot." - -#: game.py:118 -msgid "Click on the dots to make a horizontal reflection." -msgstr "Klik op de punten om een horizontale spiegeling te maken." - -#: game.py:121 -msgid "Click on the dots to make a vertical reflection." -msgstr "Klik op de punten om een verticale spiegeling te maken." - -#: game.py:124 -msgid "Click on the dots to make a bilateral reflection." -msgstr "Klik op de punten om een tweezijdige spiegeling te maken." - -#: game.py:253 game.py:263 game.py:271 game.py:277 -msgid "keep trying" -msgstr "blijf proberen" - -#: game.py:255 game.py:265 game.py:279 -msgid "good work" -msgstr "goed werk" - -#~ msgid "Game over" -#~ msgstr "Spel klaar" diff --git a/po/pl.po b/po/pl.po deleted file mode 100644 index 81021bf..0000000 --- a/po/pl.po +++ /dev/null @@ -1,66 +0,0 @@ -# SOME DESCRIPTIVE TITLE. -# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER -# This file is distributed under the same license as the PACKAGE package. -# FIRST AUTHOR , YEAR. -msgid "" -msgstr "" -"Project-Id-Version: PACKAGE VERSION\n" -"Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2012-02-15 00:33-0500\n" -"PO-Revision-Date: 2012-02-01 15:09+0200\n" -"Last-Translator: lkjlkj \n" -"Language-Team: LANGUAGE \n" -"Language: pl\n" -"MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=UTF-8\n" -"Content-Transfer-Encoding: 8bit\n" -"Plural-Forms: nplurals=3; plural=(n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 " -"|| n%100>=20) ? 1 : 2);\n" -"X-Generator: Pootle 2.0.5\n" - -#: activity/activity.info:2 -msgid "Reflection" -msgstr "Odbicie" - -#: ReflectionActivity.py:108 -msgid "Game" -msgstr "Gra" - -#: ReflectionActivity.py:116 -msgid "Start a new horizontal-reflection game." -msgstr "Rozpocznij nową grę horyzontalnego odbicia." - -#: ReflectionActivity.py:121 -msgid "Start a new vertical-reflection game." -msgstr "Rozpocznij nową grę wertykalnego odbicia." - -#: ReflectionActivity.py:126 -msgid "Start a new bilateral-reflection game." -msgstr "Rozpocznij nową grę dwustronnego odbicia." - -#: ReflectionActivity.py:135 -msgid "Play with the robot." -msgstr "Zagraj z robotem." - -#: game.py:118 -msgid "Click on the dots to make a horizontal reflection." -msgstr "Kliknij na kropki, aby stworzyć poziome odbicie." - -#: game.py:121 -msgid "Click on the dots to make a vertical reflection." -msgstr "Kliknij na kropki, aby stworzyć pionowe odbicie." - -#: game.py:124 -msgid "Click on the dots to make a bilateral reflection." -msgstr "Kliknij na kropki, aby stworzyć dwustronne odbicie." - -#: game.py:253 game.py:263 game.py:271 game.py:277 -msgid "keep trying" -msgstr "próbuj dalej" - -#: game.py:255 game.py:265 game.py:279 -msgid "good work" -msgstr "dobra robota" - -#~ msgid "Game over" -#~ msgstr "Koniec gry" diff --git a/po/pt.po b/po/pt.po deleted file mode 100644 index 3727188..0000000 --- a/po/pt.po +++ /dev/null @@ -1,62 +0,0 @@ -# SOME DESCRIPTIVE TITLE. -# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER -# This file is distributed under the same license as the PACKAGE package. -# FIRST AUTHOR , YEAR. -msgid "" -msgstr "" -"Project-Id-Version: PACKAGE VERSION\n" -"Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2012-02-15 00:33-0500\n" -"PO-Revision-Date: 2012-02-01 00:38+0200\n" -"Last-Translator: Chris \n" -"Language-Team: LANGUAGE \n" -"Language: pt\n" -"MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=UTF-8\n" -"Content-Transfer-Encoding: 8bit\n" -"Plural-Forms: nplurals=2; plural=(n != 1);\n" -"X-Generator: Pootle 2.0.5\n" - -#: activity/activity.info:2 -msgid "Reflection" -msgstr "Reflexão" - -#: ReflectionActivity.py:108 -msgid "Game" -msgstr "Jogo" - -#: ReflectionActivity.py:116 -msgid "Start a new horizontal-reflection game." -msgstr "Iniciar um novo jogo reflexão-horizontal." - -#: ReflectionActivity.py:121 -msgid "Start a new vertical-reflection game." -msgstr "Iniciar um novo jogo reflexão-vertical." - -#: ReflectionActivity.py:126 -msgid "Start a new bilateral-reflection game." -msgstr "Iniciar um novo jogo reflexão-bilateral." - -#: ReflectionActivity.py:135 -msgid "Play with the robot." -msgstr "Jogar com o robô." - -#: game.py:118 -msgid "Click on the dots to make a horizontal reflection." -msgstr "Clica nos pontos para fazer uma reflexão horizontal." - -#: game.py:121 -msgid "Click on the dots to make a vertical reflection." -msgstr "Clica nos pontos para fazer uma reflexão vertical." - -#: game.py:124 -msgid "Click on the dots to make a bilateral reflection." -msgstr "Clica nos pontos para fazer uma reflexão bilateral." - -#: game.py:253 game.py:263 game.py:271 game.py:277 -msgid "keep trying" -msgstr "continua a tentar" - -#: game.py:255 game.py:265 game.py:279 -msgid "good work" -msgstr "bom trabalho" diff --git a/po/th.po b/po/th.po deleted file mode 100644 index ae240ad..0000000 --- a/po/th.po +++ /dev/null @@ -1,62 +0,0 @@ -# SOME DESCRIPTIVE TITLE. -# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER -# This file is distributed under the same license as the PACKAGE package. -# FIRST AUTHOR , YEAR. -msgid "" -msgstr "" -"Project-Id-Version: PACKAGE VERSION\n" -"Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2012-02-15 00:33-0500\n" -"PO-Revision-Date: 2012-03-09 11:48+0200\n" -"Last-Translator: Meechai \n" -"Language-Team: LANGUAGE \n" -"Language: th\n" -"MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=UTF-8\n" -"Content-Transfer-Encoding: 8bit\n" -"Plural-Forms: nplurals=1; plural=0;\n" -"X-Generator: Pootle 2.0.5\n" - -#: activity/activity.info:2 -msgid "Reflection" -msgstr "Reflection" - -#: ReflectionActivity.py:108 -msgid "Game" -msgstr "เกม" - -#: ReflectionActivity.py:116 -msgid "Start a new horizontal-reflection game." -msgstr "เรื่ม เกมสะท้อนแบบแนวนอนใหม่" - -#: ReflectionActivity.py:121 -msgid "Start a new vertical-reflection game." -msgstr "เรื่มเกมสะท้อนแบบแนวตั้งใหม่" - -#: ReflectionActivity.py:126 -msgid "Start a new bilateral-reflection game." -msgstr "เรื่มเกมสะท้อนแบบมีสองด้านใหม่" - -#: ReflectionActivity.py:135 -msgid "Play with the robot." -msgstr "เล่นกับหุ่นยนต์" - -#: game.py:118 -msgid "Click on the dots to make a horizontal reflection." -msgstr "กดปุ่มเพื่อสร้างภาพสะท้อนแบบแนวนอน" - -#: game.py:121 -msgid "Click on the dots to make a vertical reflection." -msgstr "กดปุ่มเพื่อสร้างภาพสะท้อนแบบแนวตั้ง" - -#: game.py:124 -msgid "Click on the dots to make a bilateral reflection." -msgstr "กดปุ่มเพื่อสร้างภาพสะท้อนสองด้าน" - -#: game.py:253 game.py:263 game.py:271 game.py:277 -msgid "keep trying" -msgstr "พยายามต่อไป" - -#: game.py:255 game.py:265 game.py:279 -msgid "good work" -msgstr "เก่งมาก" diff --git a/po/zh_CN.po b/po/zh_CN.po deleted file mode 100644 index 0537601..0000000 --- a/po/zh_CN.po +++ /dev/null @@ -1,65 +0,0 @@ -# SOME DESCRIPTIVE TITLE. -# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER -# This file is distributed under the same license as the PACKAGE package. -# FIRST AUTHOR , YEAR. -msgid "" -msgstr "" -"Project-Id-Version: PACKAGE VERSION\n" -"Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2012-02-15 00:33-0500\n" -"PO-Revision-Date: 2012-03-15 03:29+0200\n" -"Last-Translator: lite \n" -"Language-Team: LANGUAGE \n" -"Language: zh_CN\n" -"MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=UTF-8\n" -"Content-Transfer-Encoding: 8bit\n" -"Plural-Forms: nplurals=1; plural=0;\n" -"X-Generator: Pootle 2.0.5\n" - -#: activity/activity.info:2 -msgid "Reflection" -msgstr "反射" - -#: ReflectionActivity.py:108 -msgid "Game" -msgstr "游戏" - -#: ReflectionActivity.py:116 -msgid "Start a new horizontal-reflection game." -msgstr "开始新的水平反射游戏。" - -#: ReflectionActivity.py:121 -msgid "Start a new vertical-reflection game." -msgstr "开始新的垂直反射游戏。" - -#: ReflectionActivity.py:126 -msgid "Start a new bilateral-reflection game." -msgstr "开始新的双向反射游戏。" - -#: ReflectionActivity.py:135 -msgid "Play with the robot." -msgstr "对战机器人。" - -#: game.py:118 -msgid "Click on the dots to make a horizontal reflection." -msgstr "水平反射请单击该点。" - -#: game.py:121 -msgid "Click on the dots to make a vertical reflection." -msgstr "垂直反射请单击该点。" - -#: game.py:124 -msgid "Click on the dots to make a bilateral reflection." -msgstr "双向反射请单击该点。" - -#: game.py:253 game.py:263 game.py:271 game.py:277 -msgid "keep trying" -msgstr "继续试试" - -#: game.py:255 game.py:265 game.py:279 -msgid "good work" -msgstr "做得好" - -#~ msgid "Game over" -#~ msgstr "游戏结束" diff --git a/setup.py b/setup.py deleted file mode 100755 index 8a900da..0000000 --- a/setup.py +++ /dev/null @@ -1,5 +0,0 @@ -#!/usr/bin/env python -from sugar3.activity import bundlebuilder - -if __name__ == "__main__": - bundlebuilder.start() diff --git a/sprites.py b/sprites.py deleted file mode 100644 index 0ef8dca..0000000 --- a/sprites.py +++ /dev/null @@ -1,852 +0,0 @@ -# -*- coding: utf-8 -*- - -#Copyright (c) 2007-8, Playful Invention Company. -#Copyright (c) 2008-11 Walter Bender - -#Permission is hereby granted, free of charge, to any person obtaining a copy -#of this software and associated documentation files (the "Software"), to deal -#in the Software without restriction, including without limitation the rights -#to use, copy, modify, merge, publish, distribute, sublicense, and/or sell -#copies of the Software, and to permit persons to whom the Software is -#furnished to do so, subject to the following conditions: - -#The above copyright notice and this permission notice shall be included in -#all copies or substantial portions of the Software. - -#THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -#IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -#FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -#AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -#LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, -#OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN -#THE SOFTWARE. - -''' - -sprites.py is a simple sprites library for managing graphics objects, -'sprites', on a gtk.DrawingArea. It manages multiple sprites with -methods such as move, hide, set_layer, etc. - -There are two classes: - -class Sprites maintains a collection of sprites -class Sprite manages individual sprites within the collection. - -Example usage: - # Import the classes into your program. - from sprites import Sprites Sprite - - # Create a new sprite collection associated with your widget - self.sprite_list = Sprites(widget) - - # Create a "pixbuf" (in this example, from SVG). - my_pixbuf = svg_str_to_pixbuf("...some svg code...") - - # Create a sprite at position x1, y1. - my_sprite = sprites.Sprite(self.sprite_list, x1, y1, my_pixbuf) - - # Move the sprite to a new position. - my_sprite.move((x1+dx, y1+dy)) - - # Create another "pixbuf". - your_pixbuf = svg_str_to_pixbuf("...some svg code...") - - # Create a sprite at position x2, y2. - your_sprite = sprites.Sprite(self.sprite_list, x2, y2, my_pixbuf) - - # Assign the sprites to layers. - # In this example, your_sprite will be on top of my_sprite. - my_sprite.set_layer(100) - your_sprite.set_layer(200) - - # Now put my_sprite on top of your_sprite. - my_sprite.set_layer(300) - - cr = self.window.cairo_create() - # In your activity's do_expose_event, put in a call to redraw_sprites - self.sprites.redraw_sprites(event.area, cairo_context) - -# method for converting SVG to a gtk pixbuf -def svg_str_to_pixbuf(svg_string): - pl = gtk.gdk.PixbufLoader('svg') - pl.write(svg_string) - pl.close() - pixbuf = pl.get_pixbuf() - return pixbuf -''' -## <-----------GTK2---------------->## - -''' - - -import pygtk -pygtk.require('2.0') -import gtk -import pango -import pangocairo -import cairo - -class Sprites: - # A class for the list of sprites and everything they share in common # - - def __init__(self, widget): - # Initialize an empty array of sprites # - self.widget = widget - self.list = [] - self.cr = None - - def set_cairo_context(self, cr): - # Cairo context may be set or reset after __init__ # - self.cr = cr - - def get_sprite(self, i): - # Return a sprint from the array # - if i < 0 or i > len(self.list) - 1: - return(None) - else: - return(self.list[i]) - - def length_of_list(self): - # How many sprites are there? # - return(len(self.list)) - - def append_to_list(self, spr): - # Append a new sprite to the end of the list. # - self.list.append(spr) - - def insert_in_list(self, spr, i): - # Insert a sprite at position i. # - if i < 0: - self.list.insert(0, spr) - elif i > len(self.list) - 1: - self.list.append(spr) - else: - self.list.insert(i, spr) - - def remove_from_list(self, spr): - # Remove a sprite from the list. # - if spr in self.list: - self.list.remove(spr) - - def find_sprite(self, pos, inverse=False): - # Search based on (x, y) position. Return the 'top/first' one. # - list = self.list[:] - if not inverse: - list.reverse() - for spr in list: - if spr.hit(pos): - return spr - return None - - def redraw_sprites(self, area=None, cr=None): - # Redraw the sprites that intersect area. # - # I think I need to do this to save Cairo some work - if cr is None: - cr = self.cr - else: - self.cr = cr - if cr is None: - print 'sprites.redraw_sprites: no Cairo context' - return - for spr in self.list: - if area == None: - spr.draw(cr=cr) - else: - intersection = spr.rect.intersect(area) - if intersection.width > 0 or intersection.height > 0: - spr.draw(cr=cr) - - -class Sprite: - # A class for the individual sprites # - - def __init__(self, sprites, x, y, image): - # Initialize an individual sprite # - self._sprites = sprites - self.save_xy = (x, y) # remember initial (x, y) position - self.rect = gtk.gdk.Rectangle(int(x), int(y), 0, 0) - self._scale = [12] - self._rescale = [True] - self._horiz_align = ["center"] - self._vert_align = ["middle"] - self._fd = None - self._bold = False - self._italic = False - self._color = None - self._margins = [0, 0, 0, 0] - self.layer = 100 - self.labels = [] - self.cached_surfaces = [] - self._dx = [] # image offsets - self._dy = [] - self.type = None - self.set_image(image) - self._sprites.append_to_list(self) - - def set_image(self, image, i=0, dx=0, dy=0): - # Add an image to the sprite. # - while len(self.cached_surfaces) < i + 1: - self.cached_surfaces.append(None) - self._dx.append(0) - self._dy.append(0) - self._dx[i] = dx - self._dy[i] = dy - if isinstance(image, gtk.gdk.Pixbuf) or \ - isinstance(image, cairo.ImageSurface): - w = image.get_width() - h = image.get_height() - else: - w, h = image.get_size() - if i == 0: # Always reset width and height when base image changes. - self.rect.width = w + dx - self.rect.height = h + dy - else: - if w + dx > self.rect.width: - self.rect.width = w + dx - if h + dy > self.rect.height: - self.rect.height = h + dy - if isinstance(image, cairo.ImageSurface): - self.cached_surfaces[i] = image - else: # Convert to Cairo surface - surface = cairo.ImageSurface( - cairo.FORMAT_ARGB32, self.rect.width, self.rect.height) - context = cairo.Context(surface) - context = gtk.gdk.CairoContext(context) - context.set_source_pixbuf(image, 0, 0) - context.rectangle(0, 0, self.rect.width, self.rect.height) - context.fill() - self.cached_surfaces[i] = surface - - def move(self, pos): - # Move to new (x, y) position # - self.inval() - self.rect.x, self.rect.y = int(pos[0]), int(pos[1]) - self.inval() - - def move_relative(self, pos): - # Move to new (x+dx, y+dy) position # - self.inval() - self.rect.x += int(pos[0]) - self.rect.y += int(pos[1]) - self.inval() - - def get_xy(self): - # Return current (x, y) position # - return (self.rect.x, self.rect.y) - - def get_dimensions(self): - # Return current size # - return (self.rect.width, self.rect.height) - - def get_layer(self): - # Return current layer # - return self.layer - - def set_shape(self, image, i=0): - # Set the current image associated with the sprite # - self.inval() - self.set_image(image, i) - self.inval() - - def set_layer(self, layer=None): - # Set the layer for a sprite # - self._sprites.remove_from_list(self) - if layer is not None: - self.layer = layer - for i in range(self._sprites.length_of_list()): - if layer < self._sprites.get_sprite(i).layer: - self._sprites.insert_in_list(self, i) - self.inval() - return - self._sprites.append_to_list(self) - self.inval() - - def set_label(self, new_label, i=0): - # Set the label drawn on the sprite # - self._extend_labels_array(i) - if type(new_label) is str or type(new_label) is unicode: - # pango doesn't like nulls - self.labels[i] = new_label.replace("\0", " ") - else: - self.labels[i] = str(new_label) - self.inval() - - def set_margins(self, l=0, t=0, r=0, b=0): - # Set the margins for drawing the label # - self._margins = [l, t, r, b] - - def _extend_labels_array(self, i): - # Append to the labels attribute list # - if self._fd is None: - self.set_font('Sans') - if self._color is None: - self._color = (0., 0., 0.) - while len(self.labels) < i + 1: - self.labels.append(" ") - self._scale.append(self._scale[0]) - self._rescale.append(self._rescale[0]) - self._horiz_align.append(self._horiz_align[0]) - self._vert_align.append(self._vert_align[0]) - - def set_font(self, font): - # Set the font for a label # - self._fd = pango.FontDescription(font) - - def set_label_color(self, rgb): - # Set the font color for a label # - COLORTABLE = {'black': '#000000', 'white': '#FFFFFF', - 'red': '#FF0000', 'yellow': '#FFFF00', - 'green': '#00FF00', 'cyan': '#00FFFF', - 'blue': '#0000FF', 'purple': '#FF00FF', - 'gray': '#808080'} - if rgb.lower() in COLORTABLE: - rgb = COLORTABLE[rgb.lower()] - # Convert from '#RRGGBB' to floats - self._color = (int('0x' + rgb[1:3], 16) / 256., - int('0x' + rgb[3:5], 16) / 256., - int('0x' + rgb[5:7], 16) / 256.) - return - - def set_label_attributes(self, scale, rescale=True, horiz_align="center", - vert_align="middle", i=0): - # Set the various label attributes # - self._extend_labels_array(i) - self._scale[i] = scale - self._rescale[i] = rescale - self._horiz_align[i] = horiz_align - self._vert_align[i] = vert_align - - def hide(self): - # Hide a sprite # - self.inval() - self._sprites.remove_from_list(self) - - def restore(self): - # Restore a hidden sprite # - self.set_layer() - - def inval(self): - # Invalidate a region for gtk # - self._sprites.widget.queue_draw_area(self.rect.x, - self.rect.y, - self.rect.width, - self.rect.height) - - def draw(self, cr=None): - # Draw the sprite (and label) # - if cr is None: - print 'sprite.draw: no Cairo context.' - return - for i, surface in enumerate(self.cached_surfaces): - cr.set_source_surface(surface, - self.rect.x + self._dx[i], - self.rect.y + self._dy[i]) - cr.rectangle(self.rect.x + self._dx[i], - self.rect.y + self._dy[i], - self.rect.width, - self.rect.height) - cr.fill() - if len(self.labels) > 0: - self.draw_label(cr) - - def hit(self, pos): - # Is (x, y) on top of the sprite? # - x, y = pos - if x < self.rect.x: - return False - if x > self.rect.x + self.rect.width: - return False - if y < self.rect.y: - return False - if y > self.rect.y + self.rect.height: - return False - return True - - def draw_label(self, cr): - # Draw the label based on its attributes # - # Create a pangocairo context - cr = pangocairo.CairoContext(cr) - my_width = self.rect.width - self._margins[0] - self._margins[2] - if my_width < 0: - my_width = 0 - my_height = self.rect.height - self._margins[1] - self._margins[3] - for i in range(len(self.labels)): - pl = cr.create_layout() - pl.set_text(str(self.labels[i])) - self._fd.set_size(int(self._scale[i] * pango.SCALE)) - pl.set_font_description(self._fd) - w = pl.get_size()[0] / pango.SCALE - if w > my_width: - if self._rescale[i]: - self._fd.set_size( - int(self._scale[i] * pango.SCALE * my_width / w)) - pl.set_font_description(self._fd) - w = pl.get_size()[0] / pango.SCALE - else: - j = len(self.labels[i]) - 1 - while(w > my_width and j > 0): - pl.set_text( - "…" + self.labels[i][len(self.labels[i]) - j:]) - self._fd.set_size(int(self._scale[i] * pango.SCALE)) - pl.set_font_description(self._fd) - w = pl.get_size()[0] / pango.SCALE - j -= 1 - if self._horiz_align[i] == "center": - x = int(self.rect.x + self._margins[0] + (my_width - w) / 2) - elif self._horiz_align[i] == 'left': - x = int(self.rect.x + self._margins[0]) - else: # right - x = int(self.rect.x + self.rect.width - w - self._margins[2]) - h = pl.get_size()[1] / pango.SCALE - if self._vert_align[i] == "middle": - y = int(self.rect.y + self._margins[1] + (my_height - h) / 2) - elif self._vert_align[i] == "top": - y = int(self.rect.y + self._margins[1]) - else: # bottom - y = int(self.rect.y + self.rect.height - h - self._margins[3]) - cr.save() - cr.translate(x, y) - cr.set_source_rgb(self._color[0], self._color[1], self._color[2]) - cr.update_layout(pl) - cr.show_layout(pl) - cr.restore() - - def label_width(self): - # Calculate the width of a label # - cr = pangocairo.CairoContext(self._sprites.cr) - if cr is not None: - max = 0 - for i in range(len(self.labels)): - pl = cr.create_layout() - pl.set_text(self.labels[i]) - self._fd.set_size(int(self._scale[i] * pango.SCALE)) - pl.set_font_description(self._fd) - w = pl.get_size()[0] / pango.SCALE - if w > max: - max = w - return max - else: - return self.rect.width - - def label_safe_width(self): - # Return maximum width for a label # - return self.rect.width - self._margins[0] - self._margins[2] - - def label_safe_height(self): - # Return maximum height for a label # - return self.rect.height - self._margins[1] - self._margins[3] - - def label_left_top(self): - # Return the upper-left corner of the label safe zone # - return(self._margins[0], self._margins[1]) - - def get_pixel(self, pos, i=0): - # Return the pixel at (x, y) # - x = int(pos[0] - self.rect.x) - y = int(pos[1] - self.rect.y) - if x < 0 or x > (self.rect.width - 1) or \ - y < 0 or y > (self.rect.height - 1): - return(-1, -1, -1, -1) - - # create a new 1x1 cairo surface - cs = cairo.ImageSurface(cairo.FORMAT_RGB24, 1, 1); - cr = cairo.Context(cs) - cr.set_source_surface(self.cached_surfaces[i], -x, -y) - cr.rectangle(0,0,1,1) - cr.set_operator(cairo.OPERATOR_SOURCE) - cr.fill() - cs.flush() # ensure all writing is done - # Read the pixel - pixels = cs.get_data() - return (ord(pixels[2]), ord(pixels[1]), ord(pixels[0]), 0) - -''' - -#<-----------------------GTK3-----------># -import gi -from gi.repository import Gtk, GdkPixbuf, Gdk -from gi.repository import Pango, PangoCairo -import cairo - - -class Sprites: - ''' A class for the list of sprites and everything they share in common ''' - - def __init__(self, widget): - ''' Initialize an empty array of sprites ''' - self.cr = None - self.widget = widget - self.list = [] - - def set_cairo_context(self, cr): - ''' Cairo context may be set or reset after __init__ ''' - self.cr = cr - - def get_sprite(self, i): - ''' Return a sprint from the array ''' - if i < 0 or i > len(self.list)-1: - return(None) - else: - return(self.list[i]) - - def length_of_list(self): - ''' How many sprites are there? ''' - return(len(self.list)) - - def append_to_list(self, spr): - ''' Append a new sprite to the end of the list. ''' - self.list.append(spr) - - def insert_in_list(self, spr, i): - ''' Insert a sprite at position i. ''' - if i < 0: - self.list.insert(0, spr) - elif i > len(self.list) - 1: - self.list.append(spr) - else: - self.list.insert(i, spr) - - def remove_from_list(self, spr): - ''' Remove a sprite from the list. ''' - if spr in self.list: - self.list.remove(spr) - - def find_sprite(self, pos): - ''' Search based on (x, y) position. Return the 'top/first' one. ''' - list = self.list[:] - list.reverse() - for spr in list: - if spr.hit(pos): - return spr - return None - - def redraw_sprites(self, area=None, cr=None): - ''' Redraw the sprites that intersect area. ''' - # I think I need to do this to save Cairo some work - if cr is None: - cr = self.cr - else: - self.cr = cr - if cr is None: - print 'sprites.redraw_sprites: no Cairo context' - return - for spr in self.list: - if area == None: - spr.draw(cr=cr) - else: - intersection = spr.rect.intersect(area) - if intersection.width > 0 or intersection.height > 0: - spr.draw(cr=cr) - - -class Sprite: - ''' A class for the individual sprites ''' - - def __init__(self, sprites, x, y, image): - ''' Initialize an individual sprite ''' - self._sprites = sprites - self.save_xy = (x, y) # remember initial (x, y) position - self.rect = [int(x), int(y), 0, 0] - self._scale = [12] - self._rescale = [True] - self._horiz_align = ["center"] - self._vert_align = ["middle"] - self._x_pos = [None] - self._y_pos = [None] - self._fd = None - self._bold = False - self._italic = False - self._color = None - self._margins = [0, 0, 0, 0] - self.layer = 100 - self.labels = [] - self.images = [] - self._dx = [] # image offsets - self._dy = [] - self.type = None - self.set_image(image) - self._sprites.append_to_list(self) - - def set_image(self, image, i=0, dx=0, dy=0): - ''' Add an image to the sprite. ''' - while len(self.images) < i + 1: - self.images.append(None) - self._dx.append(0) - self._dy.append(0) - self.images[i] = image - self._dx[i] = dx - self._dy[i] = dy - if hasattr(self.images[i], 'get_width'): - w = self.images[i].get_width() - h = self.images[i].get_height() - else: - w, h = self.images[i].get_size() - if i == 0: # Always reset width and height when base image changes. - self.rect[2] = w + dx - self.rect[3] = h + dy - else: - if w + dx > self.rect[2]: - self.rect[2] = w + dx - if h + dy > self.rect[3]: - self.rect[3] = h + dy - - def move(self, pos): - ''' Move to new (x, y) position ''' - self.inval() - self.rect[0], self.rect[1] = int(pos[0]), int(pos[1]) - self.inval() - - def move_relative(self, pos): - ''' Move to new (x+dx, y+dy) position ''' - self.inval() - self.rect[0] += int(pos[0]) - self.rect[1] += int(pos[1]) - self.inval() - - def get_xy(self): - ''' Return current (x, y) position ''' - return (self.rect[0], self.rect[1]) - - def get_dimensions(self): - ''' Return current size ''' - return (self.rect[2], self.rect[3]) - - def get_layer(self): - ''' Return current layer ''' - return self.layer - - def set_shape(self, image, i=0): - ''' Set the current image associated with the sprite ''' - self.inval() - self.set_image(image, i) - self.inval() - - def set_layer(self, layer=None): - ''' Set the layer for a sprite ''' - self._sprites.remove_from_list(self) - if layer is not None: - self.layer = layer - for i in range(self._sprites.length_of_list()): - if self.layer < self._sprites.get_sprite(i).layer: - self._sprites.insert_in_list(self, i) - self.inval() - return - self._sprites.append_to_list(self) - self.inval() - - def set_label(self, new_label, i=0): - ''' Set the label drawn on the sprite ''' - self._extend_labels_array(i) - if type(new_label) is str or type(new_label) is unicode: - # pango doesn't like nulls - self.labels[i] = new_label.replace("\0", " ") - else: - self.labels[i] = str(new_label) - self.inval() - - def set_margins(self, l=0, t=0, r=0, b=0): - ''' Set the margins for drawing the label ''' - self._margins = [l, t, r, b] - - def _extend_labels_array(self, i): - ''' Append to the labels attribute list ''' - if self._fd is None: - self.set_font('Sans') - if self._color is None: - self._color = (0., 0., 0.) - while len(self.labels) < i + 1: - self.labels.append(" ") - self._scale.append(self._scale[0]) - self._rescale.append(self._rescale[0]) - self._horiz_align.append(self._horiz_align[0]) - self._vert_align.append(self._vert_align[0]) - self._x_pos.append(self._x_pos[0]) - self._y_pos.append(self._y_pos[0]) - - def set_font(self, font): - ''' Set the font for a label ''' - self._fd = Pango.FontDescription(font) - - def set_label_color(self, rgb): - ''' Set the font color for a label ''' - COLORTABLE = {'black': '#000000', 'white': '#FFFFFF', - 'red': '#FF0000', 'yellow': '#FFFF00', - 'green': '#00FF00', 'cyan': '#00FFFF', - 'blue': '#0000FF', 'purple': '#FF00FF', - 'gray': '#808080'} - if rgb.lower() in COLORTABLE: - rgb = COLORTABLE[rgb.lower()] - # Convert from '#RRGGBB' to floats - self._color = (int('0x' + rgb[1:3], 16) / 256., - int('0x' + rgb[3:5], 16) / 256., - int('0x' + rgb[5:7], 16) / 256.) - return - - def set_label_attributes(self, scale, rescale=True, horiz_align="center", - vert_align="middle", x_pos=None, y_pos=None, i=0): - ''' Set the various label attributes ''' - self._extend_labels_array(i) - self._scale[i] = scale - self._rescale[i] = rescale - self._horiz_align[i] = horiz_align - self._vert_align[i] = vert_align - self._x_pos[i] = x_pos - self._y_pos[i] = y_pos - - def hide(self): - ''' Hide a sprite ''' - self.inval() - self._sprites.remove_from_list(self) - - def restore(self): - ''' Restore a hidden sprite ''' - self.set_layer() - - def inval(self): - ''' Invalidate a region for gtk ''' - # self._sprites.window.invalidate_rect(self.rect, False) - self._sprites.widget.queue_draw_area(self.rect[0], - self.rect[1], - self.rect[2], - self.rect[3]) - - def draw(self, cr=None): - ''' Draw the sprite (and label) ''' - if cr is None: - cr = self._sprites.cr - if cr is None: - print 'sprite.draw: no Cairo context.' - return - for i, img in enumerate(self.images): - if isinstance(img, GdkPixbuf.Pixbuf): - Gdk.cairo_set_source_pixbuf(cr, img, - self.rect[0] + self._dx[i], - self.rect[1] + self._dy[i]) - cr.rectangle(self.rect[0] + self._dx[i], - self.rect[1] + self._dy[i], - self.rect[2], - self.rect[3]) - cr.fill() - elif type(img) == cairo.ImageSurface: - cr.set_source_surface(img, self.rect[0] + self._dx[i], - self.rect[1] + self._dy[i]) - cr.rectangle(self.rect[0] + self._dx[i], - self.rect[1] + self._dy[i], - self.rect[2], - self.rect[3]) - cr.fill() - else: - print 'sprite.draw: source not a pixbuf (%s)' % (type(img)) - if len(self.labels) > 0: - self.draw_label(cr) - - def hit(self, pos): - ''' Is (x, y) on top of the sprite? ''' - x, y = pos - if x < self.rect[0]: - return False - if x > self.rect[0] + self.rect[2]: - return False - if y < self.rect[1]: - return False - if y > self.rect[1] + self.rect[3]: - return False - return True - - def draw_label(self, cr): - ''' Draw the label based on its attributes ''' - my_width = self.rect[2] - self._margins[0] - self._margins[2] - if my_width < 0: - my_width = 0 - my_height = self.rect[3] - self._margins[1] - self._margins[3] - for i in range(len(self.labels)): - pl = PangoCairo.create_layout(cr) - pl.set_text(str(self.labels[i]), -1) - self._fd.set_size(int(self._scale[i] * Pango.SCALE)) - pl.set_font_description(self._fd) - w = pl.get_size()[0] / Pango.SCALE - if w > my_width: - if self._rescale[i]: - self._fd.set_size( - int(self._scale[i] * Pango.SCALE * my_width / w)) - pl.set_font_description(self._fd) - w = pl.get_size()[0] / Pango.SCALE - else: - j = len(self.labels[i]) - 1 - while(w > my_width and j > 0): - pl.set_text( - "…" + self.labels[i][len(self.labels[i]) - j:], -1) - self._fd.set_size(int(self._scale[i] * Pango.SCALE)) - pl.set_font_description(self._fd) - w = pl.get_size()[0] / Pango.SCALE - j -= 1 - if self._x_pos[i] is not None: - x = int(self.rect[0] + self._x_pos[i]) - elif self._horiz_align[i] == "center": - x = int(self.rect[0] + self._margins[0] + (my_width - w) / 2) - elif self._horiz_align[i] == 'left': - x = int(self.rect[0] + self._margins[0]) - else: # right - x = int(self.rect[0] + self.rect[2] - w - self._margins[2]) - h = pl.get_size()[1] / Pango.SCALE - if self._y_pos[i] is not None: - y = int(self.rect[1] + self._y_pos[i]) - elif self._vert_align[i] == "middle": - y = int(self.rect[1] + self._margins[1] + (my_height - h) / 2) - elif self._vert_align[i] == "top": - y = int(self.rect[1] + self._margins[1]) - else: # bottom - y = int(self.rect[1] + self.rect[3] - h - self._margins[3]) - cr.save() - cr.translate(x, y) - cr.set_source_rgb(self._color[0], self._color[1], self._color[2]) - PangoCairo.update_layout(cr, pl) - PangoCairo.show_layout(cr, pl) - cr.restore() - - def label_width(self, cr=None): - ''' Calculate the width of a label ''' - if cr is None: - cr = self._sprites.cr - max = 0 - for i in range(len(self.labels)): - pl = PangoCairo.create_layout(cr) - pl.set_text(str(self.labels[i]), -1) - self._fd.set_size(int(self._scale[i] * Pango.SCALE)) - pl.set_font_description(self._fd) - w = pl.get_size()[0] / Pango.SCALE - if w > max: - max = w - return max - - def label_safe_width(self): - ''' Return maximum width for a label ''' - return self.rect[2] - self._margins[0] - self._margins[2] - - def label_safe_height(self): - ''' Return maximum height for a label ''' - return self.rect[3] - self._margins[1] - self._margins[3] - - def label_left_top(self): - ''' Return the upper-left corner of the label safe zone ''' - return(self._margins[0], self._margins[1]) - - def get_pixel(self, pos, i=0): - ''' Return the pixl at (x, y) ''' - x, y = pos - x = x - self.rect[0] - y = y - self.rect[1] - if y > self.images[i].get_height() - 1: - return(-1, -1, -1, -1) - try: - array = self.images[i].get_pixels() - if array is not None: - offset = (y * self.images[i].get_width() + x) * 4 - r, g, b, a = ord(array[offset]), ord(array[offset + 1]),\ - ord(array[offset + 2]), ord(array[offset + 3]) - return(r, g, b, a) - else: - return(-1, -1, -1, -1) - except IndexError: - print "Index Error: %d %d" % (len(array), offset) - return(-1, -1, -1, -1) diff --git a/toolbar_utils.py b/toolbar_utils.py deleted file mode 100644 index 03f5461..0000000 --- a/toolbar_utils.py +++ /dev/null @@ -1,163 +0,0 @@ -# -*- coding: utf-8 -*- -# Copyright (c) 2011, Walter Bender -# Copyright (c) 2012, Ignacio Rodriguez -# 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. -# -# You should have received a copy of the GNU General Public License -# along with this library; if not, write to the Free Software -# Foundation, 51 Franklin Street, Suite 500 Boston, MA 02110-1335 USA - -from gi.repository import Gtk - -from sugar3.graphics.radiotoolbutton import RadioToolButton -from sugar3.graphics.toolbutton import ToolButton -from sugar3.graphics.combobox import ComboBox -from sugar3.graphics.toolcombobox import ToolComboBox - - -def combo_factory(combo_array, toolbar, callback, cb_arg=None, - tooltip=None, default=None): - '''Factory for making a toolbar combo box''' - combo = ComboBox() - if tooltip is not None and hasattr(combo, 'set_tooltip_text'): - combo.set_tooltip_text(tooltip) - if cb_arg is not None: - combo.connect('changed', callback, cb_arg) - else: - combo.connect('changed', callback) - for i, selection in enumerate(combo_array): - combo.append_item(i, selection, None) - combo.show() - toolitem = Gtk.ToolItem() - toolitem.add(combo) - if hasattr(toolbar, 'insert'): # the main toolbar - toolbar.insert(toolitem, -1) - else: # or a secondary toolbar - toolbar.props.page.insert(toolitem, -1) - toolitem.show() - if default is not None: - combo.set_active(combo_array.index(default)) - return combo - - -def entry_factory(default_string, toolbar, tooltip=None, max=3): - ''' Factory for adding a text box to a toolbar ''' - entry = Gtk.Entry() - entry.set_text(default_string) - if tooltip is not None and hasattr(entry, 'set_tooltip_text'): - entry.set_tooltip_text(tooltip) - entry.set_width_chars(max) - entry.show() - toolitem = Gtk.ToolItem() - toolitem.add(entry) - if hasattr(toolbar, 'insert'): # the main toolbar - toolbar.insert(toolitem, -1) - else: # or a secondary toolbar - toolbar.props.page.insert(toolitem, -1) - toolitem.show() - return entry - - -def button_factory(icon_name, toolbar, callback, cb_arg=None, tooltip=None, - accelerator=None): - '''Factory for making tooplbar buttons''' - button = ToolButton(icon_name) - if tooltip is not None: - button.set_tooltip(tooltip) - button.props.sensitive = True - if accelerator is not None: - button.props.accelerator = accelerator - if cb_arg is not None: - button.connect('clicked', callback, cb_arg) - else: - button.connect('clicked', callback) - if hasattr(toolbar, 'insert'): # the main toolbar - toolbar.insert(button, -1) - else: # or a secondary toolbar - toolbar.props.page.insert(button, -1) - button.show() - return button - - -def radio_factory(name, toolbar, callback, cb_arg=None, tooltip=None, - group=None): - ''' Add a radio button to a toolbar ''' - button = RadioToolButton(group=group) - button.set_icon_name(name) - if callback is not None: - if cb_arg is None: - button.connect('clicked', callback) - else: - button.connect('clicked', callback, cb_arg) - if hasattr(toolbar, 'insert'): # Add button to the main toolbar... - toolbar.insert(button, -1) - else: # ...or a secondary toolbar. - toolbar.props.page.insert(button, -1) - button.show() - if tooltip is not None: - button.set_tooltip(tooltip) - return button - - -def label_factory(toolbar, label_text, width=None): - ''' Factory for adding a label to a toolbar ''' - label = Gtk.Label(label_text) - label.set_line_wrap(True) - if width is not None: - label.set_size_request(width, -1) # doesn't work on XOs - label.show() - toolitem = Gtk.ToolItem() - toolitem.add(label) - if hasattr(toolbar, 'insert'): # the main toolbar - toolbar.insert(toolitem, -1) - else: # or a secondary toolbar - toolbar.props.page.insert(toolitem, -1) - toolitem.show() - return label - - -def separator_factory(toolbar, expand=False, visible=True): - ''' add a separator to a toolbar ''' - separator = Gtk.SeparatorToolItem() - separator.props.draw = visible - separator.set_expand(expand) - if hasattr(toolbar, 'insert'): # the main toolbar - toolbar.insert(separator, -1) - else: # or a secondary toolbar - toolbar.props.page.insert(separator, -1) - separator.show() - - -def image_factory(image, toolbar, tooltip=None): - ''' Add an image to the toolbar ''' - img = Gtk.Image() - img.set_from_pixbuf(image) - img_tool = Gtk.ToolItem() - img_tool.add(img) - if tooltip is not None: - img.set_tooltip_text(tooltip) - if hasattr(toolbar, 'insert'): # the main toolbar - toolbar.insert(img_tool, -1) - else: # or a secondary toolbar - toolbar.props.page.insert(img_tool, -1) - img_tool.show() - return img - - -def spin_factory(default, min, max, callback, toolbar): - spin_adj = Gtk.Adjustment(default, min, max, 1, 32, 0) - spin = Gtk.SpinButton(spin_adj, 0, 0) - spin_id = spin.connect('value-changed', callback) - spin.set_numeric(True) - spin.show() - toolitem = Gtk.ToolItem() - toolitem.add(spin) - if hasattr(toolbar, 'insert'): # the main toolbar - toolbar.insert(toolitem, -1) - else: - toolbar.props.page.insert(toolitem, -1) - toolitem.show() - return spin diff --git a/utils.py b/utils.py deleted file mode 100644 index ffab831..0000000 --- a/utils.py +++ /dev/null @@ -1,53 +0,0 @@ -#Copyright (c) 2011 Walter Bender - -# 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. -# -# You should have received a copy of the GNU General Public License -# along with this library; if not, write to the Free Software -# Foundation, 51 Franklin Street, Suite 500 Boston, MA 02110-1335 USA - - -from StringIO import StringIO -try: - OLD_SUGAR_SYSTEM = False - import json - json.dumps - from json import load as jload - from json import dump as jdump -except (ImportError, AttributeError): - try: - import simplejson as json - from simplejson import load as jload - from simplejson import dump as jdump - except: - OLD_SUGAR_SYSTEM = True - - -def json_load(text): - """ Load JSON data using what ever resources are available. """ - if OLD_SUGAR_SYSTEM is True: - listdata = json.read(text) - else: - # strip out leading and trailing whitespace, nulls, and newlines - io = StringIO(text) - try: - listdata = jload(io) - except ValueError: - # assume that text is ascii list - listdata = text.split() - for i, value in enumerate(listdata): - listdata[i] = int(value) - return listdata - - -def json_dump(data): - """ Save data using available JSON tools. """ - if OLD_SUGAR_SYSTEM is True: - return json.write(data) - else: - _io = StringIO() - jdump(data, _io) - return _io.getvalue() -- cgit v0.9.1