Web   ·   Wiki   ·   Activities   ·   Blog   ·   Lists   ·   Chat   ·   Meeting   ·   Bugs   ·   Git   ·   Translate   ·   Archive   ·   People   ·   Donate
summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorWalter Bender <walter.bender@gmail.com>2011-10-28 17:35:43 (GMT)
committer Walter Bender <walter.bender@gmail.com>2011-10-28 17:35:43 (GMT)
commit7e2d7a7f903428024d7907a7f237c2dc54ab328a (patch)
treee9d2bbe1092e6aebcbac22a22716cc6b9d4a469f
parent22051a4756dd106a464f4cdc17f3cc78950a3423 (diff)
pep8
-rw-r--r--COPYING687
-rw-r--r--NEWS5
-rw-r--r--VisualMatchActivity.py28
-rw-r--r--activity/activity.info2
-rw-r--r--card.py28
-rw-r--r--constants.py16
-rw-r--r--deck.py15
-rwxr-xr-xgencards.py126
-rw-r--r--po/templates.po333
9 files changed, 857 insertions, 383 deletions
diff --git a/COPYING b/COPYING
index 6953d7e..10926e8 100644
--- a/COPYING
+++ b/COPYING
@@ -1,14 +1,675 @@
-Copyright (c) 2009-10, Walter Bender
-Copyright (c) 2009 Michele Pratusevich
-Copyright (c) 2009 Vincent Le
-
-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 Lesser General Public
-License along with this library; if not, write to the
-Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-Boston, MA 02111-1307, USA.
+ GNU GENERAL PUBLIC LICENSE
+ Version 3, 29 June 2007
+
+ Copyright (C) 2007 Free Software Foundation, Inc. <http://fsf.org/>
+ Everyone is permitted to copy and distribute verbatim copies
+ of this license document, but changing it is not allowed.
+
+ Preamble
+
+ The GNU General Public License is a free, copyleft license for
+software and other kinds of works.
+
+ The licenses for most software and other practical works are designed
+to take away your freedom to share and change the works. By contrast,
+the GNU General Public License is intended to guarantee your freedom to
+share and change all versions of a program--to make sure it remains free
+software for all its users. We, the Free Software Foundation, use the
+GNU General Public License for most of our software; it applies also to
+any other work released this way by its authors. You can apply it to
+your programs, too.
+
+ When we speak of free software, we are referring to freedom, not
+price. Our General Public Licenses are designed to make sure that you
+have the freedom to distribute copies of free software (and charge for
+them if you wish), that you receive source code or can get it if you
+want it, that you can change the software or use pieces of it in new
+free programs, and that you know you can do these things.
+
+ To protect your rights, we need to prevent others from denying you
+these rights or asking you to surrender the rights. Therefore, you have
+certain responsibilities if you distribute copies of the software, or if
+you modify it: responsibilities to respect the freedom of others.
+
+ For example, if you distribute copies of such a program, whether
+gratis or for a fee, you must pass on to the recipients the same
+freedoms that you received. You must make sure that they, too, receive
+or can get the source code. And you must show them these terms so they
+know their rights.
+
+ Developers that use the GNU GPL protect your rights with two steps:
+(1) assert copyright on the software, and (2) offer you this License
+giving you legal permission to copy, distribute and/or modify it.
+
+ For the developers' and authors' protection, the GPL clearly explains
+that there is no warranty for this free software. For both users' and
+authors' sake, the GPL requires that modified versions be marked as
+changed, so that their problems will not be attributed erroneously to
+authors of previous versions.
+
+ Some devices are designed to deny users access to install or run
+modified versions of the software inside them, although the manufacturer
+can do so. This is fundamentally incompatible with the aim of
+protecting users' freedom to change the software. The systematic
+pattern of such abuse occurs in the area of products for individuals to
+use, which is precisely where it is most unacceptable. Therefore, we
+have designed this version of the GPL to prohibit the practice for those
+products. If such problems arise substantially in other domains, we
+stand ready to extend this provision to those domains in future versions
+of the GPL, as needed to protect the freedom of users.
+
+ Finally, every program is threatened constantly by software patents.
+States should not allow patents to restrict development and use of
+software on general-purpose computers, but in those that do, we wish to
+avoid the special danger that patents applied to a free program could
+make it effectively proprietary. To prevent this, the GPL assures that
+patents cannot be used to render the program non-free.
+
+ The precise terms and conditions for copying, distribution and
+modification follow.
+
+ TERMS AND CONDITIONS
+
+ 0. Definitions.
+
+ "This License" refers to version 3 of the GNU General Public License.
+
+ "Copyright" also means copyright-like laws that apply to other kinds of
+works, such as semiconductor masks.
+
+ "The Program" refers to any copyrightable work licensed under this
+License. Each licensee is addressed as "you". "Licensees" and
+"recipients" may be individuals or organizations.
+
+ To "modify" a work means to copy from or adapt all or part of the work
+in a fashion requiring copyright permission, other than the making of an
+exact copy. The resulting work is called a "modified version" of the
+earlier work or a work "based on" the earlier work.
+
+ A "covered work" means either the unmodified Program or a work based
+on the Program.
+
+ To "propagate" a work means to do anything with it that, without
+permission, would make you directly or secondarily liable for
+infringement under applicable copyright law, except executing it on a
+computer or modifying a private copy. Propagation includes copying,
+distribution (with or without modification), making available to the
+public, and in some countries other activities as well.
+
+ To "convey" a work means any kind of propagation that enables other
+parties to make or receive copies. Mere interaction with a user through
+a computer network, with no transfer of a copy, is not conveying.
+
+ An interactive user interface displays "Appropriate Legal Notices"
+to the extent that it includes a convenient and prominently visible
+feature that (1) displays an appropriate copyright notice, and (2)
+tells the user that there is no warranty for the work (except to the
+extent that warranties are provided), that licensees may convey the
+work under this License, and how to view a copy of this License. If
+the interface presents a list of user commands or options, such as a
+menu, a prominent item in the list meets this criterion.
+
+ 1. Source Code.
+
+ The "source code" for a work means the preferred form of the work
+for making modifications to it. "Object code" means any non-source
+form of a work.
+
+ A "Standard Interface" means an interface that either is an official
+standard defined by a recognized standards body, or, in the case of
+interfaces specified for a particular programming language, one that
+is widely used among developers working in that language.
+
+ The "System Libraries" of an executable work include anything, other
+than the work as a whole, that (a) is included in the normal form of
+packaging a Major Component, but which is not part of that Major
+Component, and (b) serves only to enable use of the work with that
+Major Component, or to implement a Standard Interface for which an
+implementation is available to the public in source code form. A
+"Major Component", in this context, means a major essential component
+(kernel, window system, and so on) of the specific operating system
+(if any) on which the executable work runs, or a compiler used to
+produce the work, or an object code interpreter used to run it.
+
+ The "Corresponding Source" for a work in object code form means all
+the source code needed to generate, install, and (for an executable
+work) run the object code and to modify the work, including scripts to
+control those activities. However, it does not include the work's
+System Libraries, or general-purpose tools or generally available free
+programs which are used unmodified in performing those activities but
+which are not part of the work. For example, Corresponding Source
+includes interface definition files associated with source files for
+the work, and the source code for shared libraries and dynamically
+linked subprograms that the work is specifically designed to require,
+such as by intimate data communication or control flow between those
+subprograms and other parts of the work.
+
+ The Corresponding Source need not include anything that users
+can regenerate automatically from other parts of the Corresponding
+Source.
+
+ The Corresponding Source for a work in source code form is that
+same work.
+
+ 2. Basic Permissions.
+
+ All rights granted under this License are granted for the term of
+copyright on the Program, and are irrevocable provided the stated
+conditions are met. This License explicitly affirms your unlimited
+permission to run the unmodified Program. The output from running a
+covered work is covered by this License only if the output, given its
+content, constitutes a covered work. This License acknowledges your
+rights of fair use or other equivalent, as provided by copyright law.
+
+ You may make, run and propagate covered works that you do not
+convey, without conditions so long as your license otherwise remains
+in force. You may convey covered works to others for the sole purpose
+of having them make modifications exclusively for you, or provide you
+with facilities for running those works, provided that you comply with
+the terms of this License in conveying all material for which you do
+not control copyright. Those thus making or running the covered works
+for you must do so exclusively on your behalf, under your direction
+and control, on terms that prohibit them from making any copies of
+your copyrighted material outside their relationship with you.
+
+ Conveying under any other circumstances is permitted solely under
+the conditions stated below. Sublicensing is not allowed; section 10
+makes it unnecessary.
+
+ 3. Protecting Users' Legal Rights From Anti-Circumvention Law.
+
+ No covered work shall be deemed part of an effective technological
+measure under any applicable law fulfilling obligations under article
+11 of the WIPO copyright treaty adopted on 20 December 1996, or
+similar laws prohibiting or restricting circumvention of such
+measures.
+
+ When you convey a covered work, you waive any legal power to forbid
+circumvention of technological measures to the extent such circumvention
+is effected by exercising rights under this License with respect to
+the covered work, and you disclaim any intention to limit operation or
+modification of the work as a means of enforcing, against the work's
+users, your or third parties' legal rights to forbid circumvention of
+technological measures.
+
+ 4. Conveying Verbatim Copies.
+
+ You may convey verbatim copies of the Program's source code as you
+receive it, in any medium, provided that you conspicuously and
+appropriately publish on each copy an appropriate copyright notice;
+keep intact all notices stating that this License and any
+non-permissive terms added in accord with section 7 apply to the code;
+keep intact all notices of the absence of any warranty; and give all
+recipients a copy of this License along with the Program.
+
+ You may charge any price or no price for each copy that you convey,
+and you may offer support or warranty protection for a fee.
+
+ 5. Conveying Modified Source Versions.
+
+ You may convey a work based on the Program, or the modifications to
+produce it from the Program, in the form of source code under the
+terms of section 4, provided that you also meet all of these conditions:
+
+ a) The work must carry prominent notices stating that you modified
+ it, and giving a relevant date.
+
+ b) The work must carry prominent notices stating that it is
+ released under this License and any conditions added under section
+ 7. This requirement modifies the requirement in section 4 to
+ "keep intact all notices".
+
+ c) You must license the entire work, as a whole, under this
+ License to anyone who comes into possession of a copy. This
+ License will therefore apply, along with any applicable section 7
+ additional terms, to the whole of the work, and all its parts,
+ regardless of how they are packaged. This License gives no
+ permission to license the work in any other way, but it does not
+ invalidate such permission if you have separately received it.
+
+ d) If the work has interactive user interfaces, each must display
+ Appropriate Legal Notices; however, if the Program has interactive
+ interfaces that do not display Appropriate Legal Notices, your
+ work need not make them do so.
+
+ A compilation of a covered work with other separate and independent
+works, which are not by their nature extensions of the covered work,
+and which are not combined with it such as to form a larger program,
+in or on a volume of a storage or distribution medium, is called an
+"aggregate" if the compilation and its resulting copyright are not
+used to limit the access or legal rights of the compilation's users
+beyond what the individual works permit. Inclusion of a covered work
+in an aggregate does not cause this License to apply to the other
+parts of the aggregate.
+
+ 6. Conveying Non-Source Forms.
+
+ You may convey a covered work in object code form under the terms
+of sections 4 and 5, provided that you also convey the
+machine-readable Corresponding Source under the terms of this License,
+in one of these ways:
+
+ a) Convey the object code in, or embodied in, a physical product
+ (including a physical distribution medium), accompanied by the
+ Corresponding Source fixed on a durable physical medium
+ customarily used for software interchange.
+
+ b) Convey the object code in, or embodied in, a physical product
+ (including a physical distribution medium), accompanied by a
+ written offer, valid for at least three years and valid for as
+ long as you offer spare parts or customer support for that product
+ model, to give anyone who possesses the object code either (1) a
+ copy of the Corresponding Source for all the software in the
+ product that is covered by this License, on a durable physical
+ medium customarily used for software interchange, for a price no
+ more than your reasonable cost of physically performing this
+ conveying of source, or (2) access to copy the
+ Corresponding Source from a network server at no charge.
+
+ c) Convey individual copies of the object code with a copy of the
+ written offer to provide the Corresponding Source. This
+ alternative is allowed only occasionally and noncommercially, and
+ only if you received the object code with such an offer, in accord
+ with subsection 6b.
+
+ d) Convey the object code by offering access from a designated
+ place (gratis or for a charge), and offer equivalent access to the
+ Corresponding Source in the same way through the same place at no
+ further charge. You need not require recipients to copy the
+ Corresponding Source along with the object code. If the place to
+ copy the object code is a network server, the Corresponding Source
+ may be on a different server (operated by you or a third party)
+ that supports equivalent copying facilities, provided you maintain
+ clear directions next to the object code saying where to find the
+ Corresponding Source. Regardless of what server hosts the
+ Corresponding Source, you remain obligated to ensure that it is
+ available for as long as needed to satisfy these requirements.
+
+ e) Convey the object code using peer-to-peer transmission, provided
+ you inform other peers where the object code and Corresponding
+ Source of the work are being offered to the general public at no
+ charge under subsection 6d.
+
+ A separable portion of the object code, whose source code is excluded
+from the Corresponding Source as a System Library, need not be
+included in conveying the object code work.
+
+ A "User Product" is either (1) a "consumer product", which means any
+tangible personal property which is normally used for personal, family,
+or household purposes, or (2) anything designed or sold for incorporation
+into a dwelling. In determining whether a product is a consumer product,
+doubtful cases shall be resolved in favor of coverage. For a particular
+product received by a particular user, "normally used" refers to a
+typical or common use of that class of product, regardless of the status
+of the particular user or of the way in which the particular user
+actually uses, or expects or is expected to use, the product. A product
+is a consumer product regardless of whether the product has substantial
+commercial, industrial or non-consumer uses, unless such uses represent
+the only significant mode of use of the product.
+
+ "Installation Information" for a User Product means any methods,
+procedures, authorization keys, or other information required to install
+and execute modified versions of a covered work in that User Product from
+a modified version of its Corresponding Source. The information must
+suffice to ensure that the continued functioning of the modified object
+code is in no case prevented or interfered with solely because
+modification has been made.
+
+ If you convey an object code work under this section in, or with, or
+specifically for use in, a User Product, and the conveying occurs as
+part of a transaction in which the right of possession and use of the
+User Product is transferred to the recipient in perpetuity or for a
+fixed term (regardless of how the transaction is characterized), the
+Corresponding Source conveyed under this section must be accompanied
+by the Installation Information. But this requirement does not apply
+if neither you nor any third party retains the ability to install
+modified object code on the User Product (for example, the work has
+been installed in ROM).
+
+ The requirement to provide Installation Information does not include a
+requirement to continue to provide support service, warranty, or updates
+for a work that has been modified or installed by the recipient, or for
+the User Product in which it has been modified or installed. Access to a
+network may be denied when the modification itself materially and
+adversely affects the operation of the network or violates the rules and
+protocols for communication across the network.
+
+ Corresponding Source conveyed, and Installation Information provided,
+in accord with this section must be in a format that is publicly
+documented (and with an implementation available to the public in
+source code form), and must require no special password or key for
+unpacking, reading or copying.
+
+ 7. Additional Terms.
+
+ "Additional permissions" are terms that supplement the terms of this
+License by making exceptions from one or more of its conditions.
+Additional permissions that are applicable to the entire Program shall
+be treated as though they were included in this License, to the extent
+that they are valid under applicable law. If additional permissions
+apply only to part of the Program, that part may be used separately
+under those permissions, but the entire Program remains governed by
+this License without regard to the additional permissions.
+
+ When you convey a copy of a covered work, you may at your option
+remove any additional permissions from that copy, or from any part of
+it. (Additional permissions may be written to require their own
+removal in certain cases when you modify the work.) You may place
+additional permissions on material, added by you to a covered work,
+for which you have or can give appropriate copyright permission.
+
+ Notwithstanding any other provision of this License, for material you
+add to a covered work, you may (if authorized by the copyright holders of
+that material) supplement the terms of this License with terms:
+
+ a) Disclaiming warranty or limiting liability differently from the
+ terms of sections 15 and 16 of this License; or
+
+ b) Requiring preservation of specified reasonable legal notices or
+ author attributions in that material or in the Appropriate Legal
+ Notices displayed by works containing it; or
+
+ c) Prohibiting misrepresentation of the origin of that material, or
+ requiring that modified versions of such material be marked in
+ reasonable ways as different from the original version; or
+
+ d) Limiting the use for publicity purposes of names of licensors or
+ authors of the material; or
+
+ e) Declining to grant rights under trademark law for use of some
+ trade names, trademarks, or service marks; or
+
+ f) Requiring indemnification of licensors and authors of that
+ material by anyone who conveys the material (or modified versions of
+ it) with contractual assumptions of liability to the recipient, for
+ any liability that these contractual assumptions directly impose on
+ those licensors and authors.
+
+ All other non-permissive additional terms are considered "further
+restrictions" within the meaning of section 10. If the Program as you
+received it, or any part of it, contains a notice stating that it is
+governed by this License along with a term that is a further
+restriction, you may remove that term. If a license document contains
+a further restriction but permits relicensing or conveying under this
+License, you may add to a covered work material governed by the terms
+of that license document, provided that the further restriction does
+not survive such relicensing or conveying.
+
+ If you add terms to a covered work in accord with this section, you
+must place, in the relevant source files, a statement of the
+additional terms that apply to those files, or a notice indicating
+where to find the applicable terms.
+
+ Additional terms, permissive or non-permissive, may be stated in the
+form of a separately written license, or stated as exceptions;
+the above requirements apply either way.
+
+ 8. Termination.
+
+ You may not propagate or modify a covered work except as expressly
+provided under this License. Any attempt otherwise to propagate or
+modify it is void, and will automatically terminate your rights under
+this License (including any patent licenses granted under the third
+paragraph of section 11).
+
+ However, if you cease all violation of this License, then your
+license from a particular copyright holder is reinstated (a)
+provisionally, unless and until the copyright holder explicitly and
+finally terminates your license, and (b) permanently, if the copyright
+holder fails to notify you of the violation by some reasonable means
+prior to 60 days after the cessation.
+
+ Moreover, your license from a particular copyright holder is
+reinstated permanently if the copyright holder notifies you of the
+violation by some reasonable means, this is the first time you have
+received notice of violation of this License (for any work) from that
+copyright holder, and you cure the violation prior to 30 days after
+your receipt of the notice.
+
+ Termination of your rights under this section does not terminate the
+licenses of parties who have received copies or rights from you under
+this License. If your rights have been terminated and not permanently
+reinstated, you do not qualify to receive new licenses for the same
+material under section 10.
+
+ 9. Acceptance Not Required for Having Copies.
+
+ You are not required to accept this License in order to receive or
+run a copy of the Program. Ancillary propagation of a covered work
+occurring solely as a consequence of using peer-to-peer transmission
+to receive a copy likewise does not require acceptance. However,
+nothing other than this License grants you permission to propagate or
+modify any covered work. These actions infringe copyright if you do
+not accept this License. Therefore, by modifying or propagating a
+covered work, you indicate your acceptance of this License to do so.
+
+ 10. Automatic Licensing of Downstream Recipients.
+
+ Each time you convey a covered work, the recipient automatically
+receives a license from the original licensors, to run, modify and
+propagate that work, subject to this License. You are not responsible
+for enforcing compliance by third parties with this License.
+
+ An "entity transaction" is a transaction transferring control of an
+organization, or substantially all assets of one, or subdividing an
+organization, or merging organizations. If propagation of a covered
+work results from an entity transaction, each party to that
+transaction who receives a copy of the work also receives whatever
+licenses to the work the party's predecessor in interest had or could
+give under the previous paragraph, plus a right to possession of the
+Corresponding Source of the work from the predecessor in interest, if
+the predecessor has it or can get it with reasonable efforts.
+
+ You may not impose any further restrictions on the exercise of the
+rights granted or affirmed under this License. For example, you may
+not impose a license fee, royalty, or other charge for exercise of
+rights granted under this License, and you may not initiate litigation
+(including a cross-claim or counterclaim in a lawsuit) alleging that
+any patent claim is infringed by making, using, selling, offering for
+sale, or importing the Program or any portion of it.
+
+ 11. Patents.
+
+ A "contributor" is a copyright holder who authorizes use under this
+License of the Program or a work on which the Program is based. The
+work thus licensed is called the contributor's "contributor version".
+
+ A contributor's "essential patent claims" are all patent claims
+owned or controlled by the contributor, whether already acquired or
+hereafter acquired, that would be infringed by some manner, permitted
+by this License, of making, using, or selling its contributor version,
+but do not include claims that would be infringed only as a
+consequence of further modification of the contributor version. For
+purposes of this definition, "control" includes the right to grant
+patent sublicenses in a manner consistent with the requirements of
+this License.
+
+ Each contributor grants you a non-exclusive, worldwide, royalty-free
+patent license under the contributor's essential patent claims, to
+make, use, sell, offer for sale, import and otherwise run, modify and
+propagate the contents of its contributor version.
+
+ In the following three paragraphs, a "patent license" is any express
+agreement or commitment, however denominated, not to enforce a patent
+(such as an express permission to practice a patent or covenant not to
+sue for patent infringement). To "grant" such a patent license to a
+party means to make such an agreement or commitment not to enforce a
+patent against the party.
+
+ If you convey a covered work, knowingly relying on a patent license,
+and the Corresponding Source of the work is not available for anyone
+to copy, free of charge and under the terms of this License, through a
+publicly available network server or other readily accessible means,
+then you must either (1) cause the Corresponding Source to be so
+available, or (2) arrange to deprive yourself of the benefit of the
+patent license for this particular work, or (3) arrange, in a manner
+consistent with the requirements of this License, to extend the patent
+license to downstream recipients. "Knowingly relying" means you have
+actual knowledge that, but for the patent license, your conveying the
+covered work in a country, or your recipient's use of the covered work
+in a country, would infringe one or more identifiable patents in that
+country that you have reason to believe are valid.
+
+ If, pursuant to or in connection with a single transaction or
+arrangement, you convey, or propagate by procuring conveyance of, a
+covered work, and grant a patent license to some of the parties
+receiving the covered work authorizing them to use, propagate, modify
+or convey a specific copy of the covered work, then the patent license
+you grant is automatically extended to all recipients of the covered
+work and works based on it.
+
+ A patent license is "discriminatory" if it does not include within
+the scope of its coverage, prohibits the exercise of, or is
+conditioned on the non-exercise of one or more of the rights that are
+specifically granted under this License. You may not convey a covered
+work if you are a party to an arrangement with a third party that is
+in the business of distributing software, under which you make payment
+to the third party based on the extent of your activity of conveying
+the work, and under which the third party grants, to any of the
+parties who would receive the covered work from you, a discriminatory
+patent license (a) in connection with copies of the covered work
+conveyed by you (or copies made from those copies), or (b) primarily
+for and in connection with specific products or compilations that
+contain the covered work, unless you entered into that arrangement,
+or that patent license was granted, prior to 28 March 2007.
+
+ Nothing in this License shall be construed as excluding or limiting
+any implied license or other defenses to infringement that may
+otherwise be available to you under applicable patent law.
+
+ 12. No Surrender of Others' Freedom.
+
+ If conditions are imposed on you (whether by court order, agreement or
+otherwise) that contradict the conditions of this License, they do not
+excuse you from the conditions of this License. If you cannot convey a
+covered work so as to satisfy simultaneously your obligations under this
+License and any other pertinent obligations, then as a consequence you may
+not convey it at all. For example, if you agree to terms that obligate you
+to collect a royalty for further conveying from those to whom you convey
+the Program, the only way you could satisfy both those terms and this
+License would be to refrain entirely from conveying the Program.
+
+ 13. Use with the GNU Affero General Public License.
+
+ Notwithstanding any other provision of this License, you have
+permission to link or combine any covered work with a work licensed
+under version 3 of the GNU Affero General Public License into a single
+combined work, and to convey the resulting work. The terms of this
+License will continue to apply to the part which is the covered work,
+but the special requirements of the GNU Affero General Public License,
+section 13, concerning interaction through a network will apply to the
+combination as such.
+
+ 14. Revised Versions of this License.
+
+ The Free Software Foundation may publish revised and/or new versions of
+the GNU General Public License from time to time. Such new versions will
+be similar in spirit to the present version, but may differ in detail to
+address new problems or concerns.
+
+ Each version is given a distinguishing version number. If the
+Program specifies that a certain numbered version of the GNU General
+Public License "or any later version" applies to it, you have the
+option of following the terms and conditions either of that numbered
+version or of any later version published by the Free Software
+Foundation. If the Program does not specify a version number of the
+GNU General Public License, you may choose any version ever published
+by the Free Software Foundation.
+
+ If the Program specifies that a proxy can decide which future
+versions of the GNU General Public License can be used, that proxy's
+public statement of acceptance of a version permanently authorizes you
+to choose that version for the Program.
+
+ Later license versions may give you additional or different
+permissions. However, no additional obligations are imposed on any
+author or copyright holder as a result of your choosing to follow a
+later version.
+
+ 15. Disclaimer of Warranty.
+
+ THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY
+APPLICABLE LAW. EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT
+HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY
+OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO,
+THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM
+IS WITH YOU. SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF
+ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
+
+ 16. Limitation of Liability.
+
+ IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
+WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS
+THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY
+GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE
+USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF
+DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD
+PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS),
+EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF
+SUCH DAMAGES.
+
+ 17. Interpretation of Sections 15 and 16.
+
+ If the disclaimer of warranty and limitation of liability provided
+above cannot be given local legal effect according to their terms,
+reviewing courts shall apply local law that most closely approximates
+an absolute waiver of all civil liability in connection with the
+Program, unless a warranty or assumption of liability accompanies a
+copy of the Program in return for a fee.
+
+ END OF TERMS AND CONDITIONS
+
+ How to Apply These Terms to Your New Programs
+
+ If you develop a new program, and you want it to be of the greatest
+possible use to the public, the best way to achieve this is to make it
+free software which everyone can redistribute and change under these terms.
+
+ To do so, attach the following notices to the program. It is safest
+to attach them to the start of each source file to most effectively
+state the exclusion of warranty; and each file should have at least
+the "copyright" line and a pointer to where the full notice is found.
+
+ <one line to give the program's name and a brief idea of what it does.>
+ Copyright (C) <year> <name of author>
+
+ This program is free software: you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation, either version 3 of the License, or
+ (at your option) any later version.
+
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
+
+ You should have received a copy of the GNU General Public License
+ along with this program. If not, see <http://www.gnu.org/licenses/>.
+
+Also add information on how to contact you by electronic and paper mail.
+
+ If the program does terminal interaction, make it output a short
+notice like this when it starts in an interactive mode:
+
+ <program> Copyright (C) <year> <name of author>
+ This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
+ This is free software, and you are welcome to redistribute it
+ under certain conditions; type `show c' for details.
+
+The hypothetical commands `show w' and `show c' should show the appropriate
+parts of the General Public License. Of course, your program's commands
+might be different; for a GUI interface, you would use an "about box".
+
+ You should also get your employer (if you work as a programmer) or school,
+if any, to sign a "copyright disclaimer" for the program, if necessary.
+For more information on this, and how to apply and follow the GNU GPL, see
+<http://www.gnu.org/licenses/>.
+
+ The GNU General Public License does not permit incorporating your program
+into proprietary programs. If your program is a subroutine library, you
+may consider it more useful to permit linking proprietary applications with
+the library. If this is what you want to do, use the GNU Lesser General
+Public License instead of this License. But first, please read
+<http://www.gnu.org/philosophy/why-not-lgpl.html>.
diff --git a/NEWS b/NEWS
index 16dddad..468ad74 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,8 @@
+30
+
+* switching buttons to radio buttons
+* more button icon refactoring
+
29
* "standardized" icons
diff --git a/VisualMatchActivity.py b/VisualMatchActivity.py
index 6e9f962..d69b607 100644
--- a/VisualMatchActivity.py
+++ b/VisualMatchActivity.py
@@ -4,11 +4,12 @@
# 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, Inc., 59 Temple Place - Suite 330,
-# Boston, MA 02111-1307, USA.
+
+
+# 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
+
import pygtk
pygtk.require('2.0')
@@ -55,11 +56,11 @@ except(ImportError, AttributeError):
from StringIO import StringIO
from constants import DECKSIZE, PRODUCT, HASH, ROMAN, WORD, CHINESE, MAYAN, \
- INCAN, DOTS, STAR, DICE, LINES, DEAL, HIGH, MEDIUM, LOW, \
- DIFFICULTY_LEVEL
+ INCAN, DOTS, STAR, DICE, LINES, DEAL
from game import Game
+
BEGINNER = 2
INTERMEDIATE = 0
EXPERT = 1
@@ -372,8 +373,9 @@ class VisualMatchActivity(activity.Activity):
self.button_pattern = _button_factory('new-pattern-game',
_('New pattern game'), self._select_game_cb, games_toolbar,
'pattern')
- self.button_number = _button_factory('new-number-game',
- _('New number game'), self._select_game_cb, games_toolbar, 'number')
+ self.button_number = _button_factory(
+ 'new-number-game', _('New number game'), self._select_game_cb,
+ games_toolbar, 'number')
self.button_word = _button_factory('new-word-game', _('New word game'),
self._select_game_cb, games_toolbar, 'word')
self.button_custom = _button_factory('no-custom-game',
@@ -393,7 +395,6 @@ class VisualMatchActivity(activity.Activity):
self.import_button = _button_factory('image-tools',
_('Import custom cards'), self.image_import_cb, tools_toolbar)
-
self.product_button = _radio_button_factory(
name='product',
tooltip=_('product'),
@@ -583,7 +584,8 @@ class VisualMatchActivity(activity.Activity):
if hasattr(self, 'vmw'):
self.metadata['play_level'] = self.vmw.level
self.metadata['low_score_beginner'] = int(self.vmw.low_score[0])
- self.metadata['low_score_intermediate'] = int(self.vmw.low_score[1])
+ self.metadata['low_score_intermediate'] = int(
+ self.vmw.low_score[1])
self.metadata['low_score_expert'] = int(self.vmw.low_score[2])
self.metadata['robot_time'] = self.vmw.robot_time
self.metadata['numberO'] = self.vmw.numberO
@@ -687,8 +689,8 @@ class VisualMatchActivity(activity.Activity):
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)
+ self.tubes_chan[telepathy.CHANNEL_TYPE_TUBES].connect_to_signal(
+ 'NewTube', self._new_tube_cb)
_logger.debug('This is my activity: making a tube...')
id = self.tubes_chan[telepathy.CHANNEL_TYPE_TUBES].OfferDBusTube(
diff --git a/activity/activity.info b/activity/activity.info
index 42fba06..2da5267 100644
--- a/activity/activity.info
+++ b/activity/activity.info
@@ -1,6 +1,6 @@
[Activity]
name = Visual Match
-activity_version = 29
+activity_version = 30
license = GPLv3
bundle_id = org.sugarlabs.VisualMatchActivity
exec = sugar-activity VisualMatchActivity.VisualMatchActivity
diff --git a/card.py b/card.py
index c3b07d7..1b9cf93 100644
--- a/card.py
+++ b/card.py
@@ -5,11 +5,11 @@
# 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 Lesser General Public
-# License along with this library; if not, write to the
-# Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-# Boston, MA 02111-1307, USA.
+
+# 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
+
import pygtk
pygtk.require('2.0')
@@ -25,11 +25,11 @@ from sprites import Sprite
class Card:
- """ Individual cards """
+ ''' Individual cards '''
def __init__(self, sprites, string, attributes, file_path=None,
scale=1.0):
- """ Create the card and store its attributes """
+ ''' Create the card and store its attributes '''
if attributes[0] == SELECTMASK:
self.spr = Sprite(sprites, 0, 0, svg_str_to_pixbuf(string))
self.index = SELECTMASK
@@ -41,9 +41,9 @@ class Card:
self.color = attributes[1]
self.num = attributes[2]
self.fill = attributes[3]
- self.index = self.shape * COLORS * NUMBER * FILLS+\
- self.color * NUMBER * FILLS +\
- self.num * FILLS +\
+ self.index = self.shape * COLORS * NUMBER * FILLS + \
+ self.color * NUMBER * FILLS + \
+ self.num * FILLS + \
self.fill
self.spr = Sprite(sprites, 0, 0, svg_str_to_pixbuf(string))
if file_path is not None:
@@ -51,18 +51,18 @@ class Card:
dx=int(scale * CARD_WIDTH * .125),
dy=int(scale * CARD_HEIGHT * .125))
-
def show_card(self):
- """ Show the card """
+ ''' Show the card '''
self.spr.set_layer(2000)
self.spr.draw()
def hide_card(self):
+ ''' Hide a card '''
self.spr.hide()
def svg_str_to_pixbuf(string):
- """ Load pixbuf from SVG string """
+ ''' Load pixbuf from SVG string '''
pl = gtk.gdk.PixbufLoader('svg')
pl.write(string)
pl.close()
@@ -71,7 +71,7 @@ def svg_str_to_pixbuf(string):
def load_image(object, scale):
+ ''' Load pixbuf from file '''
return gtk.gdk.pixbuf_new_from_file_at_size(object.file_path,
int(scale * CARD_WIDTH * .75),
int(scale * CARD_HEIGHT * .75))
-
diff --git a/constants.py b/constants.py
index a201e85..14e36ea 100644
--- a/constants.py
+++ b/constants.py
@@ -5,11 +5,11 @@
# 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 Lesser General Public
-# License along with this library; if not, write to the
-# Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-# Boston, MA 02111-1307, USA.
+
+# 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 gettext import gettext as _
MATCH_POSITION = 10
@@ -83,10 +83,8 @@ WORD_CARD_MAP = {WORD_CARD_INDICIES[0]: (0, 0), WORD_CARD_INDICIES[1]: (0, 1),
WORD_CARD_INDICIES[4]: (1, 1), WORD_CARD_INDICIES[5]: (1, 2),
WORD_CARD_INDICIES[6]: (2, 0), WORD_CARD_INDICIES[7]: (2, 1),
WORD_CARD_INDICIES[8]: (2, 2)}
-CUSTOM_CARD_INDICIES = [0, 4, 8, 36, 40, 44, 72, 76, 80, None, None, None, None,
- None, None]
-# CUSTOM_CARD_INDICIES = [0, 1, 2, 36, 37, 38, 72, 73, 74, None, None, None, None, None, None]
-
+CUSTOM_CARD_INDICIES = [0, 4, 8, 36, 40, 44, 72, 76, 80, None, None, None,
+ None, None, None]
# 'dead key' Unicode dictionaries
DEAD_KEYS = ['grave', 'acute', 'circumflex', 'tilde', 'diaeresis', 'abovering']
diff --git a/deck.py b/deck.py
index d423d8f..d59026c 100644
--- a/deck.py
+++ b/deck.py
@@ -4,11 +4,11 @@
# 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 Lesser General Public
-# License along with this library; if not, write to the
-# Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-# Boston, MA 02111-1307, USA.
+
+# 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
+
import pygtk
pygtk.require('2.0')
@@ -36,7 +36,7 @@ class Deck:
number_range = NUMBER
fill_range = FILLS
if level == MEDIUM:
- fill_range = 1
+ fill_range = 1
elif level == LOW:
fill_range = 1
shape_range = 1
@@ -73,7 +73,8 @@ class Deck:
self.cards.append(Card(sprites, generate_word_card(shape, color,
num, fill, scale), [shape, color, num, fill]))
self.cards[len(self.cards) - 1].spr.set_label(lists[shape][num])
- self.cards[len(self.cards) - 1].spr.set_label_attributes(scale * 24)
+ self.cards[len(self.cards) - 1].spr.set_label_attributes(
+ scale * 24)
if fill == 0:
self.cards[len(self.cards) - 1].spr.set_font('Sans Bold')
self.cards[len(self.cards) - 1].spr.set_label_color(
diff --git a/gencards.py b/gencards.py
index 88214b2..651f3ce 100755
--- a/gencards.py
+++ b/gencards.py
@@ -7,21 +7,21 @@
# 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 Lesser General Public
-# License along with this library; if not, write to the
-# Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-# Boston, MA 02111-1307, USA.
+
+# 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
+
import os
from gettext import gettext as _
from math import sin, cos, pi
from constants import *
-#
-# SVG generators
-#
+
class SVG:
+ ''' SVG generators '''
+
def __init__(self):
self._scale = 1
self._stroke_width = 1.0
@@ -30,9 +30,9 @@ class SVG:
self._font = 'DejaVu'
def _svg_style(self, extras=""):
- return "%s%s%s%s%s%f%s%s%s" % ("style=\"fill:", self._fill, ";stroke:",
- self._stroke, ";stroke-width:",
- self._stroke_width, ";", extras,
+ return "%s%s%s%s%s%f%s%s%s" % ("style=\"fill:", self._fill, ";stroke:",
+ self._stroke, ";stroke-width:",
+ self._stroke_width, ";", extras,
"\" />\n")
def _svg_rect(self, w, h, rx, ry, x, y):
@@ -63,8 +63,8 @@ class SVG:
def _svg_text(self, x, y, size, style, string):
svg_string = " <text\n"
svg_string += "%s%s%s%s%s%s%s" % (
- " style=\"font-size:12px;text-anchor:middle;", style,
- ";text-align:center;font-family:", self._font, ";fill:",
+ " style=\"font-size:12px;text-anchor:middle;", style,
+ ";text-align:center;font-family:", self._font, ";fill:",
self._stroke, ";\">\n")
svg_string += " <tspan\n"
svg_string += " x=\"%f\"\n" % (x)
@@ -75,12 +75,12 @@ class SVG:
return svg_string
def _svg_check(self, x):
- svg_string = "%s%s%s%s%s%f%s" %\
+ svg_string = "%s%s%s%s%s%f%s" % \
("<path d=\"m 22.5,76.1 l -5.9,-5.9 -4.1,-4.1 c -0.7,-0.7 -1.2,",
- "-1.8 -1.2,-2.9 0,-2.3 1.9,-4.1 4.1,-4.1 1.1,0 2.2,0.5 2.9,1.2 l ",
- "4.1,4.1 14.1,-14.1 c 0.8,-0.7 1.8,-1.2 2.9,-1.2 2.3,0 4.1,1.9 ",
+ "-1.8 -1.2,-2.9 0,-2.3 1.9,-4.1 4.1,-4.1 1.1,0 2.2,0.5 2.9,1.2 l",
+ " 4.1,4.1 14.1,-14.1 c 0.8,-0.7 1.8,-1.2 2.9,-1.2 2.3,0 4.1,1.9 ",
"4.1,4.1 0,1.1 -0.5,2.2 -1.2,2.9 l -14.1,14.1 -5.7,5.9 z\"\n",
- " transform=\"translate(", x-10, ", -25)\"\n")
+ " transform=\"translate(", x - 10, ", -25)\"\n")
svg_string += self._svg_style()
return svg_string
@@ -94,13 +94,13 @@ class SVG:
"4.1,-4.1 1.1,0 2.2,0.5 2.9,1.2 l 10.1,10.1 10.1,-10.1 c ",
"0.8,-0.7 1.8,-1.2 2.9,-1.2 2.3,0 4.1,1.9 4.1,4.1 0,1.1 ",
"-0.5,2.2 -1.2,2.9 l -10.1,10.1 z\"\n")
- svg_string += "%s%f%s" % (" transform=\"translate(", x-10,
+ svg_string += "%s%f%s" % (" transform=\"translate(", x - 10,
", -25)\"\n")
svg_string += self._svg_style()
return svg_string
def _svg_circle_of_dots(self, n, x, y):
- rtab = {5:9, 7:13, 11:17}
+ rtab = {5: 9, 7: 13, 11: 17}
r = rtab[n]
ox = 0
oy = 32.5
@@ -120,8 +120,8 @@ class SVG:
return svg_string
def _svg_line_of_dots(self, n, x, y):
- cxtab = {5:37.5, 7:27.5, 11:7.5, 10:37.5, 14:27.5, 22:7.5, 15:37.5,
- 21:27.5, 33:7.5}
+ cxtab = {5: 37.5, 7: 27.5, 11: 7.5, 10: 37.5, 14: 27.5, 22: 7.5,
+ 15: 37.5, 21: 2.5, 33: 7.5}
svg_string = "%s%f%s%f%s" % ("<g\n transform=\"translate(", x, ", ",
y, ")\">\n")
cx = cxtab[n]
@@ -133,8 +133,8 @@ class SVG:
return svg_string
def _svg_hash(self, n, x, y):
- cxtab = {5:42.5, 7:32.5, 11:22.5, 10:42.5, 14:32.5, 22:22.5,
- 15:42.5, 21:32.5, 33:22.5}
+ cxtab = {5: 42.5, 7: 32.5, 11: 22.5, 10: 42.5, 14: 32.5, 22: 22.5,
+ 15: 42.5, 21: 32.5, 33: 22.5}
cy = 5
x2 = cxtab[n]
x1 = 7.5 + x2
@@ -143,7 +143,7 @@ class SVG:
self._set_stroke_width(2.0)
for i in range(n):
if (i + 1) % 5 == 0:
- svg_string += self._svg_line(x1-40, 7.5, x2, 7.5)
+ svg_string += self._svg_line(x1 - 40, 7.5, x2, 7.5)
else:
svg_string += self._svg_line(x1, 0, x2, 15)
x1 += 7.5
@@ -156,7 +156,7 @@ class SVG:
y, ")\">\n")
x2 = x
self._set_stroke_width(2.0)
- svg_string += self._svg_line(x2-40, 7.5, x2+40, 7.5)
+ svg_string += self._svg_line(x2 - 40, 7.5, x2 + 40, 7.5)
x2 -= 20
x1 = x2 + 7.5
for i in range(n):
@@ -186,7 +186,7 @@ class SVG:
return svg_string
def _svg_star(self, n, x, y):
- turntable = {5:3, 7:3, 11:5}
+ turntable = {5: 3, 7: 3, 11: 5}
turns = turntable[n]
x1 = 0
y1 = 0
@@ -240,8 +240,8 @@ class SVG:
svg_string += " version=\"1.0\"\n"
svg_string += "%s%f%s" % (" width=\"", 125 * self._scale, "\"\n")
svg_string += "%s%f%s" % (" height=\"", 75 * self._scale, "\">\n")
- svg_string += "%s%f%s%f%s" % ("<g\n transform=\"matrix(",
- self._scale, ", 0, 0, ", self._scale,
+ svg_string += "%s%f%s%f%s" % ("<g\n transform=\"matrix(",
+ self._scale, ", 0, 0, ", self._scale,
", 0, 0)\">\n")
svg_string += self._background()
return svg_string
@@ -299,7 +299,7 @@ class SVG:
elif number == 11:
svg_string = self._svg_bar(x, y1s)
svg_string += self._svg_bar(x, y5s)
- svg_string += self._svg_circle(x+20, y10s, 3)
+ svg_string += self._svg_circle(x + 20, y10s, 3)
elif number == 14:
svg_string = self._svg_bar(x, y1s)
svg_string += self._svg_bar(x, y5s)
@@ -497,14 +497,14 @@ class SVG:
else:
self._set_colors([stroke, stroke])
if number == 1:
- svg_string += self._svg_check(45.5)
+ svg_string += self._svg_check(45.5)
elif number == 2:
- svg_string += self._svg_check(25.5)
- svg_string += self._svg_check(65.5)
+ svg_string += self._svg_check(25.5)
+ svg_string += self._svg_check(65.5)
else:
- svg_string += self._svg_check( 5.5)
- svg_string += self._svg_check(45.5)
- svg_string += self._svg_check(85.5)
+ svg_string += self._svg_check(5.5)
+ svg_string += self._svg_check(45.5)
+ svg_string += self._svg_check(85.5)
return svg_string
def _cross_card(self, number, style, stroke, fill):
@@ -516,27 +516,27 @@ class SVG:
else:
self._set_colors([stroke, stroke])
if number == 1:
- svg_string += self._svg_cross(45.5)
+ svg_string += self._svg_cross(45.5)
elif number == 2:
- svg_string += self._svg_cross(25.5)
- svg_string += self._svg_cross(65.5)
+ svg_string += self._svg_cross(25.5)
+ svg_string += self._svg_cross(65.5)
else:
- svg_string += self._svg_cross( 5.5)
- svg_string += self._svg_cross(45.5)
- svg_string += self._svg_cross(85.5)
+ svg_string += self._svg_cross(5.5)
+ svg_string += self._svg_cross(45.5)
+ svg_string += self._svg_cross(85.5)
return svg_string
def _circle_card(self, number, style, stroke, fill):
svg_string = ""
if number == 1:
- svg_string += self._svg_donut(45.5, style, stroke, fill)
+ svg_string += self._svg_donut(45.5, style, stroke, fill)
elif number == 2:
- svg_string += self._svg_donut(25.5, style, stroke, fill)
- svg_string += self._svg_donut(65.5, style, stroke, fill)
+ svg_string += self._svg_donut(25.5, style, stroke, fill)
+ svg_string += self._svg_donut(65.5, style, stroke, fill)
else:
- svg_string += self._svg_donut( 5.5, style, stroke, fill)
- svg_string += self._svg_donut(45.5, style, stroke, fill)
- svg_string += self._svg_donut(85.5, style, stroke, fill)
+ svg_string += self._svg_donut(5.5, style, stroke, fill)
+ svg_string += self._svg_donut(45.5, style, stroke, fill)
+ svg_string += self._svg_donut(85.5, style, stroke, fill)
return svg_string
def _number_arabic(self, number):
@@ -579,13 +579,14 @@ class SVG:
def _pattern_card(self, shape, color, number, fill):
self._set_stroke_width(1.8)
- pattern_styles = [self._cross_card, self._circle_card, self._check_card]
+ pattern_styles = [self._cross_card, self._circle_card,
+ self._check_card]
return pattern_styles[CARD_TYPES.index(shape)](number, fill, color[0],
color[1])
-#
# Card generators
-#
+
+
def generate_smiley(scale):
svg = SVG()
svg._set_scale(scale * 2)
@@ -595,6 +596,7 @@ def generate_smiley(scale):
svg_string += svg._footer()
return svg_string
+
def generate_pattern_card(shape, color, number, fill, scale):
svg = SVG()
svg._set_scale(scale)
@@ -602,13 +604,14 @@ def generate_pattern_card(shape, color, number, fill, scale):
svg._set_colors([BLACK, COLOR_PAIRS[color][1]])
svg_string = svg._header()
svg_string += svg._pattern_card(CARD_TYPES[shape], COLOR_PAIRS[color],
- number+1, FILL_STYLES[fill])
+ number + 1, FILL_STYLES[fill])
svg_string += svg._footer()
return svg_string
+
def generate_number_card(shape, color, number, fill, number_types, scale):
svg = SVG()
- stab = {0:5, 1:7, 2:11}
+ stab = {0: 5, 1: 7, 2: 11}
methodO = [svg._number_roman, svg._number_product, svg._number_chinese,
svg._number_word, svg._number_mayan, svg._number_incan]
methodC = [svg._dots_in_a_line, svg._dots_in_a_circle,
@@ -619,12 +622,13 @@ def generate_number_card(shape, color, number, fill, number_types, scale):
svg._set_colors([BLACK, COLOR_PAIRS[color][1]])
svg_string = svg._header()
svg_string += svg._number_card(shape, (number + 1) * stab[fill],
- COLOR_PAIRS[color][0],
- methodX, methodO[number_types[0]],
+ COLOR_PAIRS[color][0],
+ methodX, methodO[number_types[0]],
methodC[number_types[1]])
svg_string += svg._footer()
return svg_string
+
def generate_word_card(shape, color, number, fill, scale):
svg = SVG()
svg._set_scale(scale)
@@ -647,6 +651,7 @@ def generate_word_card(shape, color, number, fill, scale):
svg_string += svg._footer()
return svg_string
+
def generate_match_card(scale):
svg = SVG()
svg._set_scale(scale)
@@ -656,6 +661,7 @@ def generate_match_card(scale):
svg_string += svg._footer()
return svg_string
+
def generate_selected_card(scale):
svg = SVG()
svg._set_scale(scale)
@@ -665,21 +671,24 @@ def generate_selected_card(scale):
svg_string += svg._footer()
return svg_string
-#
# Command line utilities used for testing purposed only
-#
+
+
def open_file(datapath, filename):
return file(os.path.join(datapath, filename), "w")
+
def close_file(f):
f.close()
+
def generator(datapath, mO=MAYAN, mC=HASH):
generate_pattern_cards(datapath)
generate_number_cards(datapath, [mO, mC])
generate_word_cards(datapath)
generate_extras(datapath)
+
def generate_pattern_cards(datapath):
i = 0
for t in range(3):
@@ -692,6 +701,7 @@ def generate_pattern_cards(datapath):
close_file(f)
i += 1
+
def generate_number_cards(datapath, number_types):
i = 0
for t in range(3):
@@ -704,6 +714,7 @@ def generate_number_cards(datapath, number_types):
close_file(f)
i += 1
+
def generate_word_cards(datapath):
i = 0
for t in range(3):
@@ -716,6 +727,7 @@ def generate_word_cards(datapath):
close_file(f)
i += 1
+
def generate_extras(datapath):
f = open_file(datapath, "match.svg")
f.write(generate_match_card(1))
@@ -724,9 +736,11 @@ def generate_extras(datapath):
f.write(generate_selected_card(1))
close_file(f)
+
def main():
return 0
+
if __name__ == "__main__":
if not os.path.exists(os.path.join(os.path.abspath('.'), 'images')):
os.mkdir(os.path.join(os.path.abspath('.'), 'images'))
diff --git a/po/templates.po b/po/templates.po
index 7e66898..7431e1e 100644
--- a/po/templates.po
+++ b/po/templates.po
@@ -10,332 +10,125 @@
# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
# This file is distributed under the same license as the PACKAGE package.
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
-# 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 <EMAIL@ADDRESS>, YEAR.
-# 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 <EMAIL@ADDRESS>, YEAR.
-# 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 <EMAIL@ADDRESS>, YEAR.
#, fuzzy
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-02-13 00:31-0500\n"
+"POT-Creation-Date: 2010-10-02 10:20-0400\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Translate Toolkit 1.5.2\n"
-
-#: activity/activity.info:2 game.py:525 visualmatch.py:35
-msgid "Visual Match"
-msgstr ""
-
-#: VisualMatchActivity.py:62
-msgid "intermediate"
-msgstr ""
-
-#: VisualMatchActivity.py:62
-msgid "expert"
-msgstr ""
-
-#: VisualMatchActivity.py:62
-msgid "beginner"
-msgstr ""
-
-#: VisualMatchActivity.py:173
-msgid "Play with the computer."
-msgstr ""
-
-#: VisualMatchActivity.py:178
-msgid "Stop playing with the computer."
-msgstr ""
-
-#: VisualMatchActivity.py:263 visualmatch.py:171
-msgid "mouse"
-msgstr ""
-
-#: VisualMatchActivity.py:264 visualmatch.py:171
-msgid "cat"
-msgstr ""
-
-#: VisualMatchActivity.py:265 visualmatch.py:171
-msgid "dog"
-msgstr ""
-
-#: VisualMatchActivity.py:266 visualmatch.py:172
-msgid "cheese"
-msgstr ""
-
-#: VisualMatchActivity.py:267 visualmatch.py:172
-msgid "apple"
-msgstr ""
-
-#: VisualMatchActivity.py:268 visualmatch.py:172
-msgid "bread"
-msgstr ""
-
-#: VisualMatchActivity.py:269 visualmatch.py:173
-msgid "moon"
-msgstr ""
-
-#: VisualMatchActivity.py:270 visualmatch.py:173
-msgid "sun"
-msgstr ""
-
-#: VisualMatchActivity.py:271 visualmatch.py:173
-msgid "earth"
-msgstr ""
-
-#: VisualMatchActivity.py:343
-msgid "Game"
-msgstr ""
-
-#: VisualMatchActivity.py:344
-msgid "Numbers"
-msgstr ""
-
-#: VisualMatchActivity.py:345
-msgid "Tools"
-msgstr ""
-
-#: VisualMatchActivity.py:350 visualmatch.py:49
-msgid "New pattern game"
-msgstr ""
-
-#: VisualMatchActivity.py:353 visualmatch.py:53
-msgid "New number game"
-msgstr ""
-
-#: VisualMatchActivity.py:354 visualmatch.py:57
-msgid "New word game"
-msgstr ""
-
-#: VisualMatchActivity.py:357 VisualMatchActivity.py:371
-msgid "Import custom cards"
-msgstr ""
-
-#: VisualMatchActivity.py:367
-msgid "Edit word lists."
-msgstr ""
-
-#: VisualMatchActivity.py:372
-msgid "product"
-msgstr ""
-
-#: VisualMatchActivity.py:376
-msgid "Roman numerals"
-msgstr ""
-
-#: VisualMatchActivity.py:380
-msgid "word"
-msgstr ""
-
-#: VisualMatchActivity.py:384 visualmatch.py:107
-msgid "Chinese"
-msgstr ""
-
-#: VisualMatchActivity.py:388 visualmatch.py:111
-msgid "Mayan"
-msgstr ""
-
-#: VisualMatchActivity.py:392
-msgid "Quipu"
-msgstr ""
-
-#: VisualMatchActivity.py:397
-msgid "hash marks"
-msgstr ""
-
-#: VisualMatchActivity.py:401
-msgid "dots in a circle"
-msgstr ""
-
-#: VisualMatchActivity.py:405
-msgid "points on a star"
-msgstr ""
-
-#: VisualMatchActivity.py:409
-msgid "dice"
-msgstr ""
-
-#: VisualMatchActivity.py:413
-msgid "dots in a line"
-msgstr ""
-
-#: VisualMatchActivity.py:422
-msgid "Play with the computer"
-msgstr ""
-
-#: VisualMatchActivity.py:429
-msgid "Set difficulty level."
-msgstr ""
-
-#: VisualMatchActivity.py:438
-msgid "Find a match."
-msgstr ""
-
-#: VisualMatchActivity.py:442 game.py:414 game.py:495
-msgid "cards"
-msgstr ""
-
-#: VisualMatchActivity.py:444 game.py:508 game.py:510
-msgid "matches"
-msgstr ""
-
-#: constants.py:70
-msgid "five"
-msgstr ""
-
-#: constants.py:70
-msgid "seven"
-msgstr ""
-
-#: constants.py:70
-msgid "eleven"
-msgstr ""
-
-#: constants.py:70
-msgid "ten"
-msgstr ""
-
-#: constants.py:71
-msgid "fourteen"
-msgstr ""
-
-#: constants.py:71
-msgid "fifteen"
-msgstr ""
-
-#: constants.py:71
-msgid "twenty two"
-msgstr ""
-
-#: constants.py:72
-msgid "twenty one"
-msgstr ""
-
-#: constants.py:72
-msgid "thirty three"
-msgstr ""
-
-#: game.py:260
-msgid "Edit the custom cards."
-msgstr ""
-
-#: game.py:288
-msgid "Edit the word cards."
-msgstr ""
-
-#: game.py:381
-msgid "Game over"
-msgstr ""
-
-#: game.py:390
-msgid "unsolvable"
-msgstr ""
+"X-Generator: Translate Toolkit 1.6.0\n"
-#: game.py:425
-msgid "New record"
+#: activity/activity.info:2 /home/walter/Desktop/abacus/abacus.py:49
+msgid "Abacus"
msgstr ""
-#: game.py:501 game.py:503
-msgid "match"
+#: /home/walter/Desktop/abacus/abacus_window.py:548
+#: /home/walter/Desktop/abacus/abacus.py:70
+msgid "Reset"
msgstr ""
-#: game.py:713
-msgid "New custom game"
+#: /home/walter/Desktop/abacus/AbacusActivity.py:136
+#: /home/walter/Desktop/abacus/AbacusActivity.py:160
+msgid "Edit"
msgstr ""
-#: namingalert.py:82
-msgid "Describe your activity"
+#: /home/walter/Desktop/abacus/AbacusActivity.py:146
+msgid "<Ctrl>Q"
msgstr ""
-#: namingalert.py:87
-msgid "Keep"
+#: /home/walter/Desktop/abacus/AbacusActivity.py:158
+msgid "Project"
msgstr ""
-#: namingalert.py:283
-msgid "Untitled"
+#: /home/walter/Desktop/abacus/AbacusActivity.py:159
+#: /home/walter/Desktop/abacus/AbacusActivity.py:208
+msgid "Custom"
msgstr ""
-#: namingalert.py:290
-msgid "Description:"
+#: /home/walter/Desktop/abacus/AbacusActivity.py:173
+#: /home/walter/Desktop/abacus/abacus.py:54
+msgid "Soroban"
msgstr ""
-#: namingalert.py:314
-msgid "Tags:"
+#: /home/walter/Desktop/abacus/AbacusActivity.py:176
+#: /home/walter/Desktop/abacus/abacus.py:56
+msgid "Nepohualtzintzin"
msgstr ""
-#: visualmatch.py:36
-msgid "Click on cards to create sets of three."
+#: /home/walter/Desktop/abacus/AbacusActivity.py:178
+#: /home/walter/Desktop/abacus/abacus.py:58
+msgid "Hexadecimal"
msgstr ""
-#: visualmatch.py:40
-msgid "Toggle level"
+#: /home/walter/Desktop/abacus/AbacusActivity.py:180
+#: /home/walter/Desktop/abacus/abacus.py:57
+msgid "Binary"
msgstr ""
-#: visualmatch.py:66
-msgid "Robot on/off"
+#: /home/walter/Desktop/abacus/AbacusActivity.py:182
+#: /home/walter/Desktop/abacus/abacus.py:55
+msgid "Schety"
msgstr ""
-#: visualmatch.py:70
-msgid "90 sec."
+#: /home/walter/Desktop/abacus/AbacusActivity.py:184
+#: /home/walter/Desktop/abacus/abacus.py:59
+msgid "Fraction"
msgstr ""
-#: visualmatch.py:74
-msgid "60 sec."
+#: /home/walter/Desktop/abacus/AbacusActivity.py:186
+#: /home/walter/Desktop/abacus/abacus.py:61
+msgid "Caacupé"
msgstr ""
-#: visualmatch.py:78
-msgid "45 sec."
+#: /home/walter/Desktop/abacus/AbacusActivity.py:188
+#: /home/walter/Desktop/abacus/abacus.py:62
+msgid "Rods"
msgstr ""
-#: visualmatch.py:82
-msgid "30 sec."
+#: /home/walter/Desktop/abacus/AbacusActivity.py:191
+msgid "Rods:"
msgstr ""
-#: visualmatch.py:86
-msgid "15 sec."
+#: /home/walter/Desktop/abacus/AbacusActivity.py:194
+msgid "Top:"
msgstr ""
-#: visualmatch.py:95
-msgid "Product"
+#: /home/walter/Desktop/abacus/AbacusActivity.py:197
+msgid "Bottom:"
msgstr ""
-#: visualmatch.py:99
-msgid "Roman"
+#: /home/walter/Desktop/abacus/AbacusActivity.py:201
+msgid "Factor:"
msgstr ""
-#: visualmatch.py:103
-msgid "Word"
+#: /home/walter/Desktop/abacus/AbacusActivity.py:204
+msgid "Base:"
msgstr ""
-#: visualmatch.py:115
-msgid "Hash"
+#: /home/walter/Desktop/abacus/AbacusActivity.py:211
+msgid "Copy"
msgstr ""
-#: visualmatch.py:119
-msgid "Dice"
+#: /home/walter/Desktop/abacus/AbacusActivity.py:213
+msgid "Paste"
msgstr ""
-#: visualmatch.py:123
-msgid "Dots"
+#: /home/walter/Desktop/abacus/AbacusActivity.py:279
+#: /home/walter/Desktop/abacus/abacus.py:53
+msgid "Suanpan"
msgstr ""
-#: visualmatch.py:127
-msgid "Star"
+#: /home/walter/Desktop/abacus/AbacusActivity.py:281
+#: /home/walter/Desktop/abacus/abacus.py:60
+msgid "Decimal"
msgstr ""
-#: visualmatch.py:131
-msgid "Lines"
+#: /home/walter/Desktop/abacus/abacus.py:73
+msgid "Quit"
msgstr ""